From 0860e167327b68d3701aa3953e60ae37bdf29d6e Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Thu, 26 Sep 2024 18:23:23 +0800
Subject: [PATCH] =?UTF-8?q?9/26=20=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../basic/collectPoint/userWorkplace.vue | 12 +++++++
src/views/basic/workplace/busTypeManage.vue | 4 +--
src/views/basic/workplace/workplaceManage.vue | 35 ++++++++++++++++---
src/views/collect/IoSplitFinishCode.vue | 2 +-
4 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/src/views/basic/collectPoint/userWorkplace.vue b/src/views/basic/collectPoint/userWorkplace.vue
index 6108aa9d..fdbc003d 100644
--- a/src/views/basic/collectPoint/userWorkplace.vue
+++ b/src/views/basic/collectPoint/userWorkplace.vue
@@ -132,6 +132,11 @@
{{ workplaceStatusMap[scope.row.workplaceStatus] }}
+
+
+ {{ workPlaceClasss[scope.row.workPlaceClass] }}
+
+
@@ -372,6 +377,10 @@ export default {
3: '内部科室',
4: '特殊往来'
},
+ workPlaceClasss: {
+ 1: '采集工位',
+ 2: '上货工位'
+ },
workplaceStatusMap: {
0: '暂停',
1: '启用'
@@ -415,6 +424,9 @@ export default {
this.getUsers()
},
onUserReset() {
+ if(this.rowData.id == null){
+ return this.$message.error("请选择用户")
+ }
this.workQuery = {
page: 1,
limit: 10,
diff --git a/src/views/basic/workplace/busTypeManage.vue b/src/views/basic/workplace/busTypeManage.vue
index 973b2d95..e7baafcb 100644
--- a/src/views/basic/workplace/busTypeManage.vue
+++ b/src/views/basic/workplace/busTypeManage.vue
@@ -3,11 +3,11 @@
-
+
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 47b79381..b4f8dbe0 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -133,6 +133,11 @@
{{ workplaceStatusMap[scope.row.workplaceStatus] }}
+
+
+ {{ workPlaceClasss[scope.row.workPlaceClass] }}
+
+
@@ -184,10 +189,10 @@
-
+
@@ -416,6 +421,14 @@
+
+
+
+
+
+
+
+
@@ -523,9 +536,7 @@
-
-
@@ -750,6 +761,7 @@ export default {
workplaceName: null,
workplaceStatus: 1,
workplaceType: 3,
+ workPlaceClass: 1,
deptCode: null,
chargeUser: null,
constituencies: null,
@@ -771,6 +783,9 @@ export default {
checkInsert: [
{required: true, message: '处理结果不能为空', trigger: 'blur'}
],
+ workPlaceClass: [
+ {required: true, message: '请选择工位类型', trigger: 'blur'}
+ ],
// invRemindNumber: [
// { required: true, message: '请输入工位存量提醒数', trigger: 'blur' }
// ],
@@ -844,6 +859,10 @@ export default {
0: '暂停',
1: '启用'
},
+ workPlaceClasss: {
+ 1: '采集工位',
+ 2: '上货工位'
+ },
orderFinishVerifys: {
0: '完全赋码',
1: '部分赋码',
@@ -1186,6 +1205,9 @@ export default {
this.getUserBindWork(this.userQuery)
},
onBusTypeReset() {
+ if (this.rowData.workplaceId == null) {
+ return this.$message.error('请先选择工位')
+ }
this.busQuery = {
busKey: '',
workplaceCode: null,
@@ -1213,6 +1235,9 @@ export default {
this.chooseBusTypeDialogVisible = true
},
onUserReset() {
+ if (this.rowData.workplaceId == null) {
+ return this.$message.error('请先选择工位')
+ }
this.userQuery = {
page: 1,
limit: 10,
@@ -1399,6 +1424,8 @@ export default {
this.getWorkBindBusTypes()
},
changeDept(){
+ this.busTypeList = []
+ this.userList = []
this.getList()
}
},
diff --git a/src/views/collect/IoSplitFinishCode.vue b/src/views/collect/IoSplitFinishCode.vue
index 024645d8..587dd275 100644
--- a/src/views/collect/IoSplitFinishCode.vue
+++ b/src/views/collect/IoSplitFinishCode.vue
@@ -1288,7 +1288,7 @@ export default {
this.filterQuery.statusType = 'scan_code';
}
- getHead("IoSplitFinishCode", "1").then((re) => {
+ getHead("IoSplitFinishLog", "1").then((re) => {
// 处理返回的数据
this.tableObj = re.data;
this.tableHeader = re.data.tableList;