'问题修复'

src/page-subspecialty/views/modules/optometryManagement/dioptric/patient-add-or-update.vue

@@ -39,15 +39,25 @@
         <el-input v-model="dataForm.patientAddress" placeholder="请输入地址" />
       </el-form-item>
       <el-form-item label="门诊医师:" prop="outpatientDoc" label-width="120px">
-        <el-select v-model="dataForm.outpatientDoc" placeholder="请选择门诊医师">
-          <el-option label="区域一" value="shanghai" />
-          <el-option label="区域二" value="beijing" />
+        <el-select v-model="dataForm.outpatientDocId" placeholder="请选择门诊医师">
+          <el-option
+            v-for="item in doctorList"
+            :key="item.id"
+            :label="item.realName"
+            :value="item.employeeId
+            "
+          />
         </el-select>
       </el-form-item>
-      <el-form-item label="视光医师" prop="optometryDoc" label-width="120px">
-        <el-select v-model="dataForm.optometryDoc" placeholder="请选择视光医师">
-          <el-option label="区域一" value="shanghai" />
-          <el-option label="区域二" value="beijing" />
+      <el-form-item label="视光医师" prop="optometryDocId" label-width="120px">
+        <el-select v-model="dataForm.optometryDocId" placeholder="请选择视光医师">
+          <el-option
+            v-for="item in doctorList"
+            :key="item.id"
+            :label="item.realName"
+            :value="item.employeeId
+            "
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="眼别:" prop="zlEye" label-width="120px">
@@ -55,6 +65,7 @@
           <el-option v-for="item in zlEyeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
+      <el-form-item label="医疗项目:" label-width="120px" prop="patientAddress">
         <el-select v-model="dataForm.zlProject" placeholder="请选择医疗项目">
           <el-option
             v-for="item in projectList"
@@ -64,6 +75,7 @@
             "
           />
         </el-select>
+      </el-form-item>
       <el-form-item label="备注:" label-width="120px" prop="remarks">
         <el-input v-model="dataForm.remark" type="textarea" />
       </el-form-item>
@@ -97,8 +109,8 @@ export default {
         patientPhone: '',
         patientAddress: '',
         patientBirthday: '',
-        outpatientDoc: '', // 门诊医师
-        optometryDoc: '', // 视光医师
+        outpatientDocId: '', // 门诊医师
+        optometryDocId: '', // 视光医师
         zlEye: '',
         zlProject: '',
         visitId: '',
@@ -111,7 +123,8 @@ export default {
       ],
       params: {},
       visitList: [],
-      projectList: []
+      projectList: [],
+      doctorList: []
     }
   },
   computed: {
@@ -139,6 +152,9 @@ export default {
         ],
         patientIdNumber: [
           { required: true, message: '请输入患者身份证号', trigger: 'blur' }
+        ],
+        optometryDocId: [
+          { required: true, message: '请选择视光医师', trigger: 'blur' }
         ]
       }
     }
@@ -165,7 +181,7 @@ export default {
     getDoctorList() {
       this.$http.get('/sys/user').then(data => {
         this.doctorList = data.data.data
-        this.dataForm.optometryDoc = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
+        this.dataForm.optometryDocId = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
       })
     },
     // 获取项目列表

src/page-subspecialty/views/modules/outpatientManagement/call/patient-add-or-update.vue

@@ -39,7 +39,7 @@
         <el-input v-model="dataForm.patientAddress" placeholder="请输入地址" />
       </el-form-item>
       <el-form-item label="门诊医师:" prop="outpatientDoc" label-width="120px">
-        <el-select v-model="dataForm.outpatientDoc" placeholder="请选择门诊医师">
+        <el-select v-model="dataForm.outpatientDocId" placeholder="请选择门诊医师">
           <el-option
             v-for="item in doctorList"
             :key="item.id"
@@ -49,8 +49,8 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="视光医师:" prop="optometryDoc" label-width="120px">
-        <el-select v-model="dataForm.optometryDoc" placeholder="请选择视光医师">
+      <el-form-item label="视光医师:" prop="optometryDocId" label-width="120px">
+        <el-select v-model="dataForm.optometryDocId" placeholder="请选择视光医师">
           <el-option
             v-for="item in doctorList"
             :key="item.id"
@@ -115,8 +115,8 @@ export default {
         patientPhone: '',
         patientAddress: '',
         patientBirthday: '',
-        outpatientDoc: '', // 门诊医师
-        optometryDoc: '', // 视光医师
+        outpatientDocId: '', // 门诊医师
+        optometryDocId: '', // 视光医师
         zlProject: '',
         zlEye: '',
         visitId: '',
@@ -158,6 +158,9 @@ export default {
         ],
         patientIdNumber: [
           { required: true, message: '请输入患者身份证号', trigger: 'blur' }
+        ],
+        optometryDocId: [
+          { required: true, message: '请选择视光医师', trigger: 'blur' }
         ]
       }
     }
