From aba1f962267488a1be683fa7349f71ad2aabc347 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Tue, 25 Jun 2024 08:31:04 +0800 Subject: [PATCH 01/15] =?UTF-8?q?wms=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E3=80=81=E5=88=9B=E5=BB=BA=E4=BA=BA=E3=80=81?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E3=80=81=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BA=BA=E3=80=81=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreceiptRecordMain.data.ts | 12 +- .../customerreceiptRequestMain.data.ts | 6 +- .../customerreturnJobMain.data.ts | 4 +- .../customerreturnRecordMain.data.ts | 10 +- .../customerreturnRequestMain.data.ts | 12 +- .../customersettleRecordMain.data.ts | 7 +- .../customersettleRequestMain.data.ts | 4 + .../deliverJobMain/deliverJobMain.data.ts | 8 +- .../deliverRecordMain.data.ts | 6 +- .../deliverRequestMain.data.ts | 10 +- .../deliverPlanMain/deliverPlanMain.data.ts | 16 +- .../deliverplan/saleMain/saleMain.data.ts | 6 +- .../saleShipmentMainRecord.data.ts | 16 +- .../saleShipmentMain.data.ts | 14 +- .../stockupMainJob/stockupMainJob.data.ts | 59 +++++-- .../stockupMainRecord.data.ts | 33 +++- .../stockupMainRequest.data.ts | 20 ++- .../inventoryManage/package/package.data.ts | 36 +++++ .../containerRecordMain.data.ts | 19 ++- .../scrapContainerMainRequest.data.ts | 15 ++ .../inventoryinitRecordMain.data.ts | 40 ++++- .../inventoryinitRequestMain.data.ts | 16 +- .../scrap/scrapJobMain/scrapJobMain.data.ts | 4 + .../scrapRecordMain/scrapRecordMain.data.ts | 4 +- .../scrapRequestMain/scrapRequestMain.data.ts | 2 + .../transferissueRecordMain.data.ts | 2 +- .../transferissueRequestMain.data.ts | 8 +- .../transferreceiptRecordMain.data.ts | 36 ++++- .../transferreceiptRequestMain.data.ts | 6 +- .../inventorychangeRecordMain.data.ts | 4 +- .../inventorychangeRequestMain.data.ts | 18 ++- .../inventorymoveJobMain.data.ts | 120 +++++++------- .../inventorymoveRecordMain.data.ts | 149 +++++++++++------- .../inventorymoveRequestMain.data.ts | 134 ++++++++-------- .../processproductionRecordMain.data.ts | 56 ++++++- .../processproductionRequestMain.data.ts | 71 ++++++++- .../productputawayJobMain.data.ts | 44 +++++- .../productputawayRecordMain.data.ts | 37 ++++- .../productputawayAssembleJobMain.data.ts | 28 ++-- .../productputawayAssembleRecordMain.data.ts | 43 ++++- .../productputawayAssembleRequestMain.data.ts | 18 +-- 41 files changed, 832 insertions(+), 321 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts index 458147c5a..2785f8c38 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts @@ -308,7 +308,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -325,7 +325,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false + isTable: true }, // { // label: '代码', @@ -543,7 +543,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive width: 150 }, }, - + { label: '从批次', field: 'fromBatch', @@ -563,7 +563,7 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive isTable: false, }, - + { label: '从包装号', field: 'fromPackingNumber', @@ -603,8 +603,8 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive }, isTable: false, }, - - + + { label: '库存状态', field: 'inventoryStatus', diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts index 8508f6f4e..19d5b35c8 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts @@ -365,7 +365,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( valueFormat: 'x', } }, - isTable: false, + isTable: true, isForm: false }, { @@ -383,7 +383,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( valueFormat: 'x', } }, - isTable: false, + isTable: true, isForm: false }, { @@ -775,4 +775,4 @@ export const CustomerreceiptRequestDetailRules = reactive({ itemCode: [ { required: true, message: '请选择物料代码', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts index e696397f7..1079f18f3 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnJobMain/customerreturnJobMain.data.ts @@ -563,7 +563,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -580,7 +580,7 @@ export const CustomerreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, { label: '最后更新时间', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts index b4cf0d581..76f01ff74 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts @@ -328,7 +328,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -345,7 +345,7 @@ export const CustomerreturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, // { // label: '代码', @@ -588,7 +588,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( }, isTable: false, }, - + { label: '从包装号', field: 'fromPackingNumber', @@ -608,7 +608,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( }, isTable: false, }, - + { label: '从器具号', field: 'fromContainerNumber', @@ -627,7 +627,7 @@ export const CustomerreturnRecordDetail = useCrudSchemas(reactive( }, isTable: false, }, - + { label: '从库位代码', field: 'fromLocationCode', diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 4931bfa92..f9e3ac998 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -148,7 +148,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ } } }, - + { label: '发货计划单号', field: 'deliverPlanNumber', @@ -505,7 +505,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable:false, + isTable:true, form: { component: 'DatePicker', componentProps: { @@ -524,7 +524,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable:false, + isTable:true, isForm: false }, { @@ -779,7 +779,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive searchPage: CustomerreturnRequestApi.pageItemCodeToBalance, searchCondition: [{ key:'customerCode', // 查询列表中字段 - value:'customerCode', // 指主表某字段 + value:'customerCode', // 指主表某字段 message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示 isMainValue: true // 表示查询条件是主表的字段的值 } @@ -796,7 +796,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive searchPage: CustomerreturnRequestApi.pageItemCodeToBalance, searchCondition: [{ key:'customerCode', // 查询列表中字段 - value:'customerCode', // 指主表某字段 + value:'customerCode', // 指主表某字段 message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示 isMainValue: true // 表示查询条件是主表的字段的值 } @@ -1363,4 +1363,4 @@ export const CustomerReturnRequestDetailLabel = useCrudSchemas(reactive( valueFormat: 'x', } }, + isTable: false, }, { label: '创建者', @@ -550,11 +551,13 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, }, { label: '最后更新时间', field: 'updateTime', formatter: dateFormatter, + isTable: false, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, @@ -570,11 +573,13 @@ export const CustomersettleRecordDetail = useCrudSchemas(reactive( valueFormat: 'x', } }, + isTable: false }, { label: '最后更新者', field: 'updater', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -616,4 +621,4 @@ export const CustomersettleRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts index e5344f0b5..cb5318166 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts @@ -301,6 +301,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ } }, isForm: false, + isTable: false, }, { label: '创建者', @@ -310,6 +311,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ width: 150 }, isForm: false, + isTable: false, }, { label: '申请时间', @@ -354,6 +356,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ } }, isForm: false, + isTable: false, }, { label: '最后更新者', @@ -363,6 +366,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ width: 150 }, isForm: false, + isTable: false, }, { label: '操作', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts index 4250a70f8..6cf16428b 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts @@ -80,7 +80,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ }, isTable: false, }, - + { label: '客户月台代码', field: 'customerDockCode', @@ -90,7 +90,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ }, isTable: false, }, - + { label: '承运商', field: 'carrierCode', @@ -569,7 +569,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -586,7 +586,7 @@ export const DeliverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, { label: '最后更新时间', diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index 3578520b6..9cef4876b 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -334,7 +334,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -351,7 +351,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, // { // label: '代码', @@ -805,4 +805,4 @@ export const DeliverRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index b554d126b..2e481c612 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -112,7 +112,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '客户月台信息', // 查询弹窗标题 searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类 - searchPage: CustomerdockApi.getCustomerdockPage, // 查询弹窗所需分页方法 + searchPage: CustomerdockApi.getCustomerdockPage, // 查询弹窗所需分页方法 searchCondition: [{ key: 'available', value: 'TRUE', @@ -524,7 +524,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -543,7 +543,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, isForm: false, }, { @@ -865,7 +865,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ isForm: false, isTableForm: false }, - + { label: '批次', field: 'batch', @@ -1054,4 +1054,4 @@ export const DeliverRequestDetailRules = reactive({ toLocationCode: [ { required: true, message: '请选择到库位代码', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts index 07c98a547..5bd2fd65c 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts @@ -214,7 +214,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ }, isTable: false, }, - + { label: '创建时间', field: 'createTime', @@ -226,7 +226,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -244,7 +244,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, isForm: false, }, { @@ -641,7 +641,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ }, tableForm: { disabled: true, - type: 'Select' + type: 'Select' }, form: { componentProps: { @@ -730,8 +730,8 @@ export const DeliverPlanDetail = useCrudSchemas(reactive([ } } }, - - + + { label: '备注', field: 'remark', @@ -867,8 +867,8 @@ export const DeliverPlanDetailRules = reactive({ planQty: [ { required: true, message: '请输入计划数量', trigger: 'blur' } ], - + remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts index 1b8f4b921..523ceba6c 100644 --- a/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts @@ -214,6 +214,7 @@ export const SaleMain = useCrudSchemas(reactive([ width: 150 }, isForm: false, + isTable: false }, { label: '最后更新时间', @@ -235,6 +236,7 @@ export const SaleMain = useCrudSchemas(reactive([ } }, isForm: false, + isTable: false }, { label: '当前阶段', @@ -778,7 +780,7 @@ export const SaleDetailRules = reactive({ itemCode: [ { required: true, message: '请选择物料代码', trigger: 'change' } ], - + remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], @@ -910,4 +912,4 @@ export const SaleDetailAndMain = useCrudSchemas(reactive([ precision: 6 } }, -])) \ No newline at end of file +])) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts index 25bc2b808..0b74c9c86 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts @@ -95,7 +95,7 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive([ sort: 'custom', isTable:false }, - + { label: '业务类型', field: 'businessType', @@ -107,6 +107,9 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, + table: { + width: 180 + }, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, @@ -119,7 +122,16 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive([ } }, isForm: false, - isTable:false + isTable:true + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true }, { label: '地点ID', diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts index fbf89bcc2..947bdb2c0 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts @@ -222,6 +222,9 @@ export const SaleShipmentMain = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, + table: { + width: 180 + }, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, @@ -235,7 +238,16 @@ export const SaleShipmentMain = useCrudSchemas(reactive([ }, isForm: false, isTableForm: false, - isTable: false + isTable: true + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true }, { label: '操作', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts index b5d73acc3..e3e6e26ed 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts @@ -76,6 +76,9 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, isTable: false, search: { component: 'DatePicker', @@ -101,6 +104,9 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, isTable: false, search: { component: 'DatePicker', @@ -118,7 +124,7 @@ export const StockupMainJob = useCrudSchemas(reactive([ } }, }, - + { label: '过期时间', field: 'expiredTime', @@ -127,6 +133,9 @@ export const StockupMainJob = useCrudSchemas(reactive([ table: { width: 180 }, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, isTable: false, search: { component: 'DatePicker', @@ -164,6 +173,9 @@ export const StockupMainJob = useCrudSchemas(reactive([ field: 'acceptTime', sort: 'custom', formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 180 }, @@ -202,6 +214,9 @@ export const StockupMainJob = useCrudSchemas(reactive([ width: 180 }, isTable: false, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, search: { component: 'DatePicker', componentProps: { @@ -389,24 +404,18 @@ export const StockupMainJob = useCrudSchemas(reactive([ }, isTable: false, }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 120 - }, - isTable: false, - }, { label: '创建时间', field: 'createTime', sort: 'custom', formatter: dateFormatter, table: { - width: 180 + width: 120 }, - isTable: false, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, + hiddenInMain: true, search: { component: 'DatePicker', componentProps: { @@ -415,7 +424,16 @@ export const StockupMainJob = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + isTableForm: false, + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, isForm: false, + isTable: true }, { label: '操作', @@ -440,7 +458,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain:true + hiddenInMain:true }, { label: '包装号', @@ -449,7 +467,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain:true + hiddenInMain:true }, { label: '批次', @@ -458,7 +476,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain:true + hiddenInMain:true }, { label: '库存状态', @@ -490,7 +508,7 @@ export const StockupDetailJob = useCrudSchemas(reactive([ }, hiddenInMain:true, }, - + { label: '物料代码', field: 'itemCode', @@ -600,6 +618,15 @@ export const StockupDetailJob = useCrudSchemas(reactive([ }, isForm: false, }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 120 + }, + isTable: false, + }, { label: '操作', field: 'action', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts index 063de8810..a671a1bf7 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts @@ -183,6 +183,9 @@ export const StockupMainRecord = useCrudSchemas(reactive([ width: 180 }, isTable: false, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -197,6 +200,9 @@ export const StockupMainRecord = useCrudSchemas(reactive([ field: 'dueTime', sort: 'custom', formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, search: { component: 'DatePicker', componentProps: { @@ -220,21 +226,32 @@ export const StockupMainRecord = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - sort: 'custom', + isForm: false, + table: { + width: 180 + }, formatter: dateFormatter, - search: { + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, + form: { component: 'DatePicker', componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } - }, + } + }, + { + label: '创建者', + field: 'creator', table: { - width: 180 + width: 130 }, - isTable: false, isForm: false, + isTable: true }, { label: '部门', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index a50f33f19..e62e7f75e 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -176,12 +176,21 @@ export const StockupMainRequest = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - isTable: false, + isTable: true, table: { width: 180 }, isForm: false, }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, { label: '发货日期', field: 'deliverDate', @@ -773,6 +782,15 @@ export const StockupDetailRequest = useCrudSchemas(reactive([ }, isTableForm: false, }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, { label: '操作', field: 'action', diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts index 32354a39e..2896272f2 100644 --- a/src/views/wms/inventoryManage/package/package.data.ts +++ b/src/views/wms/inventoryManage/package/package.data.ts @@ -90,6 +90,9 @@ export const Package = useCrudSchemas(reactive([ field: 'produceDate', sort: 'custom', formatter: dateFormatter2, + detail: { + dateFormat : 'YYYY-MM-DD' + }, search: { component: 'DatePicker', componentProps: { @@ -132,6 +135,9 @@ export const Package = useCrudSchemas(reactive([ field: 'expireDate', sort: 'custom', formatter: dateFormatter2, + detail: { + dateFormat : 'YYYY-MM-DD' + }, search: { component: 'DatePicker', componentProps: { @@ -417,6 +423,36 @@ export const Package = useCrudSchemas(reactive([ width: 150, }, }, + { + label: '创建时间', + field: 'createTime', + isForm: false, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, { label: '操作', field: 'action', diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts index eee4eb48f..4428b0768 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts @@ -120,6 +120,12 @@ export const ContainerRecordMain = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, search: { component: 'DatePicker', componentProps: { @@ -128,9 +134,18 @@ export const ContainerRecordMain = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - isTable: false, + isTable: true, isForm: false, }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, { label: '操作', field: 'action', @@ -280,4 +295,4 @@ export const ContainerRecordDetail = useCrudSchemas(reactive([ fixed: 'right' } } -])) \ No newline at end of file +])) diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts index c4fec6072..5f91c6d30 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts @@ -212,6 +212,12 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, + table: { + width: 180 + }, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, search: { component: 'DatePicker', componentProps: { @@ -223,6 +229,15 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ isTable: false, isForm: false, }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, { label: '扩展属性', field: 'extraProperties', diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts index 98a51c6ac..6b6c4d696 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/inventoryinitRecordMain.data.ts @@ -198,6 +198,42 @@ export const InventoryinitRecordMain = useCrudSchemas(reactive([ } } }, + + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, + table: { + width: 150 + } + }, + // { // label: '代码', // field: 'code', @@ -585,6 +621,7 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false }, { label: '最后更新者', @@ -593,6 +630,7 @@ export const InventoryinitRecordDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, ])) @@ -643,4 +681,4 @@ export const InventoryinitRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index 146a535f0..214889c66 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -286,6 +286,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ } }, isForm: false, + isTable: false, }, { label: '创建者', @@ -295,6 +296,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ width: 150 }, isForm: false, + isTable: false, }, { label: '最后更新时间', @@ -317,6 +319,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ } }, isForm: false, + isTable: false, }, { label: '最后更新者', @@ -326,6 +329,7 @@ export const InventoryinitRequestMain = useCrudSchemas(reactive([ width: 150 }, isForm: false, + isTable: false, }, { label: '操作', @@ -794,7 +798,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( key: 'itemCode', value: 'itemCode', message: '请选择订单行', - isTableRowValue: true, + isTableRowValue: true, isMainValue:false }, { @@ -862,7 +866,7 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( key: 'itemCode', value: 'itemCode', message: '请选择订单行', - isTableRowValue: true, + isTableRowValue: true, isMainValue:false }, { @@ -1016,7 +1020,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( } }, isTableForm: false, - isForm: false + isForm: false, + isTable: false, }, { label: '最后更新者', @@ -1026,7 +1031,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( width: 150 }, isTableForm: false, - isForm: false + isForm: false, + isTable: false, }, { label: '操作', @@ -1072,7 +1078,7 @@ export const InventoryinitRequestDetailRules = reactive({ ], itemCode: [ { required: true, message: '请选择物料代码', trigger: 'change' } - ], + ], remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts index 99effbbd7..4e83e7b06 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts @@ -474,6 +474,7 @@ export const ScrapJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -490,6 +491,7 @@ export const ScrapJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, { label: '操作', @@ -728,6 +730,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false, }, { label: '创建者', @@ -736,6 +739,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, }, ])) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index d73304fdd..2116cd297 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -204,6 +204,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -217,6 +218,7 @@ export const ScrapRecordMain = useCrudSchemas(reactive([ label: '创建者', field: 'creator', sort: 'custom', + isTable: false, table: { width: 150 }, @@ -577,4 +579,4 @@ export const ScrapRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index eaf67f99a..fe6c6a315 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -756,6 +756,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -775,6 +776,7 @@ export const ScrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isTableForm: false, isForm: false }, diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts index 17ae897cd..817185d6b 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts @@ -696,4 +696,4 @@ export const TransferissueRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts index 5ad9b5c71..dd7828519 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts @@ -610,7 +610,7 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( disabled: true } }, - + { label: '包装号', field: 'packingNumber', @@ -889,7 +889,8 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( } }, isTableForm: false, - isForm: false + isForm: false, + isTable: false }, { label: '最后更新者', @@ -899,7 +900,8 @@ export const TransferissueRequestDetail = useCrudSchemas(reactive( width: 150 }, isTableForm: false, - isForm: false + isForm: false, + isTable: false }, { label: '操作', diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts index e56a47f96..418f71b8e 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts @@ -295,6 +295,40 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, + table: { + width: 150 + } + }, { label: '是否可用', field: 'available', @@ -696,4 +730,4 @@ export const TransferreceiptRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts index 33fabc87e..19d6b5972 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts @@ -666,7 +666,8 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false }, { label: '创建者', @@ -191,6 +192,7 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, // { // label: '代码', @@ -727,4 +729,4 @@ export const InventorychangeRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts index 8c60e94e5..74acc42bd 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts @@ -27,7 +27,7 @@ const businessTypeQueryParams = { const businessTypeValue = await getBusinessTypeApi.getBusinesstypePage(businessTypeQueryParams) const businessTypeData =businessTypeValue?.list[0]||{} console.log(businessTypeValue); - + // 获取当前操作人的部门 import { useUserStore } from '@/store/modules/user' import { TableColumn } from '@/types/table' @@ -37,7 +37,7 @@ import { log } from 'console' // id 转str 否则form回显匹配不到 userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] - + /** * @returns {Array} 库存修改申请主表 @@ -272,6 +272,7 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive( } }, isForm: false, + isTable: false, }, { label: '创建者', @@ -281,6 +282,7 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive( width: 150 }, isForm: false, + isTable: false, }, { label: '最后更新时间', @@ -293,6 +295,7 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive( table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { @@ -311,7 +314,8 @@ export const InventorychangeRequestMain = useCrudSchemas(reactive( table: { width: 150 }, - isForm: false + isForm: false, + isTable: false, }, { label: '操作', @@ -961,7 +965,8 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive([ // }, // isTable: false, // }, - // { - // label: '创建时间', - // field: 'createTime', - // 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: 'creator', - // sort: 'custom', - // table: { - // width: 150 - // }, - // isTable: false, - // }, - // { - // label: '最后更新时间', - // field: 'updateTime', - // 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: 'updater', - // 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 + }, + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isTable: true, + }, + { + label: '最后更新时间', + field: 'updateTime', + 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: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, // { // label: '状态', // field: 'jobStageStatus', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts index 814928486..c1564e2df 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/inventorymoveRecordMain.data.ts @@ -211,6 +211,7 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ width: 150 }, }, + // { // label: '部门', // field: 'departmentCode', @@ -238,34 +239,68 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ // 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: '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', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, + table: { + width: 150 + } + }, // { // label: '代码', // field: 'code', @@ -595,34 +630,34 @@ export const InventorymoveRecordDetail = useCrudSchemas(reactive([ // 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: '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', @@ -683,4 +718,4 @@ export const InventorymoveRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index 518050dce..8a52a684d 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -30,7 +30,7 @@ const queryParams = { // id 转str 否则form回显匹配不到 userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] - + /** * @returns {Array} 库存转移申请主表 */ @@ -165,7 +165,7 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ // }, // isForm: false, // }, - + // { // label: '到库区类型范围', // field: 'toAreaTypes', @@ -340,68 +340,72 @@ export const InventorymoveRequestMain = 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: '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, + isTable: true + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: 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, + isTable: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: false + }, { label: '操作', field: 'action', @@ -878,4 +882,4 @@ export const InventorymoveRequestDetailRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts index 7f70ffe6f..85ab46da6 100644 --- a/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts +++ b/src/views/wms/productionManage/processproduction/processproductionRecord/processproductionRecordMain.data.ts @@ -87,6 +87,49 @@ export const ProcessproductionRecordMain = useCrudSchemas(reactive isTableForm: false, isForm: false }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, + table: { + width: 150 + } + }, { label: '删除时间', field: 'deletionTime', @@ -294,6 +337,15 @@ export const ProcessproductionRecordDetail = useCrudSchemas(reactive([ }, isTable: false, }, - + { label: '优先级', field: 'priority', @@ -301,7 +301,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -318,8 +318,40 @@ export const ProductputawayJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: true, + }, + + { + label: '最后更新时间', + field: 'updateTime', + 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: 'updater', + sort: 'custom', + table: { + width: 150 + }, isTable: false, }, + { label: '到仓库代码', field: 'toWarehouseCode', @@ -692,7 +724,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive([ }, isTable: false }, - + { label: '库存状态', field: 'inventoryStatus', @@ -705,7 +737,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive([ }, }, - + { label: '从库位代码', field: 'fromLocationCode', @@ -722,7 +754,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive([ width: 150 }, }, - + { label: '物料描述1', field: 'itemDesc1', @@ -764,7 +796,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive([ component: 'InputNumber', } }, - + { label: '单据号', field: 'number', diff --git a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts index 8b077a0c0..f3dea059e 100644 --- a/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayRecordMain/productputawayRecordMain.data.ts @@ -204,7 +204,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, { label: '创建时间', @@ -217,6 +217,37 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, isTable: false, form: { component: 'DatePicker', @@ -499,7 +530,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive( width: 150 }, }, - + { label: '从货主代码', field: 'fromOwnerCode', @@ -657,7 +688,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive( component: 'InputNumber', } }, - + // { // label: '代码', // field: 'code', diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts index 6513811fa..2531a7bc4 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/productputawayAssembleJobMain.data.ts @@ -149,14 +149,14 @@ export const ProductputawayJobMain = useCrudSchemas(reactive([ }, { label: '最后更新者', - field: 'update', + field: 'updater', sort: 'custom', table: { width: 150 }, isTable: false, }, - + { label: '优先级', field: 'priority', @@ -303,7 +303,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -320,7 +320,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, { label: '到仓库代码', @@ -719,7 +719,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain:true + hiddenInMain:true }, { label: '物料描述2', @@ -728,7 +728,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain:true + hiddenInMain:true }, { label: '项目代码', @@ -737,7 +737,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain:true + hiddenInMain:true }, { label: '数量', @@ -751,7 +751,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive([ component: 'InputNumber', } }, - + { label: '单据号', field: 'number', @@ -759,7 +759,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, - hiddenInMain:true + hiddenInMain:true }, { label: '备注', @@ -768,7 +768,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain:true + hiddenInMain:true }, { label: '从货主代码', @@ -777,7 +777,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain:true + hiddenInMain:true }, { label: '到货主代码', @@ -786,7 +786,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain:true + hiddenInMain:true }, { @@ -817,7 +817,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - hiddenInMain:true + hiddenInMain:true }, { @@ -827,7 +827,7 @@ export const ProductputawayJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false + isTable: false }, ])) diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts index 697b68590..cfbb71516 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRecordMain/productputawayAssembleRecordMain.data.ts @@ -204,7 +204,7 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, { label: '创建时间', @@ -217,6 +217,37 @@ export const ProductputawayRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, + + { + label: '更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + }, + { + label: '更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, isTable: false, form: { component: 'DatePicker', @@ -501,7 +532,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive( width: 150 }, }, - + { label: '从货主代码', field: 'fromOwnerCode', @@ -581,7 +612,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive( }, hiddenInMain: true }, - + { label: '备注', field: 'remark', @@ -622,7 +653,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive( hiddenInMain: true }, - + { label: '物料描述1', field: 'itemDesc1', @@ -663,7 +694,7 @@ export const ProductputawayRecordDetail = useCrudSchemas(reactive( component: 'InputNumber', } }, - + // { // label: '代码', // field: 'code', @@ -761,4 +792,4 @@ export const ProductputawayRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts index ec330ec7e..620475a8a 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleRequestMain/productputawayAssembleRequestMain.data.ts @@ -138,7 +138,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -156,7 +156,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, isForm: false }, { @@ -228,7 +228,7 @@ export const ProductputawayRequestMain = useCrudSchemas(reactive([ } } }, - + { label: '最后更新时间', field: 'updateTime', @@ -565,7 +565,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive disabled: true } }, - + { label: '从库位代码', field: 'fromLocationCode', @@ -582,7 +582,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive disabled: true } }, - + { label: '器具号', field: 'containerNumber', @@ -658,7 +658,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive isTableForm: false, isForm: false }, - + { label: '物料描述1', field: 'itemDesc1', @@ -713,7 +713,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive precision: 6 } }, - + { label: '从货主代码', field: 'fromOwnerCode', @@ -736,7 +736,7 @@ export const ProductputawayRequestDetail = useCrudSchemas(reactive isTableForm: false, isForm: false }, - + { label: '最后更新时间', field: 'updateTime', @@ -803,4 +803,4 @@ export const ProductputawayRequestDetailRules = reactive({ itemCode: [ { required: true, message: '请选择物料代码', trigger: 'change' } ], -}) \ No newline at end of file +}) From 08446ec2c77e5675618cfec2c323efb1a7cfd30a Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 25 Jun 2024 10:04:55 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productputawayAssembleJobMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue index 109f6000b..af130fef1 100644 --- a/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue +++ b/src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue @@ -159,7 +159,7 @@ const butttondata = (row,$index) => { defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 - defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 + // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 ] } From 826ca56b3de82d359e4a4b88e410fea1edf50c07 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 25 Jun 2024 10:15:01 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E9=9A=90=E8=97=8F=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreceipt/productionreceiptJobMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue index 3b178cb82..feaba54ef 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue @@ -157,7 +157,7 @@ const butttondata = (row,$index) => { defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接 defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭 defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃 - defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 + // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 ] } From d6d644af359ea4ea103fb068dcd62fe434b94693 Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 25 Jun 2024 11:12:14 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E9=A2=84=E8=AE=A1=E5=87=BA=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4api=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/expectout/index.ts | 5 +++++ src/views/wms/inventoryManage/expectout/index.vue | 1 + 2 files changed, 6 insertions(+) diff --git a/src/api/wms/expectout/index.ts b/src/api/wms/expectout/index.ts index 87868ace8..819320553 100644 --- a/src/api/wms/expectout/index.ts +++ b/src/api/wms/expectout/index.ts @@ -45,6 +45,11 @@ export const deleteExpectout = async (id: number) => { return await request.delete({ url: `/wms/expectout/delete?id=` + id }) } +// 批量删除预计出库存 +export const deleteExpectoutIds = async (ids: String) => { + return await request.delete({ url: `/wms/expectout/delete?ids=` + ids }) +} + // 导出预计出库存 Excel export const exportExpectout = async (params) => { if (params.isSearch) { diff --git a/src/views/wms/inventoryManage/expectout/index.vue b/src/views/wms/inventoryManage/expectout/index.vue index 11c60c94b..1810539c6 100644 --- a/src/views/wms/inventoryManage/expectout/index.vue +++ b/src/views/wms/inventoryManage/expectout/index.vue @@ -132,6 +132,7 @@ const buttonBaseClick = (val, item) => { const butttondata = [ // defaultButtons.mainListEditBtn({hasPermi:'wms:expectout:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:expectout:delete'}), // 删除 + defaultButtons.mainListDeleteBtn({hasPermi:'wms:expectout:deleteIds'}), // 批量删除 ] // 列表-操作按钮事件 From 15b8b46220b42f76c735910e77b344facea52195 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 25 Jun 2024 11:17:14 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/disposition/defaultButtons.ts | 13 ++++++ .../wms/inventoryManage/expectin/index.vue | 41 ++++++++++++++++- .../wms/inventoryManage/expectout/index.vue | 44 +++++++++++++++++-- 3 files changed, 92 insertions(+), 6 deletions(-) diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index d74160dc8..9faec3f8c 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -980,6 +980,19 @@ export function mainLisSelectiontPointBtn(option:any) { hasPermi: '' }) } +// 主列表-批量删除 +export function mainLisSelectiontDeleteBtn(option:any) { + return __defaultBtnOption(option,{ + label: t(`ts.批量删除`).replace('ts.', ''), + name: 'selection_delete', + hide: false, + type: 'primary', + icon: 'ep:download', + color: '', + float:'left', + hasPermi: '' + }) +} // 主列表-生成采购收货申请 export function mainListGenerateApplicationBtn(option:any) { return __defaultBtnOption(option,{ diff --git a/src/views/wms/inventoryManage/expectin/index.vue b/src/views/wms/inventoryManage/expectin/index.vue index 42aafcfe4..b85574fd7 100644 --- a/src/views/wms/inventoryManage/expectin/index.vue +++ b/src/views/wms/inventoryManage/expectin/index.vue @@ -1,7 +1,7 @@