diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts index 352eeb112..41b7aa7b7 100644 --- a/src/api/wms/purchasereceiptRecordDetail/index.ts +++ b/src/api/wms/purchasereceiptRecordDetail/index.ts @@ -73,6 +73,17 @@ export const getPurchasereceiptRecordDetailPageSpare = async (params) => { } +// 查询采购收货记录--退货筛选列表 +export const getPurchasereceiptRecordDetailPageReturn = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchasereceipt-record-detail/seniorReturn', data }) + } else { + return await request.get({ url: `/wms/purchasereceipt-record-detail/pageReturn`, params }) + } +} + export const getPurchasereceiptRecordDetailPageSCP = async (params) => { if (params.isSearch) { delete params.isSearch @@ -152,4 +163,4 @@ export const queryPurchaseceiptChildPackingNumber = async (params) => { // 查询采购收货缺货记录子包装数据 export const queryPurchaseshortageChildPackingNumber = async (params) => { return await request.get({ url: `/wms/purchaseshortage-detail/pageChildPackingNumber`, params }) -} \ No newline at end of file +} diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index e2920d06c..346df66f0 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -269,8 +269,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => item.packingNumber = item.fromPackingNumber item.containerNumber = item.toContainerNumber item.receiptQty = item.qty + item.packUnit = item.packUnit + item.packQty = item.packQty item.toLocationGroupCode = null item.toWarehouseCode = null + item.fromLocationCode = null item.toAreaTypes = null item.toLocationCode = null // item.fromLocationCode = item.fromLocationCode @@ -337,7 +340,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { setV['supplierUom'] = val[0]['supplierUom'] setV['inventoryStatus'] = val[0]['inventoryStatus'] // setV['fromLocationCode'] = val[0]['toLocationCode'] - setV['toLocationCode'] = val[0]['toLocationCode'] + // setV['toLocationCode'] = val[0]['toLocationCode'] setV['fromLocationGroupCode'] = val[0]['locationGroupCode'] setV['toLocationGroupCode'] = null setV['toWarehouseCode'] = null @@ -363,7 +366,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => { setV['containerNumber'] = val[0]['containerNumber'] setV['containerNumber'] = val[0]['containerNumber'] // setV['fromLocationCode'] = val[0]['fromLocationCode'] - setV['toLocationCode'] = val[0]['toLocationCode'] + // setV['toLocationCode'] = val[0]['toLocationCode'] } }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 39441468d..222fae2d7 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -96,14 +96,6 @@ const PurchasereceiptRecordMain1 = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '计量单位', field: 'uom', @@ -115,14 +107,6 @@ const PurchasereceiptRecordMain1 = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '包装号', // 实际是子表的从包装号，为了不影响页面，单独放上面 - field: 'fromPackingNumber', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '包装规格', field: 'packUnit', @@ -133,21 +117,6 @@ const PurchasereceiptRecordMain1 = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '包装数量', - field: 'packQty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - }, - tableForm: { - disabled: true, - }, - isForm:false, - }, { label: '从库位代码', field: 'fromLocationCode', @@ -241,7 +210,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ searchField: 'number', // 查询弹窗赋值字段 searchTitle: '采购收货记录', // 查询弹窗标题 searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类 - searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage, // 查询弹窗所需分页方法 + searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn, // 查询弹窗所需分页方法 searchCondition: [ { key: 'supplierCode', @@ -677,7 +646,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 + isInpuFocusShow: false, // 开启查询弹窗 searchListPlaceholder: '请选择订单行', searchField: 'poLine', searchTitle: '采购收货记录信息', @@ -693,7 +662,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive form: { // labelMessage: '信息提示说明！！！', componentProps: { - isSearchList: true, + isSearchList: false, searchListPlaceholder: '请选择订单行', searchField: 'poLine', searchTitle: '采购收货记录信息', @@ -799,33 +768,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } } }, - // { - // label: '从批次', - // field: 'fromBatch', - // sort: 'custom', - // table: { - // width: 150 - // }, - // tableForm:{ - // disabled:true - // } - // }, - { - label: '批次', - field: 'batch', - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled:true - }, - form: { - componentProps:{ - disabled:true - } - } - }, + { label: '替代批次', field: 'altBatch', @@ -883,6 +826,27 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } } }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + disabled:true, + type: 'Select', + }, + form: { + componentProps:{ + disabled:true + } + } + }, { label: '收货数量', field: 'receiptQty', @@ -898,6 +862,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive disabled:true } }, + isTable:false, + isTableForm:false, tableForm:{ disabled:true, type:'InputNumber', @@ -951,27 +917,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive precision: 6 } }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm:{ - disabled:true, - type: 'Select', - }, - form: { - componentProps:{ - disabled:true - } - } - }, + { label: '库存状态', field: 'inventoryStatus', @@ -1171,7 +1117,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive } }, }, - { label: '项目代码', field: 'projectCode', @@ -1397,7 +1342,7 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive