From 1b9b8cdc7b878db35e288e0316613b24911ce09c Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 3 Jul 2024 10:14:49 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=9B=9E=E6=98=BE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableForm/src/TableForm.vue | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index e73b602aa..28db8d9a7 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -91,7 +91,7 @@ " :disabled="disabledInput(headerItem, row)" style="flex: 1" - @blur.stop="inputStringBlur(headerItem, row[headerItem.field], row, index)" + @blur="inputStringBlur(headerItem, row[headerItem.field], row, index)" /> @@ -123,9 +123,7 @@ :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label" :disabled="itemIsDisabled(headerItem, row)" style="width: 100%" - @input.stop="row[headerItem.field] = row[headerItem.field].replace(/[^\d\.-]/g, '')" - @click.stop="" - @focus.stop="" + @input="row[headerItem.field] = row[headerItem.field].replace(/[^\d\.-]/g, '')" /> @@ -141,7 +139,7 @@ :min="headerItem?.tableForm?.min" :precision="headerItem?.tableForm?.precision" :disabled="itemIsDisabled(headerItem, row)" - @change.stop=" + @change=" (e) => { inputNumberChange(headerItem.field, $index, row, e) } @@ -164,8 +162,8 @@ :allow-create="headerItem?.tableForm.allowCreate" style="width: 100%" :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label" - @change.stop="formSelectChange(headerItem.field, $event, row)" - @blur.stop="tableFormSelectOnBlur(headerItem.field, $event, row, $index)" + @change="formSelectChange(headerItem.field, $event, row)" + @blur="tableFormSelectOnBlur(headerItem.field, $event, row, $index)" > From 37e37d7530f835494cf4d87d0d4ba71c45e1a0fb Mon Sep 17 00:00:00 2001 From: chenfang Date: Wed, 3 Jul 2024 13:37:15 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=88=B6=E5=93=81=E6=8A=A5=E5=BA=9F?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=8F=AD=E7=BB=84/=E7=8F=AD=E6=AC=A1?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptscrapRequestMain.data.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts index 2e93ad900..7896c89eb 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts @@ -485,12 +485,12 @@ export const ProductreceiptRequestMainRules = reactive({ workshopCode: [ { required: true, message: '请选择车间代码', trigger: 'change' } ], - team: [ - { required: true, message: '请选择班组代码', trigger: 'change' } - ], - shift: [ - { required: true, message: '请选择班次代码', trigger: 'change' } - ], + // team: [ + // { required: true, message: '请选择班组代码', trigger: 'change' } + // ], + // shift: [ + // { required: true, message: '请选择班次代码', trigger: 'change' } + // ], dueTime: [ { required: true, message: '请选择截止时间', trigger: 'blur' } ], From 44b7ab299c7951e76e08511c202f94c1f10aa7e9 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Wed, 3 Jul 2024 15:35:16 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=A4=84=E7=90=86=20=E5=88=9B=E5=BB=BA=E4=BA=BA=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saleShipmentMain.data.ts | 34 +++++++++++++ .../stockupMainRequest.data.ts | 34 +++++++++++++ .../inventoryManage/balance/balance.data.ts | 4 +- .../containerMainRequest.data.ts | 46 +++++++++++++++++ .../containerRecordMain.data.ts | 34 +++++++++++++ .../initialContainerMainRequest.data.ts | 49 +++++++++++++++++++ .../scrapContainerMainRequest.data.ts | 36 +++++++++++++- .../packagemergeMain/packagemergeMain.data.ts | 11 ++++- .../packageoverJobMain.data.ts | 10 +++- .../packageoverRecordMain.data.ts | 4 +- .../packageoverRetrospect.data.ts | 4 +- .../packagesplitMain/packagesplitMain.data.ts | 11 ++++- .../scrap/scrapJobMain/scrapJobMain.data.ts | 2 + .../scrapRecordMain/scrapRecordMain.data.ts | 35 +++++++++++++ .../sparepartsrequisitionRecordMain.data.ts | 42 ++++++++++++++-- .../transferissueRecordMain.data.ts | 33 +++++++++++++ .../unplannedissueRecordMain.data.ts | 38 +++++++++++++- .../unplannedreceiptRecordMain.data.ts | 36 +++++++++++++- .../issue/issueJobMain/issueJobMain.data.ts | 2 +- .../pick/pickJobMain/pickJobMain.data.ts | 2 +- .../productionreceiptJobMain.data.ts | 2 +- .../productionreceiptRecordMain.data.ts | 10 ++-- .../repleinshJobMain/repleinshJobMain.data.ts | 2 +- .../inventorychangeRecordMain.data.ts | 34 +++++++++++++ .../productionMain/productionMain.data.ts | 2 + .../qadProductionPlanMain.data.ts | 3 ++ .../productputawayJobMain.data.ts | 2 +- 27 files changed, 498 insertions(+), 24 deletions(-) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts index 947bdb2c0..00186c67c 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts @@ -249,6 +249,40 @@ export const SaleShipmentMain = useCrudSchemas(reactive([ 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: 'action', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index 7cd4f747d..acdc78077 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -191,6 +191,40 @@ export const StockupMainRequest = useCrudSchemas(reactive([ 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: 'deliverDate', diff --git a/src/views/wms/inventoryManage/balance/balance.data.ts b/src/views/wms/inventoryManage/balance/balance.data.ts index df4d67408..ed21c8de7 100644 --- a/src/views/wms/inventoryManage/balance/balance.data.ts +++ b/src/views/wms/inventoryManage/balance/balance.data.ts @@ -412,6 +412,7 @@ export const Balance = useCrudSchemas(reactive([ } }, isForm: false, + isTable: false }, { label: '最后更新者', @@ -421,6 +422,7 @@ export const Balance = useCrudSchemas(reactive([ width: 150 }, isForm: false, + isTable: false }, // TODO: 临时添加 方便操作 { @@ -455,4 +457,4 @@ export const BalanceRules = reactive({ produceDate: [ { required: true, message: '请选择生产日期', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts index 980fdaed0..ed1f59bfd 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts @@ -212,6 +212,9 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, search: { component: 'DatePicker', componentProps: { @@ -220,8 +223,51 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + isTable: true, + 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: '扩展属性', diff --git a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts index 4428b0768..e63799675 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/containerRecordMain/containerRecordMain.data.ts @@ -146,6 +146,40 @@ export const ContainerRecordMain = useCrudSchemas(reactive([ 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: 'action', diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts index e15a50fe0..42a132c15 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts @@ -216,6 +216,9 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, search: { component: 'DatePicker', componentProps: { @@ -227,6 +230,49 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ isTable: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: 'extraProperties', @@ -414,6 +460,9 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, search: { component: 'DatePicker', componentProps: { diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts index 5f91c6d30..804623d5e 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts @@ -226,7 +226,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, - isTable: false, + isTable: true, isForm: false, }, { @@ -238,6 +238,40 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ 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: 'extraProperties', diff --git a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts index a63d7609e..0dfcb1ee0 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts @@ -195,7 +195,16 @@ export const PackagemergeMain = useCrudSchemas(reactive([ } }, isForm: false - } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, ])) // 表单校验 diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts index c8a795eeb..6ba16b567 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts @@ -470,6 +470,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '创建时间', @@ -490,14 +491,16 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false }, { label: '最后更新者', - field: 'update', + field: 'updater', sort: 'custom', table: { width: 150 }, + isTable: false }, { label: '最后更新时间', @@ -518,6 +521,7 @@ export const PackageoverJobMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false }, // { // label: '操作', @@ -778,11 +782,12 @@ export const PackageoverJobDetail = useCrudSchemas(reactive([ }, { label: '最后更新者', - field: 'update', + field: 'updater', sort: 'custom', table: { width: 150 }, + isTable: false }, { label: '最后更新时间', @@ -795,6 +800,7 @@ export const PackageoverJobDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts index 0cdb5f1f4..247744996 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts @@ -206,11 +206,12 @@ export const PackageoverMain = useCrudSchemas(reactive([ }, { label: '最后更新者', - field: 'update', + field: 'updater', sort: 'custom', table: { width: 150 }, + isTable: false, }, { label: '最后更新时间', @@ -231,6 +232,7 @@ export const PackageoverMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false, }, { label: '操作', diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts index 4f1f27fb9..1939227f8 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/packageoverRetrospect.data.ts @@ -380,11 +380,12 @@ export const PackageoverRetrospect = useCrudSchemas(reactive([ }, { label: '最后更新者', - field: 'update', + field: 'updater', sort: 'custom', table: { width: 150 }, + isTable: false }, { label: '最后更新时间', @@ -405,6 +406,7 @@ export const PackageoverRetrospect = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false }, { label: '操作', diff --git a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts index 858b188df..7ea57ca7b 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts @@ -196,7 +196,16 @@ export const PackagesplitMain = useCrudSchemas(reactive([ } }, isForm: false - } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, ])) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts index d98bb5715..feef35d09 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts @@ -454,6 +454,7 @@ export const ScrapJobMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable: false }, { label: '创建者', @@ -462,6 +463,7 @@ export const ScrapJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false }, { label: '最后更新时间', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index 2116cd297..995244733 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -223,6 +223,41 @@ export const ScrapRecordMain = 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: 'code', diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts index 103ae41fa..7c91283a9 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts @@ -388,6 +388,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, + isTable:false, }, { label: '创建者', @@ -396,6 +397,41 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, + }, + { + 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: '代码', @@ -484,7 +520,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive( label: '单据号', field: 'number', sort: 'custom', - hiddenInMain:true, + hiddenInMain:true, table: { width: 180 }, @@ -672,7 +708,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive( sort: 'custom', table: { width: 150 - }, + }, }, // { // label: '任务明细ID', @@ -752,4 +788,4 @@ export const UnplannedissueRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts index 817185d6b..ed12072bb 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts @@ -287,6 +287,39 @@ export const TransferissueRecordMain = useCrudSchemas(reactive([ width: 150 }, }, + { + 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', + } + }, + isTable:false, + isForm: false, + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + isForm: false, + }, { label: '是否可用', field: 'available', diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index 0952ec3d1..3564cd088 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -409,6 +409,40 @@ export const UnplannedissueRecordMain = 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: 'code', @@ -701,7 +735,7 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive( sort: 'custom', table: { width: 150 - }, + }, }, // { // label: '任务明细ID', @@ -781,4 +815,4 @@ export const UnplannedissueRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index 94435be74..35573b9bb 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -387,6 +387,40 @@ export const UnplannedreceiptRecordMain = 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: 'code', @@ -833,4 +867,4 @@ export const UnplannedreceiptRecordDetailRules = reactive({ expireDate: [ { required: true, message: '请选择过期日期', trigger: 'change' } ] -}) \ No newline at end of file +}) diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts index 0cca5fb3e..8c9d6859b 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts +++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts @@ -178,7 +178,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ }, { label: '最后更新者', - field: 'update', + field: 'updater', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts index 0a50534e2..9c05d2389 100644 --- a/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts +++ b/src/views/wms/issueManage/pick/pickJobMain/pickJobMain.data.ts @@ -122,7 +122,7 @@ export const PickJobMain = useCrudSchemas(reactive([ }, { label: '最后更新者', - field: 'update', + field: 'updater', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts index d4a23798e..427fdf8e1 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts @@ -146,7 +146,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ }, { label: '最后更新者', - field: 'update', + field: 'updater', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts index 3aca32bcf..734aa714d 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts @@ -77,7 +77,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive label: '执行时间', field: 'executeTime', formatter: dateFormatter, - detai: { + detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', @@ -98,7 +98,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive label: '生效日期', field: 'activeDate', formatter: dateFormatter2, - detai: { + detail: { dateFormat: 'YYYY-MM-DD' }, isTable: false, @@ -120,7 +120,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive label: '申请时间', field: 'requestTime', formatter: dateFormatter, - detai: { + detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', @@ -141,7 +141,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive label: '截止时间', field: 'dueTime', formatter: dateFormatter, - detai: { + detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', @@ -200,7 +200,7 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive label: '创建时间', field: 'createTime', formatter: dateFormatter, - detai: { + detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', diff --git a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts index a7edac51c..a24e43277 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshJobMain/repleinshJobMain.data.ts @@ -558,7 +558,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ }, { label: '最后更新者', - field: 'update', + field: 'updater', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts index b33d5b3ff..d0e08da04 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts @@ -194,6 +194,40 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive([ }, isTable: false }, + { + 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', diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index 1994190d0..81fbd9a61 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -796,6 +796,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ hiddenInMain: true, isTableForm: false, isForm: false, + isTable: true }, { label: '创建时间', @@ -820,6 +821,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ }, isTableForm: false, isForm: false, + isTable: true, }, { label: '是否可用', diff --git a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts index e9de6fa60..21f5e26ea 100644 --- a/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts +++ b/src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts @@ -48,6 +48,9 @@ export const QadProductionPlanMain = useCrudSchemas(reactive([ field: 'planDate', sort: 'custom', formatter: dateFormatter2, + detail: { + dateFormat : 'YYYY-MM-DD' + }, form: { component: 'DatePicker', componentProps: { diff --git a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts index ddf7b4a66..a3386256a 100644 --- a/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts +++ b/src/views/wms/productionManage/productputaway/productputawayJobMain/productputawayJobMain.data.ts @@ -148,7 +148,7 @@ export const ProductputawayJobMain = useCrudSchemas(reactive([ }, { label: '最后更新者', - field: 'update', + field: 'updater', sort: 'custom', table: { width: 150 From 8e934624716853283e73310e80d324eea1c133b6 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Wed, 3 Jul 2024 17:24:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1=E3=80=81=E7=9B=98=E7=82=B9=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1=E6=8B=86=E5=88=86?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/countPlanMain/index.ts | 1 + src/utils/dict.ts | 1 + .../count/countPlanMain/countPlanMain.data.ts | 17 +++++++++++++++++ 3 files changed, 19 insertions(+) diff --git a/src/api/wms/countPlanMain/index.ts b/src/api/wms/countPlanMain/index.ts index 69cc8d502..e292f6d42 100644 --- a/src/api/wms/countPlanMain/index.ts +++ b/src/api/wms/countPlanMain/index.ts @@ -8,6 +8,7 @@ export interface CountPlanMainVO { ignoreListOfItem: string ignoreListOfLocation: string scopeList: string + countSplitType: string number: string businessType: string remark: string diff --git a/src/utils/dict.ts b/src/utils/dict.ts index d7a5442ae..c94fbd934 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -224,6 +224,7 @@ export enum DICT_TYPE { REQEUST_MODE = 'reqeust_mode', // 申请模式 TIME_UNIT = 'time_unit', // 时间单位 COUNT_TYPE = 'count_type', // 盘点类型 + COUNT_SPLIT_TYPE = 'count_split_type', // 盘点拆分方式 COUNT_SCOPE_TYPE = 'count_scope_type', // 盘点范围类型 BARCODE_PREFIX = 'barcode_prefix', // 条码前缀 SETTLEMENT_TYPE = 'settlement_type', // 结算类型 diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index 124281f36..c7a00e435 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -48,6 +48,20 @@ export const CountPlanMain = useCrudSchemas(reactive([ }, isSearch: true }, + { + label: '任务拆分方式', + field: 'countSplitType', + dictType: DICT_TYPE.COUNT_SPLIT_TYPE, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + form: { + value:'LOCATION_CODE', + } + }, { label: '',//执行周期 field: 'crontab', @@ -506,6 +520,9 @@ export const CountPlanMainRules = reactive({ type: [ { required: true, message: '请选择盘点类型', trigger: 'change' } ], + countSplitType: [ + { required: true, message: '请选择任务拆分方式', trigger: 'change' } + ], crontab: [ { required: false, message: '请填写执行周期', trigger: ['change','blur'] },{ max: 50, message: '不得超过50个字符', trigger: 'blur' } ],