From ce6a529a059f6cbffe1f7ecd717475c57450084d Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 20 Feb 2025 15:51:53 +0800 Subject: [PATCH] =?UTF-8?q?2/10=20=E5=8E=BB=E8=B4=A7=E6=9E=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/workPlace/SysWorkplaceFreight.js | 10 +++ src/api/basic/workPlace/regionManage.js | 27 ++++++++ src/views/basic/workplace/addRegionDialog.vue | 57 ++++++++++++++--- .../workplace/addWorkplaceFreightDialog.vue | 63 +++++++++++++++---- src/views/basic/workplace/freightManage.vue | 21 ++++--- src/views/basic/workplace/regionManage.vue | 58 +++++++++++++---- src/views/inout/DialogNewReviewOrder.vue | 22 ++++--- 7 files changed, 213 insertions(+), 45 deletions(-) diff --git a/src/api/basic/workPlace/SysWorkplaceFreight.js b/src/api/basic/workPlace/SysWorkplaceFreight.js index 1ac6246e..6757473d 100644 --- a/src/api/basic/workPlace/SysWorkplaceFreight.js +++ b/src/api/basic/workPlace/SysWorkplaceFreight.js @@ -62,6 +62,16 @@ export function printAllFreight(query) { responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf }); } + +export function printRegion(query) { + return axios({ + url: "/udiwms/WorkplaceFreight/printRegion", + method: "post", + data: query, + headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'}, + responseType: 'arraybuffer', //一定要设置响应类型，否则页面会是空白pdf + }); +} // export function printAllFreight(query) { // return axios({ // url: "/udiwms/WorkplaceFreight/printAllFreight", diff --git a/src/api/basic/workPlace/regionManage.js b/src/api/basic/workPlace/regionManage.js index 32efdc76..892fc35b 100644 --- a/src/api/basic/workPlace/regionManage.js +++ b/src/api/basic/workPlace/regionManage.js @@ -9,3 +9,30 @@ export function getRegions(query) { params: query }) } + + + +//新增槽位区域 +export function addRegion(query) { + return axios({ + url: "/udiwms/sysWorkplaceRegion/addRegion", + method: "post", + data: query + }); +} + +export function editRegion(query) { + return axios({ + url: "/udiwms/sysWorkplaceRegion/editRegion", + method: "post", + data: query + }); +} + +export function delRegion(query) { + return axios({ + url: "/udiwms/sysWorkplaceRegion/delRegion", + method: "post", + data: query + }); +} diff --git a/src/views/basic/workplace/addRegionDialog.vue b/src/views/basic/workplace/addRegionDialog.vue index 295fef69..6572d824 100644 --- a/src/views/basic/workplace/addRegionDialog.vue +++ b/src/views/basic/workplace/addRegionDialog.vue @@ -7,6 +7,7 @@ -
+
取消 +import { addRegion, editRegion } from '@/api/basic/workPlace/regionManage' +import { isBlank } from '@/utils/strUtil' export default { props: { @@ -48,7 +51,11 @@ export default { type: Function, required: true }, - rowData:{ + rowData: { + type: Object, + required: true + }, + type: { type: Object, required: true } @@ -56,24 +63,60 @@ export default { data() { return { formData: { - timeout:0, - }, + regionCode: null, + regionName: '' + } } }, methods: { - formSubmit(){ + formSubmit() { + if (isBlank(this.formData.regionCode) || isBlank(this.formData.regionName)) { + return this.$message.error('区域编码或区域名称为空') + } + if (this.type == 2) { + editRegion(this.formData).then(res => { + if (res.code == 20000) { + this.$message.success('修改成功') + this.closeDialog() + } else { + this.closeDialog() + return this.$message.error(res.message) + } + }) + } else { + addRegion(this.formData).then(res => { + if (res.code == 20000) { + this.$message.success('新增成功') + this.closeDialog() + } else { + this.closeDialog() + return this.$message.error(res.message) + } + }) + } }, - hideForm(){ + hideForm() { this.closeDialog() } }, created() { + if (this.type == 2) { + this.formData = this.rowData + } else { + this.formData = { + regionCode: null, + regionName: '' + } + } } } diff --git a/src/views/basic/workplace/addWorkplaceFreightDialog.vue b/src/views/basic/workplace/addWorkplaceFreightDialog.vue index f6059de4..60e8b11b 100644 --- a/src/views/basic/workplace/addWorkplaceFreightDialog.vue +++ b/src/views/basic/workplace/addWorkplaceFreightDialog.vue @@ -57,14 +57,25 @@ - - - + + + + + + + + + + + + + + + @@ -87,6 +98,19 @@ > + + + + @@ -169,6 +193,7 @@ import { } from '@/api/basic/workPlace/SysWorkplaceFreight' import { deleteLayer, getLayerCode, getLayerList, saveLayer } from '@/api/basic/workPlace/SysWorkplaceLayer' import { isBlank } from '@/utils/strUtil' +import { getRegions } from '@/api/basic/workPlace/regionManage' export default { props: { @@ -214,6 +239,12 @@ export default { saveStatus: false, //记录保存状态 selectedIndex: null,//记录下标位置 remarkStatus: false, + //区域 + regions:[], + regionQuery:{ + page:1, + limit:10 + }, // { // code:null, // queueNum:null, @@ -298,7 +329,8 @@ export default { if (res.code == 20000) { this.layerList.push({ code: res.data, - queueNum: null + queueNum: null, + layerName:"" }) } else { this.$message.error('系统繁忙') @@ -313,7 +345,8 @@ export default { let code = this.createLayerCode(lastLayer) this.layerList.push({ code: code, - queueNum: null + queueNum: null, + layerName:"" }) } @@ -392,7 +425,14 @@ export default { }) - } + }, + getRegionList(){ + getRegions(this.query).then(res => { + if (res.code == 20000){ + this.regions = res.data.list + } + }) + }, }, created() { if (this.rowData != null) { @@ -407,6 +447,7 @@ export default { this.getCode() } this.findWorkPlace('') + this.getRegionList() } } diff --git a/src/views/basic/workplace/freightManage.vue b/src/views/basic/workplace/freightManage.vue index f27b0adf..516a094b 100644 --- a/src/views/basic/workplace/freightManage.vue +++ b/src/views/basic/workplace/freightManage.vue @@ -11,6 +11,8 @@ + 打印区域 + 打印全部 新增取货架 @@ -94,17 +96,18 @@ @row-click="handChangeLayer" > - - - - - - - + + +