From 64b1853d8e9239f709c8be71b514f9a2ce2738eb Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 7 Aug 2024 16:14:13 +0800 Subject: [PATCH] =?UTF-8?q?HL-4976=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/balance/index.ts | 2 +- .../purchasereturnRequestMain/index.vue | 4 + .../purchasereturnRequestMain.data.ts | 179 +++++++++--------- 3 files changed, 91 insertions(+), 94 deletions(-) diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index 3d408963f..c5db15323 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -58,7 +58,7 @@ export const getBalancePageReturn= async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return await request.post({ url: '/wms/balance/senior', data }) + return await request.post({ url: '/wms/balance/seniorReturn', data }) } else { return await request.get({ url: `/wms/balance/pageReturn`, params }) } diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 773fcfd95..4a3a842db 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -304,6 +304,8 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro tableData.value.push(newRow) } }) + row['fromLocationCode'] = val[0]['locationCode'] + row['batch'] = val[0]['batch'] // row['inventoryBalance'] = val[0]['qty'] //库存余额 }else{ row[formField] = val[0][searchField] @@ -450,6 +452,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { } else if (formField == 'packingNumber'){ setV[formField] = val[0][searchField] setV['inventoryBalance'] = val[0]['qty'] + setV['batch'] = val[0]['batch'] + setV['fromLocationCode'] = val[0]['locationCode'] } else { setV[formField] = val[0][searchField] diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 1132680fb..9d1aa60e0 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -1023,71 +1023,74 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - tableForm: { - enterSearch: true, - // labelMessage: '信息提示说明！！！', - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择从库位代码', - searchField: 'code', - searchTitle: '库位代码信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.getLocationListByAreaAndBusinesstype, - searchCondition: [{ - key: 'businessType', - value: 'PurchaseReturn', - message: '请填写业务类型', - isMainValue: false - },{ - key: 'isIn', - value: 'out', - message: '', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 + tableForm:{ + disabled:true }, - // form: { - // componentProps:{ - // disabled:true - // } + // tableForm: { + // enterSearch: true, + // // labelMessage: '信息提示说明！！！', + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择从库位代码', + // searchField: 'code', + // searchTitle: '库位代码信息', + // searchAllSchemas: Location.allSchemas, + // searchPage: LocationApi.getLocationListByAreaAndBusinesstype, + // searchCondition: [{ + // key: 'businessType', + // value: 'PurchaseReturn', + // message: '请填写业务类型', + // isMainValue: false + // },{ + // key: 'isIn', + // value: 'out', + // message: '', + // isMainValue: false + // }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 // }, - form:{ - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, - searchListPlaceholder: '请选择从库位代码', - searchField: 'code', - searchTitle: '库位代码信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.getLocationListByAreaAndBusinesstype, - searchCondition: [{ - key: 'businessType', - value: 'PurchaseReturn', - message: '请填写业务类型', - isMainValue: false - },{ - key: 'isIn', - value: 'out', - message: '', - isMainValue: false - }], - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 + form: { + componentProps:{ + disabled:true } }, + // form:{ + // // labelMessage: '信息提示说明！！！', + // componentProps: { + // enterSearch: true, + // isSearchList: true, + // searchListPlaceholder: '请选择从库位代码', + // searchField: 'code', + // searchTitle: '库位代码信息', + // searchAllSchemas: Location.allSchemas, + // searchPage: LocationApi.getLocationListByAreaAndBusinesstype, + // searchCondition: [{ + // key: 'businessType', + // value: 'PurchaseReturn', + // message: '请填写业务类型', + // isMainValue: false + // },{ + // key: 'isIn', + // value: 'out', + // message: '', + // isMainValue: false + // }], + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // } + // }, hiddenInMain: true, isTable: false, }, @@ -1113,7 +1116,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive searchField: 'packingNumber', searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage, + searchPage: BalanceApi.getBalancePageReturn, searchCondition: [{ key: 'itemCode', value: 'itemCode', @@ -1121,21 +1124,16 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isTableRowValue: true, //查询当前searchTable表中行数据的值 required:true, isMainValue:true - },{ - key: 'batch', - value: 'batch', - message: '请填写批次', - isTableRowValue: true, //查询当前searchTable表中行数据的值 - // required:true, - isMainValue:true - },{ - key: 'locationCode', - value: 'fromLocationCode', - message: '请选择从库位代码', - isTableRowValue: true, //查询当前searchTable表中行数据的值 - required:true, - isMainValue:true - }], + }, + // { + // key: 'batch', + // value: 'batch', + // message: '请填写批次', + // isTableRowValue: true, //查询当前searchTable表中行数据的值 + // // required:true, + // isMainValue:true + // } + ], verificationParams: [{ key: 'packingNumber', action: '==', @@ -1155,7 +1153,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive searchField: 'packingNumber', searchTitle: '库存余额信息', // 查询弹窗标题 searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 - searchPage: BalanceApi.getBalancePage, + searchPage: BalanceApi.getBalancePageReturn, searchCondition: [{ key: 'itemCode', value: 'itemCode', @@ -1163,21 +1161,16 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isTableRowValue: true, //查询当前searchTable表中行数据的值 required:true, isMainValue:false - },{ - key: 'batch', - value: 'batch', - message: '请填写批次', - isTableRowValue: true, //查询当前searchTable表中行数据的值 - required:true, - isMainValue:false - },{ - key: 'locationCode', - value: 'fromLocationCode', - message: '请选择从库位代码', - isTableRowValue: true, //查询当前searchTable表中行数据的值 - required:true, - isMainValue:false - }], + }, + // { + // key: 'batch', + // value: 'batch', + // message: '请填写批次', + // isTableRowValue: true, //查询当前searchTable表中行数据的值 + // required:true, + // isMainValue:false + // } + ], verificationParams: [{ key: 'packingNumber', action: '==',