From 75a6f85292f6ae695e3b5d6534d0fa146d9c3565 Mon Sep 17 00:00:00 2001
From: bianyaqi <bianyaqi>
Date: Mon, 22 May 2023 17:05:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A4=E5=A3=AB=E5=B7=A5=E4=BD=9C=E5=8F=B0?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                             |  4 +-
 .../reservation/schedule/addPatientOrder.vue  | 67 +++++++++------
 .../reservation/schedule/doctor-schedule.vue  |  2 +
 .../schedule/number-detail-manage.vue         |  2 +
 .../reservation/subList/index.vue             | 81 ++++++++++++++-----
 5 files changed, 112 insertions(+), 44 deletions(-)

diff --git a/public/index.html b/public/index.html
index f449c2f..6f52be6 100644
--- a/public/index.html
+++ b/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';
     </script>
   <% } %>
   <!-- 测试环境 -->
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 e38a63e..dbff5cd 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/addPatientOrder.vue
@@ -29,48 +29,59 @@
             />
           </el-select>
         </el-col>
-        <el-col :span="12" style="display: flex;align-items: center">
+        <el-col :span="11" style="display: flex;align-items: center;margin-left: 15px">
           已开医嘱:
           <div class="radioItem" @click="form.yzOpen='Y'">
-            <input :disabled="isEdit" :checked="form.yzOpen==='Y'" type="radio">是
+            <input :checked="form.yzOpen==='Y'" type="radio">是
           </div>
           <div class="radioItem" @click="form.yzOpen='N'">
-            <input :disabled="isEdit" :checked="form.yzOpen==='N'" type="radio">否
+            <input :checked="form.yzOpen==='N'" type="radio">否
           </div>
         </el-col>
       </el-form-item>
       <el-form-item label="备注:">
-        <el-input v-model="form.remark" :readonly="isEdit" autosize type="textarea" />
+        <el-input v-model="form.remark" autosize type="textarea" />
       </el-form-item>
-      <div style="display: flex;padding:0 0 20px 20px">
-        <el-col :span="10" style="display: flex;align-items: center">
-          眼别:
+      <div style="display: flex;padding:0 0 20px 0">
+        <el-col :span="12" style="display: flex;align-items: center">
+          <div class="addLabel">眼别:</div>
           <div class="radioItem" @click="form.eyeType='OD'">
-            <input :disabled="isEdit" :checked="form.eyeType==='OD'" type="radio">OD
+            <input :checked="form.eyeType==='OD'" type="radio">OD
           </div>
           <div class="radioItem" @click="form.eyeType='OS'">
-            <input :disabled="isEdit" :checked="form.eyeType==='OS'" type="radio">OS
+            <input :checked="form.eyeType==='OS'" type="radio">OS
           </div>
           <div class="radioItem" @click="form.eyeType='OU'">
-            <input :disabled="isEdit" :checked="form.eyeType==='OU'" type="radio">OU
+            <input :checked="form.eyeType==='OU'" type="radio">OU
           </div>
         </el-col>
-        <el-col :span="7" style="display: flex;align-items: center">
+        <el-col :span="12" style="display: flex;align-items: center">
           散瞳:
           <div class="radioItem" @click="form.pupilDilate='Y'">
-            <input :disabled="isEdit" :checked="form.pupilDilate==='Y'" type="radio">是
+            <input :checked="form.pupilDilate==='Y'" type="radio">是
           </div>
           <div class="radioItem" @click="form.pupilDilate='N'">
-            <input :disabled="isEdit" :checked="form.pupilDilate==='N'" type="radio">否
+            <input :checked="form.pupilDilate==='N'" type="radio">否
           </div>
         </el-col>
-        <el-col :span="7" style="display: flex;align-items: center">
-          缩瞳:
+      </div>
+      <div style="display: flex;padding:0 0 20px 0px">
+        <el-col :span="12" style="display: flex;align-items: center">
+          <div class="addLabel">缩瞳:</div>
           <div class="radioItem" @click="form.pupilShrink='Y'">
-            <input :disabled="isEdit" :checked="form.pupilShrink==='Y'" type="radio">是
+            <input :checked="form.pupilShrink==='Y'" type="radio">是
           </div>
           <div class="radioItem" @click="form.pupilShrink='N'">
-            <input :disabled="isEdit" :checked="form.pupilShrink==='N'" type="radio">否
+            <input :checked="form.pupilShrink==='N'" type="radio">否
+          </div>
+        </el-col>
+        <el-col :span="12" style="display: flex;align-items: center">
+          三面镜:
+          <div class="radioItem" @click="form.threeMirror='Y'">
+            <input :checked="form.threeMirror==='Y'" type="radio">是
+          </div>
+          <div class="radioItem" @click="form.threeMirror='N'">
+            <input :checked="form.threeMirror==='N'" type="radio">否
           </div>
         </el-col>
       </div>
