diff --git a/src/api/wms/areabasic/index.ts b/src/api/wms/areabasic/index.ts index 1295c4629..2a3e2bb07 100644 --- a/src/api/wms/areabasic/index.ts +++ b/src/api/wms/areabasic/index.ts @@ -65,4 +65,9 @@ export const exportArea = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/areabasic/get-import-template' }) +} + +// 根据code获取数据列表 +export const getAreabasicByCodes = async (params) => { + return await request.get({ url: `/wms/areabasic/listByCodes`, params }) } \ No newline at end of file diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 881963e63..e8a2d681f 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -856,63 +856,16 @@ const onBlur = async (field, e) => { formSchema.value.find((item) => item.field == field)?.componentProps?.verificationParams || [] console.log('走新方法啦') - searchCondition = [...searchCondition, ...verificationParams] + // searchCondition = [...searchCondition, ...verificationParams] + if (e && isString(e)) { let setV = {} setV[field] = '' let params = {} - // 循环参数设置参数为key:value格式 - // if (searchCondition1 && searchCondition1.length > 0) { - // for (let i = 0; i < searchCondition1.length; i++) { - // searchCondition1[i].isSearch = true - // if (searchCondition1[i].isMainValue) { - // params[searchCondition1[i].key] = formRef.value.formModel[searchCondition1[i].value] - // ? formRef.value.formModel[searchCondition1[i].value] - // : props.detailData - // ? props.detailData[searchCondition1[i].value] - // : '' - // // 是否含有空参数情况 - // let isNull = false - // if (params[searchCondition1[i].key] == '' || params[searchCondition1[i].key] == undefined) { - // isNull = true - // } - // if (isNull) { - // message.warning( - // searchCondition1[i].message ? searchCondition1[i].message : '前置条件未选择!' - // ) - // return - // } - // } else { - // // 扩展 转换为筛选条件进行查询 - // if (searchCondition1[i].isSearch) { - // if (searchCondition1[i].isFormModel) { - // //用formModel中的值 - // if (searchCondition1[i].required) { - // if ( - // formRef.value.formModel[searchCondition1[i].value] == '' || - // formRef.value.formModel[searchCondition1[i].value] == undefined - // ) { - // message.warning( - // searchCondition1[i].message - // ? searchCondition1[i].message - // : '前置条件未选择!' - // ) - // return - // } - // } - // } - // params[searchCondition1[i].key] = searchCondition1[i].value - // } else { - // params[searchCondition1[i].key] = searchCondition1[i].value - // } - // } - // } - // } - // 判断查询条件中,是否存在指向主表的数据 const _searchCondition = {} + let filters: any[] = [] if (searchCondition && searchCondition.length > 0) { // 转换筛选条件所需 - let filters: any[] = [] for (var i = 0; i < searchCondition.length; i++) { // searchCondition.forEach((item) => { // 查询条件为主表某字段,需要赋值主表数据,数据来源是详情的,赋值需要从row中获取 @@ -924,10 +877,8 @@ const onBlur = async (field, e) => { : props.detailData ? props.detailData[searchCondition[i].value] : // : row - // ? row[searchCondition[i].value] - e - ? e.trim() - : '' + // ? row[searchCondition[i].value] + '' // 是否含有空参数情况 let isNull = false if ( @@ -942,7 +893,13 @@ const onBlur = async (field, e) => { ) return } + filters.push({ + action: searchCondition[i].action || '==', + column: searchCondition[i].key, + value: formRef.value.formModel[searchCondition[i].value] + }) } + // else if (searchCondition[i].isTableRowValue) { // if (searchCondition[i].required) { // if (row[searchCondition[i].value] == '' || row[searchCondition[i].value] == undefined) { @@ -973,35 +930,68 @@ const onBlur = async (field, e) => { } } filters.push({ - action: searchCondition[i].action, + action: searchCondition[i].action || '==', column: searchCondition[i].key, value: formRef.value.formModel[searchCondition[i].value] - ? formRef.value.formModel[searchCondition[i].value] - : e.trim() }) } else { filters.push({ - action: searchCondition[i].action, + action: searchCondition[i].action || '==', column: searchCondition[i].key, value: searchCondition[i].value }) } } else { - _searchCondition[searchCondition[i].key] = searchCondition[i].value + filters.push({ + action: searchCondition[i].action || '==', + column: searchCondition[i].key, + value: searchCondition[i].value + }) } } } - if (filters.length > 0) { - _searchCondition.isSearch = true - _searchCondition.filters = filters + } + if (verificationParams && verificationParams.length > 0) { + // 转换筛选条件所需 + for (var i = 0; i < verificationParams.length; i++) { + // 扩展 转换为筛选条件进行查询 + if (verificationParams[i].isSearch) { + if (verificationParams[i].isFormModel) { + filters.push({ + action: verificationParams[i].action, + column: verificationParams[i].key, + value: formRef.value.formModel[verificationParams[i].value] + ? formRef.value.formModel[verificationParams[i].value] + : e.trim() + }) + } else { + filters.push({ + action: verificationParams[i].action, + column: verificationParams[i].key, + value: verificationParams[i].value + }) + } + } else { + _searchCondition[verificationParams[i].key] = verificationParams[i].value + } } } + if (filters.length > 0) { + _searchCondition.isSearch = true + _searchCondition.filters = filters + } + console.log(4545, _searchCondition) let obj = { by: 'ASC', pageNo: 1, pageSize: 20 } - params = { ..._searchCondition, ...obj } + console.log(888,_searchCondition) + params = { + isSearch:_searchCondition.isSearch, + filters:_searchCondition.filters, + ...obj + } // console.log(333,params) if (!formSchemaObj?.multiple && e.indexOf(',') > -1) { message.alert('该输入框只能输入一条数据') @@ -1059,6 +1049,7 @@ const onBlur = async (field, e) => { isExecute.value = true } + // 批量增加 const batchAdd = async (val) => { const row = {} diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts index d68758f60..275ff5890 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts @@ -38,7 +38,15 @@ export const Itemarea = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -64,7 +72,15 @@ export const Itemarea = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + }], // 失去焦点校验参数 } } }, @@ -106,7 +122,15 @@ export const Itemarea = useCrudSchemas(reactive([ searchCondition: [{ key: 'available', value: 'TRUE', - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + }], // 失去焦点校验参数 } } }, @@ -136,7 +160,17 @@ export const Itemarea = useCrudSchemas(reactive([ value: 'itemCode', message: "请选择物料代码", isMainValue: true - }] + }], + verificationParams: [{ + key: 'packUnit', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + required: true, + message: '请选择物料代码', + }], // 失去焦点校验参数 } } }, @@ -166,7 +200,18 @@ export const Itemarea = useCrudSchemas(reactive([ value: 'itemCode', message: "请选择物料代码", isMainValue: true - }] + }], + verificationParams: [{ + key: 'packUnit', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + required: true, + message: '请选择物料代码', + isBlurParams:true,//是否是失去焦点的方法的参数 + }], // 失去焦点校验参数 } } }, @@ -270,7 +315,17 @@ export const Itemarea = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + required: true, + message: '请选择物料代码', + }], // 失去焦点校验参数 } } }, diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts index 1f1c1c619..97a56f508 100644 --- a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts @@ -32,7 +32,15 @@ export const Itemwarehouse = useCrudSchemas(reactive([ action: '==', isSearch: true, isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true + }], // 失去焦点校验参数 } } }, @@ -60,7 +68,15 @@ export const Itemwarehouse = useCrudSchemas(reactive([ action: '==', isSearch: true, isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true + }], // 失去焦点校验参数 } } }, diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts index 33fdc3d71..1c20eec7f 100644 --- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts +++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts @@ -334,6 +334,7 @@ export const Packageunit = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择父包装代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 @@ -344,7 +345,15 @@ export const Packageunit = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true + }], // 失去焦点校验参数 } } }, diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts index 39ccfe830..3349d07b3 100644 --- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts +++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts @@ -116,6 +116,14 @@ export const Productionlineitem = useCrudSchemas(reactive([ searchTitle: '物料信息', searchAllSchemas: Itembasic.allSchemas, searchPage: ItembasicApi.getItembasicPage, + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true + }], // 失去焦点校验参数 searchCondition: [ { key:'enableMake',