From 5b4a1bd42de95fc6f9d7887bb87b07d9c9c88d2b Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 12 Nov 2024 15:35:11 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E8=A7=84=E6=A0=BC=E5=92=8C=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../developPurchasereceiptRequestMain/index.vue | 4 ++++ .../jisPurchasereceiptRequestMain/index.vue | 4 ++++ .../purchasereceipt/purchasereceiptRequestMain/index.vue | 4 ++++ .../toolPurchasereceiptRequestMain/index.vue | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue index de3fdfd3c..fbaa32d15 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue @@ -462,6 +462,10 @@ const buttonTableClick = async (val, row) => { }) } await getDetailList() + detatableData.tableList.forEach(item=>{ + item.packQty = item.defaultPackQty + item.packUnit = item.defaultPackUnit + }) formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题 }else if (val == 'point') { // 标签打印 diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue index f9cfe89a9..b1a9ddb61 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue @@ -462,6 +462,10 @@ const buttonTableClick = async (val, row) => { }) } await getDetailList() + detatableData.tableList.forEach(item=>{ + item.packQty = item.defaultPackQty + item.packUnit = item.defaultPackUnit + }) formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题 }else if (val == 'point') { // 标签打印 diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 9e91e01e5..953b58f20 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -462,6 +462,10 @@ const buttonTableClick = async (val, row) => { }) } await getDetailList() + detatableData.tableList.forEach(item=>{ + item.packQty = item.defaultPackQty + item.packUnit = item.defaultPackUnit + }) formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题 }else if (val == 'point') { // 标签打印 diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue index a28a602d9..66bab604f 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue @@ -462,6 +462,10 @@ const buttonTableClick = async (val, row) => { }) } await getDetailList() + detatableData.tableList.forEach(item=>{ + item.packQty = item.defaultPackQty + item.packUnit = item.defaultPackUnit + }) formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题 }else if (val == 'point') { // 标签打印 From 25a6dae086f45da6ae4e728ba6f7c5fefcd6f019 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 12 Nov 2024 15:36:00 +0800 Subject: [PATCH 02/20] importJIS --- .../jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue index b1a9ddb61..a9b2524d3 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue @@ -92,7 +92,7 @@ Date: Tue, 12 Nov 2024 15:50:18 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=8A=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 19 +++++++++++++++++++ .../purchasereceiptRecordMain.data.ts | 19 +++++++++++++++++++ .../purchasereceiptJobMain.data.ts | 19 +++++++++++++++++++ .../purchasereceiptRecordMain.data.ts | 19 +++++++++++++++++++ .../purchasereceiptRequestMain.data.ts | 19 +++++++++++++++++++ .../purchasereceiptRecordMain.data.ts | 19 +++++++++++++++++++ .../purchasereceiptRequestMain.data.ts | 19 +++++++++++++++++++ .../purchasereceiptJobMain.data.ts | 19 +++++++++++++++++++ .../purchasereceiptRecordMain.data.ts | 19 +++++++++++++++++++ .../purchasereceiptRequestMain.data.ts | 19 +++++++++++++++++++ .../purchasereceiptJobMain.data.ts | 19 +++++++++++++++++++ .../purchasereceiptRecordMain.data.ts | 19 +++++++++++++++++++ .../purchasereceiptRequestMain.data.ts | 19 +++++++++++++++++++ 13 files changed, 247 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 45c51ab89..c40b03677 100644 --- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -483,6 +483,25 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:12, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 45c51ab89..c40b03677 100644 --- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -483,6 +483,25 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:12, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts index 46842c9f4..3c6a8f618 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -375,6 +375,25 @@ export const PurchasereceiptJobMain = useCrudSchemas( }, isTable: false }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '备注', field: 'remark', diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 45c51ab89..c40b03677 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -483,6 +483,25 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:12, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index ecbfbdb58..1d4361dc7 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -564,6 +564,25 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isTable: false, isSearch: false, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '操作', field: 'action', diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 45c51ab89..c40b03677 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -483,6 +483,25 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:12, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index ecbfbdb58..1d4361dc7 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -564,6 +564,25 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isTable: false, isSearch: false, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '操作', field: 'action', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts index 46842c9f4..3c6a8f618 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -375,6 +375,25 @@ export const PurchasereceiptJobMain = useCrudSchemas( }, isTable: false }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '备注', field: 'remark', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 45c51ab89..c40b03677 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -483,6 +483,25 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:12, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 6d613711f..bd27770d0 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -564,6 +564,25 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isTable: false, isSearch: false, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '操作', field: 'action', diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts index 46842c9f4..3c6a8f618 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -375,6 +375,25 @@ export const PurchasereceiptJobMain = useCrudSchemas( }, isTable: false }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '备注', field: 'remark', diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 45c51ab89..c40b03677 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -483,6 +483,25 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:12, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index ecbfbdb58..1d4361dc7 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -564,6 +564,25 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isTable: false, isSearch: false, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '操作', field: 'action', From f8efa073c89e986fab29267f2ca92a0cc22e12c1 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 12 Nov 2024 15:59:39 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=BF=90=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.wyf | 14 +++++++------- package.json | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.env.wyf b/.env.wyf index 323d8245a..99bad36e9 100644 --- a/.env.wyf +++ b/.env.wyf @@ -8,17 +8,17 @@ VITE_DEV=false # SCP 28040 # WMS 28050 # # 请求路径 -VITE_BASE_URL='http://dev.ccwin-in.com:28050/api' +# VITE_BASE_URL='http://dev.ccwin-in.com:28040/api' -# 上传路径 -VITE_UPLOAD_URL='http://dev.ccwin-in.com:28050/admin-api/infra/file/upload' +# # 上传路径 +# VITE_UPLOAD_URL='http://dev.ccwin-in.com:28040/admin-api/infra/file/upload' -# # # 请求路径 -# VITE_BASE_URL='http://192.168.1.196:12080' +# # 请求路径 +VITE_BASE_URL='http://192.168.1.196:12080' -# # 上传路径 -# VITE_UPLOAD_URL='http://192.168.1.196:12080/admin-api/infra/file/upload' +# 上传路径 +VITE_UPLOAD_URL='http://192.168.1.196:12080/admin-api/infra/file/upload' # # 请求路径 # VITE_BASE_URL='http://192.168.1.35:12080' diff --git a/package.json b/package.json index 03129b88d..e2fe74cd1 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "private": false, "scripts": { "dev": "vite", + "wyf": "vite --mode wyf", "test": "vite build --mode test", "prod": "vite build --mode prod", "preview": "vite preview", From b55e88822016245b01d5cc6aaf45030dd2c8f89f Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Tue, 12 Nov 2024 16:10:29 +0800 Subject: [PATCH 05/20] =?UTF-8?q?WMS14.=E8=AE=A1=E5=88=92=E5=A4=96?= =?UTF-8?q?=E5=85=A5=E5=BA=93=20=20YT-707?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRequestMain.data.ts | 82 ++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index b579f0938..fe8b22b0b 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -681,6 +681,86 @@ export const UnplannedreceiptRequestMainRules = reactive({ ], }) +export const ItembasicShow = useCrudSchemas( +   reactive([ + { + label: '品番', + field: 'code', + sort: 'custom', + isSearch: true, + table: { + }, + }, + + { + label: '品名', + field: 'name', + sort: 'custom', + isSearch: true, + table: { + }, + }, + { + label: '描述1', + field: 'desc1', + sort: 'custom', + table: { + } , + // isTableForm:false + }, + { + label: '描述2', + field: 'desc2', + sort: 'custom', + table: { + } , + }, + { + label: '物料状态', + field: 'status', + sort: 'custom', + dictType: DICT_TYPE.ITEM_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + } + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + } + }, + { + label: '种类', + field: 'category', + sort: 'custom', + dictType: DICT_TYPE.ITEM_CATEGORY, + dictClass: 'string', + isTable: false, + isDetail:false, + table: { + } , + }, + { + label: '类型', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.ITEM_TYPE, + dictClass: 'string', + isTable: true, + table: { + } , + }, +   ]) + ) + /** * @returns {Array} 计划外入库申请子表 */ @@ -713,7 +793,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive Date: Tue, 12 Nov 2024 16:46:47 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptJobMain.data.ts | 7 ++++++- .../purchasereceiptRequestMain.data.ts | 5 +++++ .../purchasereceiptRequestMain.data.ts | 5 +++++ .../purchasereceiptJobMain/purchasereceiptJobMain.data.ts | 7 ++++++- .../purchasereceiptRequestMain.data.ts | 5 +++++ .../purchasereceiptJobMain.data.ts | 7 ++++++- .../purchasereceiptRequestMain.data.ts | 5 +++++ 7 files changed, 38 insertions(+), 3 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts index 3c6a8f618..c80caf5a0 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -1015,7 +1015,12 @@ export const PurchasereceiptJobDetail = useCrudSchemas( dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', sortTableDefault: 7, - isSearch: true + isSearch: true, + search:{ + componentProps:{ + multiple:true, + } + } }, { label: '物料描述1', diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 1d4361dc7..0ebde31e5 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -804,6 +804,11 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive Date: Tue, 12 Nov 2024 17:23:48 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E7=89=A9=E6=96=99=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 1 - .../purchasereceiptRecordMain.data.ts | 1 - .../purchasereceiptRecordMain.data.ts | 1 - .../purchasereceiptRecordMain.data.ts | 1 - .../purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts | 1 - .../purchasereceiptRecordMain.data.ts | 1 - 6 files changed, 6 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index c40b03677..536d2cb7b 100644 --- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -729,7 +729,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', isSearch: true, - isTable:false, isDetail:false, search:{ componentProps:{ diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index c40b03677..536d2cb7b 100644 --- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -729,7 +729,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', isSearch: true, - isTable:false, isDetail:false, search:{ componentProps:{ diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index c40b03677..536d2cb7b 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -729,7 +729,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', isSearch: true, - isTable:false, isDetail:false, search:{ componentProps:{ diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index c40b03677..536d2cb7b 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -729,7 +729,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', isSearch: true, - isTable:false, isDetail:false, search:{ componentProps:{ diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index c40b03677..536d2cb7b 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -729,7 +729,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', isSearch: true, - isTable:false, isDetail:false, search:{ componentProps:{ diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index c40b03677..536d2cb7b 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -729,7 +729,6 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', isSearch: true, - isTable:false, isDetail:false, search:{ componentProps:{ From ff81d7c68970b00e9abbef587e6c0df43bdf5111 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 12 Nov 2024 17:25:49 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 3 +++ .../purchasereceiptRecordMain.data.ts | 3 +++ .../purchasereceiptRecordMain.data.ts | 3 +++ .../purchasereceiptRecordMain.data.ts | 3 +++ .../purchasereceiptRecordMain.data.ts | 3 +++ .../purchasereceiptRecordMain.data.ts | 3 +++ 6 files changed, 18 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 536d2cb7b..fbfcee548 100644 --- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -730,6 +730,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictClass: 'string', isSearch: true, isDetail:false, + table: { + width: 150 + }, search:{ componentProps:{ multiple:true, diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 536d2cb7b..fbfcee548 100644 --- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -730,6 +730,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictClass: 'string', isSearch: true, isDetail:false, + table: { + width: 150 + }, search:{ componentProps:{ multiple:true, diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 536d2cb7b..fbfcee548 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -730,6 +730,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictClass: 'string', isSearch: true, isDetail:false, + table: { + width: 150 + }, search:{ componentProps:{ multiple:true, diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 536d2cb7b..fbfcee548 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -730,6 +730,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictClass: 'string', isSearch: true, isDetail:false, + table: { + width: 150 + }, search:{ componentProps:{ multiple:true, diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 536d2cb7b..fbfcee548 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -730,6 +730,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictClass: 'string', isSearch: true, isDetail:false, + table: { + width: 150 + }, search:{ componentProps:{ multiple:true, diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 536d2cb7b..fbfcee548 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -730,6 +730,9 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictClass: 'string', isSearch: true, isDetail:false, + table: { + width: 150 + }, search:{ componentProps:{ multiple:true, From cffe30a7326a10035d761117dc8f9a557df5043b Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Tue, 12 Nov 2024 19:09:41 +0800 Subject: [PATCH 09/20] =?UTF-8?q?YT-720WMS11.=E7=89=A9=E6=96=99=E8=A1=A5?= =?UTF-8?q?=E6=89=93=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labelManage/purchasePackage/index.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index a1ec4351f..a888d8fbe 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -133,7 +133,10 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row } if (formField == 'toDockCode') { setV['receivedLocation'] = val[0]['name'] - setV['defaultReceivingArea'] = val[0]['remark'] + setV['defaultReceivingArea'] = val[0]['areaCode'] + } + if (formField == 'packUnit') { + setV['packQty'] = val[0]['packQty'] } basicFormRef.setValues(setV) }) @@ -229,7 +232,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'delete') { // 删除 handleDelete(row.id) } else if (val == 'point') { // 标签打印 - handlePoint(row) + handleDocumentPrint(row.id) } else if (val == 'enable') { handleEnable(row.id) } else if (val == 'disable') { @@ -306,6 +309,12 @@ const handleExport = async () => { } const BASE_URL = getJmreportBaseUrl() +const documentSrc = ref(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()) +const handleDocumentPrint = async (id) => { + window.open(documentSrc.value + '&id=' + id) +} + + const labelType = ref('') // 标签类别 采购还是制造等 const handlePoint = async (row) => { PackageApi.getBalanceToPackage(row.relateNumber).then(res => { From 21d6cd3ee73605ca9c70eba73d488e8166fc48ac Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Tue, 12 Nov 2024 19:14:40 +0800 Subject: [PATCH 10/20] =?UTF-8?q?YT-895=E5=9C=A8=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=90=8E=EF=BC=8C=E5=88=9B=E5=BB=BA=E8=80=85?= =?UTF-8?q?=E5=89=8D=EF=BC=8C=E5=BA=94=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicDataManage/itemManage/itembasic/itembasic.data.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index ecc2cce07..ad2840351 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -347,7 +347,10 @@ export const Itembasic = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', - isTable: false + isTable: true, + table: { + width: 180 + }, }, { label: '创建者', From 1811e0aae79f6b97df3c56ed8bf0eb69aefa5eaa Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 13 Nov 2024 09:45:11 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E7=8E=AF=E5=A2=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.wyf | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.env.wyf b/.env.wyf index 99bad36e9..e797b754c 100644 --- a/.env.wyf +++ b/.env.wyf @@ -7,18 +7,18 @@ VITE_DEV=false # SCP 28040 # WMS 28050 -# # 请求路径 -# VITE_BASE_URL='http://dev.ccwin-in.com:28040/api' +# 请求路径 +VITE_BASE_URL='http://dev.ccwin-in.com:28050/api' -# # 上传路径 -# VITE_UPLOAD_URL='http://dev.ccwin-in.com:28040/admin-api/infra/file/upload' +# 上传路径 +VITE_UPLOAD_URL='http://dev.ccwin-in.com:28050/admin-api/infra/file/upload' -# # 请求路径 -VITE_BASE_URL='http://192.168.1.196:12080' +# # # 请求路径 +# VITE_BASE_URL='http://192.168.1.196:12080' -# 上传路径 -VITE_UPLOAD_URL='http://192.168.1.196:12080/admin-api/infra/file/upload' +# # 上传路径 +# VITE_UPLOAD_URL='http://192.168.1.196:12080/admin-api/infra/file/upload' # # 请求路径 # VITE_BASE_URL='http://192.168.1.35:12080' From 4486f056b4e1dba9a18f94aa0294c8005707840d Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 13 Nov 2024 11:20:34 +0800 Subject: [PATCH 12/20] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E7=9A=84=E4=B8=8A=E6=9E=B6=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/upShelfStrategy/AddForm.vue | 282 +++++++++++------- 1 file changed, 182 insertions(+), 100 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index bd3ad9794..7c2e56220 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -53,6 +53,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + @@ -566,7 +629,7 @@ - + - + - + @@ -674,16 +737,18 @@ const formData = ref({ status: true, //状态 //规则条件集合 condition: [ - // 供应商 - { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }, + // 仓库 + { ParamCode: 'WarehouseCode', Operator: 'IN', Value: '' }, + // // 供应商 + // { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }, // 物料类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemType', Operator: 'IN', Value: '' }, - // 重量/体积/面积 - { ParamCode: 'Weight', Operator: '>', Value: [] }, - // 库存状态 - { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] }, - // 存储类型 - { ParamCode: 'StorageType', Operator: 'IN', Value: [] }, + // // 重量/体积/面积 + // { ParamCode: 'Weight', Operator: '>', Value: [] }, + // // 库存状态 + // { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] }, + // // 存储类型 + // { ParamCode: 'StorageType', Operator: 'IN', Value: [] }, // 库存事务 // 业务类型 { ParamCode: 'TransactionType', Operator: 'IN', Value: '' }, ], @@ -893,10 +958,11 @@ const filterMethodWarehouseList = (query: string) => { const searchTableRef = ref() -const searchWarehouse = ()=>{ - - - if(warehouseType.value == 'WarehouseCode'){ +const searchTableModule = ref('') // 条件 / 配置 +const searchWarehouse = ({module='config',type})=>{ + searchTableModule.value = module + // module: config 配置 condition 条件 + if( module=='condition'&&type=='WarehouseCode' || module=='config'&&warehouseType.value == 'WarehouseCode'){ // 仓库 searchTableRef.value.open( '请选择仓库', @@ -909,7 +975,7 @@ const searchWarehouse = ()=>{ undefined, undefined ) - }else if(warehouseType.value == 'AreaCode'){ + }else if(module=='condition'&&type=='AreaCode' || module=='config'&&warehouseType.value == 'AreaCode'){ searchTableRef.value.open( '请选择库区', Area.allSchemas, @@ -922,7 +988,7 @@ const searchWarehouse = ()=>{ undefined ) - }else if(warehouseType.value == 'LocationGroupCode'){ + }else if(module=='condition'&&type=='LocationGroupCode' || module=='config'&&warehouseType.value == 'LocationGroupCode'){ searchTableRef.value.open( '请选择库位组', @@ -936,7 +1002,7 @@ const searchWarehouse = ()=>{ undefined ) - }else if(warehouseType.value == 'LocationCode'){ + }else if(module=='condition'&&type=='LocationCode' || module=='config'&&warehouseType.value == 'LocationCode'){ searchTableRef.value.open( '请选择库位', Location.allSchemas, @@ -952,75 +1018,79 @@ const searchWarehouse = ()=>{ } } -const blurWarehouse = async ()=>{ +const blurWarehouse = async ({module='config',type})=>{ + // 校验的值 let warehouseValue = formData.value.configuration[warehouseType.value] + let conditionObj = null + if(module=='condition'){ + // 规则条件 + conditionObj = formData.value.condition.find(item=>item['ParamCode']==type) + if(conditionObj){ + warehouseValue = conditionObj['Value'] + } + // { value: 'WarehouseCode', label: '仓库' }, + // { value: 'AreaCode', label: '库区' }, + // { value: 'LocationGroupCode', label: '库位组' }, + // { value: 'LocationCode', label: '库位' } + } if(!warehouseValue){ return } - if(warehouseType.value == 'WarehouseCode'){ + let verifyRes = [] + if(module=='condition'&&type=='WarehouseCode' || module=='config'&&warehouseType.value == 'WarehouseCode'){ // 仓库 - let verifyRes = await WarehouseApi.verifyWarehouse({ + verifyRes = await WarehouseApi.verifyWarehouse({ code:warehouseValue }) console.log('仓库verifyRes',verifyRes) - if(verifyRes&&verifyRes.length>0){ - // formData.value.configuration[warehouseType.value] = verifyRes.map(item=>(item['code'])).join(',') - let verifyList = verifyRes.map(item=>(item['code'])) - let codeList = formData.value.configuration[warehouseType.value].split(',') - formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',') - }else{ - formData.value.configuration[warehouseType.value] = '' - } - }else if(warehouseType.value == 'AreaCode'){ + }else if(module=='condition'&&type=='AreaCode' || module=='config'&&warehouseType.value == 'AreaCode'){ // 库区 - let verifyRes = await AreaApi.verifyAreaList({ + verifyRes = await AreaApi.verifyAreaList({ code:warehouseValue }) console.log('库区verifyRes',verifyRes) - if(verifyRes&&verifyRes.length>0){ - let verifyList = verifyRes.map(item=>(item['code'])) - let codeList = formData.value.configuration[warehouseType.value].split(',') - formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',') - }else{ - formData.value.configuration[warehouseType.value] = '' - } - }else if(warehouseType.value == 'LocationGroupCode'){ + }else if(module=='condition'&&type=='LocationGroupCode' || module=='config'&&warehouseType.value == 'LocationGroupCode'){ // 库位组 let verifyRes = await LocationgroupApi.verifyLocationgroup({ code:warehouseValue }) console.log('库位组verifyRes',verifyRes) - if(verifyRes&&verifyRes.length>0){ - let verifyList = verifyRes.map(item=>(item['code'])) - let codeList = formData.value.configuration[warehouseType.value].split(',') - formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',') - }else{ - formData.value.configuration[warehouseType.value] = '' - } - - }else if(warehouseType.value == 'LocationCode'){ + }else if(module=='condition'&&type=='LocationCode' || module=='config'&&warehouseType.value == 'LocationCode'){ // 库位 let verifyRes = await LocationApi.verifyLocation({ code:warehouseValue }) console.log('库位verifyRes',verifyRes) - if(verifyRes&&verifyRes.length>0){ - let verifyList = verifyRes.map(item=>(item['code'])) + } + if(verifyRes&&verifyRes.length>0){ + let verifyList = verifyRes.map(item=>(item['code'])) + if(module=='condition'){ + // 条件 + let codeList = warehouseValue.split(',') + conditionObj['Value'] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',') + }else{ + // 配置 let codeList = formData.value.configuration[warehouseType.value].split(',') formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',') + } + + }else{ + if(module=='condition'){ + // 条件 + conditionObj['Value'] = '' }else{ formData.value.configuration[warehouseType.value] = '' } } - - let fields = ['WarehouseCode','AreaCode','LocationGroupCode','LocationCode'] - fields.forEach(item=>{ - if(item!=warehouseType.value){ - formData.value.configuration[item] = '' - } - }) - + if(module!='condition'){ + let fields = ['WarehouseCode','AreaCode','LocationGroupCode','LocationCode'] + fields.forEach(item=>{ + if(item!=warehouseType.value){ + formData.value.configuration[item] = '' + } + }) + } } // 业务类型 const searchBusinessType = ()=>{ @@ -1085,14 +1155,24 @@ const searchTableSuccess = (formField, searchField, val, type, row) => { businessType.Value = val.map(item=>(item['code'])).join(',') } return + }else if(searchTableModule.value == 'condition'){ + // module: config 配置 condition 条件 + // 仓库 库区 库位 库位组 + let conditionObj = formData.value.condition.find(item=>['WarehouseCode','AreaCode','LocationGroupCode','LocationCode'].includes(item['ParamCode'])) + conditionObj['Value'] = val.map(item=>(item['code'])).join(',') + }else{ + // 配置 + // 仓库 库区 库位 库位组 + formData.value.configuration[warehouseType.value] = val.map(item=>(item['code'])).join(',') + let fields = ['WarehouseCode','AreaCode','LocationGroupCode','LocationCode'] + fields.forEach(item=>{ + if(item!=warehouseType.value){ + formData.value.configuration[item] = '' + } + }) + } - formData.value.configuration[warehouseType.value] = val.map(item=>(item['code'])).join(',') - let fields = ['WarehouseCode','AreaCode','LocationGroupCode','LocationCode'] - fields.forEach(item=>{ - if(item!=warehouseType.value){ - formData.value.configuration[item] = '' - } - }) + } // 选择仓库/库位/库位组/库区 const changeWarehouse = (e) => { @@ -1160,12 +1240,12 @@ const open = async (type: string, strategyCode: string, id?: number) => { } } - // 判断是获取客户列表还是供应上列表 - if (formData.value.condition[0].ParamCode == 'SupplierCode') { - getFormSupplierList() - } else { - getFormCustomerList() - } + // // 判断是获取客户列表还是供应上列表 + // if (formData.value.condition[0].ParamCode == 'SupplierCode') { + // getFormSupplierList() + // } else { + // getFormCustomerList() + // } // 判断是获取仓库/库位/库位组/库区列表 if ( 'WarehouseCode' in formData.value.configuration && @@ -1210,7 +1290,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗 /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调 const submitForm = async () => { - let TransactionType = formData.value.condition[5]['Value'] + let TransactionType = formData.value.condition[2]['Value'] if(Array.isArray(TransactionType)){ TransactionType = TransactionType.join(',') } @@ -1241,7 +1321,7 @@ const submitForm = async () => { return } } - await blurWarehouse() + await blurWarehouse({module:'config',type:warehouseType.value}) // await blurTransactionType() if(warehouseType.value == 'WarehouseCode' && !formData.value.configuration.WarehouseCode){ // 仓库 @@ -1332,16 +1412,18 @@ const resetForm = () => { status: true, //状态 //规则条件集合 condition: [ - // 供应商 - { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }, + // 仓库 + { ParamCode: 'WarehouseCode', Operator: 'IN', Value: '' }, + // // 供应商 + // { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }, // 物料类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemType', Operator: 'IN', Value: '' }, - // /重量/体积/面积 - { ParamCode: 'Weight', Operator: '>', Value: [] }, - // 库存状态 - { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] }, - // 存储类型 - { ParamCode: 'StorageType', Operator: 'IN', Value: [] }, + // // /重量/体积/面积 + // { ParamCode: 'Weight', Operator: '>', Value: [] }, + // // 库存状态 + // { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] }, + // // 存储类型 + // { ParamCode: 'StorageType', Operator: 'IN', Value: [] }, // 库存事务 // 业务类型 { ParamCode: 'TransactionType', Operator: 'IN', Value: '' }, ], From 1000609158659d044623c920f7d911ebc3e680e0 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 13 Nov 2024 13:14:56 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E7=AD=96=E7=95=A5=E6=95=B4=E4=BD=93?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E5=92=8C=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arrivalInspectionStrategy/AddForm.vue | 16 +++--- .../arrivalInspectionStrategy/index.vue | 4 +- .../strategy/batchStrategy/AddForm.vue | 28 +++++----- .../strategy/batchStrategy/index.vue | 4 +- .../strategy/downShelfStrategy/AddForm.vue | 46 ++++++++-------- .../strategy/downShelfStrategy/index.vue | 4 +- .../strategy/inspectStrategy/AddForm.vue | 20 +++---- .../strategy/inspectStrategy/index.vue | 4 +- .../manageAccuracyStrategy/AddForm.vue | 23 +++++++- .../strategy/manageAccuracyStrategy/index.vue | 4 +- .../purchaseReceiptStrategy/AddForm.vue | 2 +- .../purchaseReceiptStrategy/index.vue | 4 +- .../repairMaterialStrategy/AddForm.vue | 16 +++++- .../strategy/repairMaterialStrategy/index.vue | 4 +- .../storageCapacityStrategy/AddForm.vue | 28 +++++----- .../storageCapacityStrategy/index.vue | 4 +- .../supplieDeliveryStrategy/AddForm.vue | 18 +++--- .../supplieDeliveryStrategy/index.vue | 4 +- .../strategy/upShelfStrategy/AddForm.vue | 55 ++++++++++--------- .../strategy/upShelfStrategy/index.vue | 4 +- .../utensilCapacityStrategy/AddForm.vue | 2 +- .../utensilCapacityStrategy/index.vue | 4 +- .../warehouseStorageStrategy/AddForm.vue | 14 ++--- .../warehouseStorageStrategy/index.vue | 4 +- 24 files changed, 172 insertions(+), 144 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue index 34ed4b862..1b9035c0a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue @@ -25,22 +25,22 @@ - + - + - + - + @@ -60,7 +60,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue index f2bb3979e..743fc5996 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue @@ -25,22 +25,22 @@ - + - + - + - + @@ -58,7 +58,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeSupplierCustomer" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue index 7942a9f07..0158f9739 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue @@ -144,8 +144,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index f638c1143..35f193ba3 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -26,22 +26,22 @@ - + - + - + - + @@ -60,7 +60,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeSupplierCustomer" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > @@ -212,7 +212,7 @@ placeholder="" @change="changeCalculation" style="width: 110px; margin-right: 10px" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > @@ -250,7 +250,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > --> diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue index 9bcc87580..93abbd89f 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue @@ -148,8 +148,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue index f77dfc73c..0ffb8fa97 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue @@ -26,22 +26,22 @@ - + - + - + - + @@ -57,7 +57,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue index 8c438ce6b..f682d1037 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue @@ -142,8 +142,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue index 2fab0b936..36f91fdf6 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue @@ -25,17 +25,17 @@ - + - + - + @@ -58,6 +58,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeSupplierCustomer" + :disabled="formData.priority==0&&formType=='update'" > @@ -182,6 +192,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeWarehouse" + :disabled="formData.priority==0&&formType=='update'" > @@ -257,6 +272,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" + :disabled="formData.priority==0&&formType=='update'" > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue index 19298f953..68b336052 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue @@ -150,8 +150,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue index 7e869a6bd..19381acca 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue @@ -36,7 +36,7 @@ - + diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue index a68e7d65a..2030179d0 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue @@ -145,8 +145,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue index 99c769ab7..9390c60b5 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue @@ -25,17 +25,17 @@ - + - + - + @@ -57,6 +57,7 @@ v-model="item.ParamCode" placeholder="" @change="changeItemsType" + :disabled="formData.priority==0&&formType=='update'" style="width: 110px; margin-right: 10px" > @@ -85,6 +87,7 @@ clearable multiple collapse-tags + :disabled="formData.priority==0&&formType=='update'" v-if="item.ParamCode == 'ItemType'" > @@ -139,6 +146,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeWarehouse" + :disabled="formData.priority==0&&formType=='update'" > { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue index 058b73c13..c47e39274 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue @@ -25,22 +25,22 @@ - + - + - + - + @@ -58,7 +58,7 @@ placeholder="" @change="changeItemsType" style="width: 110px; margin-right: 10px" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > @@ -146,7 +146,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeWarehouse" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue index 0fae5ae31..e3f868382 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue @@ -37,7 +37,7 @@ - + @@ -58,8 +58,8 @@ v-model="item.ParamCode" placeholder="" style="width: 110px; margin-right: 10px" + :disabled="formData.priority==0&&formType=='update'" @change="changeWarehouseArea" - :disabled="formData.name=='默认规则'&&formType=='update'" > - - + + @@ -97,7 +97,7 @@ v-model="item.Operator" :placeholder="t('ts.请选择范围').replace('ts.','')" style="width: 110px; margin-right: 10px" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" @change="OperatorChange($event,item)" > - - + + @@ -146,7 +146,7 @@ - + diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue index c07e8e033..e1a3268ee 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue @@ -173,8 +173,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:strategy:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:strategy:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index 7c2e56220..3b751646a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -25,22 +25,22 @@ - + - + - + - + @@ -57,6 +57,7 @@ v-model="item.ParamCode" placeholder="" style="width: 110px; margin-right: 10px" + :disabled="formData.priority==0&&formType=='update'" > - +