From e22250deed5eada86f7349954cdf87fc9c3ce606 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Tue, 29 Oct 2024 13:49:37 +0800 Subject: [PATCH] =?UTF-8?q?HL-6339WMS=20=E5=88=B6=E5=93=81=E5=AD=90?= =?UTF-8?q?=E4=BB=B6=E6=8A=A5=E5=BA=9F=E7=94=B3=E8=AF=B7=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=BB=E6=95=B0=E6=8D=AE=E4=B8=8D=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=94=9F=E4=BA=A7=E7=BA=BF=EF=BC=8C=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86=EF=BC=8C=E6=AD=A4=E6=97=B6?= =?UTF-8?q?=E4=BC=9A=E5=B8=A6=E5=87=BA=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=90=8E=E9=9D=A2=E9=80=89=E6=8B=A9=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E4=B8=8D=E6=98=AF=E5=89=8D=E9=9D=A2=E4=BA=A7?= =?UTF-8?q?=E7=BA=BF=E4=BB=A3=E7=A0=81=E5=AF=B9=E5=BA=94=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productscrapRequestMain/index.vue | 2 +- .../productscrapRequestMain.data.ts | 29 ++++++++++++++++--- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index f5557cfc9..8324adae6 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -476,7 +476,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['childList'] = [] newRow['singlePrice'] = item['singlePrice'] newRow['amount'] = newRow['qty']*item['singlePrice'] - + newRow['productionLineCode'] = item['productionLineCode'] if(item['bomList'].length>0){ newRow['bomVersionInitOptions'] = item['bomList'].map(item1=>({ label:item1, diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 165bf069c..90b04c253 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -981,8 +981,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ key:'productionLineCode', value:'productionLineCode', message: '请填写生产线代码！', - isMainValue: true, - isOptional:true, // isMainValue=true情况，添加参数可选可空的判断 + isMainValue: false, + // isOptional:true, // isMainValue=true情况，添加参数可选可空的判断 + isTableRowValue: true, //查询当前searchTable表中行数据的值 }, // { // key: 'itemCode', @@ -1025,8 +1026,9 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ key:'productionLineCode', value:'productionLineCode', message: '请填写生产线代码！', - isMainValue: true, - isOptional:true, // isMainValue=true情况，添加参数可选可空的判断 + isMainValue: false, + // isOptional:true, // isMainValue=true情况，添加参数可选可空的判断 + isTableRowValue: true, //查询当前searchTable表中行数据的值 }, // { // key: 'itemCode', @@ -1103,6 +1105,13 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ value: 'workshopCode', message: '请填写车间代码！', isMainValue: true + },{ + key:'productionLineCode', + value:'productionLineCode', + message: '请填写生产线代码！', + isMainValue: false, + // isOptional:true, // isMainValue=true情况，添加参数可选可空的判断 + isTableRowValue: true, //查询当前searchTable表中行数据的值 }], verificationParams: [{ key: 'code', @@ -1127,6 +1136,18 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false + }, { + key: 'workshopCode', + value: 'workshopCode', + message: '请填写车间代码！', + isMainValue: true + },{ + key:'productionLineCode', + value:'productionLineCode', + message: '请填写生产线代码！', + isMainValue: false, + // isOptional:true, // isMainValue=true情况，添加参数可选可空的判断 + isTableRowValue: true, //查询当前searchTable表中行数据的值 }], verificationParams: [{ key: 'code',