@@ -184,7 +187,7 @@ export default {
     getDoctorList() {
       this.$http.get('/sys/user').then(data => {
         this.doctorList = data.data.data
-        this.dataForm.optometryDoc = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
+        this.dataForm.optometryDocId = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
       })
     },
     // 获取项目列表

src/page-subspecialty/views/modules/outpatientManagement/treat/patient-add-or-update.vue

@@ -38,25 +38,23 @@
       <el-form-item label="家庭地址:" label-width="120px" prop="patientAddress">
         <el-input v-model="dataForm.patientAddress" placeholder="请输入地址" />
       </el-form-item>
-      <el-form-item label="门诊医师:" prop="outpatientDoc" label-width="120px">
-        <el-select v-model="dataForm.outpatientDoc" placeholder="请选择门诊医师">
+      <el-form-item label="门诊医师:" prop="outpatientDocId" label-width="120px">
+        <el-select v-model="dataForm.outpatientDocId" placeholder="请选择门诊医师">
           <el-option
             v-for="item in doctorList"
             :key="item.id"
             :label="item.realName"
-            :value="item.employeeId
-            "
+            :value="item.employeeId"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="视光医师:" prop="optometryDoc" label-width="120px">
-        <el-select v-model="dataForm.optometryDoc" placeholder="请选择视光医师">
+      <el-form-item label="视光医师:" prop="optometryDocId" label-width="120px">
+        <el-select v-model="dataForm.optometryDocId" placeholder="请选择视光医师">
           <el-option
             v-for="item in doctorList"
             :key="item.id"
             :label="item.realName"
-            :value="item.employeeId
-            "
+            :value="item.employeeId"
           />
         </el-select>
       </el-form-item>
@@ -65,15 +63,16 @@
           <el-option v-for="item in zlEyeList" :key="item.value" :label="item.name" :value="item.value" />
         </el-select>
       </el-form-item>
+      <el-form-item label="医疗项目:" label-width="120px" prop="patientAddress">
         <el-select v-model="dataForm.zlProject" placeholder="请选择医疗项目">
           <el-option
             v-for="item in projectList"
             :key="item.itemId"
             :label="item.itemName"
-          :value="item.itemId
-          "
+            :value="item.itemId"
           />
         </el-select>
+      </el-form-item>
       <!--      <el-form-item label="随访方案:" label-width="90px" prop="visitId">-->
       <!--        <el-select v-model="dataForm.visitId" placeholder="请选择随访方案">-->
       <!--          <el-option v-for="item in visitList" :key="item.id" :label="item.name" :value="item.id" />-->
@@ -112,8 +111,8 @@ export default {
         patientPhone: '',
         patientAddress: '',
         patientBirthday: '',
-        outpatientDoc: '', // 门诊医师
-        optometryDoc: '', // 视光医师
+        outpatientDocId: '', // 门诊医师
+        optometryDocId: '', // 视光医师
         zlEye: '',
         zlProject: '',
         visitId: '',
@@ -156,7 +155,7 @@ export default {
         patientIdNumber: [
           { required: true, message: '请输入患者身份证号', trigger: 'blur' }
         ],
-        optometryDoc: [
+        optometryDocId: [
           { required: true, message: '请选择视光医师', trigger: 'blur' }
         ]
       }
@@ -183,7 +182,7 @@ export default {
     getDoctorList() {
       this.$http.get('/sys/user').then(data => {
         this.doctorList = data.data.data
-        this.dataForm.optometryDoc = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
+        this.dataForm.optometryDocId = JSON.parse(window.localStorage.getItem('qg-userData')).employeeId
       })
     },
     // 获取项目列表