From eac667a2d422f69921bca216b44cf4a3a2b9e047 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 16 Jul 2024 15:09:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/business/inputBlur.ts | 14 +++- .../issueRequestMain/issueRequestMain.data.ts | 65 +++++++++++++++++-- .../productionreturnRequestMain.data.ts | 51 +++++++++++++-- 3 files changed, 115 insertions(+), 15 deletions(-) diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts index 53574165c..02da3da92 100644 --- a/src/api/wms/business/inputBlur.ts +++ b/src/api/wms/business/inputBlur.ts @@ -66,7 +66,15 @@ export const tableFormBlurVer = async (headerItem, val, row, index, routeName, f filters.push({ action: searchCondition[i].action || '==', column: searchCondition[i].key, - value: formRef.formModel[searchCondition[i].value] + value: formRef.formModel[ + searchCondition[i].value + ] + ? formRef.formModel[searchCondition[i].value] + : detailData + ? detailData[searchCondition[i].value] + : row + ? row[searchCondition[i].value] + : '' }) } else if (searchCondition[i].isTableRowValue) { if (searchCondition[i].required) { @@ -828,10 +836,10 @@ export const getListByBottonInput = async (headerItem, val, row, routeName, form let repeatCode = [] if (tableData.length > 0) { tableData.forEach((item) => { - const findIndex = arr1.findIndex(valItem => valItem == item[field]) + const findIndex = arr1.findIndex(valItem => valItem == item[headerItem.field]) if (findIndex > -1) { arr1.splice(findIndex, 1) - repeatCode.push(item[field]) + repeatCode.push(item[headerItem.field]) } }) } diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 74fe76479..197eed5b0 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -81,7 +81,15 @@ export const IssueRequestMain = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -95,6 +103,7 @@ export const IssueRequestMain = useCrudSchemas( isTable: false, hiddenInMain: true, tableForm: { + enterSearch:true, isInpuFocusShow: true, searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -113,11 +122,20 @@ export const IssueRequestMain = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch:true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -136,7 +154,15 @@ export const IssueRequestMain = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -168,7 +194,15 @@ export const IssueRequestMain = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', @@ -192,7 +226,15 @@ export const IssueRequestMain = useCrudSchemas( value: 'TRUE', isMainValue: false } - ] + ], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -792,7 +834,18 @@ export const IssueRequestDetail = useCrudSchemas( value: 'Issue', isMainValue: false } - ] + ], + + verificationPage: ItembasicApi.getItemListByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, form: { // labelMessage: '信息提示说明！！！', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index d11ab5ea3..17a4a832a 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -90,6 +90,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择车间代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -100,7 +101,15 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, }, @@ -114,6 +123,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择生产线代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -129,7 +139,15 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive value: 'workshopCode', message: '请选择车间信息！', // 当前置条件为空时 弹出信息提示 isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } }, tableForm:{ @@ -579,7 +597,9 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive