report

src/components/occDisease/OccDiseaseBase.vue

@@ -5,35 +5,39 @@
         <el-col :span="6">
           <el-form-item prop="ocCheckTypeId" label="检查类别">
             <el-select v-model="dataTransOpts.tableS.patient_occupational_disease.ocCheckTypeId" size="small">
-              <el-option v-for="item in dict.occCheckType" :key="item.value" :label="item.displayName" :value="item.id" />
+              <el-option v-for="item in dict.occCheckType" :key="item.value" :label="item.displayName"
+                :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="工种">
-            <el-input v-model="dataTransOpts.tableS.patient_occupational_disease.jobType" clearable size="small"></el-input>
+            <el-input v-model="dataTransOpts.tableS.patient_occupational_disease.jobType" clearable
+              size="small"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item prop="totalWorkTime" label="总工龄">
             <el-autocomplete class="inline-input"
-              v-model="dataTransOpts.tableS.patient_occupational_disease.totalWorkTime" :fetch-suggestions="querySearch" clearable 
-              placeholder="总工龄" size="small" />
+              v-model="dataTransOpts.tableS.patient_occupational_disease.totalWorkTime" :fetch-suggestions="querySearch"
+              clearable placeholder="总工龄" size="small" />
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item prop="poisonWorkTime" label="接害工龄">
             <el-autocomplete class="inline-input"
-              v-model="dataTransOpts.tableS.patient_occupational_disease.poisonWorkTime" :fetch-suggestions="querySearch" clearable 
-              placeholder="接害工龄" size="small" />
+              v-model="dataTransOpts.tableS.patient_occupational_disease.poisonWorkTime"
+              :fetch-suggestions="querySearch" clearable placeholder="接害工龄" size="small" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="24">
           <el-form-item label="接害因素">
-            <el-input type="textarea" v-model="dataTransOpts.tableS.patient_occupational_disease.riskFactors" size="small"
-              :autosize="{ minRows: 1, maxRows: 10 }" clearable ></el-input>
+            <el-tooltip content="此处只显示，不允许编辑" placement="left-start">
+              <el-input type="textarea" v-model="dataTransOpts.tableS.patient_occupational_disease.riskFactors"
+                size="small" :autosize="{ minRows: 1, maxRows: 10 }" disabled></el-input>
+            </el-tooltip>
           </el-form-item>
         </el-col>
       </el-row>
@@ -41,7 +45,7 @@
         <el-col :span="24">
           <el-form-item label="家族遗传史">
             <el-input type="textarea" v-model="dataTransOpts.tableS.patient_occupational_disease.familyGeneticHistory"
-              size="small" :autosize="{ minRows: 1, maxRows: 10 }" clearable ></el-input>
+              size="small" :autosize="{ minRows: 1, maxRows: 10 }" clearable></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -132,7 +136,8 @@
       <el-row v-show="dataTransOpts.tableS.patient_register.sexId == 'F'">
         <el-col :span="8">
           <el-form-item label="四、生育史：现有子女" label-width="145px">
-            <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.childrenNum" size="small">
+            <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.childrenNum"
+              size="small">
               <template slot="append">人</template>
             </el-input>
           </el-form-item>
@@ -181,7 +186,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="频次">
+          <el-form-item label="吸烟量">
             <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.smokeNum" size="small">
               <template slot="append">支/天</template>
             </el-input>
@@ -206,7 +211,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item label="频次">
+          <el-form-item label="喝酒量">
             <el-input type="number" v-model="dataTransOpts.tableS.patient_occupational_disease.drinkNum" size="small">
               <template slot="append">ml/次</template>
             </el-input>
@@ -224,7 +229,7 @@
         <el-col :span="24">
           <el-form-item label="六、其他：" label-width="75px">
             <el-input type="textarea" v-model="dataTransOpts.tableS.patient_occupational_disease.other" size="small"
-              :autosize="{ minRows: 1, maxRows: 10 }" clearable ></el-input>
+              :autosize="{ minRows: 1, maxRows: 10 }" clearable></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -335,11 +340,11 @@ export default {
       });
     },
 
