From 3024d214564b47d9f92b607d25728b272982583b Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Fri, 22 Nov 2024 07:58:29 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverRecordMain.data.ts | 277 +--------------- .../deliverRecordMain.data.ts | 297 ++---------------- .../deliverRecordMain.data.ts | 38 ++- .../deliverRecordMain.data.ts | 276 +--------------- .../deliverRecordMain.data.ts | 277 +--------------- 5 files changed, 90 insertions(+), 1075 deletions(-) diff --git a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 1576ba4ef..abecdcb1c 100644 --- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -19,77 +19,15 @@ export const DeliverRecordMain = useCrudSchemas( }, isSearch: true }, + { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true - }, - { - label: '任务单号', - field: 'jobNumber', - sort: 'custom', - table: { - width: 180 - } - }, - { - label: '发货记录单号', - field: 'deliverRecordNumber', + label: '发货类型', + field: 'businessType', sort: 'custom', - table: { - width: 150 - }, isSearch: false, - isTable: false, - isForm: false, - isDetail: false - }, - { - label: '发货计划单号', - field: 'deliverPlanNumber', - sort: 'custom', - table: { - width: 180 - }, - isTable: true, - isDetail: true - }, - // { - // label: '客户发货单号', - // field: 'customerDeliverNumber', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - { - label: '客户订单号', - field: 'customerOrderNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, isTable: true, - isForm: true, - search: { - component: 'Input', - } - }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, + dictType: DICT_TYPE.DELIVER_METHOD, dictClass: 'string', - isSearch: false, - isTable: false, - isForm: false, - isDetail: false, - sort: 'custom', table: { width: 150 } @@ -103,18 +41,6 @@ export const DeliverRecordMain = useCrudSchemas( }, isSearch: true }, - { - label: '发货类型', - field: 'deliverType', - sort: 'custom', - isSearch: false, - isTable: false, - dictType: DICT_TYPE.DELIVER_TYPE, - dictClass: 'string', - table: { - width: 150 - } - }, { label: '客户月台代码', field: 'customerDockCode', @@ -122,26 +48,21 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false + isTable: true }, { - label: '承运商', - field: 'carrierCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '运输方式', - field: 'transferMode', - dictType: DICT_TYPE.TRANSFER_MODE, + label: '客户订单号', + field: 'customerOrderNumber', sort: 'custom', table: { - width: 150 + width: 180 }, - isTable: false + isSearch: true, + isTable: true, + isForm: true, + search: { + component: 'Input', + } }, { label: '车牌号', @@ -152,27 +73,6 @@ export const DeliverRecordMain = useCrudSchemas( }, isTable: false }, - { - label: '申请时间', - field: 'requestTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, { label: '截止时间', field: 'dueTime', @@ -194,49 +94,6 @@ export const DeliverRecordMain = useCrudSchemas( } } }, - { - label: '执行时间', - field: 'executeTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, - { - label: '生效日期', - field: 'activeDate', - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x' - } - } - }, { label: '从仓库代码', field: 'fromWarehouseCode', @@ -255,111 +112,6 @@ export const DeliverRecordMain = useCrudSchemas( }, isTable: false }, - { - label: '从库区类型范围', - field: 'fromAreaTypes', - dictType: DICT_TYPE.AREA_TYPE, - dictClass: 'string', - isTable: false, - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '到库区类型范围', - field: 'toAreaTypes', - dictType: DICT_TYPE.AREA_TYPE, - dictClass: 'string', - isTable: false, - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '从库区代码范围', - field: 'fromAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '到库区代码范围', - field: 'toAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '从月台代码', - field: 'fromDockCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '出库事务类型', - field: 'outTransactionType', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '入库事务类型', - field: 'inTransactionType', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '业务类型', - field: 'businessType', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '部门', - field: 'departmentCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - dictClass: 'string', - isTable: false, - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, { label: '创建时间', field: 'createTime', @@ -430,6 +182,7 @@ export const DeliverRecordMain = useCrudSchemas( ]) ) + //表单校验 export const DeliverRecordMainRules = reactive({ requestNumber: [ diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 1b3c21874..f2e32970d 100644 --- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -19,77 +19,15 @@ export const DeliverRecordMain = useCrudSchemas( }, isSearch: true }, + { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true - }, - { - label: '任务单号', - field: 'jobNumber', - sort: 'custom', - table: { - width: 180 - } - }, - { - label: '发货记录单号', - field: 'deliverRecordNumber', + label: '发货类型', + field: 'businessType', sort: 'custom', - table: { - width: 150 - }, isSearch: false, - isTable: false, - isForm: false, - isDetail: false - }, - { - label: '发货计划单号', - field: 'deliverPlanNumber', - sort: 'custom', - table: { - width: 180 - }, isTable: true, - isDetail: true - }, - // { - // label: '客户发货单号', - // field: 'customerDeliverNumber', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - { - label: '客户订单号', - field: 'customerOrderNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, - isTable: true, - isForm: true, - search: { - component: 'Input', - } - }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, + dictType: DICT_TYPE.DELIVER_METHOD, dictClass: 'string', - isSearch: false, - isTable: false, - isForm: false, - isDetail: false, - sort: 'custom', table: { width: 150 } @@ -103,18 +41,6 @@ export const DeliverRecordMain = useCrudSchemas( }, isSearch: true }, - { - label: '发货类型', - field: 'deliverType', - sort: 'custom', - isSearch: false, - isTable: false, - dictType: DICT_TYPE.DELIVER_TYPE, - dictClass: 'string', - table: { - width: 150 - } - }, { label: '客户月台代码', field: 'customerDockCode', @@ -122,26 +48,21 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false + isTable: true }, { - label: '承运商', - field: 'carrierCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '运输方式', - field: 'transferMode', - dictType: DICT_TYPE.TRANSFER_MODE, + label: '客户订单号', + field: 'customerOrderNumber', sort: 'custom', table: { - width: 150 + width: 180 }, - isTable: false + isSearch: true, + isTable: true, + isForm: true, + search: { + component: 'Input', + } }, { label: '车牌号', @@ -152,27 +73,6 @@ export const DeliverRecordMain = useCrudSchemas( }, isTable: false }, - { - label: '申请时间', - field: 'requestTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, { label: '截止时间', field: 'dueTime', @@ -194,49 +94,6 @@ export const DeliverRecordMain = useCrudSchemas( } } }, - { - label: '执行时间', - field: 'executeTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, - { - label: '生效日期', - field: 'activeDate', - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x' - } - } - }, { label: '从仓库代码', field: 'fromWarehouseCode', @@ -255,111 +112,6 @@ export const DeliverRecordMain = useCrudSchemas( }, isTable: false }, - { - label: '从库区类型范围', - field: 'fromAreaTypes', - dictType: DICT_TYPE.AREA_TYPE, - dictClass: 'string', - isTable: false, - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '到库区类型范围', - field: 'toAreaTypes', - dictType: DICT_TYPE.AREA_TYPE, - dictClass: 'string', - isTable: false, - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '从库区代码范围', - field: 'fromAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '到库区代码范围', - field: 'toAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '从月台代码', - field: 'fromDockCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '出库事务类型', - field: 'outTransactionType', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '入库事务类型', - field: 'inTransactionType', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '业务类型', - field: 'businessType', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '部门', - field: 'departmentCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - dictClass: 'string', - isTable: false, - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, { label: '创建时间', field: 'createTime', @@ -520,6 +272,14 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ // width: 150 // }, // }, + { + label: '到库位', + field: 'toLocationCode', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '物料代码', field: 'itemCode', @@ -569,6 +329,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '父包装号', @@ -577,6 +338,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '包装规格', @@ -611,6 +373,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '单价', @@ -643,6 +406,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + hiddenInMain: true, }, { label: '从库位', @@ -651,14 +415,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, - }, - { - label: '到库位', - field: 'toLocationCode', - sort: 'custom', - table: { - width: 150 - }, + hiddenInMain: true, }, { label: '从库位组', diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index 8967fdf67..259cb490d 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -25,7 +25,7 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 180 }, - isSearch: false + isSearch: true }, { label: '任务单号', @@ -74,7 +74,7 @@ export const DeliverRecordMain = useCrudSchemas( }, isTable: true, isForm: true, - isSearch: false, + isSearch: true, search: { component: 'Input', componentProps: { @@ -88,20 +88,20 @@ export const DeliverRecordMain = useCrudSchemas( } } }, - // { - // label: '状态', - // field: 'status', - // dictType: DICT_TYPE.REQUEST_STATUS, - // dictClass: 'string', - // isSearch: false, - // isTable: false, - // isForm: false, - // isDetail: false, - // sort: 'custom', - // table: { - // width: 150 - // } - // }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.REQUEST_STATUS, + dictClass: 'string', + isSearch: false, + isTable: false, + isForm: false, + isDetail: false, + sort: 'custom', + table: { + width: 150 + } + }, { label: '客户代码', field: 'customerCode', @@ -130,8 +130,7 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: true, - isSearch:true, + isTable: false }, { label: '承运商', @@ -1000,8 +999,7 @@ export const DeliverRecordImport = useCrudSchemas(reactive([ // 导入表单校验 export const DeliverRecordImportRules = reactive({ customerOrderNumber: [ - { required: true, message: '请输入订单号', trigger: 'blur' }, - { max: 64, message: '最多64字符', trigger: 'blur' } + { required: true, message: '请输入订单号', trigger: 'blur' } ], startDate: [ { required: true, message: '请选择开始日期', trigger: 'change' } diff --git a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index b43f17125..4d04ca31d 100644 --- a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -20,77 +20,15 @@ export const DeliverRecordMain = useCrudSchemas( }, isSearch: true }, + { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true - }, - { - label: '任务单号', - field: 'jobNumber', - sort: 'custom', - table: { - width: 180 - } - }, - { - label: '发货记录单号', - field: 'deliverRecordNumber', + label: '发货类型', + field: 'businessType', sort: 'custom', - table: { - width: 150 - }, isSearch: false, - isTable: false, - isForm: false, - isDetail: false - }, - { - label: '发货计划单号', - field: 'deliverPlanNumber', - sort: 'custom', - table: { - width: 180 - }, - isTable: true, - isDetail: true - }, - // { - // label: '客户发货单号', - // field: 'customerDeliverNumber', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - { - label: '客户订单号', - field: 'customerOrderNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, isTable: true, - isForm: true, - search: { - component: 'Input', - } - }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, + dictType: DICT_TYPE.DELIVER_METHOD, dictClass: 'string', - isSearch: false, - isTable: false, - isForm: false, - isDetail: false, - sort: 'custom', table: { width: 150 } @@ -104,17 +42,6 @@ export const DeliverRecordMain = useCrudSchemas( }, isSearch: true }, - { - label: '发货类型', - field: 'deliverType', - sort: 'custom', - isSearch: true, - dictType: DICT_TYPE.DELIVER_TYPE, - dictClass: 'string', - table: { - width: 150 - } - }, { label: '客户月台代码', field: 'customerDockCode', @@ -122,26 +49,21 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false - }, - { - label: '承运商', - field: 'carrierCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false + isTable: true }, { - label: '运输方式', - field: 'transferMode', - dictType: DICT_TYPE.TRANSFER_MODE, + label: '客户订单号', + field: 'customerOrderNumber', sort: 'custom', table: { - width: 150 + width: 180 }, - isTable: false + isSearch: true, + isTable: true, + isForm: true, + search: { + component: 'Input', + } }, { label: '车牌号', @@ -152,27 +74,6 @@ export const DeliverRecordMain = useCrudSchemas( }, isTable: false }, - { - label: '申请时间', - field: 'requestTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, { label: '截止时间', field: 'dueTime', @@ -194,49 +95,6 @@ export const DeliverRecordMain = useCrudSchemas( } } }, - { - label: '执行时间', - field: 'executeTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, - { - label: '生效日期', - field: 'activeDate', - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x' - } - } - }, { label: '从仓库代码', field: 'fromWarehouseCode', @@ -255,111 +113,6 @@ export const DeliverRecordMain = useCrudSchemas( }, isTable: false }, - { - label: '从库区类型范围', - field: 'fromAreaTypes', - dictType: DICT_TYPE.AREA_TYPE, - dictClass: 'string', - isTable: false, - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '到库区类型范围', - field: 'toAreaTypes', - dictType: DICT_TYPE.AREA_TYPE, - dictClass: 'string', - isTable: false, - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '从库区代码范围', - field: 'fromAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '到库区代码范围', - field: 'toAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '从月台代码', - field: 'fromDockCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '出库事务类型', - field: 'outTransactionType', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '入库事务类型', - field: 'inTransactionType', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '业务类型', - field: 'businessType', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '部门', - field: 'departmentCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - dictClass: 'string', - isTable: false, - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, { label: '创建时间', field: 'createTime', @@ -430,6 +183,7 @@ export const DeliverRecordMain = useCrudSchemas( ]) ) + //表单校验 export const DeliverRecordMainRules = reactive({ requestNumber: [ diff --git a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index b57154432..e96624a30 100644 --- a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -19,77 +19,15 @@ export const DeliverRecordMain = useCrudSchemas( }, isSearch: true }, + { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true - }, - { - label: '任务单号', - field: 'jobNumber', - sort: 'custom', - table: { - width: 180 - } - }, - { - label: '发货记录单号', - field: 'deliverRecordNumber', + label: '发货类型', + field: 'businessType', sort: 'custom', - table: { - width: 150 - }, isSearch: false, - isTable: false, - isForm: false, - isDetail: false - }, - { - label: '发货计划单号', - field: 'deliverPlanNumber', - sort: 'custom', - table: { - width: 180 - }, - isTable: true, - isDetail: true - }, - // { - // label: '客户发货单号', - // field: 'customerDeliverNumber', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - { - label: '客户订单号', - field: 'customerOrderNumber', - sort: 'custom', - table: { - width: 180 - }, - isSearch: true, isTable: true, - isForm: true, - search: { - component: 'Input', - } - }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, + dictType: DICT_TYPE.DELIVER_METHOD, dictClass: 'string', - isSearch: false, - isTable: false, - isForm: false, - isDetail: false, - sort: 'custom', table: { width: 150 } @@ -103,18 +41,6 @@ export const DeliverRecordMain = useCrudSchemas( }, isSearch: true }, - { - label: '发货类型', - field: 'deliverType', - sort: 'custom', - isSearch: false, - isTable: false, - dictType: DICT_TYPE.DELIVER_TYPE, - dictClass: 'string', - table: { - width: 150 - } - }, { label: '客户月台代码', field: 'customerDockCode', @@ -122,26 +48,21 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false + isTable: true }, { - label: '承运商', - field: 'carrierCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '运输方式', - field: 'transferMode', - dictType: DICT_TYPE.TRANSFER_MODE, + label: '客户订单号', + field: 'customerOrderNumber', sort: 'custom', table: { - width: 150 + width: 180 }, - isTable: false + isSearch: true, + isTable: true, + isForm: true, + search: { + component: 'Input', + } }, { label: '车牌号', @@ -152,27 +73,6 @@ export const DeliverRecordMain = useCrudSchemas( }, isTable: false }, - { - label: '申请时间', - field: 'requestTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, { label: '截止时间', field: 'dueTime', @@ -194,49 +94,6 @@ export const DeliverRecordMain = useCrudSchemas( } } }, - { - label: '执行时间', - field: 'executeTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, - { - label: '生效日期', - field: 'activeDate', - formatter: dateFormatter2, - detail: { - dateFormat: 'YYYY-MM-DD' - }, - sort: 'custom', - table: { - width: 180 - }, - isTable: false, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'date', - dateFormat: 'YYYY-MM-DD', - valueFormat: 'x' - } - } - }, { label: '从仓库代码', field: 'fromWarehouseCode', @@ -255,111 +112,6 @@ export const DeliverRecordMain = useCrudSchemas( }, isTable: false }, - { - label: '从库区类型范围', - field: 'fromAreaTypes', - dictType: DICT_TYPE.AREA_TYPE, - dictClass: 'string', - isTable: false, - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '到库区类型范围', - field: 'toAreaTypes', - dictType: DICT_TYPE.AREA_TYPE, - dictClass: 'string', - isTable: false, - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '从库区代码范围', - field: 'fromAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '到库区代码范围', - field: 'toAreaCodes', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '从月台代码', - field: 'fromDockCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '出库事务类型', - field: 'outTransactionType', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '入库事务类型', - field: 'inTransactionType', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '业务类型', - field: 'businessType', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '部门', - field: 'departmentCode', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, - { - label: '接口类型', - field: 'interfaceType', - dictType: DICT_TYPE.INTERFACE_TYPE, - dictClass: 'string', - isTable: false, - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - isTable: false - }, { label: '创建时间', field: 'createTime', @@ -430,6 +182,7 @@ export const DeliverRecordMain = useCrudSchemas( ]) ) + //表单校验 export const DeliverRecordMainRules = reactive({ requestNumber: [