occ

src/components/occDisease/OccDisease.vue

@@ -8,7 +8,7 @@
         <OccDiseasePrevious />
       </el-tab-pane>
       <el-tab-pane label="接害因素" name="2">
-        <OccDiseasePoison :height="465"/>
+        <OccDiseasePoison :height="465" />
       </el-tab-pane>
 
       <el-tab-pane label="职业史" name="3">
@@ -31,7 +31,8 @@
       <div></div>
       <div>
         <el-button v-if="false" @click="btnTest">测试</el-button>
-        <el-button class="deleteButton" @click="btnDel" :disabled="dataTransOpts.tableS.patient_register.completeFlag == '3'">删除</el-button>
+        <el-button class="deleteButton" @click="btnDel"
+          :disabled="dataTransOpts.tableS.patient_register.completeFlag == '3'">删除</el-button>
         <el-button class="commonbutton" @click="btnOk">确定</el-button>
         <el-button class="commonbutton" @click="btnClose">关闭</el-button>
       </div>
@@ -141,9 +142,9 @@ export default {
               this.dataTransOpts.tableM.patient_symptom = []
               this.dict.symptom.forEach(e => {
                 // 男性 不显示月经/经期相关症状                
-                if(!(this.dataTransOpts.tableS.patient_register.sexId != 'F' && (e.displayName.indexOf('月经') > -1 || e.displayName.indexOf('经期') > -1))){
-                  this.dataTransOpts.tableM.patient_symptom.push({ symptomId: e.id, symptomName:e.displayName, degree: '-' })
-                }                
+                if (!(this.dataTransOpts.tableS.patient_register.sexId != 'F' && (e.displayName.indexOf('月经') > -1 || e.displayName.indexOf('经期') > -1))) {
+                  this.dataTransOpts.tableM.patient_symptom.push({ symptomId: e.id, symptomName: e.displayName, degree: '-' })
+                }
               });
             }
           }
@@ -178,8 +179,10 @@ export default {
     // 点击确定
     btnOk() {
       let message = ''
+      // console.log('this.dataTransOpts.tableM.patient_poison', this.dataTransOpts.tableM.patient_poison)
+
       this.dataTransOpts.tableM.patient_poison.forEach((e, i) => {
-        if(e.poisonId) message = `接害因素，第 ${i+1} 行，不能为空`
+        if (!e.poisonId) message = `接害因素，第 ${i + 1} 行，不能为空`
         if (!e.occupationalAbnormalId) e.occupationalAbnormalId = null
       });
       if (message) {