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

src/components/doctorCheck/QueueCheckList.vue

@@ -10,7 +10,7 @@
               style="width: 100px" size="small">
               <el-option v-for="item in dict.room" :key="item.id" :label="item.displayName" :value="item.id" />
             </el-select>
-          </div>          
+          </div>
           <div>
             <el-cascader :options="dict.itemTypeTree" v-model="LocalConfig.doctorCheck.queueItemTypeIds"
               popper-class="example" style="width: 160px" :props="{
@@ -74,10 +74,12 @@
               )
               " style="width: 40px; min-width: 40px; height: 26px">刷新</el-button>
           </div>
+          <!-- 分诊排队
           <div>
             <el-button type="primary" class="commonbutton" @click="fnQueue"
               style="width: 40px; min-width: 40px; height: 26px">排队</el-button>
           </div>
+          -->
         </div>
       </div>
       <div style="margin-top: 6px">已呼人员：</div>
@@ -180,7 +182,12 @@ export default {
 
       queue_play_voice_repeate_times: 2, // 语音重复播放次数
       queue_play_voice_repeate_interval: 1, // 语音重复播放时间间隔(秒)
-      isSignIn: "N"//是否签到
+      isSignIn: "N", //是否签到
+
+      // 避免单击事件与双击事件冲突
+      clickTime1: 0,
+      clickTime2: 0,
+
     };
   },
 
@@ -323,7 +330,7 @@ export default {
             this.$message.warning({
               showClose: true,
               message: "未可操作的数据，或未选择候诊人员",
-            });          
+            });
           if (this.alreadyCalledDetail.length > 0) prePatientRegisterId = this.alreadyCalledDetail[0].patientRegisterId
 
           break;
@@ -533,23 +540,43 @@ export default {
 
     // 选择候诊人员
     rowClickWait(row) {
-      this.waitRow = row;
-      this.queueParams = {
-        patientRegisterId: row.patientRegisterId,
-      };
+
+      this.clickTime1 = new Date().getTime()
+
+      setTimeout(() => {
+        if (this.clickTime1 > this.clickTime2) {
+          this.waitRow = row;
+          this.queueParams = {
+            patientRegisterId: row.patientRegisterId,
+          };
+        }
+      }, 400);
+
+
+
     },
 
     // 选择过号人员
     rowClickAlready(row) {
-      this.alreadyRow = row;
-      this.queueParams = {
-        patientRegisterId: row.patientRegisterId,
-      };
+      this.clickTime1 = new Date().getTime()
+      setTimeout(() => {
+        if (this.clickTime1 > this.clickTime2) {
+          this.alreadyRow = row;
+          this.queueParams = {
+            patientRegisterId: row.patientRegisterId,
+          };
+        }
+      }, 400);
     },
 
     // 选择过号人员
-    rowClickOver(row) {
-      this.overRow = row;
+    rowClickOver(row) {      
+      this.clickTime1 = new Date().getTime()
+      setTimeout(() => {
+        if (this.clickTime1 > this.clickTime2) {
+          this.overRow = row;
+        }
+      }, 400);
     },
   },
 

src/components/patientRegister/PatientRegisterList.vue

@@ -683,6 +683,7 @@ export default {
       dialogRecover: false,
       patientRegisterNo: '',
 
+      // 避免单击事件与双击事件冲突
       clickTime1: 0,
       clickTime2: 0,
     };