From d1c9ed2f38da64dc3e8ecc9507a2c1db668891a4 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 22 五月 2024 17:18:41 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/product/workbench/index.vue | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/views/product/workbench/index.vue b/src/views/product/workbench/index.vue
index ea1a613..aa7d640 100644
--- a/src/views/product/workbench/index.vue
+++ b/src/views/product/workbench/index.vue
@@ -531,7 +531,7 @@
<!-- :style="{ backgroundColor: taskStatusColor() }" -->
<div class="task-div-content" >
<div v-if="!isShowNormalTracking" class="task-list-div" >
- <operationTaskPane
+ <operationTaskPane
ref="operateTaskDiv"
:workstationId="dutyForm.workstationId"
:productSn="operateTaskForm.SN"
@@ -734,7 +734,6 @@
<staffDialog
:currshowlist.sync="showStaff"
:selCol="selCol"
- :selColValArr="selColValArr"
:multiSelect="true"
:dutyRecord="dutyForm"
@handleSelectionChange="selectStaff"
@@ -2378,10 +2377,10 @@
} else if (this.status) {
this.$message.warning('璇ョ彮娆″凡缁忕‘璁わ紝涓嶅彲淇敼')
} else {
- this.selCol = 'staffNo'
- for (let i = 0; i < this.personBoardList.length; i++) {
- this.selColValArr.push(this.personBoardList[i].staffNo)
- }
+ // this.selCol = 'staffNo'
+ // for (let i = 0; i < this.personBoardList.length; i++) {
+ // this.selColValArr.push(this.personBoardList[i].staffNo)
+ // }
this.showStaff = true
}
},
--
Gitblit v1.9.3