From 6c0dbbf41e6f4ba2afe854804f35f0b4fee1cdb4 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 21 Nov 2024 08:52:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerStatementMain.data.ts | 6 +++--- ...merToolApportStatementForecastMain.data.ts | 16 +++++++++------- .../index.vue | 19 +++++++++---------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts index 2b61a8290..36034c83f 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatterYM } from '@/utils/formatTime' import { validateTwoNum } from '@/utils/validator' import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain' const { t } = useI18n() // 国际化 @@ -72,7 +72,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ label: '年月', field: 'yearsMonth', sort: 'custom', - formatter: dateFormatter, + formatter: dateFormatterYM, isSearch: true, search: { component: 'DatePicker', @@ -164,7 +164,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ field: 'action', isForm: false, table: { - width: 360, + width: 400, fixed: 'right' } } diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts index 38f6d0e33..b0f00e24c 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/customerToolApportStatementForecastMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatterYM } from '@/utils/formatTime' import * as CustomerSaleInvoiceMainApi from '@/api/wms/customerSaleInvoiceMain' const { t } = useI18n() // 国际化 @@ -64,21 +64,24 @@ export const CustomerToolApportStatementForecastMain = useCrudSchemas(reactive([ { label: '车型', - field: 'number', + field: 'vehicleType', sort: 'custom', isSearch: true, }, { label: '模具分摊预测金额', - field: 'articleNumber', + field: 'forecastAllocationAmount', sort: 'custom', isSearch: true, }, diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue b/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue index c8284f58f..851d3a63a 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerToolApportStatementForecastMain/index.vue @@ -333,16 +333,15 @@ const changeTabs = async (item) => { }] apiPage.value = CustomerToolApportStatementForecastDetailApi.getCustomerToolApportStatementForecastDetailPage DetailAllSchemas.value = CustomerToolApportStatementForecastDetail.allSchemas - otherHeadButttonData.value = [] - // otherHeadButttonData.value = [{ - // label: t(`ts.导出`).replace('ts.', ''), - // name: 'exportDetail', - // hide: false, - // type: 'success', - // icon: 'ep:download', - // color: '', - // hasPermi: '' - // }] + otherHeadButttonData.value = [{ + label: t(`ts.导出`).replace('ts.', ''), + name: 'exportDetail', + hide: false, + type: 'success', + icon: 'ep:download', + color: '', + hasPermi: '' + }] } else if (item.prop == 'ForecastWithBilltDifference') { // 点击预测与对账单差异 tabsExtend.value = true From 9884fd34df04fc9f05f4b64c78f887f0f8c4301c Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Thu, 21 Nov 2024 08:58:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B9=B4=E6=9C=88=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerStatementMain.data.ts | 53 +++++++++---------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts index 36034c83f..124616c97 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts @@ -68,32 +68,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ sort: 'custom', isSearch: false, }, - { - label: '年月', - field: 'yearsMonth', - sort: 'custom', - formatter: dateFormatterYM, - isSearch: true, - search: { - component: 'DatePicker', - componentProps: { - valueFormat: 'YYYY-MM', - type: 'daterange', - defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - } - }, - detail: { - dateFormat: 'YYYY-MM' - }, - isTable:false, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'YYYY-MM' - } - }, - }, + // { // label: '年月', // field: 'yearsMonthStr', @@ -120,7 +95,31 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ } }, }, - + { + label: '年月', + field: 'yearsMonth', + sort: 'custom', + formatter: dateFormatterYM, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + detail: { + dateFormat: 'YYYY-MM' + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'YYYY-MM' + } + }, + }, { label: '创建者', field: 'creator',