新增预约和预约列表完成

public/index.html

@@ -39,8 +39,8 @@
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
     <script>
       //http://121.36.16.195:9002/huimu-admin/swagger-ui/index.html
-    window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
-    // window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
+    // window.SITE_CONFIG['apiURL'] = 'http://47.110.224.240:8036/xiangan-crf';
+    window.SITE_CONFIG['apiURL'] = 'http://192.168.0.167:8036/xiangan-crf';
     // window.SITE_CONFIG['apiURL'] = 'http://192.168.4.174:8036/xiangan-crf';
     </script>
   <% } %>

src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue

@@ -31,11 +31,11 @@
         </el-col>
         <el-col :span="11" style="display: flex;align-items: center">
           <span style="margin-right: 6px;margin-bottom: 3px">患者类型:</span>
-          <el-checkbox-group v-model="form.patientType">
-            <el-checkbox label="门诊" />
-            <el-checkbox label="住院" />
-            <el-checkbox label="会诊" />
-          </el-checkbox-group>
+          <el-radio-group v-model="form.source">
+            <el-radio label="门诊" />
+            <el-radio label="住院" />
+            <el-radio label="会诊" />
+          </el-radio-group>
         </el-col>
       </el-form-item>
       <el-form-item label="备注:">
@@ -64,29 +64,11 @@
           <el-radio v-model="form.eyeType" label="OU">OU
           </el-radio>
         </el-col>
-        <!--/*        <el-col :span="6" style="display: flex;align-items: center">*/-->
-        <!--/*          散瞳:*/-->
-        <!--/*          <div class="radioItem" @click="form.pupilDilate='Y'">*/-->
-        <!--/*            <input :checked="form.pupilDilate==='Y'" type="radio">是*/-->
-        <!--/*          </div>*/-->
-        <!--/*          <div class="radioItem" @click="form.pupilDilate='N'">*/-->
-        <!--/*            <input :checked="form.pupilDilate==='N'" type="radio">否*/-->
-        <!--/*          </div>*/-->
-        <!--/*        </el-col>*/-->
-        <!--        <el-col :span="6" style="display: flex;align-items: center">-->
-        <!--          缩瞳:-->
-        <!--          <div class="radioItem" @click="form.pupilShrink='Y'">-->
-        <!--            <input :checked="form.pupilShrink==='Y'" type="radio">是-->
-        <!--          </div>-->
-        <!--          <div class="radioItem" @click="form.pupilShrink='N'">-->
-        <!--            <input :checked="form.pupilShrink==='N'" type="radio">否-->
-        <!--          </div>-->
-        <!--        </el-col>-->
       </div>
       <div style="display: flex;padding:0 0 20px 0px">
         <el-col :span="24" style="display: flex;align-items: center">
           <div class="addLabel">项目:</div>
-          <el-checkbox-group v-model="form.patientType">
+          <el-checkbox-group v-model="form.project">
             <el-checkbox label="眼底激光治疗" />
             <el-checkbox label="三面镜检查" />
             <el-checkbox label="FFA" />
@@ -99,7 +81,7 @@
       <div style="display: flex;padding:0 0 20px 0px">
         <el-col :span="24" style="display: flex;align-items: center">
           <div class="addLabel">准备工作:</div>
-          <el-checkbox-group v-model="form.patientType">
+          <el-checkbox-group v-model="form.preparation">
             <el-checkbox label="医嘱已开" />
             <el-checkbox label="散瞳" />
             <el-checkbox label="表麻" />
