From 9f50d9b00f7787570717e8f7551577d1be8e1da7 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 21 Mar 2024 09:46:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=8A=9F=E8=83=BD=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockupMainJob/stockupMainJob.data.ts | 202 ++++++++++--- .../stockupMainRecord.data.ts | 284 +++++++++--------- .../stockupMainRequest.data.ts | 8 +- 3 files changed, 314 insertions(+), 180 deletions(-) diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts index c8aca1d29..9bb38ab9e 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts @@ -12,42 +12,58 @@ export const StockupMainJob = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, isForm: false, + table: { + width: 180 + }, }, { label: '申请单号', field: 'requestNumber', sort: 'custom', isForm: false, + table: { + width: 180 + }, }, { label: '从仓库代码', field: 'fromWarehouseCode', sort: 'custom', isForm: false, - + table: { + width: 150 + }, }, { label: '到仓库代码', field: 'toWarehouseCode', sort: 'custom', isForm: false, - + table: { + width: 150 + }, }, { label: '状态', field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', - - form: { - component: 'Radio' + table: { + width: 150 }, + isForm: false, }, { label: '申请时间', field: 'requestTime', sort: 'custom', formatter: dateFormatter, - + table: { + width: 180 + }, search: { component: 'DatePicker', componentProps: { @@ -69,6 +85,9 @@ export const StockupMainJob = useCrudSchemas(reactive([ field: 'requestDueTime', sort: 'custom', formatter: dateFormatter, + table: { + width: 180 + }, search: { component: 'DatePicker', componentProps: { @@ -91,7 +110,9 @@ export const StockupMainJob = useCrudSchemas(reactive([ field: 'expiredTime', sort: 'custom', formatter: dateFormatter, - + table: { + width: 180 + }, search: { component: 'DatePicker', componentProps: { @@ -112,20 +133,23 @@ export const StockupMainJob = useCrudSchemas(reactive([ label: '部门', field: 'departmentCode', sort: 'custom', - }, { label: '承接人用户名', field: 'acceptUserName', sort: 'custom', - + table: { + width: 150 + }, }, { label: '承接时间', field: 'acceptTime', sort: 'custom', formatter: dateFormatter, - + table: { + width: 180 + }, search: { component: 'DatePicker', componentProps: { @@ -146,12 +170,18 @@ export const StockupMainJob = useCrudSchemas(reactive([ label: '完成人用户名', field: 'completeUserName', sort: 'custom', + table: { + width: 150 + }, }, { label: '完成时间', field: 'completeTime', sort: 'custom', formatter: dateFormatter, + table: { + width: 180 + }, search: { component: 'DatePicker', componentProps: { @@ -171,12 +201,26 @@ export const StockupMainJob = useCrudSchemas(reactive([ { label: '从库区类型范围', field: 'fromAreaTypes', + dictType: DICT_TYPE.LOCATION_TYPE, + dictClass: 'string', + isTable: true, sort: 'custom', + table: { + width: 150 + }, + isForm: false, }, { label: '到库区类型范围', field: 'toAreaTypes', + dictType: DICT_TYPE.LOCATION_TYPE, + dictClass: 'string', + isTable: true, sort: 'custom', + table: { + width: 150 + }, + isForm: false, }, { label: '业务类型', @@ -185,48 +229,62 @@ export const StockupMainJob = useCrudSchemas(reactive([ form: { component: 'SelectV2' }, + table: { + width: 120 + }, }, { label: '备注', field: 'remark', sort: 'custom', - }, { label: '自动完成', field: 'autoComplete', sort: 'custom', - + table: { + width: 120 + }, }, { label: '允许修改库位', field: 'allowModifyLocation', sort: 'custom', - + table: { + width: 150 + }, }, { label: '允许修改数量', field: 'allowModifyQty', sort: 'custom', - + table: { + width: 150 + }, }, { label: '允许大于推荐数量', field: 'allowBiggerQty', sort: 'custom', - + table: { + width: 180 + }, }, { label: '允许小于推荐数量', field: 'allowSmallerQty', sort: 'custom', - + table: { + width: 180 + }, }, { label: '允许修改库存状态', field: 'allowModifyInventoryStatus', sort: 'custom', - + table: { + width: 180 + }, form: { component: 'Radio' }, @@ -235,66 +293,82 @@ export const StockupMainJob = useCrudSchemas(reactive([ label: '允许连续扫描', field: 'allowContinuousScanning', sort: 'custom', - + table: { + width: 150 + }, }, { label: '允许部分完成', field: 'allowPartialComplete', sort: 'custom', - + table: { + width: 150 + }, }, { label: '允许修改批次', field: 'allowModifyBatch', sort: 'custom', - + table: { + width: 150 + }, }, { label: '允许修改箱码', field: 'allowModifyPackingNumber', sort: 'custom', - + table: { + width: 150 + }, }, { label: '从库区代码范围', field: 'fromAreaCodes', sort: 'custom', - + table: { + width: 150 + }, }, { label: '到库区代码范围', field: 'toAreaCodes', sort: 'custom', - - }, - { - label: '工作流流水号', - field: 'serialNumber', - sort: 'custom', - + table: { + width: 150 + }, }, { label: '入库库存状态范围', field: 'inInventoryStatuses', sort: 'custom', - + table: { + width: 180 + }, }, { label: '出库库存状态范围', field: 'outInventoryStatuses', sort: 'custom', + table: { + width: 180 + }, }, { label: '创建者', field: 'creator', sort: 'custom', + table: { + width: 120 + }, }, { label: '创建时间', field: 'createTime', sort: 'custom', formatter: dateFormatter, - + table: { + width: 180 + }, search: { component: 'DatePicker', componentProps: { @@ -326,18 +400,27 @@ export const StockupDetailJob = useCrudSchemas(reactive([ field: 'number', sort: 'custom', isSearch: true, + table: { + width: 150 + }, }, { label: '包装号', field: 'packingNumber', sort: 'custom', isSearch: true, + table: { + width: 150 + }, }, { label: '批次', field: 'batch', sort: 'custom', isSearch: true, + table: { + width: 150 + }, }, { label: '库存状态', @@ -347,60 +430,90 @@ export const StockupDetailJob = useCrudSchemas(reactive([ form: { component: 'Radio' }, + table: { + width: 120 + }, }, { label: '货主代码', field: 'ownerCode', sort: 'custom', isSearch: true, + table: { + width: 120 + }, }, { label: '器具号', field: 'containerNumber', sort: 'custom', isSearch: true, + table: { + width: 120 + }, }, { label: '从库位代码', field: 'fromLocationCode', sort: 'custom', isSearch: true, + table: { + width: 120 + }, }, { label: '到库位代码', field: 'toLocationCode', sort: 'custom', isSearch: true, + table: { + width: 120 + }, }, { label: '物品代码', field: 'itemCode', sort: 'custom', isSearch: true, + table: { + width: 150 + }, }, { label: '物品名称', field: 'itemName', sort: 'custom', isSearch: true, + table: { + width: 150 + }, }, { label: '物品描述1', field: 'itemDesc1', sort: 'custom', isSearch: true, + table: { + width: 120 + }, }, { label: '物品描述2', field: 'itemDesc2', sort: 'custom', isSearch: true, + table: { + width: 120 + }, }, { label: '项目代码', field: 'projectCode', sort: 'custom', isSearch: true, + table: { + width: 120 + }, }, { label: '数量', @@ -411,18 +524,22 @@ export const StockupDetailJob = useCrudSchemas(reactive([ { label: '计量单位', field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', - isSearch: true, - }, - { - label: '主表ID', - field: 'masterId', - sort: 'custom', - isSearch: true, - form: { - component: 'InputNumber', - value: 0 + table: { + width: 150 + }, + tableForm: { + type: 'Select', + disabled: true }, + form: { + componentProps: { + disabled: true + } + } }, { label: '备注', @@ -444,6 +561,9 @@ export const StockupDetailJob = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + table: { + width: 180 + }, isForm: false, }, { diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts index 81b6e81b3..87ea3475c 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts @@ -54,17 +54,64 @@ export const StockupMainRecord = useCrudSchemas(reactive([ label: '出库事务类型', field: 'outTransactionType', sort: 'custom', + dictType: DICT_TYPE.LOCATION_TYPE, + dictClass: 'string', + isTable: true, table: { width: 150 }, + isForm: false, }, { label: '入库事务类型', field: 'inTransactionType', + dictType: DICT_TYPE.LOCATION_TYPE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, + isForm: false, + }, + { + label: '从库区类型范围', + field: 'fromAreaTypes', + dictType: DICT_TYPE.LOCATION_TYPE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 180 + }, + }, + { + label: '从库区代码范围', + field: 'fromAreaCodes', + sort: 'custom', + isSearch: true, + table: { + width: 180 + }, + }, + { + label: '到库区类型范围', + field: 'toAreaTypes', + dictType: DICT_TYPE.LOCATION_TYPE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 180 + }, + }, + { + label: '到库区代码范围', + field: 'toAreaCodes', + sort: 'custom', + table: { + width: 180 + }, }, { label: '执行时间', @@ -152,23 +199,22 @@ export const StockupMainRecord = useCrudSchemas(reactive([ }, }, { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, + label: '创建时间', + field: 'createTime', sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', + formatter: dateFormatter, + search: { + component: 'DatePicker', componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } - } + }, + table: { + width: 180 + }, + isForm: false, }, { label: '部门', @@ -198,64 +244,32 @@ export const StockupMainRecord = useCrudSchemas(reactive([ }, }, { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 100 - }, - }, - { - label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - table: { - width: 180 - }, - isForm: false, - }, - { - label: '从库区类型范围', - field: 'fromAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: true, sort: 'custom', table: { - width: 180 + width: 150 }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + } }, { - label: '从库区代码范围', - field: 'fromAreaCodes', - sort: 'custom', - isSearch: true, - }, - { - label: '到库区类型范围', - field: 'toAreaTypes', - dictType: DICT_TYPE.LOCATION_TYPE, - dictClass: 'string', - isTable: true, + label: '备注', + field: 'remark', sort: 'custom', table: { - width: 180 + width: 100 }, }, - { - label: '到库区代码范围', - field: 'toAreaCodes', - sort: 'custom', - }, { label: '操作', field: 'action', @@ -299,26 +313,6 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '从货主代码', - field: 'fromOwnerCode', - sort: 'custom', - isSearch: true, - table: { - width: 150 - }, - }, { label: '从器具号', field: 'fromContainerNumber', @@ -329,8 +323,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ }, }, { - label: '从库位代码', - field: 'fromLocationCode', + label: '物品代码', + field: 'itemCode', sort: 'custom', isSearch: true, table: { @@ -338,8 +332,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ }, }, { - label: '从库位组代码', - field: 'fromLocationGroupCode', + label: '物品名称', + field: 'itemName', sort: 'custom', isSearch: true, table: { @@ -347,8 +341,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ }, }, { - label: '从库区代码', - field: 'fromAreaCode', + label: '物品描述1', + field: 'itemDesc1', sort: 'custom', isSearch: true, table: { @@ -356,8 +350,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ }, }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '物品描述2', + field: 'itemDesc2', sort: 'custom', isSearch: true, table: { @@ -365,8 +359,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ }, }, { - label: '到器具号', - field: 'toContainerNumber', + label: '项目代码', + field: 'projectCode', sort: 'custom', isSearch: true, table: { @@ -374,8 +368,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ }, }, { - label: '到库位代码', - field: 'toLocationCode', + label: '数量', + field: 'qty', sort: 'custom', isSearch: true, table: { @@ -383,26 +377,30 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ }, }, { - label: '到库位组代码', - field: 'toLocationGroupCode', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', - isSearch: true, table: { width: 150 }, }, { - label: '到库区代码', - field: 'toAreaCode', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', - isSearch: true, table: { width: 150 }, }, { - label: '单价', - field: 'singlePrice', + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', isSearch: true, table: { @@ -410,8 +408,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ }, }, { - label: '金额', - field: 'amount', + label: '从库位代码', + field: 'fromLocationCode', sort: 'custom', isSearch: true, table: { @@ -419,8 +417,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ }, }, { - label: '备注', - field: 'remark', + label: '从库位组代码', + field: 'fromLocationGroupCode', sort: 'custom', isSearch: true, table: { @@ -428,27 +426,17 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ }, }, { - label: '创建时间', - field: 'createTime', + label: '从库区代码', + field: 'fromAreaCode', sort: 'custom', - formatter: dateFormatter, isSearch: true, table: { - width: 180 - }, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } + width: 150 }, - isForm: false, }, { - label: '物品代码', - field: 'itemCode', + label: '到货主代码', + field: 'toOwnerCode', sort: 'custom', isSearch: true, table: { @@ -456,8 +444,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ }, }, { - label: '物品名称', - field: 'itemName', + label: '到器具号', + field: 'toContainerNumber', sort: 'custom', isSearch: true, table: { @@ -465,8 +453,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ }, }, { - label: '物品描述1', - field: 'itemDesc1', + label: '到库位代码', + field: 'toLocationCode', sort: 'custom', isSearch: true, table: { @@ -474,8 +462,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ }, }, { - label: '物品描述2', - field: 'itemDesc2', + label: '到库位组代码', + field: 'toLocationGroupCode', sort: 'custom', isSearch: true, table: { @@ -483,8 +471,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ }, }, { - label: '项目代码', - field: 'projectCode', + label: '到库区代码', + field: 'toAreaCode', sort: 'custom', isSearch: true, table: { @@ -492,8 +480,8 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ }, }, { - label: '数量', - field: 'qty', + label: '单价', + field: 'singlePrice', sort: 'custom', isSearch: true, table: { @@ -501,12 +489,10 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ }, }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '金额', + field: 'amount', sort: 'custom', + isSearch: true, table: { width: 150 }, @@ -542,6 +528,34 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ } } }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + table: { + width: 180 + }, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + isForm: false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + }, { label: '操作', field: 'action', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index d0241eb88..6f2281d3b 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -389,7 +389,7 @@ export const StockupMainRequest = useCrudSchemas(reactive([ sort: 'custom', isSearch: false, table: { - width: 120 + width: 150 }, isForm: false }, @@ -472,7 +472,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ isForm: false, isTableForm: false, table: { - width: 100 + width: 180 }, }, // { @@ -567,7 +567,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, table: { - width: 120 + width: 150 }, tableForm: { disabled: true @@ -585,7 +585,7 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ isSearch: true, isTableForm: false, table: { - width: 120 + width: 150 }, }, {