From 927c1e749f1562228004daa068f87ad1f9de1599 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Fri, 24 Apr 2026 17:25:01 +0800
Subject: [PATCH] seo

---
 src/components/queue/Queue.vue | 52 ++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/components/queue/Queue.vue b/src/components/queue/Queue.vue
index 05c79a0..b35a833 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"  align="center"></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;">
@@ -318,15 +318,49 @@ export default {
         this.$message.warning({ showClose: true, message: '请选择排队房间' })
         return
       }
-      postapi('/api/app/QueueRegister/ManualQueuingRoom', {
+
+      let body = {
         patientRegisterId: this.refParams.patientRegisterId,
         roomId: this.curRoomId
-      }).then(res => {
-        if (res.code > -1) {
-          this.$message.success({ showClose: true, message: '操作成功！' })
-          return this.dictInit()
-        }
-      })
+      }
+      postapi('/api/app/QueueRegister/GetRoomAsbitemPreAsbitemStatus', body)
+        .then(res => {
+          if (res.code > -1) {
+            // {
+            //   "isPreCheckAsbitem": "string",
+            //   "asbitemNameDetail": [
+            //     "string"
+            //   ]
+            // }
+            if (res?.data?.isPreCheckAsbitem == "Y") {  // 有前置项目未先排队，给出提示
+              let asbitemNameDetail = res?.data?.asbitemNameDetail?.toString() || ''
+              this.$confirm(`尚有前置项目【${asbitemNameDetail}】未检查, 是否继续排入该房间?`, "提示", {
+                confirmButtonText: "是",
+                cancelButtonText: "否",
+                type: "warning",
+              })
+                .then(() => {
+                  // 排队接口 
+                  this.queueApi(body)
+                })
+
+            } else {
+              // 排队接口 
+              this.queueApi(body)
+            }
+          }
+        })
+    },
+
+    // 排队接口 
+    queueApi(body) {
+      postapi('/api/app/QueueRegister/ManualQueuingRoom', body)
+        .then(res => {
+          if (res.code > -1) {
+            this.$message.success({ showClose: true, message: '操作成功！' })
+            return this.dictInit()
+          }
+        })
     },
 
     // 自动排队
@@ -392,7 +426,7 @@ export default {
       postapi('/api/app/QueueRegister/RecoverCancelQueueRegisterByQueueRegisterId', { queueRegisterId: this.curQueueRow.queueRegisterId })
         .then(res => {
           if (res.code > -1) {
-            this.$message.success({showClose:true,message:'操作成功！'})
+            this.$message.success({ showClose: true, message: '操作成功！' })
             this.curQueueRow = {}
             return this.dictInit()
           }