From ee48876b357aedf1ce701efc12a92abbe78be451 Mon Sep 17 00:00:00 2001 From: chenfang <1057876684@qq.com> Date: Fri, 13 Dec 2024 16:40:46 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BA=BF=E8=BE=B9=E5=8E=9F=E6=96=99?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=8F=96=E6=B6=88=E6=9C=80=E5=A4=A7=E9=99=90?= =?UTF-8?q?=E5=88=B6=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionscrap/productionscrapRequestMain/index.vue | 1 - .../productionscrapRequestMain.data.ts | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index a047c09ed..1b7347a90 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -261,7 +261,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } else { row['batch'] = '000000' } - row['maxQty'] = val[0]['qty'] let param = {'itemCodes':val[0]['itemCode']} let resyStdcost = await StdcostpriceApi.queryStdcostpriceByItemCode(param) console.log('resyStdcost',resyStdcost) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts index c0c58e367..a7927d5cd 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts @@ -1822,7 +1822,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive Date: Mon, 16 Dec 2024 09:01:21 +0800 Subject: [PATCH 2/5] FWHL-127 --- .../productionreturnRequestMainNo/index.vue | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index f08808159..ed50e9723 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -424,6 +424,8 @@ const butttondata = (row,$index) => { ] } +const enableMake = ref('') + // 列表-操作按钮事件 const buttonTableClick = async (val, row) => { if (val == 'mainClose') { // 关闭 @@ -515,6 +517,7 @@ const buttonTableClick = async (val, row) => { by: 'ASC', }).then(res => { if (res.list.length > 0) { + enableMake.value = res.list[0].enableMake // 判断物料 可采购 可制造 if (res.list[0].enableMake == "FALSE") { // 修改 tableform 属性 @@ -547,6 +550,7 @@ const buttonTableClick = async (val, row) => { }) } } else { + enableMake.value = '' message.warning('没有查询到物料代码：【' + item.itemCode + '】') return } @@ -724,17 +728,22 @@ const submitFormLabel = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } - let flag = true - detatableData.tableList.forEach(item => { - if(!item.supplierItemCode){ - flag = false + alert(enableMake.value) + + // 判断物料 可采购 可制造 + if (enableMake.value == "FALSE") { + + let flag = true + detatableData.tableList.forEach(item => { + if(!item.supplierItemCode){ + flag = false + } + }); + if(!flag){ + message.error('请填写供应商代码') + return } - }); - if(!flag){ - message.error('请填写供应商代码') - return } - try { detatableData.tableList.forEach(async (item) => { await PackageApi.createPackageLabel({...item,toLocationCode:item.fromLocationCode}).then(res => { From edb7f2dcd67f236b7e777f53fbf651462f0b8f1c Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 16 Dec 2024 09:30:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89alert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturn/productionreturnRequestMainNo/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index ed50e9723..c5f36326f 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -728,7 +728,6 @@ const submitFormLabel = async (formType, submitData) => { if(data.masterId){ data.id = data.masterId } - alert(enableMake.value) // 判断物料 可采购 可制造 if (enableMake.value == "FALSE") { From 27cb9e1669a0d3e9f0882e1baeb0d7997fd323ac Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 16 Dec 2024 09:43:29 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=A4=A7=E4=BA=8E0?= =?UTF-8?q?=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionscrapRequestMain.data.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts index a7927d5cd..349a57f65 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts @@ -2207,7 +2207,14 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive { + console.log('validateQty',rule, value,a,b) + if (!value) { + callback(new Error('数量必须大于0')); + } else { + callback(); + } +} //表单校验 export const ProductionscrapRequestDetailRules = reactive({ workStationCode: [ @@ -2225,6 +2232,10 @@ export const ProductionscrapRequestDetailRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], + qty: [ + { validator: validateQty, trigger: 'change' } + ], + // packUnit: [ // { required: true, message: '请选择包装规格', trigger: 'blur' } // ] From de20d92dbf2ae5fd04de24053588aeae6a6f8953 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 16 Dec 2024 10:07:46 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMainNo.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts index 9177e12a6..7283b1cd1 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts @@ -749,7 +749,7 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive