diff --git a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts index d439a4ae0..278a1c099 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturnspare/purchasereturnRecordSpareMain/purchasereturnRecordSpareMain.data.ts @@ -436,31 +436,90 @@ export const PurchasereturnRecordMainRules = reactive({ * @returns {Array} 采购退货记录子表 */ export const PurchasereturnRecordDetail = useCrudSchemas(reactive([ - { - label: '从包装号', - field: 'fromPackingNumber', + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180, + }, + sortTableDefault: 1013, + hiddenInMain: true, + isSearch: false + }, + { + label: '物料代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, isSearch: true, - sortTableDefault: 1001, - sortSearchDefault: 1001, + sortSearchDefault: 6, + }, + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + sortSearchDefault: 6, }, { - label: '到包装号', - field: 'toPackingNumber', + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + sortSearchDefault: 7, + hiddenInMain: true + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + sortSearchDefault: 7, + hiddenInMain: true + }, + { + label: '从批次', + field: 'fromBatch', sort: 'custom', table: { width: 150 }, isSearch: true, - hiddenInMain: true, - sortSearchDefault: 1002, + sortTableDefault: 1000, + }, + { + label: '从包装号', + field: 'fromPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + isSearch: false, sortTableDefault: 1001, + sortSearchDefault: 1001, }, // { + // label: '到包装号', + // field: 'toPackingNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isSearch: true, + // hiddenInMain: true, + // sortSearchDefault: 1002, + // sortTableDefault: 1001, + // }, + // { // label: '包装规格', // field: 'packUnit', // dictClass: 'string', @@ -509,56 +568,60 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( } }, { - label: '从器具号', - field: 'fromContainerNumber', - sort: 'custom', - table: { - width: 150 - }, - isTable:false, - hiddenInMain: true - }, - { - label: '到器具号', - field: 'toContainerNumber', - sort: 'custom', - table: { - width: 150 - }, - isTable:false, - hiddenInMain: true - }, - { - label: '从批次', - field: 'fromBatch', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - sortTableDefault: 1000, - }, - { - label: '到批次', - field: 'toBatch', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - sortTableDefault: 1000, - hiddenInMain: true - }, - { - label: '替代批次', - field: 'altBatch', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - isTable:false, + sortTableDefault: 1008, hiddenInMain: true }, + // { + // label: '从器具号', + // field: 'fromContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable:false, + // hiddenInMain: true + // }, + // { + // label: '到器具号', + // field: 'toContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable:false, + // hiddenInMain: true + // }, + + // { + // label: '到批次', + // field: 'toBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isSearch: true, + // sortTableDefault: 1000, + // hiddenInMain: true + // }, + // { + // label: '替代批次', + // field: 'altBatch', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable:false, + // hiddenInMain: true + // }, { label: '从库位代码', field: 'fromLocationCode', @@ -639,19 +702,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( // sortTableDefault: 1010, // hiddenInMain: true // }, - { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault: 1008, - hiddenInMain: true - }, + // { // label: '订单号', // field: 'poNumber', @@ -670,70 +721,21 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( // }, // sortTableDefault: 5, // }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180, - }, - sortTableDefault: 1013, - hiddenInMain: true, - isSearch: false - }, - { - label: '原因', - field: 'reason', - dictType: DICT_TYPE.PURCHASE_RETURN_REASON, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault: 1013, - hiddenInMain: true - }, - { - label: '物料代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - sortSearchDefault: 6, - }, - { - label: '物料名称', - field: 'itemName', - sort: 'custom', - table: { - width: 150 - }, - sortSearchDefault: 6, - }, - { - label: '物料描述1', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150 - }, - sortSearchDefault: 7, - hiddenInMain: true - }, - { - label: '物料描述2', - field: 'itemDesc2', - sort: 'custom', - table: { - width: 150 - }, - sortSearchDefault: 7, - hiddenInMain: true - }, + // { + // label: '原因', + // field: 'reason', + // dictType: DICT_TYPE.PURCHASE_RETURN_REASON, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault: 1013, + // hiddenInMain: true + // }, + // { // label: '数量', // field: 'qty', @@ -785,16 +787,16 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( component: 'InputNumber', } }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault: 1011, - hiddenInMain: true - }, + // { + // label: '项目代码', + // field: 'projectCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault: 1011, + // hiddenInMain: true + // }, // { // label: '代码', // field: 'code', @@ -823,16 +825,16 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( // width: 150 // }, // }, - { - label: '原因', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault: 1007, - hiddenInMain: true - }, + // { + // label: '原因', + // field: 'remark', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault: 1007, + // hiddenInMain: true + // }, { label: '创建者', field: 'creator',