From e5169bf41dd836ee299a08d7f9631a0158e8e410 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 17:50:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E9=A1=B5=E9=9D=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=98=BE=E7=A4=BA=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 --- .../deliverJobMain/deliverJobMain.data.ts | 436 +++++++------- .../deliverRecordMain.data.ts | 366 ++++++------ .../deliverRequestMain.data.ts | 538 +++++++++--------- 3 files changed, 670 insertions(+), 670 deletions(-) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts index cdc7594be..1e0521c4c 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts @@ -5,6 +5,28 @@ import { dateFormatter } from '@/utils/formatTime' * @returns {Array} 发货任务主表 */ export const DeliverJobMain = 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', @@ -78,22 +100,6 @@ export const DeliverJobMain = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '从仓库代码', - field: 'fromWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到仓库代码', - field: 'toWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '申请时间', field: 'requestTime', @@ -134,18 +140,6 @@ export const DeliverJobMain = useCrudSchemas(reactive([ } }, }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, { label: '过期时间', field: 'expiredTime', @@ -167,127 +161,21 @@ export const DeliverJobMain = 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', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '部门', - field: 'departmentCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '承接人', - field: 'acceptUserId', + label: '从仓库代码', + field: 'fromWarehouseCode', 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: 'toWarehouseCode', 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', @@ -311,78 +199,70 @@ export const DeliverJobMain = useCrudSchemas(reactive([ }, }, { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150, - fixed: 'left' - }, - isSearch: true, - }, - { - label: '业务类型', - field: 'businessType', + label: '从库区代码范围', + field: 'fromAreaCodes', sort: 'custom', table: { width: 150 }, }, { - label: '备注', - field: 'remark', + label: '到库区代码范围', + field: 'toAreaCodes', sort: 'custom', table: { width: 150 }, }, { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '从月台代码', + field: 'fromDockCode', sort: 'custom', table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + width: 150 }, }, + // { + // label: '状态', + // field: 'jobStageStatus', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { - label: '创建者', - field: 'creator', + label: '优先级', + field: 'priority', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '从库区代码范围', - field: 'fromAreaCodes', + label: '优先级增量', + field: 'priorityIncrement', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '到库区代码范围', - field: 'toAreaCodes', + label: '业务类型', + field: 'businessType', sort: 'custom', table: { width: 150 }, }, { - label: '从月台代码', - field: 'fromDockCode', + label: '部门', + field: 'departmentCode', sort: 'custom', table: { width: 150 @@ -578,6 +458,126 @@ export const DeliverJobMain = useCrudSchemas(reactive([ } } }, + { + label: '备注', + field: 'remark', + 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: '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: 'action', @@ -659,145 +659,145 @@ export const DeliverJobMainRules = reactive({ */ export const DeliverJobDetail = useCrudSchemas(reactive([ { - label: '销售订单号', - field: 'soNumber', + label: '单据号', + field: 'number', sort: 'custom', table: { width: 150 }, }, { - label: '销售订单行', - field: 'soLine', + label: '销售订单号', + field: 'soNumber', sort: 'custom', table: { width: 150 }, }, { - label: '包装号', - field: 'packingNumber', + label: '销售订单行', + field: 'soLine', sort: 'custom', table: { width: 150 }, }, { - label: '器具号', - field: 'containerNumber', + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '货主代码', - field: 'ownerCode', + label: '物品名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, }, { - label: '批次', - field: 'batch', + 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: 'fromLocationCode', + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, }, { - label: '到库位代码', - field: 'toLocationCode', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '物品代码', - field: 'itemCode', + label: '器具号', + field: 'containerNumber', sort: 'custom', table: { width: 150 }, }, { - label: '物品名称', - field: 'itemName', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '物品描述1', - field: 'itemDesc1', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '物品描述2', - field: 'itemdesc2', + label: '从库位代码', + field: 'fromLocationCode', sort: 'custom', table: { width: 150 }, }, { - label: '项目代码', - field: 'projectCode', + label: '到库位代码', + field: 'toLocationCode', 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, - dictClass: 'string', - isTable: true, + label: '货主代码', + field: 'ownerCode', sort: 'custom', table: { width: 150 }, }, { - label: '单据号', - field: 'number', + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index d83a7afa0..760683832 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -5,6 +5,16 @@ import { dateFormatter } from '@/utils/formatTime' * @returns {Array} 发货记录主表 */ export const DeliverRecordMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150, + fixed: 'left' + }, + isSearch: true + }, { label: '申请单号', field: 'requestNumber', @@ -80,40 +90,8 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从仓库代码', - field: 'fromWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到仓库代码', - field: 'toWarehouseCode', - 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' @@ -132,8 +110,8 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ }, }, { - label: '生效日期', - field: 'activeDate', + label: '截止时间', + field: 'dueTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -152,8 +130,8 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ }, }, { - label: '申请时间', - field: 'requestTime', + label: '执行时间', + field: 'executeTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -172,8 +150,8 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ }, }, { - label: '截止时间', - field: 'dueTime', + label: '生效日期', + field: 'activeDate', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -192,17 +170,25 @@ export const DeliverRecordMain = 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', @@ -211,90 +197,76 @@ export const DeliverRecordMain = 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 }, - isSearch: true }, { - label: '业务类型', - field: 'businessType', + label: '从库区代码范围', + field: 'fromAreaCodes', sort: 'custom', table: { width: 150 }, }, { - label: '备注', - field: 'remark', + label: '到库区代码范围', + field: 'toAreaCodes', sort: 'custom', table: { width: 150 }, }, { - label: '创建者', - field: 'creator', + label: '从月台代码', + field: 'fromDockCode', sort: 'custom', table: { width: 150 }, }, { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '出库事务类型', + field: 'outTransactionType', sort: 'custom', table: { - width: 180 + width: 150 }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + }, + { + label: '入库事务类型', + field: 'inTransactionType', + sort: 'custom', + table: { + width: 150 }, }, - // { - // label: '代码', - // field: 'code', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, { - label: '从库位类型范围', - field: 'fromLocationTypes', - dictType: DICT_TYPE.LOCATION_TYPE, - dictClass: 'string', - isTable: true, + label: '业务类型', + field: 'businessType', sort: 'custom', table: { width: 150 }, }, { - label: '从库区代码范围', - field: 'fromAreaCodes', + label: '部门', + field: 'departmentCode', sort: 'custom', table: { width: 150 }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', isTable: true, sort: 'custom', @@ -303,21 +275,49 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ }, }, { - label: '到库区代码范围', - field: 'toAreaCodes', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, }, { - label: '从月台代码', - field: 'fromDockCode', + 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: 'code', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '是否可用', field: 'available', @@ -405,6 +405,14 @@ export const DeliverRecordMainRules = reactive({ * @returns {Array} 发货记录子表 */ export const DeliverRecordDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '销售订单号', field: 'soNumber', @@ -422,235 +430,238 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ }, }, { - label: '包装号', - field: 'packingNumber', + 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: 'fromOwnerCode', + label: '物品描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, }, { - label: '从器具号', - field: 'fromContainerNumber', + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 }, }, { - label: '从库位代码', - field: 'fromLocationCode', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '从库位组代码', - field: 'fromLocationGroupCode', + label: '从器具号', + field: 'fromContainerNumber', sort: 'custom', table: { width: 150 }, }, { - label: '从库区代码', - field: 'fromAreaCode', + label: '到器具号', + field: 'toContainerNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '到器具号', - field: 'toContainerNumber', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '到库位代码', - field: 'toLocationCode', + label: '从库位代码', + field: 'fromLocationCode', sort: 'custom', table: { width: 150 }, }, { - label: '到库位组代码', - field: 'toLocationGroupCode', + label: '到库位代码', + field: 'toLocationCode', sort: 'custom', table: { width: 150 }, }, { - label: '到库区代码', - field: 'toAreaCode', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '单价', - field: 'singlePrice', + label: '从库位组代码', + field: 'fromLocationGroupCode', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '金额', - field: 'amount', + label: '到库位组代码', + field: 'toLocationGroupCode', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '单据号', - field: 'number', + label: '从库区代码', + field: 'fromAreaCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品代码', - field: 'itemCode', + label: '到库区代码', + field: 'toAreaCode', sort: 'custom', table: { width: 150 }, }, { - label: '备注', - field: 'remark', + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', table: { width: 150 }, }, { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '到货主代码', + field: 'toOwnerCode', 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: 'singlePrice', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '物品描述1', - field: 'itemDesc1', + label: '金额', + field: 'amount', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '物品描述2', - field: 'itemDesc2', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, }, { - label: '项目代码', - field: 'projectCode', + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, + dictClass: 'string', + isTable: true, 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 @@ -672,17 +683,6 @@ export const DeliverRecordDetail = 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/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 3fabd513f..ab0973b28 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -41,6 +41,35 @@ const userDept = userStore.userSelfInfo.dept * @returns {Array} 发货申请主表 */ export const DeliverRequestMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150, + fixed: 'left' + }, + isForm: false, + isSearch: true, + }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + value: '1', + componentProps: { + disabled: true + } + } + }, { label: '发货计划单号', field: 'deliverPlanNumber', @@ -166,6 +195,49 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '申请时间', + field: 'requestTime', + 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: 'dueTime', + 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', + } + }, + }, { label: '从仓库代码', field: 'fromWarehouseCode', @@ -235,17 +307,6 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150, - fixed: 'left' - }, - isForm: false, - isSearch: true, - }, { label: '业务类型', field: 'businessType', @@ -261,89 +322,6 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ }, 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: '申请时间', - field: 'requestTime', - 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: 'dueTime', - 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', - } - }, - }, { label: '部门', field: 'departmentCode', @@ -358,55 +336,6 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ } } }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - value: '1', - 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', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - }, { label: '自动提交', field: 'autoCommit', @@ -488,16 +417,87 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ } }, { - label: '操作', - field: 'action', - isDetail: 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: 300, - fixed: 'right' + 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', + isDetail: false, + isForm: false, + table: { + width: 300, + fixed: 'right' + }, + } +])) //表单校验 export const DeliverRequestMainRules = reactive({ @@ -549,6 +549,20 @@ export const DeliverRequestMainRules = reactive({ * @returns {Array} 发货申请子表 */ export const DeliverRequestDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } + }, { label: '销售订单号', field: 'soNumber', @@ -624,54 +638,75 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ } }, { - label: '包装号', - field: 'packingNumber', + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物品代码', + searchField: 'code', + searchTitle: '物品基础信息', + searchAllSchemas: Itembasic.allSchemas, + searchPage: ItembasicApi.getItembasicPage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择物品代码', + searchField: 'code', + searchTitle: '物品基础信息', + searchAllSchemas: Itembasic.allSchemas, + searchPage: ItembasicApi.getItembasicPage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + } }, { - label: '器具号', - field: 'containerNumber', + label: '物品名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, - isTableForm: false, isForm: false, + isTableForm: false }, { - label: '批次', - field: 'batch', + label: '物品描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - isTableForm: false, isForm: false, + isTableForm: false }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '物品描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, - tableForm: { - type: 'Select' - }, - isTableForm: false, isForm: false, + isTableForm: false }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '批次', + field: 'batch', sort: 'custom', table: { width: 150 @@ -680,8 +715,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: '到库位代码', - field: 'toLocationCode', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 @@ -690,100 +725,78 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ isForm: false, }, { - label: '单据号', - field: 'number', + label: '器具号', + field: 'containerNumber', sort: 'custom', table: { width: 150 }, isTableForm: false, - form: { - componentProps: { - disabled: true - } - } + isForm: false, }, { - label: '物品代码', - field: 'itemCode', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, - tableForm:{ - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物品代码', - searchField: 'code', - searchTitle: '物品基础信息', - searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] - }, form: { - // labelMessage: '信息提示说明！！！', + component: 'InputNumber', componentProps: { - isSearchList: true, - searchListPlaceholder: '请选择物品代码', - searchField: 'code', - searchTitle: '物品基础信息', - searchAllSchemas: Itembasic.allSchemas, - searchPage: ItembasicApi.getItembasicPage, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }] + min: 1, + precision: 6 } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 } }, { - label: '备注', - field: 'remark', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, + tableForm: { + type: 'Select' + } }, { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '到库位代码', + field: 'toLocationCode', sort: 'custom', table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + width: 150 }, isTableForm: false, - isForm: false + isForm: false, }, { - label: '创建者', - field: 'creator', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, + tableForm: { + type: 'Select' + }, isTableForm: false, - isForm: false + isForm: false, }, { - label: '物品名称', - field: 'itemName', + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 @@ -792,8 +805,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ isTableForm: false }, { - label: '物品描述1', - field: 'itemDesc1', + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', table: { width: 150 @@ -802,68 +815,55 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ isTableForm: false }, { - label: '物品描述2', - field: 'itemDesc2', + label: '到货主代码', + field: 'toOwnerCode', sort: 'custom', table: { width: 150 }, + isTableForm: false, isForm: false, - isTableForm: false }, { - label: '项目代码', - field: 'projectCode', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - isForm: false, - isTableForm: 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: 'fromOwnerCode', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, - isForm: false, - isTableForm: false + isTableForm: false, + isForm: false }, { label: '最后更新时间',