From 413d6c9302e65dd7cb53e63f4cce7facdaba33c3 Mon Sep 17 00:00:00 2001
From: zhang_li
Date: Mon, 12 May 2025 14:22:40 +0800
Subject: [PATCH 1/3] YT-2599
---
.../deliver/deliverRequestMain/index.vue | 44 ++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index 3baa1316e..b1bb44d43 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -114,7 +114,6 @@ const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息
const routeName = ref()
routeName.value = route.name
-const tableColumns = ref([...DeliverRequestMain.allSchemas.tableColumns,...DeliverRequestDetail.allSchemas.tableMainColumns])
const isShowButton = ref(true)
const businessType = ref()
@@ -131,12 +130,53 @@ const { tableObject, tableMethods } = useTable({
/**
* DeliverRequestMain 成品发货申请
*/
+console.log(4555, routeName.value)
+DeliverRequestMain.allSchemas.formSchema.forEach(item => {
+ if (item.field == 'dueTime') {
+ item.label = '截止时间'
+ }
+})
+DeliverRequestMain.allSchemas.tableColumns.forEach(item => {
+ if (item.field == 'dueTime') {
+ item.label = '截止时间'
+ }
+})
+DeliverRequestMain.allSchemas.detailSchema.forEach(item => {
+ if (item.field == 'dueTime') {
+ item.label = '截止时间'
+ }
+})
+DeliverRequestMain.allSchemas.searchSchema.forEach(item => {
+ if (item.field == 'dueTime') {
+ item.label = '截止时间'
+ }
+})
if ( routeName.value == 'DeliverRequestMain') {
tableObject.params = {
businessType: 'Deliver'
}
businessType.value = 'Deliver'
importFileName.value = '成品发货申请'
+ DeliverRequestMain.allSchemas.formSchema.forEach(item => {
+ if (item.field == 'dueTime') {
+ item.label = '发货日期'
+ }
+ })
+ DeliverRequestMain.allSchemas.tableColumns.forEach(item => {
+ if (item.field == 'dueTime') {
+ item.label = '发货日期'
+ }
+ })
+ DeliverRequestMain.allSchemas.detailSchema.forEach(item => {
+ if (item.field == 'dueTime') {
+ item.label = '发货日期'
+ }
+ })
+ DeliverRequestMain.allSchemas.searchSchema.forEach(item => {
+ if (item.field == 'dueTime') {
+ item.label = '发货日期'
+ }
+ })
} else if ( routeName.value == 'ZZBJDeliverRequestMain') {
tableObject.params = {
businessType: 'ZZBJDeliver'
@@ -144,6 +184,8 @@ const { tableObject, tableMethods } = useTable({
businessType.value = 'ZZBJDeliver'
importFileName.value = '自制备件发货申请'
}
+console.log(333,DeliverRequestMain.allSchemas.tableColumns)
+const tableColumns = ref([...DeliverRequestMain.allSchemas.tableColumns,...DeliverRequestDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段
const updataTableColumns = (val) => {
From 0f0afb5819514c621b0d1b25d039665f283f61c2 Mon Sep 17 00:00:00 2001
From: zhang_li
Date: Mon, 12 May 2025 14:24:48 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=BF=AE=E6=94=B9YT-2599?=
=?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../deliver/deliverRequestMain/index.vue | 44 +------------------
1 file changed, 1 insertion(+), 43 deletions(-)
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index b1bb44d43..3baa1316e 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -114,6 +114,7 @@ const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息
const routeName = ref()
routeName.value = route.name
+const tableColumns = ref([...DeliverRequestMain.allSchemas.tableColumns,...DeliverRequestDetail.allSchemas.tableMainColumns])
const isShowButton = ref(true)
const businessType = ref()
@@ -130,53 +131,12 @@ const { tableObject, tableMethods } = useTable({
/**
* DeliverRequestMain 成品发货申请
*/
-console.log(4555, routeName.value)
-DeliverRequestMain.allSchemas.formSchema.forEach(item => {
- if (item.field == 'dueTime') {
- item.label = '截止时间'
- }
-})
-DeliverRequestMain.allSchemas.tableColumns.forEach(item => {
- if (item.field == 'dueTime') {
- item.label = '截止时间'
- }
-})
-DeliverRequestMain.allSchemas.detailSchema.forEach(item => {
- if (item.field == 'dueTime') {
- item.label = '截止时间'
- }
-})
-DeliverRequestMain.allSchemas.searchSchema.forEach(item => {
- if (item.field == 'dueTime') {
- item.label = '截止时间'
- }
-})
if ( routeName.value == 'DeliverRequestMain') {
tableObject.params = {
businessType: 'Deliver'
}
businessType.value = 'Deliver'
importFileName.value = '成品发货申请'
- DeliverRequestMain.allSchemas.formSchema.forEach(item => {
- if (item.field == 'dueTime') {
- item.label = '发货日期'
- }
- })
- DeliverRequestMain.allSchemas.tableColumns.forEach(item => {
- if (item.field == 'dueTime') {
- item.label = '发货日期'
- }
- })
- DeliverRequestMain.allSchemas.detailSchema.forEach(item => {
- if (item.field == 'dueTime') {
- item.label = '发货日期'
- }
- })
- DeliverRequestMain.allSchemas.searchSchema.forEach(item => {
- if (item.field == 'dueTime') {
- item.label = '发货日期'
- }
- })
} else if ( routeName.value == 'ZZBJDeliverRequestMain') {
tableObject.params = {
businessType: 'ZZBJDeliver'
@@ -184,8 +144,6 @@ DeliverRequestMain.allSchemas.searchSchema.forEach(item => {
businessType.value = 'ZZBJDeliver'
importFileName.value = '自制备件发货申请'
}
-console.log(333,DeliverRequestMain.allSchemas.tableColumns)
-const tableColumns = ref([...DeliverRequestMain.allSchemas.tableColumns,...DeliverRequestDetail.allSchemas.tableMainColumns])
// 字段设置 更新主列表字段
const updataTableColumns = (val) => {
From 4e7bcfd57dcf3dccc9bc2116a39a241ccfbfbd93 Mon Sep 17 00:00:00 2001
From: zhang_li
Date: Mon, 12 May 2025 14:33:21 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=81=A2=E5=A4=8DYT-2595SCP=E3=80=8A?=
=?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7=E8=AE=B0=E5=BD=95=E3=80=8B?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E6=98=BE=E7=A4=BA=E5=AD=90=E8=A1=A8?=
=?UTF-8?q?=E7=9A=84=20=E2=80=9C=E5=88=B0=E8=B4=A7=E6=97=A5=E6=9C=9F?=
=?UTF-8?q?=E2=80=9D=20=E5=AD=97=E6=AE=B5=E4=B9=8B=E5=89=8D=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../purchasereceiptRecordMain.data.ts | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
index f1b5feff8..ca436ac6a 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts
@@ -976,7 +976,8 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive
valueFormat: 'x',
}
},
- sortTableDefault:19,
+ sortTableDefault: 17,
+ hiddenInMain: true
},
{
label: '生产日期',
@@ -998,7 +999,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive
valueFormat: 'x',
}
},
- sortTableDefault: 19,
+ sortTableDefault: 17,
hiddenInMain:true
},
{
@@ -1021,7 +1022,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive
valueFormat: 'x',
}
},
- sortTableDefault: 19,
+ sortTableDefault: 17,
hiddenInMain:true
},
{