seo

src/components/doctorCheck/CheckSumSug.vue

@@ -363,10 +363,10 @@ export default {
         this.$message.warning({ showClose: true, message: '未获取到人员信息' })
         return
       }      
-      this.dialogWin.queue3 = true
       this.queueParams.patientRegisterId = this.patient_register.id
       this.queueParams.patientName = this.patient_register.patientName
       this.queueParams.queueTimes++   
+      this.dialogWin.queue3 = true   
     },
 
     // 危急值

src/components/doctorCheck/QueueCheckList.vue

@@ -264,7 +264,7 @@ export default {
               this.LocalConfig.doctorCheck.queueRoom
             );
         });
-        this.setQueueParams();
+        //this.setQueueParams();
 
         try {
           let sysParam = await postapi(
@@ -552,38 +552,34 @@ export default {
       }
     },
 
-    setQueueParams() {
-      this.queueParams.patientRegisterId =
-        this.dataTransOpts.tableS.patient_register.id;
-    },
+    // setQueueParams() {
+    //   this.queueParams.patientRegisterId =
+    //     this.dataTransOpts.tableS.patient_register.id;
+    // },
 
     // 分诊排队
     fnQueue() {
+      console.log('fnQueue.queueParams', this.queueParams)
       if (!this.queueParams.patientRegisterId) {
         this.$message.warning({ showClose: true, message: "未获取到人员信息" });
         return;
       }
       //console.log('fnQueue.queueParams',this.queueParams)
-      this.dialogWin.queue2 = true;
       this.queueParams.queueTimes++
+      this.dialogWin.queue2 = true;
     },
 
     // 选择候诊人员
     rowClickWait(row) {
       this.waitRow = row;
-      this.queueParams = {
-        patientRegisterId: row.patientRegisterId,
-        patientName:row.patientName
-      };
+      this.queueParams = Object.assign(this.queueParams, row)
+
     },
 
     // 选择过号人员
     rowClickAlready(row) {
       this.alreadyRow = row;
-      this.queueParams = {
-        patientRegisterId: row.patientRegisterId,
-        patientName:row.patientName
-      };
+      this.queueParams = Object.assign(this.queueParams, row)
     },
 
     // 选择过号人员
@@ -593,6 +589,7 @@ export default {
 
     // 右击选择人员
     rClick(row, column, event) {
+      console.log('排队时，右击', row)
       this.queueParams = Object.assign(this.queueParams, row)
       //console.log('rClick.queueParams',this.queueParams,row)
       // this.queueParams = {
@@ -621,9 +618,16 @@ export default {
         items.push({
           label: "取消排队",
           onClick: () => {
-            postapi('/api/app/QueueRegister/DeleteByPatientRegisterId', {
-              patientRegisterId: this.queueParams.patientRegisterId
-            }).then(res => {
+            // postapi('/api/app/QueueRegister/DeleteByPatientRegisterId', {
+            //   patientRegisterId: this.queueParams.patientRegisterId
+            // }).then(res => {
+            //   if (res.code > -1) {
+            //     this.$message.success({ showClose: true, message: '操作成功！' })
+            //     this.getQueueRegisterList(this.LocalConfig.doctorCheck.queueRoom, this.LocalConfig.doctorCheck.queueItemTypeIds)
+            //   }
+            // })
+            postapi('/api/app/QueueRegister/Delete', { queueRegisterId: this.queueParams.queueRegisterId })
+              .then(res => {
                 if (res.code > -1) {
                   this.$message.success({ showClose: true, message: '操作成功！' })
                   this.getQueueRegisterList(this.LocalConfig.doctorCheck.queueRoom, this.LocalConfig.doctorCheck.queueItemTypeIds)

src/components/follow/FollowCriticalCheck.vue

@@ -1094,14 +1094,6 @@ export default {
 
     },
 
-    // 分诊排队
-    fnQueue(row) {
-      this.queueParams = {
-        patientRegisterId: row.id
-      }
-      this.dialogWin.queue = true
-      this.dataTransOpts.plus.queue++
-    },
     
     //右击菜单
     onCellRightClick(row, column) {
@@ -1136,13 +1128,7 @@ export default {
             this.fnUpBaseInfo(row, 'idNo');
           },
         })
-      if (checkPagePriv(this.pagePriv.privs, '分诊排队') && row.completeFlag != '0')
-        items.push({
-          label: "分诊排队",
-          onClick: () => {
-            this.fnQueue(row);
-          },
-        })
+      
       if (checkPagePriv(this.pagePriv.privs, '发送检验申请') && row.completeFlag != '0')
         items.push({
           label: "发送检验申请",

src/components/patientRegister/PatientRegisterEdit.vue

@@ -1838,10 +1838,10 @@ export default {
         this.$message.warning({ showClose: true, message: '请先保存人员信息，再执行此操作！' })
         return
       }      
-      this.dialogWin.queue1 = true
       this.queueParams.patientRegisterId = this.form.id
       this.queueParams.patientName = this.form.patientName
       this.queueParams.queueTimes++
+      this.dialogWin.queue1 = true
     },
 
     //修改单位体检次数

src/components/patientRegister/PatientRegisterList.vue

@@ -2199,10 +2199,10 @@ export default {
 
     // 分诊排队
     fnQueue(row) {      
-      this.dialogWin.queue = true; // queue:人员登记列表；  queue1:人员登记界面； queue2:医生诊台
       this.queueParams.patientRegisterId = row.id
       this.queueParams.patientName = row.patientName
       this.queueParams.queueTimes++
+      this.dialogWin.queue = true; // queue:人员登记列表；  queue1:人员登记界面； queue2:医生诊台
     },
 
     // 知情同意书

src/views/doctorCheck/tabletCalling.vue

@@ -277,7 +277,10 @@ export default {
   },
   data() {
     return {
-      queueParams: {},
+      queueParams: {
+        patientRegisterId:'',
+        queueTimes:0
+      },
       patientName: "",
       waitDetail: [],
       alreadyCalledDetail: [],
@@ -656,7 +659,7 @@ export default {
       // this.queueParams = {
       //   patientRegisterId: this.queueParams.patientRegisterId,
       // };
-      this.dataTransOpts.plus.queue++;
+      this.queueParams.queueTimes++;
       this.dialogWin.queue = true;
     },