diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index 9dab845d5..fbca93edf 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -192,5 +192,5 @@ export const getBalanceByBusinessTypeByItemType = async (params) => { } // 根据code获取数据列表 export const getBalanceItemListByCodes = async (data) => { -   return await request.get({ url: `/wms/balance/listByCodes?itemCode=` +( data.itemCode?data.itemCode:'') +  '&batch='+(data.batch?data.batch:'')  +  '&locationCode='+(data.locationCode?data.locationCode:'' )  +  '&packingNumber='+(data.packingNumber?data.packingNumber:'') +  '&warehouseCode='+(data.warehouseCode?data.warehouseCode:'')   }) +   return await request.get({ url: `/wms/balance/listByCodes`,data }) } \ No newline at end of file diff --git a/src/api/wms/business/business.ts b/src/api/wms/business/business.ts index fa9deea44..6329afa0b 100644 --- a/src/api/wms/business/business.ts +++ b/src/api/wms/business/business.ts @@ -139,20 +139,20 @@ export const tableFormBlurVer = async (headerItem, val, row, index,routeName,for routeName == 'InventorymoveRequestMain' || routeName == 'InventorychangeRequestMain' ) { - //合格转隔离,隔离转合格，隔离转报废，合格转报废，报废转隔离，库存移动申请参数稍有不同 - if ( - routeName == 'OktoholdRequestMain' || - routeName == 'HoldtookRequestMain' || - routeName == 'HoldtoscrapRequestMain' || - routeName == 'OktoscrapRequestMain' || - routeName == 'ScraptoholdRequestMain' || - routeName == 'InventorymoveRequestMain' || - routeName == 'InventorychangeRequestMain' - ) { - searchField = 'packingNumber' - params.value.packingNumber = val?.trim() - } - pageApi.value = getBalanceItemListByCodes + // //合格转隔离,隔离转合格，隔离转报废，合格转报废，报废转隔离，库存移动申请参数稍有不同 + // if ( + // routeName == 'OktoholdRequestMain' || + // routeName == 'HoldtookRequestMain' || + // routeName == 'HoldtoscrapRequestMain' || + // routeName == 'OktoscrapRequestMain' || + // routeName == 'ScraptoholdRequestMain' || + // routeName == 'InventorymoveRequestMain' || + // routeName == 'InventorychangeRequestMain' + // ) { + // searchField = 'packingNumber' + // params.value.packingNumber = val?.trim() + // } + // pageApi.value = getBalanceItemListByCodes } else if ( routeName == 'RepleinshRequestMain' || routeName == 'IssueRequestMain' || @@ -297,12 +297,13 @@ export const FormBlur = async (formField, val,routeName,formRef,detailData,formS packUnit: val.trim() } pageApi.value = getItemPackageunitListByCodes - } else if (formField == 'fromPackingNumber') { - params.value = { - packingNumber: val?.trim() - } - pageApi.value = getBalanceItemListByCodes - } + } + // else if (formField == 'fromPackingNumber') { + // params.value = { + // packingNumber: val?.trim() + // } + // pageApi.value = getBalanceItemListByCodes + // } let obj = {} let searchCondition1 = formSchema.find((item) => item.field == formField).componentProps .searchCondition //获取data.ts参数信息 @@ -415,14 +416,16 @@ export const getListByBottonInput = async (headerItem, val,row,routeName,formRef customerCode: formRef.formModel.customerCode, itemCodes: val?.trim() } - } else if (routeName == 'UnplannedissueRequestMain') { - // 计划外出库 - pageApi.value = getBalanceItemListByCodes - params.value = { - packingNumber: val?.trim() - } - field = 'packingNumber' - } else { + } + // else if (routeName == 'UnplannedissueRequestMain') { + // // 计划外出库 + // pageApi.value = getBalanceItemListByCodes + // params.value = { + // packingNumber: val?.trim() + // } + // field = 'packingNumber' + // } + else { params.value.codes = val?.trim() pageApi.value = getItemListByCodes } diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index 5de9de0c5..c72d90387 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -333,7 +333,7 @@
{{t('ts.批量删除')}}
-
+
{{t('批量添加')}}
diff --git a/src/views/eam/equipmentRepairRecordMain/index.vue b/src/views/eam/equipmentRepairRecordMain/index.vue index 91aa00756..61a18bc9b 100644 --- a/src/views/eam/equipmentRepairRecordMain/index.vue +++ b/src/views/eam/equipmentRepairRecordMain/index.vue @@ -240,7 +240,7 @@ const openRepairExperience = (type: string, row?: any) => { const repairExperienceFormsSuccess = async (formType, data) => { console.log(data) const data1 = { - repairNumber: data.number, + repairRecordNumber: data.recordNo, name: data.name, content: data.content, masterId: data.id, diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index b50d7e642..fe6c6a315 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -480,7 +480,6 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ width: 150 }, tableForm:{ - enterSearch:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择包装号', searchField: 'packingNumber', diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts index 35679ae33..dd7828519 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts @@ -619,7 +619,6 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm:{ - enterSearch:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择包装号', searchField: 'packingNumber', diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index 23b28a715..74acc42bd 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts @@ -383,7 +383,6 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm:{ - enterSearch:true, isInpuFocusShow: true, // 开启查询弹窗 searchListPlaceholder: '请选择从包装号', searchField: 'packingNumber', diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts index 4c03cc5d0..c40d77a5f 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts @@ -605,7 +605,6 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive