Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

src/views/doctorCheck/tabletCalling.vue

@@ -303,6 +303,7 @@ export default {
       queue_play_voice_repeate_times: 2, // 语音重复播放次数
       queue_play_voice_repeate_interval: 1, // 语音重复播放时间间隔(秒)
       isSignIn: "N", //是否签到
+      queue_after_call: 'N',  // 呼叫后是否自动排队
     };
   },
 
@@ -329,7 +330,7 @@ export default {
     ]),
 
     tableHeight() {
-      return this.window.pageHeight < 600 ? 330 : this.window.pageHeight - 150;
+      return this.window.pageHeight < 600 ? 330 : this.window.pageHeight - 155;
     },
   },
 
@@ -381,6 +382,17 @@ export default {
           console.log(error);
         }
 
+        // 叫号后是否自动排队
+        try {
+          let sysParam = await postapi(
+            "/api/app/SysParmValue/GetSysParmValueBySysParmId",
+            { sysParmId: "queue_after_call" }
+          );
+          this.queue_after_call = sysParam.data;
+        } catch (error) {
+          console.log(error);
+        }
+
         // 壳端
         if (this.$peisAPI) {
           postapi("/api/app/SysParmValue/GetSysParmValueBySysParmId", {
@@ -411,6 +423,7 @@ export default {
     },
 
     btnCall(refRow, completeFlag) {
+      let prePatientRegisterId = ''
       let row = Object.assign({}, refRow);
       switch (completeFlag) {
         case "0": // 退回
@@ -426,16 +439,14 @@ export default {
           break;
         case "1": // 呼叫
           if (!row.queueRegisterId) {
-            if (this.waitDetail.length > 0){
-                row = this.waitDetail[0];
-                this.setQueueParams(row)
-            }
+            if (this.waitDetail.length > 0) row = this.waitDetail[0];
           }
           if (!row.queueRegisterId)
             this.$message.warning({
               showClose: true,
               message: "未可操作的数据，或未选择候诊人员",
             });
+            if (this.alreadyCalledDetail.length > 0) prePatientRegisterId = this.alreadyCalledDetail[0].patientRegisterId
           break;
         case "2": // 过号
           if (!row.queueRegisterId) {
@@ -481,6 +492,9 @@ export default {
               this.LocalConfig.doctorCheck.queueItemTypeIds
             );
             if (this.$peisAPI && completeFlag == "1") this.outShellCall(row);
+            if (this.queue_after_call == 'Y' && prePatientRegisterId) return postapi('/api/app/QueueRegister/AutomaticQueuingRoom', {
+              patientRegisterId: prePatientRegisterId
+            })
           }
         });
       } else if (completeFlag == "9") {
@@ -639,9 +653,9 @@ export default {
         return;
       }
 
-      this.queueParams = {
-        patientRegisterId: this.queueParams.patientRegisterId,
-      };
+      // this.queueParams = {
+      //   patientRegisterId: this.queueParams.patientRegisterId,
+      // };
       this.dataTransOpts.plus.queue++;
       this.dialogWin.queue = true;
     },
@@ -655,13 +669,13 @@ export default {
     // 选择过号人员
     rowClickAlready(row) {
       this.alreadyRow = row;
-      this.setQueueParams(row)
+      // this.setQueueParams(row)
     },
 
     // 选择过号人员
     rowClickOver(row) {
       this.overRow = row;
-      this.setQueueParams(row)
+      // this.setQueueParams(row)
     },
   },
 };