From 8e44241f439cf99b50a7ed94abe5a692fc1c91ec Mon Sep 17 00:00:00 2001
From: bianyaqi <bianyaqi>
Date: Mon, 17 Jul 2023 11:22:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=88=97=E8=A1=A8=E5=8F=8A?=
 =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../360View/commonForm/eyesVision.vue         |  2 +-
 .../views/modules/formList/mraOrder.vue       | 11 +++---
 .../reservation/schedule/addPatientOrder.vue  |  9 +++--
 .../reservation/subList/index.vue             | 29 +++++++--------
 .../reservation/subList/printTable.vue        | 36 +++++++------------
 5 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/src/components/360View/commonForm/eyesVision.vue b/src/components/360View/commonForm/eyesVision.vue
index 3deb291..00cf567 100644
--- a/src/components/360View/commonForm/eyesVision.vue
+++ b/src/components/360View/commonForm/eyesVision.vue
@@ -1086,7 +1086,7 @@ export default {
         } else if (rowIndex === 17) {
           return {
             rowspan: 1,
-            colspan: 3
+            colspan: 4
           }
         }
       } else if (rowIndex === 15 || rowIndex === 16) {
diff --git a/src/page-subspecialty/views/modules/formList/mraOrder.vue b/src/page-subspecialty/views/modules/formList/mraOrder.vue
index 096ea6c..2c86a0f 100644
--- a/src/page-subspecialty/views/modules/formList/mraOrder.vue
+++ b/src/page-subspecialty/views/modules/formList/mraOrder.vue
@@ -10,7 +10,7 @@
         <img width="450" src="@/assets/img/xianganlogo.png">
       </div>
       <hr>
-      <p style="color:#000000;font-size:32px;margin:0 0 30px 0;text-align:center;">
+      <p style="color:#000000;font-size:32px;margin:0 0 15px 0;text-align:center;">
         眼底血管造影患者预约单
       </p>
       <div>
@@ -23,7 +23,7 @@
               患者姓名：<el-input v-model="formData.patientName" style="flex: 1" />
             </div>
           </td>
-          <td>
+          <td width="55%">
             <div class="flex">
               登记号：<el-input v-model="formData.patientId" style="flex: 1" />
             </div>
@@ -131,7 +131,7 @@
           </td>
           <td>
             <div class="flex">
-              备注：<el-input v-model="formData.remark" style="flex: 1" />
+              备注：<el-input v-model="formData.remark" type="textarea" :autosize="{ minRows: 1, maxRows: 3}" style="flex: 1" />
             </div>
           </td>
         </tr>
@@ -400,6 +400,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-textarea__inner{
+  border: none;
+}
 .flex{
   display: flex;
 }
@@ -457,7 +460,7 @@ input{
 }
 table tr td{
   border: 1px solid #ccc;
-  padding: 5px;
+  padding: 3px 5px;
 }
 .checkBox{
   cursor: pointer;
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
index 6ca3623..4f4c382 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
@@ -39,7 +39,7 @@
         </el-col>
       </el-form-item>
       <el-form-item label="备注:">
-        <el-input v-model="form.remark" type="textarea" />
+        <el-input v-model="form.remark" type="textarea" maxlength="75" :autosize="{ minRows: 3, maxRows: 3}" show-word-limit />
       </el-form-item>
       <div style="display: flex;padding:0 0 20px 0">
         <el-col :span="10" style="display: flex;align-items: center">
@@ -66,10 +66,12 @@
         <el-col :span="24" style="display: flex;align-items: center">
           <div class="addLabel">准备工作:</div>
           <el-checkbox-group v-model="form.preparation">
-            <el-checkbox label="医嘱已开" />
+            <el-checkbox label="激光/三面镜/造影/电生理/视功能/ubm等 医嘱已开" />
+            <el-checkbox label="激光/三面镜/造影/电生理/视功能/ubm等 医嘱未开" />
             <el-checkbox label="散瞳" />
             <el-checkbox label="表麻" />
-            <el-checkbox label="全身检查完成" />
+            <el-checkbox label="全身检查医嘱已开" />
+            <el-checkbox label="全身检查已完成" />
             <el-checkbox label="缩瞳" />
           </el-checkbox-group>
         </el-col>
@@ -213,6 +215,7 @@ export default {
           this.patientInfo = data.data.data.list[0]
         } else {
           this.patientInfo = null
+          this.$message.error('未找到该患者！')
         }
       })
     },
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
index 1f66196..1e71d0a 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
@@ -128,23 +128,17 @@
               </template>
             </el-table-column>
             <el-table-column label="操作者工号" prop="operatorId" header-align="center" align="center" width="110px" />
-            <el-table-column label="准备工作" prop="preparation" header-align="center" align="center" width="120px">
+            <el-table-column label="备注" prop="remark" header-align="center" align="center" />
+            <el-table-column label="准备工作" prop="preparation" header-align="center" align="center" width="160px">
               <template slot-scope="scope">
-                <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 v-if="showPreparation(scope.row.preparation,'全身检查完成')" :class="{active_check:showPreparation(scope.row.preparation,'全身检查完成')}">
-                    全身检查完成
-                  </div>
-                  <div v-if="showPreparation(scope.row.preparation,'缩瞳')" :class="{active_check_red:showPreparation(scope.row.preparation,'缩瞳')}">
-                    缩瞳
+                <div v-if="scope.row.preparation">
+                  <div
+                    v-for="item in scope.row.preparation.split(',')"
+                    :key="item"
+                    :class="item==='缩瞳'?'active_check_red':'active_check'"
+                    class="readyItem"
+                  >
+                    {{ item }}
                   </div>
                 </div>
               </template>
@@ -515,6 +509,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.readyItem:not(:last-child){
+  border-bottom: 1px dashed #cccccc;
+}
 ::v-deep .el-table .el-table__cell{
   padding:9px 0;
 }
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/printTable.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/printTable.vue
index f53e161..c980064 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/printTable.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/printTable.vue
@@ -36,23 +36,16 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="准备工作" prop="preparation" header-align="center" align="center" width="120px">
+      <el-table-column label="准备工作" prop="preparation" header-align="center" align="center" width="160px">
         <template slot-scope="scope">
-          <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 v-if="showPreparation(scope.row.preparation,'全身检查完成')" :class="{active_check:showPreparation(scope.row.preparation,'全身检查完成')}">
-              全身检查完成
-            </div>
-            <div v-if="showPreparation(scope.row.preparation,'缩瞳')" :class="{active_check_red:showPreparation(scope.row.preparation,'缩瞳')}">
-              缩瞳
+          <div v-if="scope.row.preparation">
+            <div
+              v-for="item in scope.row.preparation.split(',')"
+              :key="item"
+              :class="item==='缩瞳'?'active_check_red':'active_check'"
+              class="readyItem"
+            >
+              {{ item }}
             </div>
           </div>
         </template>
@@ -74,13 +67,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="操作" class-name="hidden" header-align="center" align="center" width="200px">
-        <template slot-scope="scope">
-          <span class="call" @click="editOpera(scope.row)">{{ scope.row.appointDate ? "改约":"预约" }}</span>
-          <span class="cancel" @click="cancelClick(scope.row)">取消</span>
-          <span class="call" @click="checkPatientDetail(scope.row)">患者360</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="备注" prop="remark" header-align="center" align="center" width="240px" />
     </el-table>
   </div>
 </template>
@@ -138,4 +125,7 @@ export default {
     padding: 0;
   }
 }
+.readyItem:not(:last-child){
+  border-bottom: 1px dashed #cccccc;
+}
 </style>