diff --git a/src/api/wms/business/inputBlur.ts b/src/api/wms/business/inputBlur.ts index 53574165c..754ec10f9 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) { @@ -807,10 +815,9 @@ export const getListByBottonInput = async (headerItem, val, row, routeName, form console.log(999, verificationParams) if (verificationParams && verificationParams.length > 0) { for (let i = 0; i < verificationParams.length; i++) { - if (verificationParams[i].key == 'code') { - verificationParams[i].key = 'codes' - } - params.value[verificationParams[i].key] = val + console.log(54565, verificationParams[i].key) + verificationParams[i].key1 = verificationParams[i].key +'s' + params.value[verificationParams[i].key1] = val } } await tableFormSchemaObj.verificationPage(params.value).then(async (res) => { @@ -828,10 +835,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/api/wms/productionlineitem/index.ts b/src/api/wms/productionlineitem/index.ts index 0b3b03e20..430a0e9e5 100644 --- a/src/api/wms/productionlineitem/index.ts +++ b/src/api/wms/productionlineitem/index.ts @@ -69,6 +69,6 @@ export const importTemplate = () => { } -export const getProductionLineCodelistByCodes = (data) => { - return request.get({ url: `/wms/productionlineitem/listByCodes?productionLineCode=`+data.productionLineCode +'&itemCodes='+data.itemCodes}) +export const getProductionLineCodelistByCodes = async (params) => { + return await request.get({ url: `/wms/productionlineitem/listByCodes`, params }) } diff --git a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue index 40b628fb8..24ca1a1ad 100644 --- a/src/components/TableFormCountPlan/src/TableFormCountPlan.vue +++ b/src/components/TableFormCountPlan/src/TableFormCountPlan.vue @@ -66,16 +66,18 @@ row.type == 'LOCATION_CODE' " > - + + + diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts index fee2ec949..396528e7b 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts @@ -191,7 +191,7 @@ export const Customeritem = useCrudSchemas(reactive([ componentProps: { inactiveValue: 'FALSE', activeValue: 'TRUE', - disabled: true + // disabled: true } }, isSearch: true diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index b59f27657..50d706355 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -27,6 +27,26 @@ export const Itembasic = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '是否可用', + field: 'available', + sort: 'custom', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, + isSearch: true, + table: { + width: 120 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + }, { label: '描述1', field: 'desc1', @@ -50,9 +70,9 @@ export const Itembasic = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.ITEM_STATUS, dictClass: 'string', - isForm: true, - isSearch: true, - isTable: true, + isForm: false, + isSearch: false, + isTable: false, table: { width: 100 } , @@ -346,25 +366,6 @@ export const Itembasic = useCrudSchemas(reactive([ } }, }, - { - label: '是否可用', - field: 'available', - sort: 'custom', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - table: { - width: 120 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - }, { label: '生效时间', field: 'activeTime', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 4865fc301..b26be7afc 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -491,10 +491,14 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ searchAllSchemas: Balance.allSchemas, searchPage: BalanceApi.getBalanceItemPage, searchCondition: [{ + message: '请填写从仓库代码!', key: 'warehouseCode', value: 'fromWarehouseCode', - message: '请填写从仓库代码!', - isMainValue: true + isFormModel:true, // filters中添加筛选的数据--取于formModel + required:true, // 前置添加必有,和isFormModel结合使用 + action: '==', + isSearch: true, + isMainValue: false },{ key: 'businessType', value: 'Scrap', @@ -507,12 +511,6 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ action: '==', isSearch: true, isMainValue: false - },{ - key: 'inventoryStatus', - value: 'SCRAP', - action: '==', - isSearch: true, - isMainValue: false }] }, form: { 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([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择车间', searchField: 'code', @@ -114,7 +115,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -129,6 +138,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch:true, isSearchList: true, searchListPlaceholder: '请选择生产线', searchField: 'code', @@ -144,7 +154,15 @@ export const ProductionMain = useCrudSchemas(reactive([ value: 'workshop', message: '请填写车间代码!', isMainValue: true - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -158,6 +176,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班组', searchField: 'code', @@ -168,7 +187,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -182,6 +209,7 @@ export const ProductionMain = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明!!!', componentProps: { + enterSearch: true, isSearchList: true, searchListPlaceholder: '请选择班次', searchField: 'code', @@ -192,7 +220,15 @@ export const ProductionMain = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 } } }, @@ -651,7 +687,8 @@ export const ProductionDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }], + }], + } }, tableForm:{ @@ -672,7 +709,18 @@ export const ProductionDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }], + }], + + verificationPage: ProductionlineitemApi.getProductionLineCodelistByCodes, // 校验数去焦点输入是否正确的方法 + isShowTableFormSearch: true, + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 }, }, { diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 68db0280c..ce7df9147 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -980,6 +980,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive label: '货币', field: 'currency', sort: 'custom', + dictType: DICT_TYPE.CURRENCY, + dictClass: 'string', table: { width: 150 }, + tableForm:{ + type:'Select', + disabled: true + } }, { label: '合同价格', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index dab603fea..d6b173054 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1957,10 +1957,12 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts index 652c04092..4317d424b 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts @@ -1960,6 +1960,9 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive([ label: '货币', field: 'currency', sort: 'custom', + dictType: DICT_TYPE.CURRENCY, + dictClass: 'string', table: { width: 150 }, + tableForm:{ + type:'Select', + disabled: true + } }, { label: '创建时间',