diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts index 67c835403..ff8e7a8f7 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts @@ -5,6 +5,16 @@ import { dateFormatter } from '@/utils/formatTime' * @returns {Array} 客户收货记录主表 */ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150, + fixed: 'left' + }, + isSearch: true + }, { label: '申请单号', field: 'requestNumber', @@ -71,40 +81,8 @@ export const CustomerreceiptRecordMain = 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' @@ -123,8 +101,8 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ }, }, { - label: '生效日期', - field: 'activeDate', + label: '截止时间', + field: 'dueTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -143,8 +121,8 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ }, }, { - label: '申请时间', - field: 'requestTime', + label: '执行时间', + field: 'executeTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -163,8 +141,8 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ }, }, { - label: '截止时间', - field: 'dueTime', + label: '生效日期', + field: 'activeDate', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -183,17 +161,25 @@ export const CustomerreceiptRecordMain = 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', @@ -202,71 +188,68 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ }, }, { - label: '单据号', - field: 'number', + label: '从库区代码范围', + field: 'fromAreaCodes', sort: 'custom', table: { - width: 150, - fixed: 'left' + width: 150 }, - isSearch: true }, { - label: '业务类型', - field: 'businessType', + label: '到库位类型范围', + field: 'toLocationTypes', + dictType: DICT_TYPE.LOCATION_TYPE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '备注', - field: 'remark', + label: '到库区代码范围', + field: 'toAreaCodes', sort: 'custom', table: { width: 150 }, }, { - label: '创建者', - field: 'creator', + label: '出库事务类型', + field: 'outTransactionType', sort: 'custom', table: { width: 150 }, }, { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + label: '入库事务类型', + field: 'inTransactionType', + sort: 'custom', + table: { + width: 150 }, + }, + { + label: '业务类型', + field: 'businessType', sort: 'custom', table: { - width: 180 + width: 150 }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } + }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + table: { + width: 150 }, }, - // { - // label: '代码', - // field: 'code', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, { - label: '从库位类型范围', - field: 'fromLocationTypes', - dictType: DICT_TYPE.LOCATION_TYPE, + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', isTable: true, sort: 'custom', @@ -275,32 +258,49 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ }, }, { - label: '从库区代码范围', - field: 'fromAreaCodes', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, }, { - label: '到库位类型范围', - field: 'toLocationTypes', - dictType: DICT_TYPE.LOCATION_TYPE, - dictClass: 'string', - isTable: true, + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, sort: 'custom', table: { - width: 150 + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } }, }, { - label: '到库区代码范围', - field: 'toAreaCodes', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, }, + // { + // label: '代码', + // field: 'code', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '是否可用', field: 'available', @@ -389,251 +389,239 @@ export const CustomerreceiptRecordMainRules = reactive({ */ export const CustomerreceiptRecordDetail = 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: 'fromBatch', + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '物品名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, }, { - label: '从货主代码', - field: 'fromOwnerCode', + label: '物品描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, }, { - label: '从器具号', - field: 'fromContainerNumber', + label: '物品描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, }, { - label: '从库位代码', - field: 'fromLocationCode', + label: '从批次', + field: 'fromBatch', sort: 'custom', table: { width: 150 }, }, { - label: '从库位组代码', - field: 'fromLocationGroupCode', + label: '到批次', + field: 'toBatch', sort: 'custom', table: { width: 150 }, }, { - label: '从库区代码', - field: 'fromAreaCode', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '从包装号', + field: 'fromPackingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到器具号', - field: 'toContainerNumber', + label: '到包装号', + field: 'toPackingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到库位代码', - field: 'toLocationCode', + label: '从器具号', + field: 'fromContainerNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到库位组代码', - field: 'toLocationGroupCode', + label: '到器具号', + field: 'toContainerNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到库区代码', - field: 'toAreaCode', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '单价', - field: 'singlePrice', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '金额', - field: 'amount', + label: '从库位代码', + field: 'fromLocationCode', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '单据号', - field: 'number', + label: '到库位代码', + field: 'toLocationCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品代码', - field: 'itemCode', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '备注', - field: 'remark', + label: '单价', + field: 'singlePrice', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '金额', + field: 'amount', sort: 'custom', table: { width: 150 }, form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, + component: 'InputNumber', + } }, { - label: '创建者', - field: 'creator', + label: '从库位组代码', + field: 'fromLocationGroupCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品名称', - field: 'itemName', + label: '到库位组代码', + field: 'toLocationGroupCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品描述1', - field: 'itemDesc1', + label: '从库区代码', + field: 'fromAreaCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品描述2', - field: 'itemDesc2', + label: '到库区代码', + field: 'toAreaCode', sort: 'custom', table: { width: 150 }, }, { - label: '项目代码', - field: 'projectCode', + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', table: { width: 150 }, }, { - label: '数量', - field: 'qty', + label: '到货主代码', + field: 'toOwnerCode', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 @@ -667,29 +655,41 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '从包装号', - field: 'fromPackingNumber', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, }, { - label: '到包装号', - field: 'toPackingNumber', + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, sort: 'custom', table: { width: 150 }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, }, { - label: '到批次', - field: 'toBatch', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, - } + }, ])) //表单校验 diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts index b85d8f26c..ab8ee6664 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts @@ -21,6 +21,35 @@ const userDept = userStore.userSelfInfo.dept * @returns {Array} 客户收货申请主表 */ export const CustomerreceiptRequestMain = 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: 'deliverRequestNumber', @@ -79,6 +108,46 @@ export const CustomerreceiptRequestMain = 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: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '截止时间', + field: 'dueTime', + 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: 'fromWarehouseCode', @@ -139,17 +208,6 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( width: 150 }, }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150, - fixed: 'left' - }, - isForm: false, - isSearch: true, - }, { label: '业务类型', field: 'businessType', @@ -159,93 +217,6 @@ export const CustomerreceiptRequestMain = 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: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isForm: false - }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isForm: false - }, - { - label: '申请时间', - field: 'requestTime', - 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: 'dueTime', - 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: 'departmentCode', @@ -261,52 +232,13 @@ export const CustomerreceiptRequestMain = 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: { - 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: '自动提交', @@ -388,6 +320,74 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( } } }, + { + 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', + } + }, + isForm: false + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false + }, + { + 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', + } + }, + isForm: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isForm: false + }, { label: '操作', field: 'action', @@ -448,17 +448,22 @@ export const CustomerreceiptRequestMainRules = reactive({ */ export const CustomerreceiptRequestDetail = useCrudSchemas(reactive([ { - label: '销售订单号', - field: 'soNumber', + label: '单据号', + field: 'number', sort: 'custom', - isForm: false, table: { width: 150 }, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } }, { - label: '销售订单行', - field: 'soLine', + label: '销售订单号', + field: 'soNumber', sort: 'custom', isForm: false, table: { @@ -466,187 +471,182 @@ export const CustomerreceiptRequestDetail = 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', @@ -79,22 +101,6 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '从仓库代码', - field: 'fromWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到仓库代码', - field: 'toWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '申请时间', field: 'requestTime', @@ -135,18 +141,6 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ } }, }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.JOB_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, { label: '过期时间', field: 'expiredTime', @@ -168,127 +162,21 @@ export const CustomerreturnJobMain = 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,79 +199,79 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ width: 150 }, }, + // { + // label: '状态', + // field: 'jobStageStatus', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { - label: '单据号', - field: 'number', + label: '从库区代码范围', + field: 'fromAreaCodes', sort: 'custom', table: { - width: 150, - fixed: 'left' + width: 150 }, - isSearch: true, }, { - label: '业务类型', - field: 'businessType', + label: '到库区代码范围', + field: 'toAreaCodes', sort: 'custom', table: { width: 150 }, }, { - label: '备注', - field: 'remark', + label: '到月台代码', + field: 'toDockCode', sort: 'custom', table: { width: 150 }, }, { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '优先级', + field: 'priority', 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: '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: 'toDockCode', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 @@ -579,6 +467,118 @@ export const CustomerreturnJobMain = 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: 'action', @@ -663,145 +663,145 @@ export const CustomerreturnJobMainRules = reactive({ */ export const CustomerreturnJobDetail = 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: 'projectCode', sort: 'custom', table: { width: 150 }, }, { - label: '单据号', - field: 'number', + label: '货主代码', + field: 'ownerCode', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts index 8376c7024..5b750ec96 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts @@ -5,6 +5,16 @@ import { dateFormatter } from '@/utils/formatTime' * @returns {Array} 客户退货记录主表 */ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150, + fixed: 'left' + }, + isSearch: true + }, { label: '申请单号', field: 'requestNumber', @@ -80,40 +90,8 @@ export const CustomerreturnRecordMain = 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 CustomerreturnRecordMain = useCrudSchemas(reactive([ }, }, { - label: '生效日期', - field: 'activeDate', + label: '截止时间', + field: 'dueTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -152,8 +130,8 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ }, }, { - label: '申请时间', - field: 'requestTime', + label: '执行时间', + field: 'executeTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -172,8 +150,8 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ }, }, { - label: '截止时间', - field: 'dueTime', + label: '生效日期', + field: 'activeDate', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -192,17 +170,25 @@ export const CustomerreturnRecordMain = 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 CustomerreturnRecordMain = useCrudSchemas(reactive([ }, }, { - label: '单据号', - field: 'number', + label: '从库区代码范围', + field: 'fromAreaCodes', sort: 'custom', table: { - width: 150, - fixed: 'left' + width: 150 }, - isSearch: true }, { - label: '业务类型', - field: 'businessType', + label: '到库位类型范围', + field: 'toLocationTypes', + dictType: DICT_TYPE.LOCATION_TYPE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '备注', - field: 'remark', + label: '到库区代码范围', + field: 'toAreaCodes', sort: 'custom', table: { width: 150 }, }, { - label: '创建者', - field: 'creator', + label: '到月台代码', + field: 'toDockCode', 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 CustomerreturnRecordMain = useCrudSchemas(reactive([ }, }, { - label: '到库区代码范围', - field: 'toAreaCodes', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, }, { - label: '到月台代码', - field: 'toDockCode', + 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', @@ -409,237 +409,228 @@ export const CustomerreturnRecordMainRules = reactive({ */ export const CustomerreturnRecordDetail = 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: 'fromBatch', + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '物品名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, }, { - label: '从货主代码', - field: 'fromOwnerCode', + label: '物品描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, }, { - label: '从器具号', - field: 'fromContainerNumber', + label: '物品描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, }, { - label: '从库位代码', - field: 'fromLocationCode', + label: '从批次', + field: 'fromBatch', sort: 'custom', table: { width: 150 }, }, { - label: '从库位组代码', - field: 'fromLocationGroupCode', + label: '到批次', + field: 'toBatch', sort: 'custom', table: { width: 150 }, }, { - label: '从库区代码', - field: 'fromAreaCode', + label: '从包装号', + field: 'fromPackingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '到包装号', + field: 'toPackingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到器具号', - field: 'toContainerNumber', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到库位代码', - field: 'toLocationCode', + label: '从器具号', + field: 'fromContainerNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到库位组代码', - field: 'toLocationGroupCode', + label: '到器具号', + field: 'toContainerNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到库区代码', - field: 'toAreaCode', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '单价', - field: 'singlePrice', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '金额', - field: 'amount', + label: '从库位代码', + field: 'fromLocationCode', sort: 'custom', table: { width: 150 }, - form: { - component: 'InputNumber', - } }, { - label: '单据号', - field: 'number', + label: '到库位代码', + field: 'toLocationCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品代码', - field: 'itemCode', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '备注', - field: 'remark', + label: '从库位组代码', + field: 'fromLocationGroupCode', sort: 'custom', table: { width: 150 }, }, { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '到库位组代码', + field: 'toLocationGroupCode', 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: 'fromAreaCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品名称', - field: 'itemName', + label: '到库区代码', + field: 'toAreaCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品描述1', - field: 'itemDesc1', + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品描述2', - field: 'itemDesc2', + label: '到货主代码', + field: 'toOwnerCode', sort: 'custom', table: { width: 150 }, }, { - label: '项目代码', - field: 'projectCode', + label: '单价', + field: 'singlePrice', sort: 'custom', table: { width: 150 }, + form: { + component: 'InputNumber', + } }, { - label: '数量', - field: 'qty', + label: '金额', + field: 'amount', sort: 'custom', table: { width: 150 @@ -649,11 +640,8 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( } }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 @@ -687,29 +675,41 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( }, }, { - label: '从包装号', - field: 'fromPackingNumber', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, }, { - label: '到包装号', - field: 'toPackingNumber', + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, sort: 'custom', table: { - width: 150 + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } }, }, { - label: '到批次', - field: 'toBatch', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, - } + }, ])) //表单校验 diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index a00b4cbdb..b8e44fea6 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -35,6 +35,35 @@ const userDept = userStore.userSelfInfo.dept * @returns {Array} 客户退货申请主表 */ export const CustomerreturnRequestMain = 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', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + value: '1', + componentProps: { + disabled: true + } + }, + isSearch: true, + }, { label: '发货记录单号', field: 'deliverRecordNumber', @@ -108,6 +137,49 @@ export const CustomerreturnRequestMain = 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', @@ -177,17 +249,6 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150, - fixed: 'left' - }, - isForm: false, - isSearch: true, - }, { label: '业务类型', field: 'businessType', @@ -203,89 +264,6 @@ export const CustomerreturnRequestMain = 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', @@ -301,53 +279,13 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ } }, { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - value: '1', - componentProps: { - disabled: true - } - }, - isSearch: 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: '自动提交', @@ -429,6 +367,68 @@ export const CustomerreturnRequestMain = 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', @@ -491,6 +491,20 @@ export const CustomerreturnRequestMainRules = reactive({ * @returns {Array} 客户退货申请子表 */ export const CustomerreturnRequestDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } + }, { label: '销售订单号', field: 'soNumber', @@ -565,6 +579,68 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive } } }, + { + label: '物品代码', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + 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: 'batch', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '包装号', field: 'packingNumber', @@ -609,25 +685,29 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive } }, { - label: '批次', - field: 'batch', + label: '数量', + field: 'qty', sort: 'custom', table: { width: 150 }, - tableForm: { - disabled: true - }, form: { + component: 'InputNumber', componentProps: { - disabled: true + min: 1, + precision: 6 } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 } }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, dictClass: 'string', isTable: true, sort: 'custom', @@ -635,13 +715,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive width: 150 }, tableForm: { - disabled: true, type: 'Select' - }, - form: { - componentProps: { - disabled: true - } } }, { @@ -698,28 +772,18 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive } }, { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '物品代码', - field: 'itemCode', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, tableForm: { - disabled: true + disabled: true, + type: 'Select' }, form: { componentProps: { @@ -728,40 +792,8 @@ export const CustomerreturnRequestDetail = 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', - } - }, - isTableForm: false, - isForm: false - }, - { - label: '创建者', - field: 'creator', + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 @@ -770,8 +802,8 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive isForm: false }, { - label: '物品名称', - field: 'itemName', + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', table: { width: 150 @@ -780,8 +812,8 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive isForm: false }, { - label: '物品描述1', - field: 'itemDesc1', + label: '到货主代码', + field: 'toOwnerCode', sort: 'custom', table: { width: 150 @@ -790,72 +822,40 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive isForm: false }, { - label: '物品描述2', - field: 'itemDesc2', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - isTableForm: false, - isForm: false + isTable: false }, { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - isTableForm: false, - isForm: false - }, - { - label: '数量', - field: 'qty', 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' - } - }, - { - label: '从货主代码', - field: 'fromOwnerCode', - sort: 'custom', - table: { - width: 150 - }, isTableForm: false, isForm: false }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts index a708a5ac3..39652a8ed 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRecordMain/customersettleRecordMain.data.ts @@ -5,6 +5,16 @@ import { dateFormatter } from '@/utils/formatTime' * @returns {Array} 客户结算记录主表 */ export const CustomersettleRecordMain = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150, + fixed: 'left' + }, + isSearch: true + }, { label: '申请单号', field: 'requestNumber', @@ -40,32 +50,8 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive([ isSearch: true }, { - label: '从仓库代码', - field: 'fromWarehouseCode', - 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' @@ -84,8 +70,8 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive([ }, }, { - label: '生效日期', - field: 'activeDate', + label: '截止时间', + field: 'dueTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -104,8 +90,8 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive([ }, }, { - label: '申请时间', - field: 'requestTime', + label: '执行时间', + field: 'executeTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -124,8 +110,8 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive([ }, }, { - label: '截止时间', - field: 'dueTime', + label: '生效日期', + field: 'activeDate', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -144,17 +130,17 @@ export const CustomersettleRecordMain = 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', @@ -163,14 +149,28 @@ export const CustomersettleRecordMain = 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: '业务类型', @@ -181,16 +181,27 @@ export const CustomersettleRecordMain = 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 @@ -216,6 +227,14 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive([ } }, }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + }, // { // label: '代码', // field: 'code', @@ -224,25 +243,6 @@ export const CustomersettleRecordMain = useCrudSchemas(reactive([ // 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', @@ -321,6 +321,14 @@ export const CustomersettleRecordMainRules = reactive({ * @returns {Array} 客户结算记录子表 */ export const CustomersettleRecordDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '销售订单号', field: 'soNumber', @@ -338,16 +346,32 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive( }, }, { - label: '货主代码', - field: 'ownerCode', + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '包装号', - field: 'packingNumber', + 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 @@ -362,9 +386,28 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive( }, }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, + label: '包装号', + field: 'packingNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + } + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, dictClass: 'string', isTable: true, sort: 'custom', @@ -380,6 +423,17 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive( width: 150 }, }, + { + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + }, { label: '从库位组代码', field: 'fromLocationGruopCode', @@ -419,16 +473,26 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive( } }, { - label: '单据号', - field: 'number', + label: '货主代码', + field: 'ownerCode', sort: 'custom', table: { width: 150 }, }, { - label: '物品代码', - field: 'itemCode', + label: '项目代码', + field: 'projectCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '接口类型', + field: 'interfaceType', + dictType: DICT_TYPE.INTERFACE_TYPE, + isTable: true, sort: 'custom', table: { width: 150 @@ -450,16 +514,6 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive( // width: 150 // }, // }, - { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, // { // label: '任务明细ID', // field: 'jobDetailId', @@ -496,60 +550,6 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive( width: 150 }, }, - { - 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 - }, - }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '数量', - field: 'qty', - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'InputNumber', - } - }, - { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, { label: '最后更新时间', field: 'updateTime', diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts index 434690df8..7f18d28e9 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts @@ -26,6 +26,35 @@ const userDept = userStore.userSelfInfo.dept * @returns {Array} 客户结算申请主表 */ export const CustomersettleRequestMain = 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: 'deliverRecordNumber', @@ -67,6 +96,27 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ }, isSearch: true, }, + { + 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', @@ -98,17 +148,6 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150, - fixed: 'left' - }, - isForm: false, - isSearch: true, - }, { label: '业务类型', field: 'businessType', @@ -125,123 +164,111 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ isForm: false, }, { - label: '备注', - field: 'remark', + label: '部门', + field: 'departmentCode', 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: userDept.name, componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + disabled: true } - }, - isForm: false, + } }, { - label: '创建者', - field: 'creator', + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - isForm: false, + isTable: false, }, { - label: '申请时间', - field: 'requestTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '自动提交', + field: 'autoCommit', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { - width: 180 + width: 150 }, form: { - component: 'DatePicker', + component: 'Switch', + value: requestsettingData.autoCommit, componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true } - }, - isForm: false, + } }, { - label: '截止时间', - field: 'dueTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, + label: '自动通过', + field: 'autoAgree', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { - width: 180 + width: 150 }, form: { - component: 'DatePicker', + component: 'Switch', + value: requestsettingData.autoAgree, componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + inactiveValue: 'FALSE', + activeValue: 'TRUE', + disabled: true } - }, + } }, { - label: '部门', - field: 'departmentCode', + label: '自动执行', + field: 'autoExecute', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, form: { - value: userDept.name, + component: 'Switch', + value: requestsettingData.autoExecute, componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', disabled: true } } }, { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, + label: '直接生成记录', + field: 'directCreateRecord', + dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isSearch: true, isTable: true, sort: 'custom', table: { width: 150 }, form: { - value: '1', + component: 'Switch', + value: requestsettingData.directCreateRecord, componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE', disabled: true } } }, { - label: '最后更新时间', - field: 'updateTime', + label: '创建时间', + field: 'createTime', formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -262,8 +289,8 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ isForm: false, }, { - label: '最后更新者', - field: 'updater', + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 @@ -271,84 +298,57 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ isForm: false, }, { - label: '自动提交', - field: 'autoCommit', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 + label: '申请时间', + field: 'requestTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - form: { - component: 'Switch', - value: requestsettingData.autoCommit, - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE', - disabled: true - } - } - }, - { - label: '自动通过', - field: 'autoAgree', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, sort: 'custom', table: { - width: 150 + width: 180 }, form: { - component: 'Switch', - value: requestsettingData.autoAgree, + component: 'DatePicker', componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE', - disabled: true + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } - } + }, + isForm: false, }, { - label: '自动执行', - field: 'autoExecute', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, sort: 'custom', table: { - width: 150 + width: 180 }, form: { - component: 'Switch', - value: requestsettingData.autoExecute, + component: 'DatePicker', componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE', - disabled: true + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } - } + }, + isForm: false, }, { - label: '直接生成记录', - field: 'directCreateRecord', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, + label: '最后更新者', + field: 'updater', sort: 'custom', table: { width: 150 }, - form: { - component: 'Switch', - value: requestsettingData.directCreateRecord, - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE', - disabled: true - } - } + isForm: false, }, { label: '操作', @@ -403,6 +403,21 @@ export const CustomersettleRequestMainRules = reactive({ * @returns {Array} 客户结算申请子表 */ export const CustomersettleRequestDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150, + fixed: 'left' + }, + isTableForm: false, + form: { + componentProps: { + disabled: true + } + } + }, { label: '销售订单号', field: 'soNumber', @@ -447,18 +462,8 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive } }, { - label: '从货主代码', - field: 'fromOwnerCode', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - isTableForm: false, - }, - { - label: '包装号', - field: 'packingNumber', + label: '物品代码', + field: 'itemCode', sort: 'custom', table: { width: 150 @@ -473,56 +478,45 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive } }, { - label: '批次', - field: 'batch', + label: '物品名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } + isForm: false, + isTableForm: false, }, { - label: '库存状态', - field: 'inventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, + label: '物品描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - tableForm: { - type: 'Select' - }, - isTableForm: false, isForm: false, + isTableForm: false, }, { - label: '从库位代码', - field: 'fromLocationCode', + label: '物品描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, - isTableForm: false, isForm: false, + isTableForm: false, }, { - label: '单据号', - field: 'number', + label: '批次', + field: 'batch', sort: 'custom', table: { - width: 150, - fixed: 'left' + width: 150 + }, + tableForm: { + disabled: true }, - isTableForm: false, form: { componentProps: { disabled: true @@ -530,8 +524,8 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive } }, { - label: '物品代码', - field: 'itemCode', + label: '包装号', + field: 'packingNumber', sort: 'custom', table: { width: 150 @@ -546,70 +540,72 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive } }, { - label: '备注', - field: 'remark', + label: '数量', + field: 'qty', 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', + component: 'InputNumber', componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + min: 1, + precision: 6 } }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + }, isTableForm: false, - isForm: false + isForm: false, }, { - label: '创建者', - field: 'creator', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, + tableForm: { + type: 'Select' + }, isTableForm: false, - isForm: false + isForm: false, }, { - label: '物品名称', - field: 'itemName', + label: '从库位代码', + field: 'fromLocationCode', sort: 'custom', table: { width: 150 }, - isForm: false, isTableForm: false, + isForm: false, }, { - label: '物品描述1', - field: 'itemDesc1', + label: '库存状态', + field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, - isForm: false, + tableForm: { + type: 'Select' + }, isTableForm: false, + isForm: false, }, { - label: '物品描述2', - field: 'itemDesc2', + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 @@ -618,8 +614,8 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive isTableForm: false, }, { - label: '项目代码', - field: 'projectCode', + label: '从货主代码', + field: 'fromOwnerCode', sort: 'custom', table: { width: 150 @@ -628,42 +624,46 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive isTableForm: false, }, { - label: '数量', - field: 'qty', + 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: '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 - }, isTableForm: false, - isForm: false, + isForm: false }, { - label: '计量单位', - field: 'uom', - dictType: DICT_TYPE.UOM, - dictClass: 'string', - isTable: true, + label: '创建者', + field: 'creator', sort: 'custom', table: { width: 150 }, - tableForm: { - type: 'Select' - }, isTableForm: false, - isForm: false, + isForm: false }, { label: '最后更新时间',