occ report

src/components/occDisease/OccDiseaseHistory.vue

@@ -87,8 +87,8 @@
         </span>
       </el-dialog>
       <!-- 接害因素字典库 -->
-      <el-dialog title="" :visible.sync="dialogDictPoison" :close-on-click-modal="false" :append-to-body="true" fullscreen
-        @close="closeDialogDictPoison">
+      <el-dialog title="" :visible.sync="dialogDictPoison" :close-on-click-modal="false" :append-to-body="true"
+        fullscreen @close="closeDialogDictPoison">
         <div style="margin-top: 10px;">
           <DictPoison />
         </div>
@@ -212,7 +212,14 @@ export default {
     btnAdd() {
       this.postion = deepCopy(this.dict.postion)
       this.dataTransOpts.tableM.patient_occupational_history.push({
-        patientRegisterId: this.patientRegisterId
+        patientRegisterId: this.patientRegisterId,
+        beginDate: '',
+        endDate: '',
+        org: '',
+        workShop: '',
+        workType: '',
+        poison: '',
+        protectiveMeasures: ''
       });
     },
 
@@ -220,14 +227,14 @@ export default {
     btnDispPoison(index) {
       this.currRow = index
       this.poisonList = deepCopy(this.dict.poisonList)
-      
+
       this.poison = this.madeSelectGroup(this.poisonList)
-      if(this.dataTransOpts.tableM.patient_occupational_history[index]['poison']){
+      if (this.dataTransOpts.tableM.patient_occupational_history[index]['poison']) {
         this.choosedPoison = this.dataTransOpts.tableM.patient_occupational_history[index]['poison'].split(",")
-      }else{
+      } else {
         this.choosedPoison = []
       }
-      
+
       this.dialogPoison = true
     },
 

src/components/occDisease/OccDiseasePrevious.vue

@@ -43,7 +43,7 @@
           </div>
         </template>
         <template slot-scope="scope">
-          <i class="el-icon-delete" @click="deleteRow(scope.$index,'past')"
+          <i class="el-icon-delete" @click="deleteRow(scope.$index, 'past')"
             style="font-size: 24px;color: red;cursor:pointer;"></i>
         </template>
       </el-table-column>
@@ -91,7 +91,7 @@
           </div>
         </template>
         <template slot-scope="scope">
-          <i class="el-icon-delete" @click="deleteRow(scope.$index,'occ')"
+          <i class="el-icon-delete" @click="deleteRow(scope.$index, 'occ')"
             style="font-size: 24px;color: red;cursor:pointer;"></i>
         </template>
       </el-table-column>
@@ -201,16 +201,23 @@ export default {
       if (tableType == 'past') {
         this.dataTransOpts.tableM.patient_past_medical_history.push({
           patientRegisterId: this.patientRegisterId,
-          poisonId: ''
+          occupationalDisease: '',
+          diagnosisDate: '',
+          diagnosisHospital: '',
+          isRecovery: 'N',
+          treatmentMethods: ''
         });
       } else {
         this.dataTransOpts.tableM.patient_occupational_medical_history.push({
           patientRegisterId: this.patientRegisterId,
-          poisonId: ''
+          occupationalDisease: '',
+          diagnosisDate: '',
+          diagnosisHospital: '',
+          isRecovery: 'N',
+          treatmentMethods: ''
         });
       }
     },
-
   },
 
   watch: {