Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI

.env.prod-myhk

@@ -1,7 +1,7 @@
 # 页面标题
 VUE_APP_TITLE =木易华康互联网医院管理系统
 # 首页菜单标题
-VUE_APP_TITLE_INDEX =木易华康互联网医院
+VUE_APP_TITLE_INDEX =康复e站
 # 公司名称
 VUE_APP_COMPANY_NAME =福州市木易华康医药有限公司
 # ICP备案号

src/api/his/fsFirstDiagnosis.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询初诊单列表
+export function listFsFirstDiagnosis(query) {
+  return request({
+    url: '/his/fsFirstDiagnosis/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询初诊单详细
+export function getFsFirstDiagnosis(id) {
+  return request({
+    url: '/his/fsFirstDiagnosis/' + id,
+    method: 'get'
+  })
+}
+
+// 新增初诊单
+export function addFsFirstDiagnosis(data) {
+  return request({
+    url: '/his/fsFirstDiagnosis',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改初诊单
+export function updateFsFirstDiagnosis(data) {
+  return request({
+    url: '/his/fsFirstDiagnosis',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除初诊单
+export function delFsFirstDiagnosis(id) {
+  return request({
+    url: '/his/fsFirstDiagnosis/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出初诊单
+export function exportFsFirstDiagnosis(query) {
+  return request({
+    url: '/his/fsFirstDiagnosis/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/components/his/inquiryOrderDetails.vue

@@ -556,7 +556,6 @@ import { js } from "js-beautify";
           content:'',
           advice:'',
         })
-        let ak = this.patientForm.doctorAdviceJson.treatmentAdvice.filter(obj => obj.content != '');
       },
       delItem(item,index){
         this.patientForm.doctorAdviceJson.treatmentAdvice.splice(index,1)

src/views/his/fsFirstDiagnosis/index.vue

@@ -0,0 +1,369 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="患者姓名" prop="patientName">
+        <el-input v-model="queryParams.patientName" placeholder="请输入患者姓名" clearable size="small"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="电话" prop="phone">
+        <el-input v-model="queryParams.phone" placeholder="请输入电话" clearable size="small"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="医生名称" prop="doctorName">
+        <el-input v-model="queryParams.doctorName" placeholder="请输入医生名称" clearable size="small"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="用户姓名" prop="userName">
+        <el-input v-model="queryParams.userName" placeholder="请输入用户姓名" clearable size="small"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="销售名称" prop="qwUserName">
+        <el-input v-model="queryParams.qwUserName" placeholder="请输入销售名称" clearable size="small"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="医生证号" prop="doctorCertificate">
+        <el-input v-model="queryParams.doctorCertificate" placeholder="请输入医生证号" clearable size="small"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="医生填写" prop="doctorStatus">
+        <el-select clearable v-model="queryParams.doctorStatus">
+          <el-option label="未填写" value="0"></el-option>
+          <el-option label="已填写" value="1"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="用户答复" prop="userStatus">
+        <el-select clearable v-model="queryParams.userStatus">
+          <el-option label="未答复" value="0"></el-option>
+          <el-option label="已答复" value="1"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['his:fsFirstDiagnosis:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['his:fsFirstDiagnosis:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['his:fsFirstDiagnosis:remove']"
+        >删除</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading"
+          @click="handleExport" v-hasPermi="['his:fsFirstDiagnosis:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table border v-loading="loading" :data="fsFirstDiagnosisList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <!-- <el-table-column label="医生证号" align="center" prop="id" /> -->
+      <el-table-column label="患者姓名" align="center" prop="patientName" />
+      <el-table-column label="年龄" align="center" prop="age" />
+      <el-table-column label="性别" align="center" prop="gender">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.gender == 0">未知</el-tag>
+          <el-tag v-if="scope.row.gender == 1">男</el-tag>
+          <el-tag v-if="scope.row.gender == 2">女</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="电话" align="center" prop="phone" />
+      <el-table-column label="身体状况" align="center" prop="physicalCondition" :show-overflow-tooltip="true" />
+      <el-table-column label="日期" align="center" prop="dateTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.dateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="初步诊断" align="center" prop="firstDiagnosis" :show-overflow-tooltip="true" />
+      <el-table-column label="医生名称" align="center" prop="doctorName" />
+      <el-table-column label="医生职称" align="center" prop="doctorDep" />
+      <el-table-column label="医生证号" align="center" prop="doctorCertificate" />
+      <el-table-column label="用户姓名" align="center" prop="userName" />
+      <el-table-column label="销售名称" align="center" prop="qwUserName" />
+      <el-table-column label="用户答复" align="center" prop="userStatus" width="120px">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.userStatus == 0">未答复</el-tag>
+          <el-tag type="success" v-if="scope.row.userStatus == 1">已答复</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="医生填写" align="center" prop="doctorStatus" width="120px">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.doctorStatus == 0">未填写</el-tag>
+          <el-tag type="success" v-if="scope.row.doctorStatus == 1">已填写</el-tag>
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['his:fsFirstDiagnosis:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['his:fsFirstDiagnosis:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column> -->
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
+
+    <!-- 添加或修改初诊单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="患者姓名" prop="patientName">
+          <el-input v-model="form.patientName" placeholder="请输入患者姓名" />
+        </el-form-item>
+        <el-form-item label="年龄" prop="age">
+          <el-input v-model="form.age" placeholder="请输入年龄" />
+        </el-form-item>
+        <el-form-item label="0-未知 1-男性 2-女性" prop="gender">
+          <el-input v-model="form.gender" placeholder="请输入0-未知 1-男性 2-女性" />
+        </el-form-item>
+        <el-form-item label="电话" prop="phone">
+          <el-input v-model="form.phone" placeholder="请输入电话" />
+        </el-form-item>
+        <el-form-item label="身体状况" prop="physicalCondition">
+          <el-input v-model="form.physicalCondition" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="日期" prop="dateTime">
+          <el-date-picker clearable size="small" v-model="form.dateTime" type="date" value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="出版诊断" prop="firstDiagnosis">
+          <el-input v-model="form.firstDiagnosis" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="医生id" prop="doctoId">
+          <el-input v-model="form.doctoId" placeholder="请输入医生id" />
+        </el-form-item>
+        <el-form-item label="医生名称" prop="doctorName">
+          <el-input v-model="form.doctorName" placeholder="请输入医生名称" />
+        </el-form-item>
+        <el-form-item label="职称" prop="doctorDep">
+          <el-input v-model="form.doctorDep" placeholder="请输入职称" />
+        </el-form-item>
+        <el-form-item label="用户id" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id" />
+        </el-form-item>
+        <el-form-item label="医生证号" prop="doctorCertificate">
+          <el-input v-model="form.doctorCertificate" placeholder="请输入医生证号" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listFsFirstDiagnosis, getFsFirstDiagnosis, delFsFirstDiagnosis, addFsFirstDiagnosis, updateFsFirstDiagnosis, exportFsFirstDiagnosis } from "@/api/his/fsFirstDiagnosis";
+
+export default {
+  name: "FsFirstDiagnosis",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 初诊单表格数据
+      fsFirstDiagnosisList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        patientName: null,
+        age: null,
+        gender: null,
+        phone: null,
+        physicalCondition: null,
+        dateTime: null,
+        firstDiagnosis: null,
+        doctoId: null,
+        doctorName: null,
+        doctorDep: null,
+        userId: null,
+        doctorCertificate: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询初诊单列表 */
+    getList() {
+      this.loading = true;
+      listFsFirstDiagnosis(this.queryParams).then(response => {
+        this.fsFirstDiagnosisList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        patientName: null,
+        age: null,
+        gender: null,
+        phone: null,
+        physicalCondition: null,
+        dateTime: null,
+        firstDiagnosis: null,
+        doctoId: null,
+        doctorName: null,
+        doctorDep: null,
+        createTime: null,
+        updateTime: null,
+        userId: null,
+        doctorCertificate: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加初诊单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getFsFirstDiagnosis(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改初诊单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateFsFirstDiagnosis(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFsFirstDiagnosis(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除初诊单编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delFsFirstDiagnosis(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有初诊单数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        return exportFsFirstDiagnosis(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+  }
+};
+</script>

src/views/system/config/config.vue

@@ -1583,7 +1583,7 @@
         </el-form>
 
       </el-tab-pane>
-       <el-tab-pane label="企业理念" name="store.concept">
+      <el-tab-pane label="企业理念" name="store.concept">
          <el-form ref="form21" :model="form21" :rules="rules21" label-width="160px">
            <el-form-item   label="企业理念图片" prop="images">
              <Material v-model="images" type="image" :num="10" :width="150" :height="150" />
@@ -1609,6 +1609,32 @@
         </div>
       </el-form>
     </el-tab-pane>
+    <el-tab-pane label="APP推广" name="app.config">
+         <el-form ref="form25" :model="form25" :rules="rules25" label-width="160px">
+           <el-form-item   label="APP推广图片" prop="images">
+             <Material v-model="appImages" type="image" :num="10" :width="150" :height="150" />
+           </el-form-item>
+           <el-form-item label="APP推广视频" prop="videoUrl">
+             <div>
+               <el-upload
+                 ref="upload"
+                 class="upload-demo"
+                 :action="uploadUrl"
+                 :on-success="appHandleSuccess"
+                 :before-upload="beforeUpload"
+                 :limit="1"
+                 :accept="videoAccept"
+               >
+                 <el-button size="small" type="primary">点击上传视频</el-button>
+               </el-upload>
+               <video :src="form25.videoUrl" controls style="max-width: 400px; max-height: 400px;"></video>
+             </div>
+           </el-form-item>
+           <div  class="footer">
+             <el-button type="primary" @click="submitForm25">提  交</el-button>
+        </div>
+      </el-form>
+    </el-tab-pane>
     </el-tabs>
 
 
@@ -1648,6 +1674,7 @@ export default {
     return {
       citys:[],
       images:[],
+      appImages:[],
       uploadUrl:process.env.VUE_APP_BASE_API+"/common/uploadOSS",
       videoAccept:"video/*",
       courseMaConfigLoading:false,
@@ -1729,6 +1756,8 @@ export default {
       },
       form24:{
       },
+      form25:{
+      },
       photoArr:[],
       couponList:[],
       inquirySubTypeOptions:[],
@@ -1782,7 +1811,8 @@ export default {
         cLevelMax: [{ required: true, message: '请输入C级最大值', trigger: 'blur' }],
         dLevelMax: [{ required: true, message: '请输入D级最大值', trigger: 'blur' }],
       },
-      rules21:{}
+      rules21:{},
+      rules25:{}
     };
   },
   created() {
@@ -1804,7 +1834,10 @@ export default {
     },
     images: function(val) {
      this.form21.images = val.join(',')
-   }
+    },
+    appImages: function(val) {
+     this.form25.images = val.join(',')
+    }
   },
   methods: {
 
@@ -1909,6 +1942,12 @@ export default {
       this.form21.videoUrl = response.url;
       this.$refs.upload.clearFiles();
     },
+    appHandleSuccess(response, file) {
+      // 上传成功后的回调函数
+      this.myloading.close();
+      this.form25.videoUrl = response.url;
+      this.$refs.upload.clearFiles();
+    },
     beforeUpload(file) {
       // 上传前的钩子函数，可以在这里对文件进行处理
       // 返回 false 则取消上传
@@ -2119,6 +2158,14 @@ export default {
             this.form24 =JSON.parse(response.data.configValue);
             console.log(this.form24.sign)
           }
+          else if(key=="app.config"){
+            this.configId=response.data.configId;
+            this.configKey=response.data.configKey;
+            this.form25 =JSON.parse(response.data.configValue);
+            if(this.form25.images!=null){
+              this.appImages=this.form25.images.split(",");
+            }
+          }
         });
      },
     /** 提交按钮 */
@@ -2313,6 +2360,15 @@ export default {
       });
 
     },
+    submitForm25(){
+      var param={configId:this.configId,configKey:this.configKey,configValue:JSON.stringify(this.form25)}
+      console.log(param)
+      updateConfigByKey(param).then(response => {
+        if (response.code === 200) {
+          this.msgSuccess("修改成功");
+        }
+      });
+    },
     submitForm21(){
       var param={configId:this.configId,configKey:this.configKey,configValue:JSON.stringify(this.form21)}
       updateConfigByKey(param).then(response => {