seo

2 days ago · eb8ec1d422
6 changed files with 49 additions and 56 deletions
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@ -362,11 +362,11 @@ export default {
      if (!this.patient_register.id) {
        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.queueParams.queueTimes++   
+      this.dialogWin.queue3 = true   
    },

    // 危急值
--- a/src/components/doctorCheck/QueueCheckList.vue
+++ b/src/components/doctorCheck/QueueCheckList.vue
@ -87,7 +87,7 @@
      <div style="display: flex" @contextmenu.prevent="onContextmenu">
        <el-table :data="alreadyCalledDetail" style="width: 100%" border highlight-current-row @row-contextmenu="rClick"
          @row-click="rowClickAlready" :row-style="{ height: '28px' }" :height="Math.floor((tableHeight - 72) / 3)">
-          <el-table-column type="index" label="序" width="30" align="center" />          
+          <el-table-column type="index" label="序" width="30" align="center" />
          <el-table-column prop="patientName" label="姓名" width="80" align="center" />
          <el-table-column prop="isVip" label="Vip" width="30" align="center">
            <template slot-scope="scope">
@ -160,9 +160,9 @@ export default {
  data() {
    return {
      queueParams: {
-        patientRegisterId:'',
-        queueTimes:0, //刷新用
-        patientName:'',
+        patientRegisterId: '',
+        queueTimes: 0, //刷新用
+        patientName: '',
        state: '',
        queueRegisterId: ''
      },
@ -196,7 +196,7 @@ export default {
      // 避免单击事件与双击事件冲突
      clickTime1: 0,
      clickTime2: 0,
-      dialogWinQueue:false,
+      dialogWinQueue: false,
    };
  },

@ -264,7 +264,7 @@ export default {
              this.LocalConfig.doctorCheck.queueRoom
            );
        });
-        this.setQueueParams();
+        //this.setQueueParams();

        try {
          let sysParam = await postapi(
@ -385,7 +385,7 @@ export default {
          completeFlag,
        }).then((res) => {
          if (res.code > -1) {
-            if(completeFlag == '1'){
+            if (completeFlag == '1') {
              this.waitRow = {}
            }

@ -429,11 +429,11 @@ export default {
            RepatPlayNum: this.queue_play_voice_repeate_times,
            Delay: this.queue_play_voice_repeate_interval,
          };
-          console.log("叫号 this.$peisAPI.speechSendText",toOutShell)
+          console.log("叫号 this.$peisAPI.speechSendText", toOutShell)
          return this.$peisAPI.speechSendText(JSON.stringify(toOutShell));
        })
        .then(res => {
-          console.log('叫号返回 this.$peisAPI.speechSendText',res)
+          console.log('叫号返回 this.$peisAPI.speechSendText', res)
        })
        .catch((err) => {
          // console.log('呼叫失败', err)
@ -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.queueParams.queueTimes++
      this.dialogWin.queue2 = true;
-      this.queueParams.queueTimes++      
    },

    // 选择候诊人员
    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,7 +589,8 @@ export default {

    // 右击选择人员
    rClick(row, column, event) {
-      this.queueParams = Object.assign(this.queueParams,row)
+      console.log('排队时，右击', row)
+      this.queueParams = Object.assign(this.queueParams, row)
      //console.log('rClick.queueParams',this.queueParams,row)
      // this.queueParams = {
      //   patientRegisterId: row.patientRegisterId,
@ -621,14 +618,21 @@ export default {
        items.push({
          label: "取消排队",
          onClick: () => {
-            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/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)
+                }
+              })
          },
        })
      }
--- a/src/components/follow/FollowCriticalCheck.vue
+++ b/src/components/follow/FollowCriticalCheck.vue
@ -1094,15 +1094,7 @@ export default {

    },

-    // 分诊排队
-    fnQueue(row) {
-      this.queueParams = {
-        patientRegisterId: row.id
-      }
-      this.dialogWin.queue = true
-      this.dataTransOpts.plus.queue++
-    },
-
+    
    //右击菜单
    onCellRightClick(row, column) {
      this.rClickRow = { ...row }; //右击的行记录
@ -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: "发送检验申请",
--- a/src/components/patientRegister/PatientRegisterEdit.vue
+++ b/src/components/patientRegister/PatientRegisterEdit.vue
@ -1837,11 +1837,11 @@ export default {
      if (!this.form.id) {
        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
    },

    //修改单位体检次数
--- a/src/components/patientRegister/PatientRegisterList.vue
+++ b/src/components/patientRegister/PatientRegisterList.vue
@ -2198,11 +2198,11 @@ export default {
    },

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

    // 知情同意书
--- a/src/views/doctorCheck/tabletCalling.vue
+++ b/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;
    },