Merge branch 'master' of http://47.110.224.240:13000/pengqiang/xiangan_pc

src/page-subspecialty/views/modules/formList/laserSurgery.vue

@@ -160,7 +160,7 @@
               </td>
               <td>
                 <div class="flex">
-                  <el-input ref="input10" v-model="confirmData.jgzlDs" style="flex: 1" @keyup.enter.native="onEnter(10)" />
+                  <el-input ref="input10" v-model="confirmData.spotSpacing" style="flex: 1" @keyup.enter.native="onEnter(10)" />
                   <span>Φ</span>
                 </div>
               </td>
@@ -170,7 +170,7 @@
                 备注
               </td>
               <td>
-                <el-input ref="input11" v-model="confirmData.jgzlDs" style="flex: 1" @keyup.enter.native="onEnter(11)" />
+                <el-input ref="input11" v-model="confirmData.remark" style="flex: 1" @keyup.enter.native="onEnter(11)" />
               </td>
             </tr>
           </tbody>
@@ -251,6 +251,8 @@ export default {
         jgzlGbMax: '',
         jgzlGlMin: '',
         jgzlGlMax: '',
+        remark: '',
+        spotSpacing: '',
         jgzlDs: '',
         jgzlSyt: '',
         laserType: ''
@@ -285,6 +287,7 @@ export default {
   },
   created() {
     // 患者信息带入
+    this.origin = JSON.parse(JSON.stringify(this.confirmData))
     this.getConfirmDetail()
     this.queryProject()
     this.$store.commit('initPlugin')
@@ -365,6 +368,7 @@ export default {
         if (detail.jzNumber) {
           this.confirmData = { ...detail }
         } else {
+          this.confirmData = this.origin
           this.queryDiagnostic()
           this.confirmData.patientName = this.patientDetail.patientName
           this.confirmData.patientAge = this.patientDetail.patientAge

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

@@ -32,9 +32,9 @@
         <el-col :span="13" style="display: flex;align-items: center;margin-left: 15px">
           <span style="margin-right: 6px;margin-bottom: 3px">患者类型:</span>
           <el-checkbox-group v-model="form.patientType">
-            <el-checkbox label="门诊"></el-checkbox>
-            <el-checkbox label="住院"></el-checkbox>
-            <el-checkbox label="会诊"></el-checkbox>
+            <el-checkbox label="门诊" />
+            <el-checkbox label="住院" />
+            <el-checkbox label="会诊" />
           </el-checkbox-group>
           <!--          <div class="radioItem" @click="form.yzOpen='Y'">-->
           <!--            <input :checked="form.yzOpen==='Y'" type="radio">是-->
@@ -93,12 +93,12 @@
         <el-col :span="24" style="display: flex;align-items: center">
           <div class="addLabel">项目:</div>
           <el-checkbox-group v-model="form.patientType">
-            <el-checkbox label="眼底激光治疗"></el-checkbox>
-            <el-checkbox label="三面镜检查"></el-checkbox>
-            <el-checkbox label="FFA"></el-checkbox>
-            <el-checkbox label="ICGA"></el-checkbox>
-            <el-checkbox label="其他"></el-checkbox>
-            <el-input size="small" v-model="form.patientId" placeholder="请输入" style="width: 125px;"/>
+            <el-checkbox label="眼底激光治疗" />
+            <el-checkbox label="三面镜检查" />
+            <el-checkbox label="FFA" />
+            <el-checkbox label="ICGA" />
+            <el-checkbox label="其他" />
+            <el-input v-model="form.otherProject" size="small" placeholder="" style="width: 125px;" />
           </el-checkbox-group>
           <!--          <div class="radioItem" @click="form.threeMirror='Y'">-->
           <!--            <input :checked="form.threeMirror==='Y'" type="radio">是-->
@@ -112,11 +112,11 @@
         <el-col :span="24" style="display: flex;align-items: center">
           <div class="addLabel">准备工作:</div>
           <el-checkbox-group v-model="form.patientType">
-            <el-checkbox label="医嘱已开"></el-checkbox>
-            <el-checkbox label="散瞳"></el-checkbox>
-            <el-checkbox label="表麻"></el-checkbox>
-            <el-checkbox label="全身检查完成"></el-checkbox>
-            <el-checkbox label="缩瞳"></el-checkbox>
+            <el-checkbox label="医嘱已开" />
+            <el-checkbox label="散瞳" />
+            <el-checkbox label="表麻" />
+            <el-checkbox label="全身检查完成" />
+            <el-checkbox label="缩瞳" />
           </el-checkbox-group>
           <!--          <div class="radioItem" @click="form.threeMirror='Y'">-->
           <!--            <input :checked="form.threeMirror==='Y'" type="radio">是-->
@@ -194,6 +194,7 @@ export default {
         remark: '',
         doctorId: '',
         eyeType: '',
+        otherProject: '',
         pupilDilate: '',
         pupilShrink: '',
         threeMirror: '',
@@ -201,8 +202,8 @@ export default {
         date2: ''
       },
       startTime: '08:30',
-      step: '',
-      endTime: '18:30',
+      step: '00:15',
+      endTime: '18:00',
       options: [{
         value: 'FFA',
         label: 'FFA'