@@ -170,16 +152,14 @@ export default {
       patientInfo: null,
       form: {
         patientId: '',
-        patientType: [],
+        source: '',
+        project: [],
+        preparation: [],
         doctorName: '',
-        yzOpen: '',
         remark: '',
         doctorId: '',
         eyeType: '',
         otherProject: '',
-        pupilDilate: '',
-        pupilShrink: '',
-        threeMirror: '',
         date1: '',
         date2: ''
       },
@@ -213,23 +193,24 @@ export default {
   },
   created() {
     this.getDoctorList()
+  },
+  mounted() {
     if (this.patientDetail) {
       this.form.patientId = this.patientDetail.patientId
       this.form.doctorId = this.patientDetail.doctorId
       this.form.doctorName = this.patientDetail.doctorName
       this.form.eyeType = this.patientDetail.eyeType
-      this.form.pupilDilate = this.patientDetail.pupilDilate
-      this.form.pupilShrink = this.patientDetail.pupilShrink
+      this.form.project = this.patientDetail.project.split(',')
+      this.form.preparation = this.patientDetail.preparation.split(',')
       this.form.remark = this.patientDetail.remark
-      this.form.yzOpen = this.patientDetail.yzOpen
+      this.form.otherProject = this.patientDetail.otherProject
+      this.form.source = this.patientDetail.source
       if (this.patientDetail.appointDate) {
         this.form.date1 = this.patientDetail.appointDate.split(' ')[0]
         this.form.date2 = this.patientDetail.appointDate.split(' ')[1].substring(0, 5)
       }
       this.patientInfo = this.patientDetail
     }
-  },
-  mounted() {
     if (this.orderDetail) {
       this.form.date1 = this.orderDetail.date
       if (this.morOrAft === 1) {
@@ -270,11 +251,13 @@ export default {
     },
     // 确认提交
     handleSave() {
-      if (!this.isEdit) {
       this.$refs.addPatientForm.validate((valid) => {
         if (!valid) {
           return false
         }
+        this.form.project = this.form.project.join(',')
+        this.form.preparation = this.form.preparation.join(',')
+        if (!this.isEdit) {
           const params = {
             appointDate: `${this.form.date1} ${this.form.date2}:00`,
             patientName: this.patientInfo.patientName,
@@ -292,7 +275,6 @@ export default {
             this.$emit('updateAppoint')
             this.visible = false
           })
-        })
         } else {
           const params = {
             appointDate: `${this.form.date1} ${this.form.date2}:00`,
@@ -307,6 +289,7 @@ export default {
             this.visible = false
           })
         }
+      })
     },
     // 关闭弹框
     closeDialog() {

src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue

@@ -91,7 +91,7 @@
                 {{ scope.row.appointDate ? scope.row.appointDate : '-' }}
               </template>
             </el-table-column>
-            <el-table-column label="类型" header-align="center" align="center" width="55px" />
+            <el-table-column label="类型" prop="source" header-align="center" align="center" width="55px" />
             <el-table-column label="负责医生" header-align="center" align="center" width="100px">
               <template slot-scope="scope">
                 {{ scope.row.doctorName ? scope.row.doctorName : '-' }}
@@ -102,15 +102,38 @@
             <el-table-column prop="patientPhone" label="电话" header-align="center" align="center" width="120px" />
             <el-table-column label="眼别" prop="eyeType" header-align="center" align="center" width="80px" />
             <el-table-column v-if="!dataForm.itemId" label="医疗项目" prop="itemName" header-align="center" align="center" width="100px" />
-            <el-table-column label="准备工作" header-align="center" align="center" width="140px">
+            <el-table-column label="项目" prop="project" header-align="center" align="center" width="120px">
+              <template slot-scope="scope">
+                <div v-if="scope.row.project">
+                  <div v-for="item in scope.row.project.split(',')" :key="item">
+                    <div v-if="item!=='其他'">
+                      {{ item }}
+                    </div>
+                    <div v-else>
+                      {{ `${item}: ${scope.row.otherProject}` }}
+                    </div>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="准备工作" prop="preparation" header-align="center" align="center" width="140px">
               <template slot-scope="scope">
                 <div>
-                  <div v-if="scope.row.yzOpen==='Y'" :class="{active_check:scope.row.yzOpen==='Y'}">
+                  <div v-if="showPreparation(scope.row.preparation,'医嘱已开')" :class="{active_check:showPreparation(scope.row.preparation,'医嘱已开')}">
                     医嘱已开
                   </div>
-                  <div v-if="scope.row.pupilDilate==='Y'" :class="{active_check:scope.row.pupilDilate==='Y'}">
+                  <div v-if="showPreparation(scope.row.preparation,'散瞳')" :class="{active_check_red:showPreparation(scope.row.preparation,'散瞳')}">
                     散瞳
                   </div>
+                  <div v-if="showPreparation(scope.row.preparation,'表麻')" :class="{active_check:showPreparation(scope.row.preparation,'表麻')}">
+                    表麻
+                  </div>
+                  <div v-if="showPreparation(scope.row.preparation,'全身检查完成')" :class="{active_check:showPreparation(scope.row.preparation,'全身检查完成')}">
+                    全身检查完成
+                  </div>
+                  <div v-if="showPreparation(scope.row.preparation,'缩瞳')" :class="{active_check:showPreparation(scope.row.preparation,'缩瞳')}">
+                    缩瞳
+                  </div>
                 </div>
               </template>
             </el-table-column>
@@ -296,6 +319,12 @@ export default {
     this.getDataListInitial()
   },
   methods: {
+    showPreparation(scope, value) {
+      if (!scope) {
+        return false
+      }
+      return scope.includes(value)
+    },
     dateChange(e) {
       // 日期改变时
       this.dataForm.beginDate = e ? e[0] : ''
@@ -503,6 +532,9 @@ export default {
 .active_check{
   color: #409EFF;
 }
+.active_check_red{
+  color: #ff0000;
+}
 ::v-deep .active_check>.el-input--suffix>.el-input__inner{
   color: #67C23A;
 }