From 34053c3ddc3a16abcdcf0a54e480db8b0ddef5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com> Date: Thu, 30 Nov 2023 09:30:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=A1=BA=E5=BA=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrap/scrapJobMain/scrapJobMain.data.ts | 396 ++++++++--------- .../scrapRecordMain/scrapRecordMain.data.ts | 288 ++++++------- .../scrapRequestMain/scrapRequestMain.data.ts | 402 +++++++++--------- 3 files changed, 543 insertions(+), 543 deletions(-) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts index c547ae7fe..1894e8899 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts @@ -6,21 +6,35 @@ import { dateFormatter } from '@/utils/formatTime' */ export const ScrapJobMain = useCrudSchemas(reactive([ { - label: '申请单号', - field: 'requestNumber', + label: '单据号', + field: 'number', sort: 'custom', table: { - width: 150 + width: 150, + fixed: 'left' }, isSearch: true, }, { - label: '从仓库代码', - field: 'fromWarehouseCode', + label: '状态', + field: 'status', + dictType: DICT_TYPE.JOB_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '申请单号', + field: 'requestNumber', sort: 'custom', table: { width: 150 }, + isSearch: true, }, { label: '申请时间', @@ -62,18 +76,6 @@ export const ScrapJobMain = useCrudSchemas(reactive([ } }, }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, { label: '过期时间', field: 'expiredTime', @@ -95,28 +97,38 @@ export const ScrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '最后更新时间', - field: 'updateTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + label: '从仓库代码', + field: 'fromWarehouseCode', + sort: 'custom', + table: { + width: 150 }, + }, + { + label: '从库区代码范围', + field: 'fromAreaCodes', sort: 'custom', table: { - width: 180 + width: 150 }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + }, + { + label: '从库位类型范围', + field: 'fromLocationTypes', + dictType: DICT_TYPE.LOCATION_TYPE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 }, }, { - label: '最后更新者', - field: 'updater', + label: '到库位类型范围', + field: 'toLocationTypes', + dictType: DICT_TYPE.LOCATION_TYPE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 @@ -152,6 +164,14 @@ export const ScrapJobMain = useCrudSchemas(reactive([ component: 'InputNumber', } }, + { + label: '业务类型', + field: 'businessType', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '部门', field: 'departmentCode', @@ -161,23 +181,22 @@ export const ScrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '承接人', - field: 'acceptUserId', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, }, { - label: '承接时间', - field: 'acceptTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '自动完成', + field: 'autoComplete', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { - width: 180 + width: 150 }, form: { component: 'DatePicker', @@ -189,24 +208,15 @@ export const ScrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '完成人', - field: 'completeUserId', + label: '允许修改库位', + field: 'allowModifyLocation', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - }, - { - label: '完成时间', - field: 'completeTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, form: { component: 'DatePicker', componentProps: { @@ -217,64 +227,34 @@ export const ScrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '从库位类型范围', - field: 'fromLocationTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + label: '允许修改数量', + field: 'allowModifyQty', + dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: true, sort: 'custom', table: { width: 150 }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + label: '允许大于推荐数量', + field: 'allowBiggerQty', + dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: true, sort: 'custom', table: { width: 150 }, - }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150, - fixed: 'left' - }, - isSearch: true, - }, - { - label: '业务类型', - field: 'businessType', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, form: { component: 'DatePicker', componentProps: { @@ -285,24 +265,8 @@ export const ScrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '从库区代码范围', - field: 'fromAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '自动完成', - field: 'autoComplete', + label: '允许小于推荐数量', + field: 'allowSmallerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: true, @@ -320,8 +284,8 @@ export const ScrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '允许修改库位', - field: 'allowModifyLocation', + label: '允许修改库存状态', + field: 'allowModifyInventoryStatus', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: true, @@ -339,8 +303,8 @@ export const ScrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '允许修改数量', - field: 'allowModifyQty', + label: '允许连续扫描', + field: 'allowContinuousScanning', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: true, @@ -358,8 +322,8 @@ export const ScrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '允许大于推荐数量', - field: 'allowBiggerQty', + label: '允许部分完成', + field: 'allowPartialComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: true, @@ -377,8 +341,8 @@ export const ScrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '允许小于推荐数量', - field: 'allowSmallerQty', + label: '允许修改批次', + field: 'allowModifyBatch', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: true, @@ -396,8 +360,8 @@ export const ScrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '允许修改库存状态', - field: 'allowModifyInventoryStatus', + label: '允许修改箱码', + field: 'allowModifyPackingNumber', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: true, @@ -415,14 +379,15 @@ export const ScrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '允许连续扫描', - field: 'allowContinuousScanning', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, + label: '承接时间', + field: 'acceptTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, sort: 'custom', table: { - width: 150 + width: 180 }, form: { component: 'DatePicker', @@ -434,15 +399,24 @@ export const ScrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '允许部分完成', - field: 'allowPartialComplete', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, + label: '承接人', + field: 'acceptUserId', sort: 'custom', table: { width: 150 }, + }, + { + label: '完成时间', + field: 'completeTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, form: { component: 'DatePicker', componentProps: { @@ -453,15 +427,24 @@ export const ScrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '允许修改批次', - field: 'allowModifyBatch', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, + label: '完成人', + field: 'completeUserId', sort: 'custom', table: { width: 150 }, + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, form: { component: 'DatePicker', componentProps: { @@ -472,15 +455,24 @@ export const ScrapJobMain = useCrudSchemas(reactive([ }, }, { - label: '允许修改箱码', - field: 'allowModifyPackingNumber', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, + }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, form: { component: 'DatePicker', componentProps: { @@ -490,6 +482,14 @@ export const ScrapJobMain = useCrudSchemas(reactive([ } }, }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '操作', field: 'action', @@ -559,122 +559,114 @@ export const ScrapJobMainRules = reactive({ */ export const ScrapJobDetail = useCrudSchemas(reactive([ { - label: '货主代码', - field: 'ownerCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '包装号', - field: 'packingNumber', + label: '单据号', + field: 'number', sort: 'custom', table: { width: 150 }, }, { - label: '器具号', - field: 'containerNumber', + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '批次', - field: 'batch', + label: '物品名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, }, { - label: '从库位代码', - field: 'fromLocationCode', + label: '物品描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '物品描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, }, { - label: '原因', - field: 'reason', - dictType: DICT_TYPE.SCRAP_REASON, - dictClass: 'string', - isTable: true, + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, }, { - label: '物品代码', - field: 'itemCode', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '物品名称', - field: 'itemName', + label: '器具号', + field: 'containerNumber', sort: 'custom', table: { width: 150 }, }, { - label: '物品描述1', - field: 'itemDesc1', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '物品描述2', - field: 'itemDesc2', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '项目代码', - field: 'projectCode', + label: '从库位代码', + field: 'fromLocationCode', sort: 'custom', table: { width: 150 }, }, { - label: '数量', - field: 'qty', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, + label: '原因', + field: 'reason', + dictType: DICT_TYPE.SCRAP_REASON, dictClass: 'string', isTable: true, sort: 'custom', @@ -683,24 +675,24 @@ export const ScrapJobDetail = useCrudSchemas(reactive([ }, }, { - label: '单据号', - field: 'number', + label: '货主代码', + field: 'ownerCode', sort: 'custom', table: { width: 150 }, }, { - label: '备注', - field: 'remark', + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 }, }, { - label: '创建者', - field: 'creator', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 @@ -726,6 +718,14 @@ export const ScrapJobDetail = useCrudSchemas(reactive([ } }, }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + }, ])) //表单校验 diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index 6290da8d9..6166136a3 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -6,17 +6,18 @@ import { dateFormatter } from '@/utils/formatTime' */ export const ScrapRecordMain = useCrudSchemas(reactive([ { - label: '申请单号', - field: 'requestNumber', + label: '单据号', + field: 'number', sort: 'custom', table: { - width: 150 + width: 150, + fixed: 'left' }, isSearch: true }, { - label: '任务单号', - field: 'jobNumber', + label: '申请单号', + field: 'requestNumber', sort: 'custom', table: { width: 150 @@ -24,24 +25,17 @@ export const ScrapRecordMain = useCrudSchemas(reactive([ isSearch: true }, { - label: '出库事务类型', - field: 'outTransactionType', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '入库事务类型', - field: 'inTransactionType', + label: '任务单号', + field: 'jobNumber', sort: 'custom', table: { width: 150 }, + isSearch: true }, { - label: '执行时间', - field: 'executeTime', + label: '申请时间', + field: 'requestTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -60,8 +54,8 @@ export const ScrapRecordMain = useCrudSchemas(reactive([ }, }, { - label: '生效日期', - field: 'activeDate', + label: '截止时间', + field: 'dueTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -80,8 +74,8 @@ export const ScrapRecordMain = useCrudSchemas(reactive([ }, }, { - label: '申请时间', - field: 'requestTime', + label: '执行时间', + field: 'executeTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -100,8 +94,8 @@ export const ScrapRecordMain = useCrudSchemas(reactive([ }, }, { - label: '截止时间', - field: 'dueTime', + label: '生效日期', + field: 'activeDate', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -120,17 +114,17 @@ export const ScrapRecordMain = useCrudSchemas(reactive([ }, }, { - label: '部门', - field: 'departmentCode', + label: '从仓库代码', + field: 'fromWarehouseCode', sort: 'custom', table: { width: 150 }, }, { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, + label: '从库位类型范围', + field: 'fromLocationTypes', + dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, sort: 'custom', @@ -139,14 +133,28 @@ export const ScrapRecordMain = useCrudSchemas(reactive([ }, }, { - label: '单据号', - field: 'number', + label: '从库区代码范围', + field: 'fromAreaCodes', sort: 'custom', table: { - width: 150, - fixed: 'left' + width: 150 + }, + }, + { + label: '出库事务类型', + field: 'outTransactionType', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '入库事务类型', + field: 'inTransactionType', + sort: 'custom', + table: { + width: 150 }, - isSearch: true }, { label: '业务类型', @@ -157,16 +165,27 @@ export const ScrapRecordMain = useCrudSchemas(reactive([ }, }, { - label: '备注', - field: 'remark', + label: '部门', + field: 'departmentCode', sort: 'custom', table: { width: 150 }, }, { - label: '创建者', - field: 'creator', + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 @@ -192,6 +211,14 @@ export const ScrapRecordMain = useCrudSchemas(reactive([ } }, }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + }, // { // label: '代码', // field: 'code', @@ -200,33 +227,6 @@ export const ScrapRecordMain = useCrudSchemas(reactive([ // width: 150 // }, // }, - { - label: '从仓库代码', - field: 'fromWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '从库位类型范围', - field: 'fromLocationTypes', - dictType: DICT_TYPE.LOCATION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '从库区代码范围', - field: 'fromAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '是否可用', field: 'available', @@ -299,24 +299,40 @@ export const ScrapRecordMainRules = reactive({ */ export const ScrapRecordDetail = useCrudSchemas(reactive([ { - label: '从货主代码', - field: 'fromOwnerCode', + label: '单据号', + field: 'number', sort: 'custom', table: { width: 150 }, }, { - label: '包装号', - field: 'packingNumber', + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '器具号', - field: 'containerNumber', + label: '物品名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 @@ -331,24 +347,46 @@ export const ScrapRecordDetail = useCrudSchemas(reactive([ }, }, { - label: '从库位代码', - field: 'fromLocationCode', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '从库位组代码', - field: 'fromLocationGroupCode', + label: '器具号', + field: 'containerNumber', sort: 'custom', table: { width: 150 }, }, { - label: '从库区代码', - field: 'fromAreaCode', + 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: 'fromLocationCode', sort: 'custom', table: { width: 150 @@ -399,106 +437,79 @@ export const ScrapRecordDetail = useCrudSchemas(reactive([ } }, { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '物品代码', - field: 'itemCode', + label: '从库位组代码', + field: 'fromLocationGroupCode', sort: 'custom', table: { width: 150 }, }, { - label: '备注', - field: 'remark', + label: '从库区代码', + field: 'fromAreaCode', sort: 'custom', table: { width: 150 }, }, { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - }, - { - label: '创建者', - field: 'creator', + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品名称', - field: 'itemName', + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品描述1', - field: 'itemDesc1', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, }, { - label: '物品描述2', - field: 'itemDesc2', + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - }, - { - label: '数量', - field: 'qty', sort: 'custom', table: { - width: 150 + width: 180 }, form: { - component: 'InputNumber', - } + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 @@ -520,17 +531,6 @@ export const ScrapRecordDetail = useCrudSchemas(reactive([ // width: 150 // }, // }, - { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, ])) //表单校验 diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 985413945..86e2f94b2 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -25,38 +25,6 @@ const userDept = userStore.userSelfInfo.dept * @returns {Array} 报废出库申请主表 */ export const ScrapRequestMain = useCrudSchemas(reactive([ - { - label: '从仓库代码', - field: 'fromWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - isForm: false, - }, - { - label: '从库位类型范围', - field: 'fromLocationTypes', - dictType: DICT_TYPE.LOCATION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - isForm: false, - }, - { - label: '从库区代码范围', - field: 'fromAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, { label: '单据号', field: 'number', @@ -69,59 +37,22 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ isSearch: true, }, { - label: '业务类型', - field: 'businessType', + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, sort: 'custom', table: { width: 150 }, form: { - value: 'Scrap', + value: '1', componentProps: { disabled: true } - }, - isForm: false, - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, - }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width: '100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isForm: false, - }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, + } }, { label: '申请时间', @@ -167,67 +98,65 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ }, }, { - label: '部门', - field: 'departmentCode', + label: '从仓库代码', + field: 'fromWarehouseCode', sort: 'custom', table: { width: 150 }, - form: { - value: userDept.name, - componentProps: { - disabled: true - } - } + isSearch: true, + isForm: false, }, { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, + label: '从库位类型范围', + field: 'fromLocationTypes', + dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { width: 150 }, - form: { - value: '1', - componentProps: { - disabled: true - } - } + isSearch: true, + isForm: false, }, { - label: '最后更新时间', - field: 'updateTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + label: '从库区代码范围', + field: 'fromAreaCodes', + sort: 'custom', + table: { + width: 150 }, + isForm: false, + }, + { + label: '业务类型', + field: 'businessType', sort: 'custom', table: { - width: 180 + width: 150 }, form: { - component: 'DatePicker', + value: 'Scrap', componentProps: { - style: {width: '100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + disabled: true } }, isForm: false, }, { - label: '最后更新者', - field: 'updater', + label: '部门', + field: 'departmentCode', sort: 'custom', table: { width: 150 }, - isForm: false, + form: { + value: userDept.name, + componentProps: { + disabled: true + } + } }, { label: '自动提交', @@ -309,6 +238,77 @@ export const ScrapRequestMain = useCrudSchemas(reactive([ } } }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false, + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width: '100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false, + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, { label: '操作', field: 'action', @@ -357,8 +357,30 @@ export const ScrapRequestMainRules = reactive({ */ export const ScrapRequestDetail = useCrudSchemas(reactive([ { - label: '从货主代码', - field: 'fromOwnerCode', + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物品代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '物品名称', + field: 'itemName', sort: 'custom', table: { width: 150 @@ -366,6 +388,34 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false, }, + { + label: '物品描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + }, + { + label: '物品描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '包装号', field: 'packingNumber', @@ -402,12 +452,38 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ }, }, { - label: '批次', - field: 'batch', + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, + tableForm: { + type: 'Select' + } }, { label: '从库位代码', @@ -448,28 +524,8 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ } }, { - label: '物品名称', - field: 'itemName', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, - { - label: '物品描述1', - field: 'itemDesc1', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, - { - label: '物品描述2', - field: 'itemDesc2', + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', table: { width: 150 @@ -477,26 +533,6 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ isTableForm: false, isForm: false, }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - componentProps: { - min: 1, - precision: 6 - } - }, - tableForm: { - type: 'InputNumber', - min: 1, - precision: 6 - } - }, { label: '项目代码', field: 'projectCode', @@ -508,22 +544,16 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - tableForm: { - type: 'Select' - } }, { - label: '最后更新时间', - field: 'updateTime', + label: '创建时间', + field: 'createTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -545,8 +575,8 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ isForm: false }, { - label: '最后更新者', - field: 'updater', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 @@ -555,38 +585,8 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ isForm: false }, { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '物品代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '创建时间', - field: 'createTime', + label: '最后更新时间', + field: 'updateTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -608,8 +608,8 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ isForm: false }, { - label: '创建者', - field: 'creator', + label: '最后更新者', + field: 'updater', sort: 'custom', table: { width: 150