diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts index aff3b371f..cb40fc97f 100644 --- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts +++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts @@ -594,20 +594,11 @@ export const CountJobMainRules = reactive({ */ export const CountJobDetail = useCrudSchemas(reactive([ { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 180 - }, - hiddenInMain:true, - }, - { - label: '盘点明细号', - field: 'countDetailNumber', + label: '库位代码', + field: 'locationCode', sort: 'custom', table: { - width: 180 + width: 150 }, }, { @@ -627,111 +618,133 @@ export const CountJobDetail = useCrudSchemas(reactive([ }, }, { - label: '物料描述1', - field: 'itemDesc1', + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, }, { - label: '物料描述2', - field: 'itemDesc2', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '批次', - field: 'batch', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '包装号', - field: 'packingNumber', + label: '盘点数量', + field: 'countQty', sort: 'custom', table: { width: 150 }, }, { - label: '仓库代码', - field: 'warehouseCode', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, - { - label: '库区代码', - field: 'areaCode', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - },{ - label: '库位组代码', - field: 'locationGroupCode', + }, + { + label: '物料描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, }, { - label: '库位代码', - field: 'locationCode', + label: '物料描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, }, - // { - // label: '器具号', - // field: 'containerNumber', - // sort: 'custom', - // table: { - // width: 150 - // }, - // isTable:false, - // }, { - label: '数量', - field: 'qty', + label: '单据号', + field: 'number', sort: 'custom', table: { - width: 150 + width: 180 }, - form: { - component: 'InputNumber', - } + hiddenInMain:true, }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '盘点明细号', + field: 'countDetailNumber', + sort: 'custom', + table: { + width: 180 + }, + }, + + { + label: '仓库代码', + field: 'warehouseCode', sort: 'custom', table: { width: 150 }, }, + { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '库区代码', + field: 'areaCode', + sort: 'custom', + table: { + width: 150 + }, + },{ + label: '库位组代码', + field: 'locationGroupCode', sort: 'custom', table: { width: 150 }, }, + + // { + // label: '器具号', + // field: 'containerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable:false, + // }, + + + // { // label: '项目代码', // field: 'projectCode', @@ -749,14 +762,7 @@ export const CountJobDetail = useCrudSchemas(reactive([ // width: 150 // }, // }, - { - label: '盘点数量', - field: 'countQty', - sort: 'custom', - table: { - width: 150 - }, - }, + { label: '盘点时间', field: 'countTime', diff --git a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts index f1b4c3677..9b654999a 100644 --- a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts +++ b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts @@ -353,11 +353,11 @@ export const CountRecordMainRules = reactive({ */ export const CountRecordDetail = useCrudSchemas(reactive([ { - label: '单据号', - field: 'number', + label: '库位代码', + field: 'locationCode', sort: 'custom', table: { - width: 180 + width: 150 }, }, { @@ -377,28 +377,31 @@ export const CountRecordDetail = useCrudSchemas(reactive([ }, }, { - label: '物料描述1', - field: 'itemDesc1', + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, }, { - label: '物料描述2', - field: 'itemDesc2', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '盘点明细号', - field: 'countDetailNumber', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { label: '盘点数量', @@ -411,6 +414,60 @@ export const CountRecordDetail = useCrudSchemas(reactive([ component: 'InputNumber', } }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物料描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '盘点明细号', + field: 'countDetailNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 180 + }, + }, { label: '盘点时间', field: 'countTime', @@ -447,22 +504,7 @@ export const CountRecordDetail = useCrudSchemas(reactive([ // width: 150 // }, // }, - { - label: '批次', - field: 'batch', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '包装号', - field: 'packingNumber', - sort: 'custom', - table: { - width: 150 - }, - }, + // { // label: '器具号', // field: 'containerNumber', @@ -471,36 +513,9 @@ export const CountRecordDetail = useCrudSchemas(reactive([ // width: 150 // }, // }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '库位代码', - field: 'locationCode', - sort: 'custom', - table: { - width: 150 - }, - }, + + + { label: '库位组代码', field: 'locationGroupCode', @@ -517,17 +532,7 @@ export const CountRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + { label: '货主代码', field: 'ownerCode',