From 59ac86f29703ed1a245c9546daa7e10293d98832 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Mon, 15 Jul 2024 16:11:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain/index.vue | 9 ++- .../purchasereturnRequestMain.data.ts | 79 +++++++++++++++++-- 2 files changed, 80 insertions(+), 8 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 0145d5de3..7875f9402 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -418,7 +418,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { setV['singlePrice'] = val[0]['singlePrice'] setV['amount'] = val[0]['amount'] setV['projectCode'] = val[0]['projectCode'] - setV['packingNumber'] = val[0]['packingNumber'] + // setV['packingNumber'] = val[0]['packingNumber'] + // setV['inventoryBalance'] = val[0]['qty'] if (formField == 'itemCode') { setV['batch'] = val[0]['toBatch'] @@ -428,7 +429,11 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { // setV['fromLocationCode'] = val[0]['fromLocationCode'] // setV['toLocationCode'] = val[0]['toLocationCode'] } - } else { + } else if (formField == 'packingNumber'){ + setV[formField] = val[0][searchField] + setV['inventoryBalance'] = val[0]['qty'] + } + else { setV[formField] = val[0][searchField] } formRef.setValues(setV) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index a7b55418d..eef4f4f85 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -780,6 +780,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isTableForm:false, isTable:false, hiddenInMain: true, + isForm: false, tableForm:{ disabled:true }, @@ -799,6 +800,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isTableForm:false, isTable:false, hiddenInMain: true, + isForm: false, tableForm:{ disabled:true }, @@ -834,6 +836,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive hiddenInMain: true, isTableForm: false, isTable: false, + isForm: false, tableForm:{ disabled:true }, @@ -856,6 +859,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive }, isTableForm: false, isTable: false, + isForm: false, form: { componentProps:{ disabled:true @@ -939,11 +943,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - form: { - componentProps:{ - disabled:true - } - }, tableForm:{ // labelMessage: '信息提示说明！！！', isInpuFocusShow: true, // 开启查询弹窗 @@ -964,6 +963,33 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isMainValue: false }] }, + // form: { + // componentProps:{ + // disabled:true + // } + // }, + form:{ + // labelMessage: '信息提示说明！！！', + componentProps: { + 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 + }] + } + }, hiddenInMain: true, isTable: false, }, @@ -976,9 +1002,41 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive }, hiddenInMain: true, isTable: false, + // form: { + // componentProps:{ + // disabled: true, + // } + // }, form: { componentProps:{ - disabled:true + isSearchList: true, + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', // 查询弹窗标题 + searchAllSchemas: Balance.allSchemas, // 查询弹窗所需类 + searchPage: BalanceApi.getBalancePage, + searchCondition: [{ + key: 'itemCode', + value: 'itemCode', + message: '请填写物料代码', + 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 + }] } }, tableForm:{ @@ -1024,6 +1082,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive form: { component: 'InputNumber', componentProps: { + disabled: true, min: 0, precision: 6 } @@ -1036,6 +1095,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive }, hiddenInMain: true, isTable: false, + isDetail: false, }, { label: '退货数量', @@ -1075,6 +1135,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive }, isTableForm: false, isTable: false, + isForm: false, form: { componentProps:{ disabled:true @@ -1094,6 +1155,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive hiddenInMain: true, isTableForm: false, isTable: false, + isForm: false, form: { componentProps:{ disabled:true @@ -1113,6 +1175,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive hiddenInMain: true, isTableForm: false, isTable: false, + isForm: false, form: { componentProps:{ disabled:true @@ -1132,6 +1195,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive hiddenInMain: true, isTableForm: false, isTable: false, + isForm: false, form: { componentProps:{ disabled:true @@ -1257,6 +1321,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive tableForm:{ disabled:true }, + isForm: false, isTableForm: false, isTable: false, hiddenInMain: true, @@ -1278,6 +1343,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive tableForm:{ disabled:true }, + isForm: false, isTableForm:false, isForm:false }, @@ -1317,6 +1383,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive isTableForm: false, isTable: false, hiddenInMain: true, + isForm: false, form: { componentProps:{ disabled:true