From f02cbd083eb84b91a37d09c6b3fdcf67dec98b33 Mon Sep 17 00:00:00 2001
From: bianyaqi <bianyaqi>
Date: Tue, 13 Jun 2023 16:57:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=88=97=E8=A1=A8=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reservation/subList/index.vue             | 46 +++++++++++++------
 1 file changed, 32 insertions(+), 14 deletions(-)

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 2accc70..fd0de5b 100644
--- a/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
+++ b/src/page-subspecialty/views/modules/nurseManagement/reservation/subList/index.vue
@@ -95,6 +95,7 @@
             style="width: 100%"
             :cell-class-name="tableCellClassName"
             @selection-change="handleSelectionChange"
+            @sort-change="sortList"
           >
             <el-table-column v-if="printHidden" type="selection" />
             <el-table-column label="预约时间" header-align="center" align="center" width="110px">
@@ -150,14 +151,19 @@
             </el-table-column>
             <el-table-column sortable label="是否到达" header-align="center" align="center" width="110px">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.arrival" :class="{'active_check':scope.row.arrival==='Y'}" class="arrivalSelect" placeholder="" size="small" @change="value=>changeEyeType(value,scope)">
-                  <el-option
-                    v-for="item in arrivalList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
+                <div>
+                  <el-select v-model="scope.row.arrival" :class="{'active_check':scope.row.arrival==='Y'}" class="arrivalSelect" placeholder="" size="small" @change="value=>changeEyeType(value,scope)">
+                    <el-option
+                      v-for="item in arrivalList"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                  <div v-if="scope.row.arrivalDate && scope.row.arrival==='Y'">
+                    {{ scope.row.arrivalDate }}
+                  </div>
+                </div>
               </template>
             </el-table-column>
             <el-table-column prop="jzNumber" label="就诊号" header-align="center" align="center" />
@@ -224,11 +230,7 @@ export default {
       mixinViewModuleOptions: {
         getDataListURL: '/appoint/page',
         getDataListIsPage: true,
-        createdIsNeed: false,
-        arrival: '',
-        beginDate: '',
-        endDate: '',
-        morning: ''
+        createdIsNeed: false
       },
       appointTime: [],
       isEdit: false,
@@ -240,7 +242,12 @@ export default {
       dataForm: {
         appointStatus: '',
         searchType: '9',
-        itemId: ''
+        itemId: '',
+        morning: '',
+        arrival: '',
+        beginDate: '',
+        endDate: '',
+        arrivalSort: ''
       },
       options: [
         {
@@ -395,6 +402,7 @@ export default {
         if (res.data.data) {
           this.$message.error(res.data.data)
         }
+        this.getDataListInitial()
       })
     },
     projectChange(value) {
@@ -443,6 +451,16 @@ export default {
     handleSelectionChange(val) {
       this.patientList = val
     },
+    sortList(val) {
+      if (val.order === 'ascending') {
+        val.order = 'asc'
+      }
+      if (val.order === 'descending') {
+        val.order = 'desc'
+      }
+      this.dataForm.arrivalSort = val.order
+      this.getDataList()
+    },
     // 给单元格绑定横向和竖向的index，这样就能确定是哪一个单元格
     tableCellClassName({ row, column, rowIndex, columnIndex }) {
       row.index = rowIndex