@@ -92,7 +103,7 @@
           </el-form-item>
         </el-col>
       </el-form-item>
-    </el-form>
+      </div></el-form>
     <span slot="footer" class="dialog-footer">
       <el-button size="small" @click="goFormList">表单</el-button>
       <el-button size="small" @click="closeDialog">取 消</el-button>
@@ -113,6 +124,9 @@ export default {
     patientDetail: {
       type: Object
     },
+    orderDate: {
+      type: String
+    },
     project: {
       type: Object
     },
@@ -173,6 +187,11 @@ export default {
       this.patientInfo = this.patientDetail
     }
   },
+  mounted() {
+    if (this.orderDate) {
+      this.form.date1 = this.orderDate
+    }
+  },
   methods: {
     init() {
       this.visible = true
@@ -201,7 +220,6 @@ export default {
     // 确认提交
     handleSave() {
       if (!this.isEdit) {
-        console.log('asdfasdf')
         this.$refs.addPatientForm.validate((valid) => {
           if (!valid) {
             return false
@@ -227,12 +245,10 @@ export default {
       } else {
         const params = {
           appointDate: `${this.form.date1} ${this.form.date2}`,
-          doctorId: this.form.doctorId,
-          doctorName: this.form.doctorName,
-          patientId: this.form.patientId,
           patientName: this.patientDetail.patientName,
           id: this.patientDetail.id,
-          itemId: this.patientDetail.itemId
+          itemId: this.patientDetail.itemId,
+          ...this.form
         }
         this.$http.post('/appoint/updateAppointInfo', params).then(() => {
           this.$message.success('修改成功')
@@ -269,6 +285,11 @@ export default {
   margin:0 8px;
   display: flex;
 }
+.addLabel{
+  width: 80px;
+  text-align: right;
+  margin-right: 10px
+}
 input{
   -webkit-appearance: checkbox !important;
   margin-right: 5px !important;
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue
index aa9e0d5..d24ddce 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/doctor-schedule.vue
@@ -376,10 +376,12 @@ export default {
         if (morOrAft===1){
           this.curPatients = weekInfoItem.morning.appointPatients
           this.$refs.numberManageRef.dateInfo = weekInfoItem.date + '上午'
+          this.$refs.numberManageRef.orderDate = weekInfoItem.date
           this.canAdd = weekInfoItem.morning.maxNumber>weekInfoItem.morning.orderNum || !item.needLimit
         }else {
           this.curPatients = weekInfoItem.after.appointPatients
           this.$refs.numberManageRef.dateInfo = weekInfoItem.date + '下午'
+          this.$refs.numberManageRef.orderDate = weekInfoItem.date
           this.canAdd = weekInfoItem.after.maxNumber>weekInfoItem.after.orderNum || !item.needLimit
         }
         this.$refs.numberManageRef.curProject = item // 当前改约的项目
diff --git a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue
index 43da790..8027203 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/schedule/number-detail-manage.vue
@@ -30,6 +30,7 @@
       :project="curProject"
       :patient-detail="curPatient"
       :title="addTitle"
+      :order-date="orderDate"
       :is-edit="isEdit"
       @goFormList="goFormList"
       @closeDialog="closeAddDialog"
@@ -58,6 +59,7 @@ export default {
     return {
       visible: false,
       addPatientVisible: false,
+      orderDate: '',
       dateInfo: '',
       isEdit: false,
       projectName: '',
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 1fc33b8..d51be86 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
@@ -3,7 +3,7 @@
   <div class="nurse_content">
     <div v-if="!detailViewVisible" class="scheduled-patient">
       <div class="scheduled-patient-head">
-        <div>
+        <div style="display:flex;">
           <el-select
             v-model="dataForm.searchType"
             placeholder="请选择"
@@ -42,10 +42,23 @@
             color="white"
             @click="handleType(item.value, index)"
           >{{ item.label }}</el-button>
+          <div style="margin-left: 15px">
+            预约时间:
+            <el-date-picker
+              v-model="appointTime"
+              size="small"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+              @change="dateChange"
+            />
+          </div>
         </div>
         <div>
           <el-button type="primary" icon="el-icon-edit" size="small" @click="changeOrder">改约</el-button>
-          <el-button v-print="printObj" type="primary" icon="el-icon-edit" size="small">打印</el-button>
+          <el-button v-print="printObj" type="primary" icon="el-icon-edit" size="small" @click="printTable">打印</el-button>
         </div>
       </div>
       <div class="scheduled-patient-content">
@@ -58,23 +71,37 @@
           :cell-class-name="tableCellClassName"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column class-name="hidden" type="selection" width="50px" />
-          <el-table-column prop="patientId" label="登记号" header-align="center" align="center" min-width="150px" />
-          <el-table-column prop="jzNumber" label="就诊号" header-align="center" align="center" width="150px" />
-          <el-table-column prop="patientName" label="患者姓名" header-align="center" align="center" width="150px" />
-          <el-table-column label="负责医生" header-align="center" align="center" width="150px">
+          <el-table-column v-if="printHidden" type="selection" />
+          <el-table-column label="预约时间" header-align="center" align="center" width="170px">
+            <template slot-scope="scope">
+              {{ scope.row.appointDate ? scope.row.appointDate : '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="负责医生" header-align="center" align="center" width="100px">
             <template slot-scope="scope">
               {{ scope.row.doctorName ? scope.row.doctorName : '-' }}
             </template>
           </el-table-column>
-          <el-table-column label="预约时间" header-align="center" align="center" width="170px">
+          <el-table-column prop="patientName" label="患者姓名" header-align="center" align="center" width="100px" />
+          <el-table-column prop="patientId" label="登记号" header-align="center" align="center" width="120px" />
+          <el-table-column prop="patientPhone" label="电话号" header-align="center" align="center" width="150px" />
+          <el-table-column label="医疗项目" prop="itemName" header-align="center" align="center" width="180px" />
+          <el-table-column label="眼别" prop="eyeType" header-align="center" align="center" width="80px" />
+          <el-table-column label="准备工作" header-align="center" align="center" width="140px">
             <template slot-scope="scope">
-              {{ scope.row.appointDate ? scope.row.appointDate : '-' }}
+              <div>
+                <div>
+                  <input style="margin-right: 5px" type="checkbox" :checked="scope.row.yzOpen==='Y'">医嘱已开
+                </div>
+                <div>
+                  <input style="margin-right: 5px" type="checkbox" :checked="scope.row.pupilDilate==='Y'">散瞳
+                </div>
+              </div>
             </template>
           </el-table-column>
-          <el-table-column label="医疗项目" prop="itemName" header-align="center" align="center" />
-          <el-table-column label="眼别" prop="eyeType" header-align="center" align="center" />
-          <el-table-column label="操作" header-align="center" align="center" width="200px">
+
+          <el-table-column prop="jzNumber" label="就诊号" header-align="center" align="center" />
+          <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>
@@ -136,8 +163,11 @@ export default {
       mixinViewModuleOptions: {
         getDataListURL: '/appoint/page',
         getDataListIsPage: true,
-        createdIsNeed: false
+        createdIsNeed: false,
+        beginDate: '',
+        endDate: ''
       },
+      appointTime: [],
       isEdit: false,
       addTitle: '',
       addPatientVisible: false,
@@ -197,8 +227,12 @@ export default {
       // 打印
       printObj: {
         id: 'multipleTable',
-        extraHead: '<style>#printId { width: 100%; !important; }  #multipleTable .hidden { display: none } <style>'
-      }
+        extraHead: '<style> .el-table .el-table__cell{padding:9px 0 !important;}</style>',
+        closeCallback: () => {
+          this.printHidden = true
+        }
+      },
+      printHidden: true
     }
   },
   created() {
@@ -206,6 +240,13 @@ export default {
     this.getDataListInitial()
   },
   methods: {
+    dateChange(e) {
+      // 日期改变时
+      this.dataForm.beginDate = e ? e[0] : ''
+      this.dataForm.endDate = e ? e[1] : ''
+      this.dataForm.searchType = e ? '' : '0'
+      this.getDataListInitial()
+    },
     handleType(value, index) {
       this.curIndex = index
       this.dataForm.appointStatus = value
@@ -228,6 +269,9 @@ export default {
         })
       })
     },
+    printTable() {
+      this.printHidden = false
+    },
     // 改约
     changeOrder() {
       this.reDialogShow = true
@@ -300,6 +344,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+::v-deep .el-table .el-table__cell{
+  padding:9px 0;
+}
 .active{
   color: #3ea3f6;
   background-color: #e0f2fd;
@@ -371,8 +418,4 @@ export default {
     }
   }
 }
-#multipleTable .hidden { display: none }
-//::v-deep .hidden {
-//  display: none !important
-//}
 </style>