From d14617b49dcd8a8ea52ae45a0120160200b98862 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 13:39:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E7=AE=A1=E7=90=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorychangeRecordMain.data.ts | 382 +++++------ .../inventorychangeRequestMain.data.ts | 540 ++++++++-------- .../inventorymoveJobMain.data.ts | 420 ++++++------ .../inventorymoveRecordMain.data.ts | 378 ++++++----- .../inventorymoveRequestMain.data.ts | 610 +++++++++--------- 5 files changed, 1161 insertions(+), 1169 deletions(-) diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts index f6169244e..46bfbc84f 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts @@ -6,41 +6,35 @@ import { dateFormatter } from '@/utils/formatTime' */ export const InventorychangeRecordMain = useCrudSchemas(reactive([ { - label: '申请单号', - field: 'requestNumber', + label: '单据号', + field: 'number', sort: 'custom', table: { - width: 150 + width: 150, + fixed: 'left' }, isSearch: true }, { - label: '仓库代码', - field: 'warehouseCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '出库事务类型', - field: 'outTransactionType', + label: '申请单号', + field: 'requestNumber', sort: 'custom', table: { width: 150 }, + isSearch: true }, { - label: '入库事务类型', - field: 'inTransactionType', + label: '仓库代码', + field: 'warehouseCode', sort: 'custom', table: { width: 150 }, }, { - label: '执行时间', - field: 'executeTime', + label: '申请时间', + field: 'requestTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -59,8 +53,8 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive([ }, }, { - label: '生效日期', - field: 'activeDate', + label: '截止时间', + field: 'dueTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -79,8 +73,8 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive([ }, }, { - label: '申请时间', - field: 'requestTime', + label: '执行时间', + field: 'executeTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -99,8 +93,8 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive([ }, }, { - label: '截止时间', - field: 'dueTime', + label: '生效日期', + field: 'activeDate', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -119,37 +113,32 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive([ }, }, { - label: '部门', - field: 'departmentCode', + label: '出库事务类型', + field: 'outTransactionType', sort: 'custom', table: { width: 150 }, }, { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - dictClass: 'string', - isTable: true, + label: '入库事务类型', + field: 'inTransactionType', sort: 'custom', table: { width: 150 }, }, { - label: '单据号', - field: 'number', + label: '业务类型', + field: 'businessType', sort: 'custom', table: { - width: 150, - fixed: 'left' + width: 150 }, - isSearch: true }, { - label: '业务类型', - field: 'businessType', + label: '部门', + field: 'departmentCode', sort: 'custom', table: { width: 150 @@ -164,8 +153,11 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive([ }, }, { - label: '创建者', - field: 'creator', + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 @@ -191,6 +183,14 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive([ } }, }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + }, // { // label: '代码', // field: 'code', @@ -269,43 +269,56 @@ export const InventorychangeRecordMainRules = reactive({ */ export const InventorychangeRecordDetail = useCrudSchemas(reactive([ { - label: '库位代码', - field: 'locationCode', + label: '单据号', + field: 'number', sort: 'custom', table: { width: 150 }, }, { - label: '库位组代码', - field: 'locationGroupCode', + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '库区代码', - field: 'areaCode', + label: '物品名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, }, { - label: '从数量', - field: 'fromQty', + label: '物品描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '从货主代码', - field: 'fromOwnerCode', + label: '物品描述2', + field: 'itemDesc2', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从批次', + field: 'fromBatch', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到批次', + field: 'toBatch', sort: 'custom', table: { width: 150 @@ -320,93 +333,66 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive }, }, { - label: '从器具号', - field: 'fromContainerNumber', + label: '到包装号', + field: 'toPackingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '从批次', - field: 'fromBatch', + label: '从器具号', + field: 'fromContainerNumber', sort: 'custom', table: { width: 150 }, }, { - label: '从替代批次', - field: 'fromAltbatch', + label: '到器具号', + field: 'toContainerNumber', sort: 'custom', table: { width: 150 }, }, { - label: '从到货日期', - field: 'fromArriveDate', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '数量', + field: 'qty', sort: 'custom', table: { - width: 180 + width: 150 }, form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, + component: 'InputNumber', + } }, { - label: '从生产日期', - field: 'fromProduceDate', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '从数量', + field: 'fromQty', sort: 'custom', table: { - width: 180 + width: 150 }, form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, + component: 'InputNumber', + } }, { - label: '从过期日期', - field: 'fromExpireDate', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '到数量', + field: 'toQty', sort: 'custom', table: { - width: 180 + width: 150 }, form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, + component: 'InputNumber', + } }, { - label: '从库存状态', - field: 'frominventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, dictClass: 'string', isTable: true, sort: 'custom', @@ -415,43 +401,54 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive }, }, { - label: '到数量', - field: 'toQty', + label: '库位代码', + field: 'locationCode', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '从库存状态', + field: 'fromInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '到包装号', - field: 'toPackingNumber', + label: '到库存状态', + field: 'toInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '到器具号', - field: 'toContainerNumber', + label: '库位组代码', + field: 'locationGroupCode', sort: 'custom', table: { width: 150 }, }, { - label: '到批次', - field: 'toBatch', + label: '库区代码', + field: 'areaCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从替代批次', + field: 'fromAltBatch', sort: 'custom', table: { width: 150 @@ -466,8 +463,8 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive }, }, { - label: '到到货日期', - field: 'toArrivdAte', + label: '从到货日期', + field: 'fromArriveDate', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -486,8 +483,8 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive }, }, { - label: '到生产日期', - field: 'toProduceDate', + label: '到到货日期', + field: 'toArriveDate', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -506,8 +503,8 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive }, }, { - label: '到过期日期', - field: 'toExpireDate', + label: '从生产日期', + field: 'fromProduceDate', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -526,51 +523,28 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive }, }, { - label: '到库存状态', - field: 'toInventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 + label: '到生产日期', + field: 'toProduceDate', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - }, - { - label: '单据号', - field: 'number', sort: 'custom', table: { - width: 150 - }, - }, - { - label: '物品代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 + width: 180 }, - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } }, }, - // { - // label: '任务明细ID', - // field: 'jobDetailId', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, { - label: '创建时间', - field: 'createTime', + label: '从过期日期', + field: 'fromExpireDate', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -589,32 +563,36 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive }, }, { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 + label: '到过期日期', + field: 'toExpireDate', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - }, - { - label: '物品名称', - field: 'itemName', sort: 'custom', table: { - width: 150 + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } }, }, { - label: '物品描述1', - field: 'itemDesc1', + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品描述2', - field: 'itemDesc2', + label: '到货主代码', + field: 'toOwnerCode', sort: 'custom', table: { width: 150 @@ -628,42 +606,64 @@ export const InventorychangeRecordDetail = useCrudSchemas(reactive width: 150 }, }, + // { + // label: '代码', + // field: 'code', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { - label: '数量', - field: 'qty', + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, }, // { - // label: '代码', - // field: 'code', + // label: '任务明细ID', + // field: 'jobDetailId', // sort: 'custom', // table: { // width: 150 // }, // }, { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - dictClass: 'string', - isTable: true, + 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', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index 51e6784bd..f03e461ce 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts @@ -25,15 +25,6 @@ const userDept = userStore.userSelfInfo.dept * @returns {Array} 库存修改申请主表 */ export const InventorychangeRequestMain = useCrudSchemas(reactive([ - { - label: '仓库代码', - field: 'warehouseCode', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, { label: '单据号', field: 'number', @@ -46,48 +37,26 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive( isSearch: true, }, { - label: '业务类型', - field: 'businessType', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, - { - label: '备注', - field: 'remark', + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, 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', + value: '1', componentProps: { - style: { width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + disabled: true } - }, - isForm: false, + } }, { - label: '创建者', - field: 'creator', + label: '仓库代码', + field: 'warehouseCode', sort: 'custom', table: { width: 150 @@ -138,67 +107,36 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive( }, }, { - label: '部门', - field: 'departmentCode', + label: '业务类型', + field: 'businessType', sort: 'custom', table: { width: 150 }, - form: { - value: userDept.name, - componentProps: { - disabled: true - } - } + isForm: false, }, { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, + label: '部门', + field: 'departmentCode', sort: 'custom', table: { width: 150 }, form: { - value: '1', + value: userDept.name, componentProps: { disabled: true } } }, { - 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', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - isForm: false + isTable: false, }, { label: '自动提交', @@ -280,6 +218,68 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive( } } }, + { + 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', @@ -325,8 +325,22 @@ export const InventorychangeRequestMainRules = reactive({ */ export const InventorychangeRequestDetail = useCrudSchemas(reactive([ { - label: '库位代码', - field: 'locationCode', + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 @@ -336,8 +350,8 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150, + fixed: 'left' + }, + isSearch: true, + }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.JOB_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '申请单号', field: 'requestNumber', @@ -32,14 +54,6 @@ export const InventorymoveJobMain = useCrudSchemas(reactive([ } } }, - { - label: '从仓库代码', - field: 'fromWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '申请时间', field: 'requestTime', @@ -80,18 +94,6 @@ export const InventorymoveJobMain = useCrudSchemas(reactive([ } }, }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, { label: '过期时间', field: 'expiredTime', @@ -113,127 +115,37 @@ export const InventorymoveJobMain = useCrudSchemas(reactive([ }, }, { - label: '最后更新时间', - field: 'updateTime', - 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: 'updater', - sort: 'custom', - table: { - width: 150 - }, - }, - // { - // label: '状态', - // field: 'jobStageStatus', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - { - label: '优先级', - field: 'priority', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '优先级增量', - field: 'priorityIncrement', + label: '从仓库代码', + field: 'fromWarehouseCode', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '部门', - field: 'departmentCode', + label: '到仓库代码', + field: 'toWarehouseCode', sort: 'custom', table: { width: 150 }, }, { - label: '承接人', - field: 'acceptUserId', + label: '从库区代码范围', + field: 'fromAreaCodes', sort: 'custom', table: { width: 150 }, }, { - label: '承接时间', - field: 'acceptTime', - 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: 'completeUserId', + label: '到库区代码范围', + field: 'toAreaCodes', 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: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - }, { label: '从库位类型范围', field: 'fromLocationTypes', @@ -259,78 +171,46 @@ export const InventorymoveJobMain = useCrudSchemas(reactive([ }, }, { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150, - fixed: 'left' - }, - isSearch: true, - }, - { - label: '业务类型', - field: 'businessType', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '备注', - field: 'remark', + label: '优先级', + field: 'priority', 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', - } - }, + component: 'InputNumber', + } }, { - label: '创建者', - field: 'creator', + label: '优先级增量', + field: 'priorityIncrement', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '从库区代码范围', - field: 'fromAreaCodes', + label: '业务类型', + field: 'businessType', sort: 'custom', table: { width: 150 }, }, { - label: '到库区代码范围', - field: 'toAreaCodes', + label: '部门', + field: 'departmentCode', sort: 'custom', table: { width: 150 }, }, { - label: '到仓库代码', - field: 'toWarehouseCode', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 @@ -526,6 +406,126 @@ export const InventorymoveJobMain = useCrudSchemas(reactive([ } } }, + { + label: '承接时间', + field: 'acceptTime', + 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: '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: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + 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: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + 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: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + }, + // { + // label: '状态', + // field: 'jobStageStatus', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '操作', field: 'action', @@ -598,153 +598,153 @@ export const InventorymoveJobMainRules = reactive({ */ export const InventorymoveJobDetail = useCrudSchemas(reactive([ { - 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: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '物品描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, }, { - label: '订单号', - field: 'poNumber', + label: '物品描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, }, { - label: '订单行', - field: 'poLine', + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, }, { - label: '从库位代码', - field: 'fromLocationCode', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到库位代码', - field: 'toLocationCode', + label: '器具号', + field: 'containerNumber', sort: 'custom', table: { width: 150 }, }, { - label: '从货主代码', - field: 'fromOwnerCode', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '物品代码', - field: 'itemCode', + label: '从库位代码', + field: 'fromLocationCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品名称', - field: 'itemName', + label: '到库位代码', + field: 'toLocationCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品描述1', - field: 'itemDesc1', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '物品描述2', - field: 'itemDesc2', + label: '订单号', + field: 'poNumber', sort: 'custom', table: { width: 150 }, }, { - label: '项目代码', - field: 'projectCode', + label: '订单行', + field: 'poLine', sort: 'custom', table: { width: 150 }, }, { - label: '数量', - field: 'qty', + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '到货主代码', + field: 'toOwnerCode', sort: 'custom', table: { width: 150 }, }, { - label: '单据号', - field: 'number', + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts index a65383f4d..fb7510f52 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts @@ -5,6 +5,16 @@ import { dateFormatter } from '@/utils/formatTime' * @returns {Array} 库存转移记录主表 */ export const InventorymoveRecordMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150, + fixed: 'left' + }, + isSearch: true + }, { label: '申请单号', field: 'requestNumber', @@ -43,86 +53,8 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ } }, { - label: '从仓库代码', - field: 'fromWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到仓库代码', - field: 'toWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '从库位类型范围', - field: 'fromLocationTypes', - dictType: DICT_TYPE.LOCATION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到库位类型范围', - field: 'toLocationTypes', - dictType: DICT_TYPE.LOCATION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '从库区代码范围', - field: 'fromAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到库区代码范围', - field: 'toAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '出库事务类型', - field: 'outTransactionType', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '出库事务类型', - field: 'outTransactionType', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '入库事务类型', - field: 'inTransactionType', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '执行时间', - field: 'executeTime', + label: '申请时间', + field: 'requestTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -141,8 +73,8 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ }, }, { - label: '生效日期', - field: 'activeDate', + label: '截止时间', + field: 'dueTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -161,8 +93,8 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ }, }, { - label: '申请时间', - field: 'requestTime', + label: '执行时间', + field: 'executeTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -181,8 +113,8 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ }, }, { - label: '截止时间', - field: 'dueTime', + label: '生效日期', + field: 'activeDate', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -201,17 +133,25 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ }, }, { - label: '部门', - field: 'departmentCode', + label: '从仓库代码', + field: 'fromWarehouseCode', sort: 'custom', table: { width: 150 }, }, { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, + label: '到仓库代码', + field: 'toWarehouseCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从库位类型范围', + field: 'fromLocationTypes', + dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', isTable: true, sort: 'custom', @@ -220,14 +160,47 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ }, }, { - label: '单据号', - field: 'number', + label: '到库位类型范围', + field: 'toLocationTypes', + dictType: DICT_TYPE.LOCATION_TYPE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { - width: 150, - fixed: 'left' + width: 150 + }, + }, + { + label: '从库区代码范围', + field: 'fromAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '到库区代码范围', + field: 'toAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '出库事务类型', + field: 'outTransactionType', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '入库事务类型', + field: 'inTransactionType', + sort: 'custom', + table: { + width: 150 }, - isSearch: true }, { label: '业务类型', @@ -238,16 +211,27 @@ export const InventorymoveRecordMain = 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 @@ -273,6 +257,14 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ } }, }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + }, // { // label: '代码', // field: 'code', @@ -363,91 +355,88 @@ export const InventorymoveRecordMainRules = reactive({ */ export const InventorymoveRecordDetail = useCrudSchemas(reactive([ { - label: '在途库库位', - field: 'onTheWayLocationCode', + label: '单据号', + field: 'number', sort: 'custom', table: { width: 150 }, }, { - label: '从货主代码', - field: 'fromOwnerCode', + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '从包装号', - field: 'fromPackingNumber', + label: '物品名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, }, { - label: '从器具号', - field: 'fromContainerNumber', + label: '物品描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, }, { - label: '从批次', - field: 'fromBatch', + label: '物品描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, }, { - label: '从库位代码', - field: 'fromLocationCode', + label: '在途库库位', + field: 'onTheWayLocationCode', sort: 'custom', table: { width: 150 }, }, { - label: '从库位组代码', - field: 'fromLocationGroupCode', + label: '从批次', + field: 'fromBatch', sort: 'custom', table: { width: 150 }, }, { - label: '从库区代码', - field: 'fromAreaCode', + label: '到批次', + field: 'toBatch', sort: 'custom', table: { width: 150 }, }, { - label: '从库存状态', - field: 'fromInventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '从包装号', + field: 'fromPackingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '到包装号', + field: 'toPackingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到包装号', - field: 'toPackingNumber', + label: '从器具号', + field: 'fromContainerNumber', sort: 'custom', table: { width: 150 @@ -462,32 +451,49 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive([ }, }, { - label: '到批次', - field: 'toBatch', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '到库位代码', - field: 'toLocationCode', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '到库位组代码', - field: 'toLocationGroupCode', + label: '从库位代码', + field: 'fromLocationCode', sort: 'custom', table: { width: 150 }, }, { - label: '到库区代码', - field: 'toAreaCode', + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '从库存状态', + field: 'fromInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 @@ -505,114 +511,111 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive([ }, }, { - label: '单据号', - field: 'number', + label: '从库位组代码', + field: 'fromLocationGroupCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品代码', - field: 'itemCode', + label: '到库位组代码', + field: 'toLocationGroupCode', sort: 'custom', table: { width: 150 }, }, { - label: '备注', - field: 'remark', + label: '从库区代码', + field: 'fromAreaCode', sort: 'custom', table: { width: 150 }, }, - // { - // label: '任务明细ID', - // field: 'jobDetailId', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '到库区代码', + field: 'toAreaCode', sort: 'custom', table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + width: 150 }, }, { - label: '创建者', - field: 'creator', + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品名称', - field: 'itemName', + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品描述1', - field: 'itemDesc1', + label: '到货主代码', + field: 'toOwnerCode', 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', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, }, + // { + // label: '任务明细ID', + // field: 'jobDetailId', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { - label: '数量', - field: 'qty', + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, 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 @@ -626,17 +629,6 @@ export const InventorymoveRecordDetail = 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/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index fed7ae4c5..2d7202777 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -28,67 +28,6 @@ const userDept = userStore.userSelfInfo.dept * @returns {Array} 库存转移申请主表 */ export const InventorymoveRequestMain = useCrudSchemas(reactive([ - { - label: '从仓库代码', - field: 'fromWarehouseOde', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, - { - label: '从库位类型范围', - field: 'fromLocationTypes', - dictType: DICT_TYPE.LOCATION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, - { - label: '从库区代码范围', - field: 'fromAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, - { - label: '到仓库代码', - field: 'toWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, - { - label: '到库位类型范围', - field: 'toLocationTypes', - dictType: DICT_TYPE.LOCATION_TYPE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - isForm: false, - }, - { - label: '到库区代码范围', - field: 'toAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, { label: '单据号', field: 'number', @@ -101,32 +40,26 @@ export const InventorymoveRequestMain = 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: 'Move', + value: '1', componentProps: { disabled: true } - }, - isForm: false, - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false, + } }, { - label: '创建时间', - field: 'createTime', + label: '申请时间', + field: 'requestTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -147,17 +80,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ isForm: false, }, { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, - { - label: '申请时间', - field: 'requestTime', + label: '截止时间', + field: 'dueTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -175,91 +99,105 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, - isForm: false, }, { - label: '截止时间', - field: 'dueTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + label: '从仓库代码', + field: 'fromWarehouseOde', + sort: 'custom', + table: { + width: 150 }, + isForm: false, + }, + { + label: '从库位类型范围', + field: 'fromLocationTypes', + dictType: DICT_TYPE.LOCATION_TYPE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { - width: 180 + width: 150 }, - form: { - component: 'DatePicker', - componentProps: { - style: { width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + isForm: false, + }, + { + label: '从库区代码范围', + field: 'fromAreaCodes', + sort: 'custom', + table: { + width: 150 }, + isForm: false, }, { - label: '部门', - field: 'departmentCode', + label: '到仓库代码', + field: 'toWarehouseCode', sort: 'custom', table: { width: 150 }, - form: { - value: userDept.name, - componentProps: { - disabled: true - } - } + isForm: false, }, { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, + label: '到库位类型范围', + field: 'toLocationTypes', + dictType: DICT_TYPE.LOCATION_TYPE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { width: 150 }, + isSearch: true, + isForm: false, + }, + { + label: '到库区代码范围', + field: 'toAreaCodes', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, + { + label: '业务类型', + field: 'businessType', + sort: 'custom', + table: { + width: 150 + }, form: { - value: '1', + value: 'Move', componentProps: { disabled: true } - } + }, + isForm: false, }, { - label: '最后更新时间', - field: 'updateTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '部门', + field: 'departmentCode', sort: 'custom', table: { - width: 180 + width: 150 }, form: { - component: 'DatePicker', + value: userDept.name, componentProps: { - style: { width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + disabled: true } - }, - isForm: false + } }, { - label: '最后更新者', - field: 'updater', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - isForm: false + isTable: false, }, { label: '自动提交', @@ -362,34 +300,96 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ } }, { - label: '操作', - field: 'action', - isDetail: 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: 300, - fixed: 'right' + width: 150 }, - } -])) - -//表单校验 -export const InventorymoveRequestMainRules = reactive({ - // fromWarehouseOde: [ - // { required: true, message: '请选择从仓库代码', trigger: 'change' } - // ], - // fromLocationTypes: [ - // { required: true, message: '请选择从库位类型范围', trigger: 'change' } - // ], - // fromAreaCodes: [ - // { required: true, message: '请选择从库区代码范围', trigger: 'change' } - // ], - // toWarehouseCode: [ - // { required: true, message: '请选择到仓库代码', trigger: 'change' } - // ], - // toLocationTypes: [ - // { required: true, message: '请选择到库位类型范围', trigger: 'change' } - // ], + 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', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } +])) + +//表单校验 +export const InventorymoveRequestMainRules = reactive({ + // fromWarehouseOde: [ + // { required: true, message: '请选择从仓库代码', trigger: 'change' } + // ], + // fromLocationTypes: [ + // { required: true, message: '请选择从库位类型范围', trigger: 'change' } + // ], + // fromAreaCodes: [ + // { required: true, message: '请选择从库区代码范围', trigger: 'change' } + // ], + // toWarehouseCode: [ + // { required: true, message: '请选择到仓库代码', trigger: 'change' } + // ], + // toLocationTypes: [ + // { required: true, message: '请选择到库位类型范围', trigger: 'change' } + // ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } ], @@ -418,8 +418,74 @@ export const InventorymoveRequestMainRules = reactive({ */ export const InventorymoveRequestDetail = 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 + }, + tableForm: { + disabled: true + } + }, + { + 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', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + }, + { + label: '从批次', + field: 'fromBatch', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '到批次', + field: 'toBatch', sort: 'custom', table: { width: 150 @@ -454,6 +520,16 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( } } }, + { + label: '到包装号', + field: 'toPackingNumber', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false, + }, { label: '从器具号', field: 'fromContainerNumber', @@ -466,31 +542,39 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( } }, { - label: '从批次', - field: 'fromBatch', + label: '到器具号', + field: 'toContainerNumber', sort: 'custom', table: { width: 150 }, - tableForm: { - disabled: true - } + isTableForm: false, + isForm: false, }, { - label: '从库位代码', - field: 'fromLocationCode', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + } + }, tableForm: { - disabled: true + type: 'InputNumber', + min: 1, + precision: 6 } }, { - label: '从库存状态', - field: 'fromInventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, dictClass: 'string', isTable: true, sort: 'custom', @@ -498,49 +582,19 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm: { - disabled: true, type: 'Select' } }, { - label: '到货主代码', - field: 'toOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, - { - label: '到包装号', - field: 'toPackingNumber', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, - { - label: '到器具号', - field: 'toContainerNumber', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, - { - label: '到批次', - field: 'toBatch', + label: '从库位代码', + field: 'fromLocationCode', sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, + tableForm: { + disabled: true + } }, { label: '到库位代码', @@ -580,8 +634,8 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( } }, { - label: '到库存状态', - field: 'toInventoryStatus', + label: '从库存状态', + field: 'fromInventoryStatus', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', isTable: true, @@ -590,78 +644,27 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm: { + disabled: true, type: 'Select' - }, - }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - form: { - componentProps: { - disabled: true - } } }, { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: 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', - } - }, - isTableForm: false, - isForm: false - }, - { - label: '物品代码', - field: 'itemCode', + label: '到库存状态', + field: 'toInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, tableForm: { - disabled: true - } + type: 'Select' + }, }, { - label: '物品名称', - field: 'itemName', + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', table: { width: 150 @@ -670,8 +673,8 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( isForm: false, }, { - label: '物品描述1', - field: 'itemDesc1', + label: '到货主代码', + field: 'toOwnerCode', sort: 'custom', table: { width: 150 @@ -680,8 +683,8 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( isForm: false, }, { - label: '物品描述2', - field: 'itemDesc2', + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 @@ -690,52 +693,39 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( isForm: false, }, { - label: '项目代码', - field: 'projectCode', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, }, { - label: '数量', - field: 'qty', + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, sort: 'custom', table: { - width: 150 + width: 180 }, form: { - component: 'InputNumber', + component: 'DatePicker', componentProps: { - min: 1, - precision: 6 + style: { width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } }, - 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' - } + isTableForm: false, + isForm: false }, { - label: '最后更新者', - field: 'updater', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 @@ -766,6 +756,16 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( isTableForm: false, isForm: false }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + isForm: false + }, { label: '操作', field: 'action',