From 6c9cf27e42d0385b4775d2f3bb86ad88c6635c06 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 16 Aug 2024 11:09:00 +0800
Subject: [PATCH] =?UTF-8?q?8*16=20=E5=B7=A5=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/basic/collectPoint/gatherOrderType.js | 10 +++
.../basic/collectPoint/gatherOrderType.vue | 2 +-
src/views/basic/workplace/workplaceManage.vue | 62 ++++++++++++-------
3 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/src/api/basic/collectPoint/gatherOrderType.js b/src/api/basic/collectPoint/gatherOrderType.js
index 1ec21596..17b21b90 100644
--- a/src/api/basic/collectPoint/gatherOrderType.js
+++ b/src/api/basic/collectPoint/gatherOrderType.js
@@ -34,3 +34,13 @@ export function delCollectBusType(query) {
data: query
});
}
+
+
+
+export function genCode(query) {
+ return axios({
+ url: "/udiwms/basic/collectBusType/genCode",
+ method: "post",
+ data: query
+ });
+}
diff --git a/src/views/basic/collectPoint/gatherOrderType.vue b/src/views/basic/collectPoint/gatherOrderType.vue
index 9f78edb7..37dd720f 100644
--- a/src/views/basic/collectPoint/gatherOrderType.vue
+++ b/src/views/basic/collectPoint/gatherOrderType.vue
@@ -162,7 +162,7 @@ import {
getCollectBusType,
addCollectBusType,
updateCollectBusType,
- delCollectBusType
+ delCollectBusType, genCode
} from '@/api/basic/collectPoint/gatherOrderType'
import { getBusTypeList } from '@/api/basic/busType'
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 2237ef1f..7d123948 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -120,7 +120,7 @@
{{ operationTypes[scope.row.operationType] }}
-
+
{{ checkInserts[scope.row.checkInsert] }}
@@ -132,8 +132,8 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ item.label }}
+
+
+
+
@@ -578,12 +578,17 @@ export default {
total: 0,
userTotal: 0
}
+ },
+ computed: {
+
},
methods: {
hideSearch() {
this.showSearch = !this.showSearch
},
onSubmit() {
+ this.userList = []
+ this.rowData.workplaceName = "工位"
this.query.page = 1
this.getList()
},
@@ -600,7 +605,7 @@ export default {
getList() {
listPage(this.query).then(res => {
if (res.code != 20000) {
- return this.$message.error('错误错误')
+ return this.$message.error(res.message)
}
this.list = res.data.list || []
this.total = res.data.total || 0
@@ -647,7 +652,7 @@ export default {
})
},
formSubmit() {
- this.formData.constituencies = this.groupData.code
+ // this.formData.constituencies = this.groupData.code
if (this.fromName == 'add') {
this.$refs['dataForm'].validate((valid) => {
if (!valid) {
@@ -665,8 +670,7 @@ export default {
}
this.getList()
}).catch(() => {
- this.addWorkplaceDialogVisible = false
- this.$message.error('新增错误')
+
})
}
})
@@ -687,7 +691,17 @@ export default {
},
edit(row) {
this.formData = row
+ this.formData.invCode = String(row.invCode)
+ this.formData.chargeUser = Number(row.chargeUser)
this.fromName = 'edit'
+ this.invQuery.invCode = row.invCode
+ getUsers(this.invQuery).then(res => {
+ if (res.code == 20000) {
+ this.users = res.data.list || []
+ } else {
+ this.$message.error('错误')
+ }
+ })
this.addWorkplaceDialogVisible = true
},
deleteWorkplace(row) {