-    
+
     querySearch(queryString, cb) {
       var restaurants = [{ value: '年月' }]; //不需要字典库显示  deepCopy(this.restaurants) [{ value: '阴性' },{ value: '阳性' }]
       var results = queryString
-        ? restaurants.filter(e => { return e.value.indexOf(queryString) > -1})
+        ? restaurants.filter(e => { return e.value.indexOf(queryString) > -1 })
         : restaurants;
       // 调用 callback 返回建议列表的数据
       cb(results);
@@ -361,11 +366,13 @@ export default {
   },
 };
 </script>
-<style scoped>@import '../../assets/css/global_table.css';
+<style scoped>
+@import '../../assets/css/global_table.css';
 @import '../../assets/css/global_input.css';
 @import '../../assets/css/global_form.css';
 @import '../../assets/css/global_dialog.css';
 
 .btnClass {
   width: 110px;
-}</style>
+}
+</style>

src/components/occDisease/OccDiseaseHistory.vue

@@ -32,7 +32,7 @@
         </el-table-column>
         <el-table-column prop="poison" label="接害因素" min-width="180">
           <template slot-scope="scope">
-            <el-input placeholder="请选接害因素" v-model="scope.row.poison" size="small" disabled>
+            <el-input placeholder="请选接害因素" v-model="scope.row.poison" size="small">
               <el-button slot="append" icon="el-icon-search" @click="btnDispPoison(scope.$index)"
                 style="font-size: 20px;"></el-button>
             </el-input>

src/components/occDisease/OccDiseasePoison.vue

@@ -44,7 +44,7 @@
     <!--弹窗-->
     <div>
       <el-dialog title="选择接害因素" :visible.sync="dialogPoison" width="400px" :close-on-click-modal="false"
-        :append-to-body="true">
+        :append-to-body="true" @close="mergePoisonName">
         <div style="height: 320px;display: flex;">
           <el-select v-model="choosedPoison" size="small" style="width:350px;" clearable filterable
             :filter-method="filterMethod" value-key="id">
@@ -146,6 +146,15 @@ export default {
       this.poison = this.madeSelectGroup(this.poisonList)
     },
 
