mzak

src/components/patientRegister/PatientRegisterEdit.vue

@@ -822,7 +822,7 @@ export default {
         isPatientOccupationalDisease: 'Y', // 是否职业病检查（主表不保存此项数据）
         appointPatientRegisterId: "",
         thirdBookingId: "",
-        occupationalDiseaseNumber:"",
+        occupationalDiseaseNumber: "",
       }, //单位 记录 目前新增与更新是一致
 
 
@@ -853,10 +853,10 @@ export default {
         medicalCenterId: [
           { required: true, message: "请填写体检中心", trigger: "blur" },
         ],
-        mobileTelephone: [
-          { required: true, message: "请填写手机号", trigger: "blur" },
-          { validator: validateMobileTelephone, trigger: 'blur' }
-        ],
+        // mobileTelephone: [
+        //   { required: true, message: "请填写手机号", trigger: "blur" },
+        //   { validator: validateMobileTelephone, trigger: 'blur' }
+        // ],
       },
 
       dialogVisible: false,
@@ -1844,7 +1844,7 @@ export default {
         ocCheckTypeId: this.form.ocCheckTypeId,
         jobType: this.form.jobType,
         riskFactors: `${lriskFactors}`,
-        occupationalDiseaseNumber:this.form.occupationalDiseaseNumber
+        occupationalDiseaseNumber: this.form.occupationalDiseaseNumber
       }
 
       // 职业病接害因素
@@ -1884,26 +1884,35 @@ export default {
 
     // 获取职业病信息
     getOccDiseaseData() {
-      let patientRegisterId = this.form.id
-      postapi('/api/app/OccupationalDisease/GetOccupationalDiseaseWithDetailByPatientRegisterId', { patientRegisterId })
-        .then(res => {
-          if (res.code > -1) {
-            if (res.data['patientOccupationalDisease'] == null) {
-              this.dataTransOpts.tableS.patient_occupational_disease = { patientRegisterId }
-            } else {
-              this.dataTransOpts.tableS.patient_occupational_disease = deepCopy(res.data['patientOccupationalDisease'])
+      return new Promise((resolve, reject) => {
+        let patientRegisterId = this.form.id
+        postapi('/api/app/OccupationalDisease/GetOccupationalDiseaseWithDetailByPatientRegisterId', { patientRegisterId })
+          .then(res => {
+            if (res.code > -1) {
+              if (res.data['patientOccupationalDisease'] == null) {
+                this.dataTransOpts.tableS.patient_occupational_disease = { patientRegisterId }
+              } else {
+                this.dataTransOpts.tableS.patient_occupational_disease = deepCopy(res.data['patientOccupationalDisease'])
+              }
+              this.dataTransOpts.tableM.patient_poison = deepCopy(res.data['patientPoisonDtos'])
+              this.form.ocCheckTypeId = this.dataTransOpts.tableS.patient_occupational_disease.ocCheckTypeId
+              this.form.jobType = this.dataTransOpts.tableS.patient_occupational_disease.jobType
+              this.form.occupationalDiseaseNumber = this.dataTransOpts.tableS.patient_occupational_disease.occupationalDiseaseNumber
+              let poisonIds = []  // 接害因素IDs
+              this.dataTransOpts.tableM.patient_poison.forEach(e => {
+                poisonIds.push(e.poisonId)
+              });
+              this.form.poisonIds = poisonIds
+              resolve('')
+            }else{
+              reject(res.message)
             }
-            this.dataTransOpts.tableM.patient_poison = deepCopy(res.data['patientPoisonDtos'])
-            this.form.ocCheckTypeId = this.dataTransOpts.tableS.patient_occupational_disease.ocCheckTypeId
-            this.form.jobType = this.dataTransOpts.tableS.patient_occupational_disease.jobType
-            this.form.occupationalDiseaseNumber = this.dataTransOpts.tableS.patient_occupational_disease.occupationalDiseaseNumber
-            let poisonIds = []  // 接害因素IDs
-            this.dataTransOpts.tableM.patient_poison.forEach(e => {
-              poisonIds.push(e.poisonId)
-            });
-            this.form.poisonIds = poisonIds
-          }
-        })
+          })
+          .catch(error => {
+            reject(error)
+          })
+      })
+
     },
 
     // 列表数据生成 分组 select
@@ -2879,6 +2888,13 @@ export default {
         }
       )
 
+      // 人寿接口，甲方需求：岗位数据导入人员类别
+      // personnelTypeId   --> positionName
+      // dict.personnelType" :key="item.id" :label="item.displayName" 
+      let lfind = arrayExistObj(this.dict.personnelType,'displayName',appoint_patient_register.positionName)
+      if(lfind > -1) this.form.personnelTypeId = this.dict.personnelType[lfind].id
+
+
       console.log('this.form', JSON.stringify(this.form))
       // 明细必填项
       // "id": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
@@ -2910,6 +2926,13 @@ export default {
       if (this.form.customerOrgGroupId) this.changeCustomerOrgGroupId()
 
       this.changeIdNo() //  触发身份证查询档案号
+
+      // 
+      setTimeout(() => {
+        this.form.customerOrgGroupId = appoint_patient_register.customerOrgGroupId
+      }, 500);
+
+
     },
 
 
@@ -2964,9 +2987,9 @@ export default {
     //人员ID未切换换时 也可以强制刷新数据
     "dataTransOpts.refresh.patient_register.S": {
       // immediate: true,
-      async handler(newVal, oldVal) {
+      handler(newVal, oldVal) {
         // console.log(`watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);
-        if (newVal != oldVal) await this.initFormData(this.dataTransOpts.tableS.patient_register.id)
+        if (newVal != oldVal) this.initFormData(this.dataTransOpts.tableS.patient_register.id)
       }
     },
 

src/components/webBooking/WebBookingMzak.vue

@@ -45,7 +45,8 @@
         size="small" @row-click="rowClick" ref="webBooking" id="webBookingMzak">  
         <el-table-column label="序号" type="index" width="40" align="center" />
         <el-table-column label="部门名称" width="150" prop="departmentName" align="center" />
-        <el-table-column label="子部门" width="150" prop="childCompanyName" align="center" />      
+        <el-table-column label="子部门" width="150" prop="childCompanyName" align="center" />   
+        <el-table-column label="岗位" width="100" prop="positionName" align="center" />   
         <el-table-column label="姓名" width="80" prop="patientName" align="center" />
         <el-table-column label="身份证号" width="150" prop="idNo" align="center" />
         <el-table-column label="预约时间" width="150" prop="bookingDate" align="center" />

src/views/customerOrg/BusReservationImport.vue

@@ -518,7 +518,7 @@ export default {
         { dispLabel: "身份证号", val: "idNo" },
         { dispLabel: "性别", val: "sexName" },
         { dispLabel: "年龄", val: "age" },
-        { dispLabel: "电话", val: "telephone" },
+        { dispLabel: "电话", val: "phone" },
         { dispLabel: "分公司", val: "childCompanyName" },
         { dispLabel: "部门", val: "departmentName" },
         { dispLabel: "岗位", val: "positionName" },