From 8e2211bc525c624bf27e361876d05490c614a4ec Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Fri, 17 Apr 2026 20:02:51 +0800
Subject: [PATCH] seo

---
 src/components/queue/Queue.vue | 54 ++++++++++++++++++++++++++--------
 src/store/index.js             |  1 +
 2 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/src/components/queue/Queue.vue b/src/components/queue/Queue.vue
index c10711d..05c79a0 100644
--- a/src/components/queue/Queue.vue
+++ b/src/components/queue/Queue.vue
@@ -61,7 +61,7 @@
               <div>{{ dddw(dict.queueFlag, 'id', scope.row.completeFlag, 'displayName') }}</div>
             </template>
           </el-table-column>
-          <el-table-column label="候诊" min-width="40" prop="queueCount"></el-table-column>
+          <el-table-column label="候诊" min-width="40" prop="queueCount"  align="center"></el-table-column>
           <el-table-column label="排号人" prop="triageName" min-width="60" align="center" />
         </el-table>
         <div style="width: 110px;">
@@ -73,7 +73,11 @@
             <el-button class="commonbutton" @click="btnQueueAuto">AI智能分诊</el-button>
           </div>
           <div style="margin-left: 10px;margin-bottom: 10px;">
-            <el-button class="commonbutton" @click="btnCancelQueue">取消排队</el-button>
+            <el-button class="deleteButton" @click="btnCancelQueue">取消排队</el-button>
+          </div>
+          <div style="margin-left: 10px;margin-bottom: 10px;">
+            <el-button class="commonbutton" @click="btnRecoverQueue"
+              :disabled="curQueueRow?.completeFlag == '9' ? false : true">恢复排队</el-button>
           </div>
           <div style="margin-left: 10px;">
             <el-button class="commonbutton" @click="btnClose">关闭</el-button>
@@ -159,11 +163,11 @@ export default {
       }
     },
 
-    changeMedicalCenter(v){
-      if(v){
+    changeMedicalCenter(v) {
+      if (v) {
         this.roomsForAsbitemFilter = this.roomsForAsbitem.filter(e => e.medicalCenterId == v)
-      }else{
-        this.roomsForAsbitemFilter = this.roomsForAsbitem 
+      } else {
+        this.roomsForAsbitemFilter = this.roomsForAsbitem
       }
 
     },
@@ -196,7 +200,7 @@ export default {
                 reject('patientRegisterId 无值')
               }
             } else {
-              reject(res.message)
+              reject(res?.message || '/api/app/QueueRegister/GetRoomQueueList 调用错误')
             }
           })
           .then(res => {
@@ -208,7 +212,7 @@ export default {
                 reject('patientRegisterId 无值')
               }
             } else {
-              reject(res.message)
+              reject(res?.message || '/api/app/QueueRegister/GetNotTriageAsbitemList 调用错误')
             }
           })
           .then(res => {
@@ -220,7 +224,7 @@ export default {
                 reject('patientRegisterId 无值')
               }
             } else {
-              reject(res.message)
+              reject(res?.message || '/api/app/QueueRegister/GetYesTriageAsbitemList 调用错误')
             }
           })
           .then(res => {
@@ -230,9 +234,21 @@ export default {
               } else {
                 this.queueRegister = { patientName: this.refParams?.patientName, roomName: '无', queueCount: '' }
               }
-              resolve(res)
+              // resolve(res)
+              return postapi('/api/app/QueueRegister/GetCancelQueueRegisterByPatientRegisterId', { patientRegisterId })
+            } else {
+              reject(res?.message || '/api/app/QueueRegister/GetQueueRegisterByPatientRegisterId 调用错误')
+            }
+          })
+          .then(res => {
+            if (res && res.code > -1) {
+              res.data.forEach(e => {
+                e.completeFlag = '9'
+                this.yesTriageAsbitemList.push(e)
+              });
+
             } else {
-              reject(res.message)
+              reject(res?.message || '/api/app/QueueRegister/GetCancelQueueRegisterByPatientRegisterId 调用错误')
             }
           })
           .catch(err => {
@@ -368,7 +384,21 @@ export default {
             }
           });
       }
-    }
+    },
+
+    // 恢复排队
+    btnRecoverQueue() {
+
+      postapi('/api/app/QueueRegister/RecoverCancelQueueRegisterByQueueRegisterId', { queueRegisterId: this.curQueueRow.queueRegisterId })
+        .then(res => {
+          if (res.code > -1) {
+            this.$message.success({showClose:true,message:'操作成功！'})
+            this.curQueueRow = {}
+            return this.dictInit()
+          }
+        })
+    },
+
   },
 
   //监听事件()
diff --git a/src/store/index.js b/src/store/index.js
index c60b82e..26f423a 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -400,6 +400,7 @@ export default new Vuex.Store({
                 { id: "0", displayName: "候诊" },
                 { id: "1", displayName: "已呼" },
                 { id: "2", displayName: "过号" },
+                { id: "9", displayName: "取消" },
             ],
         },