+    // 接害因素汇总
+    mergePoisonName(){
+      let poisonNames = []
+      this.dataTransOpts.tableM.patient_poison.forEach(e => {
+        if(e.poisonName) poisonNames.push(e.poisonName)
+      });
+      this.dataTransOpts.tableS.patient_occupational_disease.riskFactors = `${poisonNames}`
+    },
+
     // 显示选择症状项目
     btnDispPoison(index) {
       this.currRow = index
@@ -193,6 +202,7 @@ export default {
         type: "warning",
       }).then(() => {
         this.dataTransOpts.tableM.patient_poison.splice(index, 1);
+        this.mergePoisonName()
         //this.submit('form');
       }).catch((err) => {
         if (err != 'cancel') {

src/components/sumDoctorCheck/SumPREdit.vue

@@ -7,13 +7,12 @@
           :disabled="dataTransOpts.tableS.patient_register.completeFlag == '3' ? true : false" placeholder="请选择"
           style="width: 80px" size="small">
           <el-option-group v-for="group in medicalConclusionGroup" :key="group.value" :label="group.label">
-            <el-option v-for="item in group.options" :key="item.id" :label="item.displayName"
-              :value="item.id" />
+            <el-option v-for="item in group.options" :key="item.id" :label="item.displayName" :value="item.id" />
           </el-option-group>
         </el-select>
       </div>
       <div>
-        <span class="query">总检医生</span>
+        <span class="query">{{ summary_check_doctor_alias[0] || '总检' }}医生</span>
         <el-select v-model="dataTransOpts.tableS.patient_register.summaryDoctorId" filterable clearable
           :disabled="dataTransOpts.tableS.patient_register.completeFlag == '3' ? true : false" placeholder="请选择"
           style="width: 80px" size="small">
@@ -21,29 +20,29 @@
         </el-select>
       </div>
       <div>
-        <span class="query">总检日期</span>
+        <span class="query">{{ summary_check_doctor_alias[0] || '总检' }}日期</span>
         <el-date-picker v-model="dataTransOpts.tableS.patient_register.summaryDate" value-format="yyyy-MM-dd HH:mm:ss"
           :disabled="dataTransOpts.tableS.patient_register.completeFlag == '3' ? true : false" type="date"
           style="width: 90px" size="small" />
       </div>
       <div style="margin-top: 3px;">
-        <span class="query">总检</span>
+        <span class="query">{{ summary_check_doctor_alias[0] || '总检' }}</span>
         <el-checkbox :value="dataTransOpts.tableS.patient_register.completeFlag == '3'" disabled></el-checkbox>
       </div>
       <div>
-        <span class="query">审核医生</span>
+        <span class="query">{{ summary_check_doctor_alias[1] || '审核' }}医生</span>
         <el-select v-model="dataTransOpts.tableS.patient_register.auditDoctorId" disabled placeholder="请选择"
           style="width: 80px" size="small">
           <el-option v-for="item in users" :key="item.id" :label="item.surname" :value="item.id" />
         </el-select>
       </div>
       <div>
-        <span class="query">审核日期</span>
+        <span class="query">{{ summary_check_doctor_alias[1] || '审核' }}日期</span>
         <el-date-picker v-model="dataTransOpts.tableS.patient_register.auditDate" value-format="yyyy-MM-dd" disabled
           type="date" style="width: 90px" size="small" />
       </div>
       <div style="margin-top: 3px;">
-        <span class="query">审核</span>
+        <span class="query">{{ summary_check_doctor_alias[1] || '审核' }}</span>
         <el-checkbox :value="dataTransOpts.tableS.patient_register.isAudit == 'Y'" disabled></el-checkbox>
       </div>
     </div>
@@ -62,6 +61,7 @@ export default {
       users: [],
       medicalConclusion: [],
       medicalConclusionGroup: [],
+      summary_check_doctor_alias: ["总检", "审核"],
     };
   },
 
@@ -73,13 +73,13 @@ export default {
   },
 
   computed: {
-    ...mapState(["dict","window", "dataTransOpts"]),   
+    ...mapState(["dict", "window", "dataTransOpts"]),
   },
   methods: {
     // 初始化字典数据
     dictInit() {
       // 获取用户信息
-      postapi('/api/identity/users/GetListByOperatorType',{operatorTypes:["2","3"]})
+      postapi('/api/identity/users/GetListByOperatorType', { operatorTypes: ["2", "3"] })
         .then(res => {
           if (res.code > -1) {
             this.users = res.data
@@ -95,6 +95,16 @@ export default {
           }
         })
 
+
+      let sysParmId = "summary_check_doctor_alias"
+      postapi('/api/app/SysParmValue/GetSysParmValueBySysParmId', { sysParmId })
+        .then(res => {
+          if (res.code > -1) {
+            this.summary_check_doctor_alias = JSON.parse(res.data)
+          }
+        })
+
+
     },
 
     medicalConclusionHandle() {
@@ -115,7 +125,7 @@ export default {
         if (lfind > -1) {
           this.medicalConclusionGroup[lfind]["options"].push({ id: e.id, displayName: e.displayName })
         } else {
-          this.medicalConclusionGroup.push({            
+          this.medicalConclusionGroup.push({
             label: e.medicalConclusionTypeName,
             value: e.medicalConclusionTypeId,
             options: [{ id: e.id, displayName: e.displayName }]
@@ -131,12 +141,13 @@ export default {
 };
 </script>
 <style scoped>
-::v-deep .el-select-group__title{
+::v-deep .el-select-group__title {
   font-size: 15px;
   background-color: #EEEEEE;
   color: black;
   font-weight: 700;
 }
+
 /*  popper-class="sumarySelect" :popper-append-to-body="false"
 ::v-deep .sumarySelect .el-select-dropdown__wrap {
   background-color: #FFF;