From 534533425b15b183cea60fa162d9884e5d3c6243 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 13 十月 2026 17:55:50 +0800
Subject: [PATCH] Merge branch 'dev_海西州_北京同仁堂' into dev_海西州_惠牧
---
src/views/bi/dashboard/index.vue | 10
src/views/mes/pro/mps/data.ts | 2
src/views/mes/pro/process/data.ts | 2
src/views/erp/finance/payment/data.ts | 4
src/views/basicData/mdm/unit/data.ts | 2
src/views/wms/order/shipment/data.ts | 6
src/views/crm/salesTarget/data.ts | 2
src/views/hrm/salary/structure/data.ts | 2
src/views/crm/customer/limitConfig/data.ts | 2
src/views/hrm/overtime/data.ts | 2
src/views/system/dict/data.ts | 4
src/views/wls/warehouse/location/data.ts | 2
src/views/wms/order/receipt/modules/print.vue | 6
src/views/erp/purchase/request/detail/index.vue | 10
src/views/hrm/attendance/holiday/data.ts | 2
src/views/mes/pro/route/data.ts | 2
src/views/crm/product/data.ts | 4
src/views/hrm/salary/employee-social-security/data.ts | 2
src/views/crm/product/category/data.ts | 2
src/views/mes/pd/project/detail/data.ts | 4
src/views/crm/contract/detail/index.vue | 2
src/views/crm/receivable/plan/detail/index.vue | 2
src/views/wms/order/movement/data.ts | 6
src/views/crm/invoice/data.ts | 6
src/views/hrm/attendance/exception/data.ts | 2
src/views/erp/stock/move/data.ts | 4
src/views/erp/finance/payment/detail/approve/index.vue | 6
src/views/mes/dv/metering/data.ts | 2
src/views/mes/qc/template/data.ts | 2
src/views/crm/invoice/detail/data.ts | 10
src/views/hrm/resignation/data.ts | 2
src/views/hrm/salary/payment/data.ts | 2
src/views/erp/product/category/data.ts | 2
src/views/system/role/data.ts | 2
src/views/crm/customer/detail/data.ts | 11
src/views/crm/saleQuotation/modules/ocr-upload.vue | 3
src/views/mes/qc/report/instance/data.ts | 2
src/api/crm/customer/index.ts | 1
src/views/mes/pro/workorder/data.ts | 2
src/views/mes/process-design/process/data.ts | 2
src/views/system/loginlog/data.ts | 6
src/views/wms/order/shipment/modules/print.vue | 6
src/views/crm/receivable/detail/approve/index.vue | 6
src/views/erp/stock/check/data.ts | 4
src/views/wls/barcode/data.ts | 6
src/views/mes/process-design/template/data.ts | 2
src/views/mes/qc/ledger/data.ts | 2
src/views/crm/customer/pool/data.ts | 18 +
src/views/mes/pro/feedback/data.ts | 10
src/views/basicData/mdm/data.ts | 2
src/views/crm/clue/data.ts | 11
src/components/operate-log/typing.ts | 2
src/views/erp/purchase/in/data.ts | 4
src/views/crm/business/detail/index.vue | 2
src/views/hrm/employee/contract/data.ts | 2
src/views/wls/sn/data.ts | 4
src/views/erp/product/unit/data.ts | 2
src/views/mes/pd/project/data.ts | 4
src/views/wms/order/movement/modules/print.vue | 6
src/views/wms/order/check/data.ts | 6
src/views/mes/cal/team/data.ts | 2
src/views/erp/purchase/order/data.ts | 4
src/views/hrm/attendance/exception/detail/approve/index.vue | 4
src/views/system/post/data.ts | 2
src/components/operate-log/operate-log.vue | 5
src/views/crm/receivable/components/data.ts | 2
src/views/erp/purchase/invoice/detail/approve/index.vue | 6
src/views/mes/dv/maintenrecord/data.ts | 8
src/views/srm/supplierApply/detail/index.vue | 4
src/views/erp/purchase/request/data.ts | 4
src/views/erp/stock/warehouse/data.ts | 2
src/views/mes/dv/machinery/modules/mainten-record-list.vue | 2
src/views/crm/business/detail/data.ts | 8
src/views/erp/sale/return/data.ts | 4
src/views/wms/order/shipment/index.vue | 6
src/views/crm/receivable/detail/data.ts | 10
src/views/hrm/transfer/data.ts | 2
src/views/wms/md/item/category/data.ts | 2
src/views/mes/pd/project/modules/version-change/data.ts | 2
src/views/crm/receivable/plan/detail/data.ts | 12
src/views/wms/order/movement/index.vue | 6
src/views/erp/purchase/order/detail/index.vue | 10
src/views/mes/dv/checkplan/data.ts | 2
src/views/mes/dv/machinery/data.ts | 16
src/views/crm/contact/detail/data.ts | 6
src/views/crm/statistics/funnel/data.ts | 17
src/views/crm/receivable/plan/data.ts | 10
src/views/mes/qc/defect/data.ts | 2
src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue | 2
src/views/wms/md/warehouse/data.ts | 2
src/views/mes/pro/workrecord/data.ts | 2
src/views/mes/md/workstation/data.ts | 2
src/views/mes/md/item/data.ts | 4
src/views/mes/md/item/type/data.ts | 2
src/views/hrm/transfer/detail/approve/index.vue | 6
src/views/crm/customer/data.ts | 46 +++
src/views/erp/stock/in/data.ts | 4
src/views/mes/md/autocode/data.ts | 2
src/views/erp/stock/warehouseMapping/data.ts | 2
src/views/mes/qc/rqc/data.ts | 6
src/views/mes/dv/meteringcheck/data.ts | 2
src/views/crm/business/data.ts | 10
src/views/mes/dv/checkrecord/data.ts | 8
src/views/hrm/salary/leave-type-config/data.ts | 2
src/views/system/operatelog/data.ts | 6
src/views/crm/invoice/index.vue | 1
src/views/crm/receivable/plan/components/data.ts | 4
src/views/mes/pro/feedback/modules/batch-input-dialog.vue | 4
src/views/mes/qc/report/template/data.ts | 2
src/views/bi/config/chart/data.ts | 2
src/views/hrm/employee/data.ts | 2
src/views/crm/statistics/portrait/data.ts | 1
src/views/system/dept/data.ts | 2
src/views/crm/clue/detail/index.vue | 2
src/views/crm/product/detail/index.vue | 2
src/views/mes/process-design/route/data.ts | 2
src/views/crm/permission/modules/data.ts | 2
src/views/hrm/leave/detail/approve/index.vue | 4
src/views/hrm/overtime/detail/approve/index.vue | 4
src/views/mes/qc/batchtrace/data.ts | 4
src/views/mes/qc/ncr/data.ts | 4
src/views/system/user/data.ts | 2
src/views/crm/clue/detail/data.ts | 6
src/views/erp/purchase/invoice/data.ts | 2
src/views/wms/order/check/index.vue | 6
src/views/crm/invoice/detail/approve/index.vue | 6
src/views/erp/finance/receipt/data.ts | 4
src/views/mes/pd/project/modules/task/data.ts | 2
src/views/crm/invoice/detail/index.vue | 5
src/views/wms/order/receipt/index.vue | 6
src/views/wls/productissue/data.ts | 6
src/views/erp/stock/out/data.ts | 4
src/views/crm/statistics/customer/data.ts | 5
src/views/mes/pd/archive/data.ts | 4
src/views/wls/warehouse/data.ts | 2
src/views/erp/product/product/data.ts | 2
src/views/mes/cal/plan/data.ts | 2
src/views/wls/transaction/data.ts | 2
src/views/crm/receivable/data.ts | 6
src/views/wls/materialstock/data.ts | 4
src/views/mes/dv/machinery/modules/check-record-list.vue | 2
src/views/crm/customer/pool/index.vue | 14 +
src/views/mes/qc/indicator/data.ts | 2
src/views/mes/dv/machinery/modules/repair-list.vue | 2
src/views/mes/dv/repair/data.ts | 6
src/views/crm/customer/detail/index.vue | 2
src/views/hrm/resignation/detail/approve/index.vue | 6
src/views/mes/dv/machinery/type/data.ts | 2
src/views/bi/config/data-source/data.ts | 2
src/views/wls/returnissue/data.ts | 6
src/views/erp/sale/customer/data.ts | 2
src/views/wls/warehouse/area/data.ts | 2
src/views/mes/pro/andon/record/data.ts | 2
src/views/crm/contact/detail/index.vue | 2
src/views/crm/followup/data.ts | 14
src/views/erp/purchase/return/data.ts | 4
src/views/erp/stock/record/data.ts | 2
src/views/hrm/leave/data.ts | 2
src/views/hrm/salary/social-security-scheme/data.ts | 2
src/views/crm/contact/data.ts | 10
src/views/crm/business/status/data.ts | 2
src/views/erp/finance/account/data.ts | 2
src/views/crm/receivable/detail/index.vue | 2
src/views/mes/process-design/parameter/data.ts | 2
src/views/crm/statistics/rank/data.ts | 1
src/views/wms/md/item/brand/data.ts | 2
src/views/mes/tm/tool/type/data.ts | 2
src/views/erp/sale/out/data.ts | 4
src/views/mes/dv/subject/data.ts | 2
src/views/wls/returnvendor/data.ts | 6
src/views/wms/order/check/modules/print.vue | 6
src/views/wms/order/receipt/data.ts | 6
src/views/mes/tm/tool/data.ts | 12
173 files changed, 425 insertions(+), 344 deletions(-)
diff --git a/src/api/crm/customer/index.ts b/src/api/crm/customer/index.ts
index a8a03ae..38d6e04 100644
--- a/src/api/crm/customer/index.ts
+++ b/src/api/crm/customer/index.ts
@@ -19,6 +19,7 @@
ownerUserDeptName?: string; // 璐熻矗浜虹殑閮ㄩ棬鍚嶇О
lockStatus?: boolean;
dealStatus?: boolean;
+ autoPoolEnabled?: boolean; // 鏄惁娴佸叆鍏捣锛屽叧闂椂鍙栨秷鍏捣鍙搴�
mobile: string; // 鎵嬫満鍙�
telephone: string; // 鐢佃瘽
qq: string; // QQ
diff --git a/src/components/operate-log/operate-log.vue b/src/components/operate-log/operate-log.vue
index 8b49466..a868e16 100644
--- a/src/components/operate-log/operate-log.vue
+++ b/src/components/operate-log/operate-log.vue
@@ -3,7 +3,7 @@
import { DICT_TYPE } from '@vben/constants';
import { getDictLabel, getDictObj } from '@vben/hooks';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { Tag, Timeline } from 'ant-design-vue';
@@ -11,6 +11,7 @@
withDefaults(defineProps<OperateLogProps>(), {
logList: () => [],
+ dateFormat: 'YYYY-MM-DD HH:mm:ss',
});
/** 鑾峰緱 userType 棰滆壊 */
@@ -48,7 +49,7 @@
</template>
<div class="ml-2 flex flex-wrap items-center gap-2 leading-[22px]">
<span class="w-[140px] shrink-0 text-[13px] text-gray-400">
- {{ formatDateTime(log.createTime) }}
+ {{ formatDate(log.createTime, dateFormat) }}
</span>
<Tag color="success" class="!mr-0">{{ log.userName }}</Tag>
<span>{{ log.action }}</span>
diff --git a/src/components/operate-log/typing.ts b/src/components/operate-log/typing.ts
index 773237b..856aa57 100644
--- a/src/components/operate-log/typing.ts
+++ b/src/components/operate-log/typing.ts
@@ -1,5 +1,7 @@
import type { SystemOperateLogApi } from '#/api/system/operate-log';
export interface OperateLogProps {
+ /** 浠呮帶鍒舵棩鏈熷睍绀猴紝涓嶆敼鍙樻棩蹇楀師濮嬫椂闂淬�� */
+ dateFormat?: string;
logList: SystemOperateLogApi.OperateLog[]; // 鎿嶄綔鏃ュ織鍒楄〃
}
diff --git a/src/views/basicData/mdm/data.ts b/src/views/basicData/mdm/data.ts
index b30e5e3..86d9b19 100644
--- a/src/views/basicData/mdm/data.ts
+++ b/src/views/basicData/mdm/data.ts
@@ -588,7 +588,7 @@
field: "createTime",
title: "鍒涘缓鏃堕棿",
minWidth: 180,
- formatter: "formatDateTime",
+ formatter: 'formatDate',
},
{
field: "isBatchManaged",
diff --git a/src/views/basicData/mdm/unit/data.ts b/src/views/basicData/mdm/unit/data.ts
index 6e15fe9..58ffaad 100644
--- a/src/views/basicData/mdm/unit/data.ts
+++ b/src/views/basicData/mdm/unit/data.ts
@@ -119,7 +119,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/bi/config/chart/data.ts b/src/views/bi/config/chart/data.ts
index 44b770d..4c7a5bb 100644
--- a/src/views/bi/config/chart/data.ts
+++ b/src/views/bi/config/chart/data.ts
@@ -201,7 +201,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 170,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/bi/config/data-source/data.ts b/src/views/bi/config/data-source/data.ts
index 7375b4e..c621eba 100644
--- a/src/views/bi/config/data-source/data.ts
+++ b/src/views/bi/config/data-source/data.ts
@@ -127,7 +127,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 170,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/bi/dashboard/index.vue b/src/views/bi/dashboard/index.vue
index cac84a6..c1bbf5c 100644
--- a/src/views/bi/dashboard/index.vue
+++ b/src/views/bi/dashboard/index.vue
@@ -134,8 +134,16 @@
return formatNumber(v);
}
+// 澶у睆琛ㄦ牸閲岀殑鏃ユ湡鍒楀彧灞曠ず鍒板ぉ锛堝舰濡� 2026-09-01 10:23:45 鐨勫�煎垏鎴� 2026-09-01锛夛紝
+// 鍥捐〃 SQL 閲岀殑 order_time / receipt_date / create_time / hire_date 閮芥槸甯︽椂鍒嗙鐨�
+const DATE_TIME_RE = /^\d{4}-\d{2}-\d{2}[ T]\d{2}:\d{2}(?::\d{2})?(?:\.\d+)?$/;
+
function getCellValue(row: unknown, col: string): unknown {
- return (row as Record<string, unknown>)[col];
+ const val = (row as Record<string, unknown>)[col];
+ if (typeof val === 'string' && DATE_TIME_RE.test(val)) {
+ return val.slice(0, 10);
+ }
+ return val;
}
// ======== 鐪嬫澘涓婚鑹� ========
diff --git a/src/views/crm/business/data.ts b/src/views/crm/business/data.ts
index d1c9a3e..99e576b 100644
--- a/src/views/crm/business/data.ts
+++ b/src/views/crm/business/data.ts
@@ -97,7 +97,7 @@
component: 'DatePicker',
componentProps: {
showTime: false,
- format: 'YYYY-MM-DD HH:mm:ss',
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
placeholder: '璇烽�夋嫨棰勮鎴愪氦鏃ユ湡',
},
@@ -218,7 +218,7 @@
{
field: 'contactNextTime',
title: '涓嬫鑱旂郴鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
width: 180,
},
{
@@ -234,19 +234,19 @@
{
field: 'contactLastTime',
title: '鏈�鍚庤窡杩涙椂闂�',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
width: 180,
},
{
field: 'updateTime',
title: '鏇存柊鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
width: 180,
},
{
field: 'createTime',
title: '鍒涘缓鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
width: 180,
},
{
diff --git a/src/views/crm/business/detail/data.ts b/src/views/crm/business/detail/data.ts
index 78272d2..c6b7abc 100644
--- a/src/views/crm/business/detail/data.ts
+++ b/src/views/crm/business/detail/data.ts
@@ -4,7 +4,7 @@
import type { CrmBusinessApi } from '#/api/crm/business';
import type { DescriptionItemSchema } from '#/components/description';
-import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
+import { erpPriceInputFormatter, formatDate } from '@vben/utils';
import {
getBusinessStatusSimpleList,
@@ -33,7 +33,7 @@
{
field: 'createTime',
label: '鍒涘缓鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
];
}
@@ -57,12 +57,12 @@
{
field: 'dealTime',
label: '棰勮鎴愪氦鏃ユ湡',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'contactNextTime',
label: '涓嬫鑱旂郴鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'statusTypeName',
diff --git a/src/views/crm/business/detail/index.vue b/src/views/crm/business/detail/index.vue
index a303220..869acae 100644
--- a/src/views/crm/business/detail/index.vue
+++ b/src/views/crm/business/detail/index.vue
@@ -168,7 +168,7 @@
/>
</Tabs.TabPane>
<Tabs.TabPane tab="鎿嶄綔鏃ュ織" key="6" :force-render="true">
- <OperateLog :log-list="logList" />
+ <OperateLog :log-list="logList" date-format="YYYY-MM-DD" />
</Tabs.TabPane>
<Tabs.TabPane tab="鍥㈤槦鎴愬憳" key="7" :force-render="true">
<PermissionList
diff --git a/src/views/crm/business/status/data.ts b/src/views/crm/business/status/data.ts
index 6a6920f..716b2be 100644
--- a/src/views/crm/business/status/data.ts
+++ b/src/views/crm/business/status/data.ts
@@ -70,7 +70,7 @@
{
field: 'createTime',
title: '鍒涘缓鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/crm/clue/data.ts b/src/views/crm/clue/data.ts
index 9973372..857622c 100644
--- a/src/views/crm/clue/data.ts
+++ b/src/views/crm/clue/data.ts
@@ -143,7 +143,7 @@
component: 'DatePicker',
componentProps: {
showTime: true,
- format: 'YYYY-MM-DD HH:mm:ss',
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
placeholder: '璇烽�夋嫨涓嬫鑱旂郴鏃堕棿',
},
@@ -209,6 +209,7 @@
component: 'RangePicker',
componentProps: {
...getRangePickerDefaultProps(),
+ format: 'YYYY-MM-DD',
allowClear: true,
placeholder: ['寮�濮嬫棩鏈�', '缁撴潫鏃ユ湡'],
},
@@ -278,7 +279,7 @@
{
field: 'contactNextTime',
title: '涓嬫鑱旂郴鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
minWidth: 180,
},
{
@@ -289,7 +290,7 @@
{
field: 'contactLastTime',
title: '鏈�鍚庤窡杩涙椂闂�',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
minWidth: 180,
},
{
@@ -310,13 +311,13 @@
{
field: 'updateTime',
title: '鏇存柊鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
minWidth: 180,
},
{
field: 'createTime',
title: '鍒涘缓鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
minWidth: 180,
},
{
diff --git a/src/views/crm/clue/detail/data.ts b/src/views/crm/clue/detail/data.ts
index 9536eb7..db47cc4 100644
--- a/src/views/crm/clue/detail/data.ts
+++ b/src/views/crm/clue/detail/data.ts
@@ -3,7 +3,7 @@
import { h } from 'vue';
import { DICT_TYPE } from '@vben/constants';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { DictTag } from '#/components/dict-tag';
@@ -30,7 +30,7 @@
{
field: 'createTime',
label: '鍒涘缓鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
];
}
@@ -101,7 +101,7 @@
{
field: 'contactNextTime',
label: '涓嬫鑱旂郴鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'remark',
diff --git a/src/views/crm/clue/detail/index.vue b/src/views/crm/clue/detail/index.vue
index 0966eb1..b72adf4 100644
--- a/src/views/crm/clue/detail/index.vue
+++ b/src/views/crm/clue/detail/index.vue
@@ -162,7 +162,7 @@
/>
</Tabs.TabPane>
<Tabs.TabPane tab="鎿嶄綔鏃ュ織" key="4" :force-render="true">
- <OperateLog :log-list="logList" />
+ <OperateLog :log-list="logList" date-format="YYYY-MM-DD" />
</Tabs.TabPane>
</Tabs>
</Card>
diff --git a/src/views/crm/contact/data.ts b/src/views/crm/contact/data.ts
index 331135d..c2d6813 100644
--- a/src/views/crm/contact/data.ts
+++ b/src/views/crm/contact/data.ts
@@ -164,7 +164,7 @@
component: 'DatePicker',
componentProps: {
showTime: true,
- format: 'YYYY-MM-DD HH:mm:ss',
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
placeholder: '璇烽�夋嫨涓嬫鑱旂郴鏃堕棿',
},
@@ -304,7 +304,7 @@
{
field: 'contactNextTime',
title: '涓嬫鑱旂郴鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
minWidth: 180,
},
{
@@ -324,7 +324,7 @@
{
field: 'contactLastTime',
title: '鏈�鍚庤窡杩涙椂闂�',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
minWidth: 180,
},
{
@@ -340,13 +340,13 @@
{
field: 'updateTime',
title: '鏇存柊鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
minWidth: 180,
},
{
field: 'createTime',
title: '鍒涘缓鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
minWidth: 180,
},
{
diff --git a/src/views/crm/contact/detail/data.ts b/src/views/crm/contact/detail/data.ts
index 3f10193..38948f9 100644
--- a/src/views/crm/contact/detail/data.ts
+++ b/src/views/crm/contact/detail/data.ts
@@ -3,7 +3,7 @@
import { h } from 'vue';
import { DICT_TYPE } from '@vben/constants';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { DictTag } from '#/components/dict-tag';
@@ -25,7 +25,7 @@
{
field: 'createTime',
label: '鍒涘缓鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
];
}
@@ -96,7 +96,7 @@
{
field: 'contactNextTime',
label: '涓嬫鑱旂郴鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'remark',
diff --git a/src/views/crm/contact/detail/index.vue b/src/views/crm/contact/detail/index.vue
index f11d7fe..66deaff 100644
--- a/src/views/crm/contact/detail/index.vue
+++ b/src/views/crm/contact/detail/index.vue
@@ -134,7 +134,7 @@
<Info :contact="contact" />
</Tabs.TabPane>
<Tabs.TabPane tab="鎿嶄綔鏃ュ織" key="3" :force-render="true">
- <OperateLog :log-list="logList" />
+ <OperateLog :log-list="logList" date-format="YYYY-MM-DD" />
</Tabs.TabPane>
<Tabs.TabPane tab="鍥㈤槦鎴愬憳" key="4" :force-render="true">
<PermissionList
diff --git a/src/views/crm/contract/detail/index.vue b/src/views/crm/contract/detail/index.vue
index 972e42f..310c838 100644
--- a/src/views/crm/contract/detail/index.vue
+++ b/src/views/crm/contract/detail/index.vue
@@ -169,7 +169,7 @@
/>
</Tabs.TabPane>
<Tabs.TabPane tab="鎿嶄綔鏃ュ織" key="6" :force-render="true">
- <OperateLog :log-list="logList" />
+ <OperateLog :log-list="logList" date-format="YYYY-MM-DD" />
</Tabs.TabPane>
</Tabs>
</Card>
diff --git a/src/views/crm/customer/data.ts b/src/views/crm/customer/data.ts
index 3a54242..77edaea 100644
--- a/src/views/crm/customer/data.ts
+++ b/src/views/crm/customer/data.ts
@@ -153,11 +153,22 @@
component: 'DatePicker',
componentProps: {
showTime: true,
- format: 'YYYY-MM-DD HH:mm:ss',
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
placeholder: '璇烽�夋嫨涓嬫鑱旂郴鏃堕棿',
allowClear: true,
},
+ },
+ {
+ fieldName: 'autoPoolEnabled',
+ label: '鏄惁娴佸叆鍏捣',
+ component: 'Switch',
+ defaultValue: true,
+ componentProps: {
+ checkedChildren: '鏄�',
+ unCheckedChildren: '鍚�',
+ },
+ help: '鍏抽棴鍚庝笉鑷姩娴佸叆鍏捣锛屽苟鍙栨秷鏅�氱敤鎴风殑鍏捣鍙搴︼紱淇濈暀璐熻矗浜哄拰鍥㈤槦鏉冮檺锛岃秴绾х鐞嗗憳浠嶅彲鏌ョ湅銆�',
},
{
fieldName: 'remark',
@@ -202,11 +213,25 @@
},
},
{
+ fieldName: 'autoPoolEnabled',
+ label: '鏄惁娴佸叆鍏捣',
+ component: 'Select',
+ componentProps: {
+ options: [
+ { label: '鏄�', value: true },
+ { label: '鍚�', value: false },
+ ],
+ placeholder: '璇烽�夋嫨',
+ allowClear: true,
+ },
+ },
+ {
fieldName: 'createTime',
label: '鍒涘缓鏃堕棿',
component: 'RangePicker',
componentProps: {
...getRangePickerDefaultProps(),
+ format: 'YYYY-MM-DD',
placeholder: ['寮�濮嬫棩鏈�', '缁撴潫鏃ユ湡'],
allowClear: true,
},
@@ -240,7 +265,7 @@
label: '瀹㈡埛鏁版嵁',
component: 'Upload',
rules: 'required',
- help: '浠呭厑璁稿鍏� xls銆亁lsx 鏍煎紡鏂囦欢',
+ help: '浠呭厑璁稿鍏� xls銆亁lsx 鏍煎紡鏂囦欢銆傗�滄槸鍚︽祦鍏ュ叕娴封�濆垪濉啓鏄�/鍚︼紱鐣欑┖鏃舵柊澧為粯璁ゆ槸锛岃鐩栦繚鐣欏師鍊笺�傚叧闂悗鍙栨秷鍏捣鍙搴︺��',
},
{
fieldName: 'updateSupport',
@@ -296,7 +321,7 @@
{
field: 'contactNextTime',
title: '涓嬫鑱旂郴鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
minWidth: 180,
},
{
@@ -314,6 +339,15 @@
},
},
{
+ field: 'autoPoolEnabled',
+ title: '鏄惁娴佸叆鍏捣',
+ minWidth: 140,
+ cellRender: {
+ name: 'CellDict',
+ props: { type: DICT_TYPE.INFRA_BOOLEAN_STRING },
+ },
+ },
+ {
field: 'dealStatus',
title: '鎴愪氦鐘舵��',
minWidth: 120,
@@ -325,7 +359,7 @@
{
field: 'contactLastTime',
title: '鏈�鍚庤窡杩涙椂闂�',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
minWidth: 180,
},
{
@@ -351,13 +385,13 @@
{
field: 'updateTime',
title: '鏇存柊鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
minWidth: 180,
},
{
field: 'createTime',
title: '鍒涘缓鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
minWidth: 180,
},
{
diff --git a/src/views/crm/customer/detail/data.ts b/src/views/crm/customer/detail/data.ts
index 9d55b40..ec5b2ea 100644
--- a/src/views/crm/customer/detail/data.ts
+++ b/src/views/crm/customer/detail/data.ts
@@ -5,7 +5,7 @@
import { DICT_TYPE } from '@vben/constants';
import { useUserStore } from '@vben/stores';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { getSimpleUserList } from '#/api/system/user';
import { DictTag } from '#/components/dict-tag';
@@ -47,6 +47,11 @@
h(DictTag, { type: DICT_TYPE.CRM_CUSTOMER_LEVEL, value: val }),
},
{
+ field: 'autoPoolEnabled',
+ label: '鏄惁娴佸叆鍏捣',
+ render: (val) => (val === false ? '鍚�' : '鏄�'),
+ },
+ {
field: 'dealStatus',
label: '鎴愪氦鐘舵��',
render: (val) => (val ? '宸叉垚浜�' : '鏈垚浜�'),
@@ -58,7 +63,7 @@
{
field: 'createTime',
label: '鍒涘缓鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
];
}
@@ -120,7 +125,7 @@
{
field: 'contactNextTime',
label: '涓嬫鑱旂郴鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'remark',
diff --git a/src/views/crm/customer/detail/index.vue b/src/views/crm/customer/detail/index.vue
index 301ee0c..e854603 100644
--- a/src/views/crm/customer/detail/index.vue
+++ b/src/views/crm/customer/detail/index.vue
@@ -286,7 +286,7 @@
<ReceivableDetailsList :customer-id="customerId" />
</Tabs.TabPane>
<Tabs.TabPane tab="鎿嶄綔鏃ュ織" key="8" :force-render="true">
- <OperateLog :log-list="logList" />
+ <OperateLog :log-list="logList" date-format="YYYY-MM-DD" />
</Tabs.TabPane>
</Tabs>
</Card>
diff --git a/src/views/crm/customer/limitConfig/data.ts b/src/views/crm/customer/limitConfig/data.ts
index afcf66c..1be9836 100644
--- a/src/views/crm/customer/limitConfig/data.ts
+++ b/src/views/crm/customer/limitConfig/data.ts
@@ -143,7 +143,7 @@
{
field: 'createTime',
title: '鍒涘缓鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/crm/customer/pool/data.ts b/src/views/crm/customer/pool/data.ts
index d48670e..a42ee8a 100644
--- a/src/views/crm/customer/pool/data.ts
+++ b/src/views/crm/customer/pool/data.ts
@@ -114,7 +114,7 @@
title: '涓嬫鑱旂郴鏃堕棿',
field: 'contactNextTime',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '澶囨敞',
@@ -134,7 +134,7 @@
title: '鏈�鍚庤窡杩涙椂闂�',
field: 'contactLastTime',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鏈�鍚庤窡杩涜褰�',
@@ -142,16 +142,26 @@
minWidth: 200,
},
{
+ title: '璐熻矗浜�',
+ field: 'ownerUserName',
+ minWidth: 100,
+ },
+ {
+ title: '鎵�灞為儴闂�',
+ field: 'ownerUserDeptName',
+ minWidth: 100,
+ },
+ {
title: '鏇存柊鏃堕棿',
field: 'updateTime',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鍒涘缓鏃堕棿',
field: 'createTime',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鍒涘缓浜�',
diff --git a/src/views/crm/customer/pool/index.vue b/src/views/crm/customer/pool/index.vue
index 1e68a0e..af7f7c0 100644
--- a/src/views/crm/customer/pool/index.vue
+++ b/src/views/crm/customer/pool/index.vue
@@ -37,6 +37,14 @@
const records: CrmCustomerApi.Customer[] = row
? [row]
: gridApi.grid.getCheckboxRecords();
+ if (
+ records.some(
+ (item) => item.ownerUserId != null || item.autoPoolEnabled === false,
+ )
+ ) {
+ message.warning('浠呭彲棰嗗彇鎴栧垎閰嶆棤璐熻矗浜轰笖鍏佽娴佸叆鍏捣鐨勫鎴�');
+ return [];
+ }
const ids = records.map((item) => item.id!);
if (ids.length === 0) {
message.warning('璇峰厛鍕鹃�夊鎴�');
@@ -98,6 +106,10 @@
columns: useGridColumns(),
height: 'auto',
keepSource: true,
+ checkboxConfig: {
+ checkMethod: ({ row }: { row: CrmCustomerApi.Customer }) =>
+ row.ownerUserId == null && row.autoPoolEnabled !== false,
+ },
proxyConfig: {
ajax: {
query: async ({ page }, formValues) => {
@@ -161,6 +173,7 @@
type: 'link',
auth: ['crm:customer:receive'],
disabled: receiving,
+ ifShow: row.ownerUserId == null && row.autoPoolEnabled !== false,
onClick: () => handleReceive(row),
},
{
@@ -168,6 +181,7 @@
type: 'link',
auth: ['crm:customer:distribute'],
disabled: receiving,
+ ifShow: row.ownerUserId == null && row.autoPoolEnabled !== false,
onClick: () => handleDistribute(row),
},
]"
diff --git a/src/views/crm/followup/data.ts b/src/views/crm/followup/data.ts
index 7132d4b..03e3375 100644
--- a/src/views/crm/followup/data.ts
+++ b/src/views/crm/followup/data.ts
@@ -6,7 +6,7 @@
import { DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { getBusinessPageByCustomer } from '#/api/crm/business';
import { getContactPageByCustomer } from '#/api/crm/contact';
@@ -48,7 +48,7 @@
component: 'DatePicker',
componentProps: {
showTime: true,
- format: 'YYYY-MM-DD HH:mm:ss',
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
placeholder: '璇烽�夋嫨涓嬫鑱旂郴鏃堕棿',
},
@@ -128,7 +128,7 @@
{
field: 'createTime',
title: '鍒涘缓鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{ field: 'creatorName', title: '璺熻繘浜�' },
{
@@ -143,7 +143,7 @@
{
field: 'nextTime',
title: '涓嬫鑱旂郴鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'contacts',
@@ -179,7 +179,7 @@
{
field: 'contactLastTime',
label: '鏈�鍚庤窡杩涙椂闂�',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'creatorName',
@@ -188,12 +188,12 @@
{
field: 'createTime',
label: '鍒涘缓鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'updateTime',
label: '鏇存柊鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
];
}
diff --git a/src/views/crm/invoice/data.ts b/src/views/crm/invoice/data.ts
index c58ff5c..a5db7b2 100644
--- a/src/views/crm/invoice/data.ts
+++ b/src/views/crm/invoice/data.ts
@@ -256,7 +256,7 @@
title: '寮�绁ㄦ棩鏈�',
field: 'invoiceTime',
minWidth: 150,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '澶囨敞',
@@ -277,13 +277,13 @@
title: '鏇存柊鏃堕棿',
field: 'updateTime',
minWidth: 150,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鍒涘缓鏃堕棿',
field: 'createTime',
minWidth: 150,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鍒涘缓浜�',
diff --git a/src/views/crm/invoice/detail/approve/index.vue b/src/views/crm/invoice/detail/approve/index.vue
index ec1530c..0b32761 100644
--- a/src/views/crm/invoice/detail/approve/index.vue
+++ b/src/views/crm/invoice/detail/approve/index.vue
@@ -6,7 +6,7 @@
import { ContentWrap } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
-import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
+import { erpPriceInputFormatter, formatDate } from '@vben/utils';
import { Spin } from 'ant-design-vue';
@@ -58,7 +58,7 @@
{
label: '寮�绁ㄦ棩鏈�',
field: 'invoiceTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
label: '瀹℃壒鐘舵��',
@@ -71,7 +71,7 @@
{
label: '鍒涘缓鏃堕棿',
field: 'createTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{ label: '澶囨敞', field: 'remark', render: textRender },
] as DescriptionItemSchema[],
diff --git a/src/views/crm/invoice/detail/data.ts b/src/views/crm/invoice/detail/data.ts
index 0b2e323..f86d712 100644
--- a/src/views/crm/invoice/detail/data.ts
+++ b/src/views/crm/invoice/detail/data.ts
@@ -3,7 +3,7 @@
import { h } from 'vue';
import { DICT_TYPE } from '@vben/constants';
-import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
+import { erpPriceInputFormatter, formatDate } from '@vben/utils';
import { DictTag } from '#/components/dict-tag';
@@ -27,7 +27,7 @@
{
field: 'invoiceTime',
label: '寮�绁ㄦ棩鏈�',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'invoiceType',
@@ -100,7 +100,7 @@
{
field: 'invoiceTime',
label: '寮�绁ㄦ棩鏈�',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'remark',
@@ -123,12 +123,12 @@
{
field: 'createTime',
label: '鍒涘缓鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'updateTime',
label: '鏇存柊鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
];
}
diff --git a/src/views/crm/invoice/detail/index.vue b/src/views/crm/invoice/detail/index.vue
index daf9836..7af2848 100644
--- a/src/views/crm/invoice/detail/index.vue
+++ b/src/views/crm/invoice/detail/index.vue
@@ -17,6 +17,7 @@
import { OperateLog } from '#/components/operate-log';
import { ACTION_ICON, TableAction } from '#/components/table-action';
import { $t } from '#/locales';
+import { automaticApproval } from '#/store/audit-policy';
import { PermissionList } from '#/views/crm/permission';
import InvoiceForm from '../modules/form.vue';
@@ -96,7 +97,7 @@
type: 'primary',
icon: ACTION_ICON.EDIT,
auth: ['crm:invoice:update'],
- ifShow: permissionListRef?.validateWrite,
+ ifShow: permissionListRef?.validateWrite && (automaticApproval || invoice.auditStatus === 0 || invoice.auditStatus === 10),
onClick: handleEdit,
},
]"
@@ -111,7 +112,7 @@
<Info :invoice="invoice" />
</Tabs.TabPane>
<Tabs.TabPane tab="鎿嶄綔鏃ュ織" key="2" :force-render="true">
- <OperateLog :log-list="logList" />
+ <OperateLog :log-list="logList" date-format="YYYY-MM-DD" />
</Tabs.TabPane>
<Tabs.TabPane tab="鍥㈤槦鎴愬憳" key="3" :force-render="true">
<PermissionList
diff --git a/src/views/crm/invoice/index.vue b/src/views/crm/invoice/index.vue
index ccc576d..9573cb6 100644
--- a/src/views/crm/invoice/index.vue
+++ b/src/views/crm/invoice/index.vue
@@ -245,6 +245,7 @@
icon: ACTION_ICON.EDIT,
auth: ['crm:invoice:update'],
onClick: handleEdit.bind(null, row),
+ ifShow: automaticApproval || row.auditStatus === 0 || row.auditStatus === 10,
},
{
label: '鎻愪氦瀹℃牳',
diff --git a/src/views/crm/permission/modules/data.ts b/src/views/crm/permission/modules/data.ts
index fdbe9bc..3bb186b 100644
--- a/src/views/crm/permission/modules/data.ts
+++ b/src/views/crm/permission/modules/data.ts
@@ -227,7 +227,7 @@
{
field: 'createTime',
title: '鍔犲叆鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
];
}
diff --git a/src/views/crm/product/category/data.ts b/src/views/crm/product/category/data.ts
index f7802e8..010173a 100644
--- a/src/views/crm/product/category/data.ts
+++ b/src/views/crm/product/category/data.ts
@@ -80,7 +80,7 @@
{
field: 'createTime',
title: '鍒涘缓鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'actions',
diff --git a/src/views/crm/product/data.ts b/src/views/crm/product/data.ts
index 5dd7d45..030f5e6 100644
--- a/src/views/crm/product/data.ts
+++ b/src/views/crm/product/data.ts
@@ -208,7 +208,7 @@
{
field: 'updateTime',
title: '鏇存柊鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
minWidth: 180,
},
{
@@ -219,7 +219,7 @@
{
field: 'createTime',
title: '鍒涘缓鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
minWidth: 180,
},
{
diff --git a/src/views/crm/product/detail/index.vue b/src/views/crm/product/detail/index.vue
index c73f7a7..db26ecf 100644
--- a/src/views/crm/product/detail/index.vue
+++ b/src/views/crm/product/detail/index.vue
@@ -80,7 +80,7 @@
<Info :product="product" />
</Tabs.TabPane>
<Tabs.TabPane tab="鎿嶄綔鏃ュ織" key="2" :force-render="true">
- <OperateLog :log-list="logList" />
+ <OperateLog :log-list="logList" date-format="YYYY-MM-DD" />
</Tabs.TabPane>
</Tabs>
</Card>
diff --git a/src/views/crm/receivable/components/data.ts b/src/views/crm/receivable/components/data.ts
index 4aa273b..e0a48db 100644
--- a/src/views/crm/receivable/components/data.ts
+++ b/src/views/crm/receivable/components/data.ts
@@ -25,7 +25,7 @@
title: '鍥炴鏃ユ湡',
field: 'returnTime',
minWidth: 150,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鍥炴閲戦锛堝厓锛�',
diff --git a/src/views/crm/receivable/data.ts b/src/views/crm/receivable/data.ts
index dbb8d5f..111aeba 100644
--- a/src/views/crm/receivable/data.ts
+++ b/src/views/crm/receivable/data.ts
@@ -303,7 +303,7 @@
title: '鍥炴鏃ユ湡',
field: 'returnTime',
minWidth: 150,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鍥炴閲戦锛堝厓锛�',
@@ -345,13 +345,13 @@
title: '鏇存柊鏃堕棿',
field: 'updateTime',
minWidth: 150,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鍒涘缓鏃堕棿',
field: 'createTime',
minWidth: 150,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鍒涘缓浜�',
diff --git a/src/views/crm/receivable/detail/approve/index.vue b/src/views/crm/receivable/detail/approve/index.vue
index cc3c795..4ce131a 100644
--- a/src/views/crm/receivable/detail/approve/index.vue
+++ b/src/views/crm/receivable/detail/approve/index.vue
@@ -6,7 +6,7 @@
import { ContentWrap } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
-import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
+import { erpPriceInputFormatter, formatDate } from '@vben/utils';
import { Spin } from 'ant-design-vue';
@@ -51,7 +51,7 @@
{
label: '鍥炴鏃ユ湡',
field: 'returnTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
label: '鍥炴閲戦锛堝厓锛�',
@@ -78,7 +78,7 @@
{
label: '鍒涘缓鏃堕棿',
field: 'createTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{ label: '澶囨敞', field: 'remark', render: textRender },
] as DescriptionItemSchema[],
diff --git a/src/views/crm/receivable/detail/data.ts b/src/views/crm/receivable/detail/data.ts
index 8d1ad4d..d2b1698 100644
--- a/src/views/crm/receivable/detail/data.ts
+++ b/src/views/crm/receivable/detail/data.ts
@@ -3,7 +3,7 @@
import { h } from 'vue';
import { DICT_TYPE } from '@vben/constants';
-import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
+import { erpPriceInputFormatter, formatDate } from '@vben/utils';
import { DictTag } from '#/components/dict-tag';
@@ -23,7 +23,7 @@
{
field: 'returnTime',
label: '鍥炴鏃ユ湡',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'price',
@@ -65,7 +65,7 @@
{
field: 'returnTime',
label: '鍥炴鏃ユ湡',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'price',
@@ -102,12 +102,12 @@
{
field: 'createTime',
label: '鍒涘缓鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'updateTime',
label: '鏇存柊鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
];
}
diff --git a/src/views/crm/receivable/detail/index.vue b/src/views/crm/receivable/detail/index.vue
index 39c84b9..45e5d52 100644
--- a/src/views/crm/receivable/detail/index.vue
+++ b/src/views/crm/receivable/detail/index.vue
@@ -114,7 +114,7 @@
<Info :receivable="receivable" />
</Tabs.TabPane>
<Tabs.TabPane tab="鎿嶄綔鏃ュ織" key="2" :force-render="true">
- <OperateLog :log-list="logList" />
+ <OperateLog :log-list="logList" date-format="YYYY-MM-DD" />
</Tabs.TabPane>
<Tabs.TabPane tab="鍥㈤槦鎴愬憳" key="3" :force-render="true">
<PermissionList
diff --git a/src/views/crm/receivable/plan/components/data.ts b/src/views/crm/receivable/plan/components/data.ts
index 9a67c0b..93c3aac 100644
--- a/src/views/crm/receivable/plan/components/data.ts
+++ b/src/views/crm/receivable/plan/components/data.ts
@@ -28,7 +28,7 @@
title: '璁″垝鍥炴鏃ユ湡',
field: 'returnTime',
minWidth: 150,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎻愬墠鍑犲ぉ鎻愰啋',
@@ -39,7 +39,7 @@
title: '鎻愰啋鏃ユ湡',
field: 'remindTime',
minWidth: 150,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '璐熻矗浜�',
diff --git a/src/views/crm/receivable/plan/data.ts b/src/views/crm/receivable/plan/data.ts
index ee60405..7d28dce 100644
--- a/src/views/crm/receivable/plan/data.ts
+++ b/src/views/crm/receivable/plan/data.ts
@@ -201,7 +201,7 @@
title: '璁″垝鍥炴鏃ユ湡',
field: 'returnTime',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎻愬墠鍑犲ぉ鎻愰啋',
@@ -212,7 +212,7 @@
title: '鎻愰啋鏃ユ湡',
field: 'remindTime',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鍥炴鏂瑰紡',
@@ -243,7 +243,7 @@
title: '瀹為檯鍥炴鏃ユ湡',
field: 'receivable.returnTime',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鏈洖娆鹃噾棰濓紙鍏冿級',
@@ -260,13 +260,13 @@
title: '鏇存柊鏃堕棿',
field: 'updateTime',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鍒涘缓鏃堕棿',
field: 'createTime',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鍒涘缓浜�',
diff --git a/src/views/crm/receivable/plan/detail/data.ts b/src/views/crm/receivable/plan/detail/data.ts
index 5059f02..0710f01 100644
--- a/src/views/crm/receivable/plan/detail/data.ts
+++ b/src/views/crm/receivable/plan/detail/data.ts
@@ -3,7 +3,7 @@
import { h } from 'vue';
import { DICT_TYPE } from '@vben/constants';
-import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
+import { erpPriceInputFormatter, formatDate } from '@vben/utils';
import { DictTag } from '#/components/dict-tag';
@@ -26,7 +26,7 @@
{
field: 'returnTime',
label: '璁″垝鍥炴鏃ユ湡',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'receivable',
@@ -54,7 +54,7 @@
{
field: 'returnTime',
label: '璁″垝鍥炴鏃ユ湡',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'price',
@@ -90,7 +90,7 @@
{
field: 'receivable.returnTime',
label: '瀹為檯鍥炴鏃ユ湡',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'remark',
@@ -113,12 +113,12 @@
{
field: 'createTime',
label: '鍒涘缓鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'updateTime',
label: '鏇存柊鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
];
}
diff --git a/src/views/crm/receivable/plan/detail/index.vue b/src/views/crm/receivable/plan/detail/index.vue
index 1e2e559..791710c 100644
--- a/src/views/crm/receivable/plan/detail/index.vue
+++ b/src/views/crm/receivable/plan/detail/index.vue
@@ -117,7 +117,7 @@
<ReceivablePlanDetailsInfo :receivable-plan="receivablePlan" />
</Tabs.TabPane>
<Tabs.TabPane tab="鎿嶄綔鏃ュ織" key="2" :force-render="true">
- <OperateLog :log-list="logList" />
+ <OperateLog :log-list="logList" date-format="YYYY-MM-DD" />
</Tabs.TabPane>
<Tabs.TabPane tab="鍥㈤槦鎴愬憳" key="3" :force-render="true">
<PermissionList
diff --git a/src/views/crm/saleQuotation/modules/ocr-upload.vue b/src/views/crm/saleQuotation/modules/ocr-upload.vue
index 2da0826..09233bb 100644
--- a/src/views/crm/saleQuotation/modules/ocr-upload.vue
+++ b/src/views/crm/saleQuotation/modules/ocr-upload.vue
@@ -4,6 +4,7 @@
import { ref } from 'vue';
import { IconifyIcon } from '@vben/icons';
+import { formatDate } from '@vben/utils';
import { Modal, Button, Upload, Descriptions, Table, Tag, message, Alert } from 'ant-design-vue';
@@ -140,7 +141,7 @@
<Tag color="orange">{{ ocrResult.customerName }}</Tag>
</Descriptions.Item>
<Descriptions.Item v-if="ocrResult.quotationTime" label="鎶ヤ环鏃ユ湡">
- {{ ocrResult.quotationTime }}
+ {{ formatDate(ocrResult.quotationTime) }}
</Descriptions.Item>
<Descriptions.Item v-if="ocrResult.validUntil" label="鏈夋晥鏈熻嚦">
{{ ocrResult.validUntil }}
diff --git a/src/views/crm/salesTarget/data.ts b/src/views/crm/salesTarget/data.ts
index 2d70bb7..b77663d 100644
--- a/src/views/crm/salesTarget/data.ts
+++ b/src/views/crm/salesTarget/data.ts
@@ -334,7 +334,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 160,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'creatorName',
diff --git a/src/views/crm/statistics/customer/data.ts b/src/views/crm/statistics/customer/data.ts
index a2ec49e..5ba644f 100644
--- a/src/views/crm/statistics/customer/data.ts
+++ b/src/views/crm/statistics/customer/data.ts
@@ -62,6 +62,7 @@
component: 'RangePicker',
componentProps: {
...getRangePickerDefaultProps(),
+ format: 'YYYY-MM-DD',
},
defaultValue: [
formatDateTime(beginOfDay(new Date(Date.now() - 3600 * 1000 * 24 * 7))),
@@ -176,13 +177,13 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 200,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'orderDate',
title: '涓嬪崟鏃ユ湡',
minWidth: 200,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
];
}
diff --git a/src/views/crm/statistics/funnel/data.ts b/src/views/crm/statistics/funnel/data.ts
index 5dd93db..efdf276 100644
--- a/src/views/crm/statistics/funnel/data.ts
+++ b/src/views/crm/statistics/funnel/data.ts
@@ -36,6 +36,7 @@
component: 'RangePicker',
componentProps: {
...getRangePickerDefaultProps(),
+ format: 'YYYY-MM-DD',
},
defaultValue: [
formatDateTime(beginOfDay(new Date(Date.now() - 3600 * 1000 * 24 * 7))),
@@ -116,7 +117,7 @@
field: 'dealTime',
title: '棰勮鎴愪氦鏃ユ湡',
minWidth: 200,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'ownerUserName',
@@ -132,19 +133,19 @@
field: 'contactLastTime',
title: '鏈�鍚庤窡杩涙椂闂�',
minWidth: 200,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'updateTime',
title: '鏇存柊鏃堕棿',
minWidth: 200,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 200,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'creatorName',
@@ -189,7 +190,7 @@
field: 'dealTime',
title: '棰勮鎴愪氦鏃ユ湡',
minWidth: 200,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'ownerUserName',
@@ -205,19 +206,19 @@
field: 'contactLastTime',
title: '鏈�鍚庤窡杩涙椂闂�',
minWidth: 200,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'updateTime',
title: '鏇存柊鏃堕棿',
minWidth: 200,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 200,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'creatorName',
diff --git a/src/views/crm/statistics/portrait/data.ts b/src/views/crm/statistics/portrait/data.ts
index 18e22e7..b443f75 100644
--- a/src/views/crm/statistics/portrait/data.ts
+++ b/src/views/crm/statistics/portrait/data.ts
@@ -39,6 +39,7 @@
component: 'RangePicker',
componentProps: {
...getRangePickerDefaultProps(),
+ format: 'YYYY-MM-DD',
},
defaultValue: [
formatDateTime(beginOfDay(new Date(Date.now() - 3600 * 1000 * 24 * 7))),
diff --git a/src/views/crm/statistics/rank/data.ts b/src/views/crm/statistics/rank/data.ts
index b60d90d..ebbf6f8 100644
--- a/src/views/crm/statistics/rank/data.ts
+++ b/src/views/crm/statistics/rank/data.ts
@@ -53,6 +53,7 @@
component: 'RangePicker',
componentProps: {
...getRangePickerDefaultProps(),
+ format: 'YYYY-MM-DD',
},
defaultValue: [
formatDateTime(beginOfDay(new Date(Date.now() - 3600 * 1000 * 24 * 7))),
diff --git a/src/views/erp/finance/account/data.ts b/src/views/erp/finance/account/data.ts
index 5edc769..9a623b2 100644
--- a/src/views/erp/finance/account/data.ts
+++ b/src/views/erp/finance/account/data.ts
@@ -179,7 +179,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/erp/finance/payment/data.ts b/src/views/erp/finance/payment/data.ts
index 2d40c12..790c520 100644
--- a/src/views/erp/finance/payment/data.ts
+++ b/src/views/erp/finance/payment/data.ts
@@ -41,8 +41,8 @@
componentProps: {
disabled: formType === 'detail',
placeholder: '閫夋嫨浠樻鏃堕棿',
- showTime: true,
- format: 'YYYY-MM-DD HH:mm:ss',
+ showTime: false,
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
diff --git a/src/views/erp/finance/payment/detail/approve/index.vue b/src/views/erp/finance/payment/detail/approve/index.vue
index c098816..43cb680 100644
--- a/src/views/erp/finance/payment/detail/approve/index.vue
+++ b/src/views/erp/finance/payment/detail/approve/index.vue
@@ -7,7 +7,7 @@
import { ContentWrap } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
-import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
+import { erpPriceInputFormatter, formatDate } from '@vben/utils';
import { Spin } from 'ant-design-vue';
@@ -94,7 +94,7 @@
{
label: '浠樻鏃堕棿',
field: 'paymentTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
label: '鍚堣閲戦锛堝厓锛�',
@@ -123,7 +123,7 @@
{
label: '鍒涘缓鏃堕棿',
field: 'createTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{ label: '澶囨敞', field: 'remark', render: textRender },
] as DescriptionItemSchema[],
diff --git a/src/views/erp/finance/receipt/data.ts b/src/views/erp/finance/receipt/data.ts
index a81b7c0..39f4093 100644
--- a/src/views/erp/finance/receipt/data.ts
+++ b/src/views/erp/finance/receipt/data.ts
@@ -40,8 +40,8 @@
componentProps: {
disabled: formType === 'detail',
placeholder: '閫夋嫨鏀舵鏃堕棿',
- showTime: true,
- format: 'YYYY-MM-DD HH:mm:ss',
+ showTime: false,
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
diff --git a/src/views/erp/product/category/data.ts b/src/views/erp/product/category/data.ts
index d3e9372..bfce067 100644
--- a/src/views/erp/product/category/data.ts
+++ b/src/views/erp/product/category/data.ts
@@ -138,7 +138,7 @@
{
field: 'createTime',
title: '鍒涘缓鏃堕棿',
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/erp/product/product/data.ts b/src/views/erp/product/product/data.ts
index 7fbf70f..b2f5cae 100644
--- a/src/views/erp/product/product/data.ts
+++ b/src/views/erp/product/product/data.ts
@@ -243,7 +243,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/erp/product/unit/data.ts b/src/views/erp/product/unit/data.ts
index 7b7b1a3..0d1fe79 100644
--- a/src/views/erp/product/unit/data.ts
+++ b/src/views/erp/product/unit/data.ts
@@ -91,7 +91,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/erp/purchase/in/data.ts b/src/views/erp/purchase/in/data.ts
index d7ee380..4b5122a 100644
--- a/src/views/erp/purchase/in/data.ts
+++ b/src/views/erp/purchase/in/data.ts
@@ -45,8 +45,8 @@
componentProps: {
disabled: formType === 'detail',
placeholder: '閫夋嫨鍏ュ簱鏃堕棿',
- showTime: true,
- format: 'YYYY-MM-DD HH:mm:ss',
+ showTime: false,
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
diff --git a/src/views/erp/purchase/invoice/data.ts b/src/views/erp/purchase/invoice/data.ts
index 73ff3e0..db4754c 100644
--- a/src/views/erp/purchase/invoice/data.ts
+++ b/src/views/erp/purchase/invoice/data.ts
@@ -225,7 +225,7 @@
title: '鏉ョエ鏃ユ湡',
field: 'invoiceTime',
minWidth: 150,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '澶囨敞',
diff --git a/src/views/erp/purchase/invoice/detail/approve/index.vue b/src/views/erp/purchase/invoice/detail/approve/index.vue
index 993efbc..4bbcbaf 100644
--- a/src/views/erp/purchase/invoice/detail/approve/index.vue
+++ b/src/views/erp/purchase/invoice/detail/approve/index.vue
@@ -5,7 +5,7 @@
import { onMounted, ref } from 'vue';
import { ContentWrap } from '@vben/common-ui';
-import { erpPriceInputFormatter, formatDateTime } from '@vben/utils';
+import { erpPriceInputFormatter, formatDate } from '@vben/utils';
import { Spin } from 'ant-design-vue';
@@ -50,13 +50,13 @@
{
label: '寮�绁ㄦ棩鏈�',
field: 'invoiceTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{ label: '鍒涘缓浜�', field: 'creatorName', render: textRender },
{
label: '鍒涘缓鏃堕棿',
field: 'createTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{ label: '澶囨敞', field: 'remark', render: textRender },
] as DescriptionItemSchema[],
diff --git a/src/views/erp/purchase/order/data.ts b/src/views/erp/purchase/order/data.ts
index 0676202..80c3008 100644
--- a/src/views/erp/purchase/order/data.ts
+++ b/src/views/erp/purchase/order/data.ts
@@ -43,8 +43,8 @@
component: 'DatePicker',
componentProps: {
placeholder: '閫夋嫨璁㈠崟鏃堕棿',
- showTime: true,
- format: 'YYYY-MM-DD HH:mm:ss',
+ showTime: false,
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
diff --git a/src/views/erp/purchase/order/detail/index.vue b/src/views/erp/purchase/order/detail/index.vue
index fadc835..d008658 100644
--- a/src/views/erp/purchase/order/detail/index.vue
+++ b/src/views/erp/purchase/order/detail/index.vue
@@ -6,11 +6,7 @@
import { ContentWrap } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
-import {
- erpCountInputFormatter,
- erpPriceInputFormatter,
- formatDateTime,
-} from '@vben/utils';
+import { erpCountInputFormatter, erpPriceInputFormatter, formatDate } from '@vben/utils';
import { Spin, Tag } from 'ant-design-vue';
@@ -52,7 +48,7 @@
{
label: '璁㈠崟鏃堕棿',
field: 'orderTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
label: '鍚堣鏁伴噺',
@@ -89,7 +85,7 @@
{
label: '鍒涘缓鏃堕棿',
field: 'createTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{ label: '澶囨敞', field: 'remark', render: textRender },
] as DescriptionItemSchema[],
diff --git a/src/views/erp/purchase/request/data.ts b/src/views/erp/purchase/request/data.ts
index ac87d16..dd16834 100644
--- a/src/views/erp/purchase/request/data.ts
+++ b/src/views/erp/purchase/request/data.ts
@@ -46,8 +46,8 @@
component: 'DatePicker',
componentProps: {
placeholder: '閫夋嫨鐢宠鏃堕棿',
- showTime: true,
- format: 'YYYY-MM-DD HH:mm:ss',
+ showTime: false,
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
disabled: formType === 'detail',
},
diff --git a/src/views/erp/purchase/request/detail/index.vue b/src/views/erp/purchase/request/detail/index.vue
index 62c383e..2f026c5 100644
--- a/src/views/erp/purchase/request/detail/index.vue
+++ b/src/views/erp/purchase/request/detail/index.vue
@@ -7,11 +7,7 @@
import { ContentWrap } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
-import {
- erpCountInputFormatter,
- erpPriceInputFormatter,
- formatDateTime,
-} from '@vben/utils';
+import { erpCountInputFormatter, erpPriceInputFormatter, formatDate } from '@vben/utils';
import { Spin } from 'ant-design-vue';
@@ -114,7 +110,7 @@
{
label: '鐢宠鏃堕棿',
field: 'requestTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{ label: '渚涘簲鍟嗗悕绉�', field: 'supplierName', render: textRender },
{
@@ -132,7 +128,7 @@
{
label: '鍒涘缓鏃堕棿',
field: 'createTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{ label: '澶囨敞', field: 'remark', render: textRender },
] as DescriptionItemSchema[],
diff --git a/src/views/erp/purchase/return/data.ts b/src/views/erp/purchase/return/data.ts
index d640187..8dd033c 100644
--- a/src/views/erp/purchase/return/data.ts
+++ b/src/views/erp/purchase/return/data.ts
@@ -45,8 +45,8 @@
componentProps: {
disabled: formType === 'detail',
placeholder: '閫夋嫨閫�璐ф椂闂�',
- showTime: true,
- format: 'YYYY-MM-DD HH:mm:ss',
+ showTime: false,
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
diff --git a/src/views/erp/sale/customer/data.ts b/src/views/erp/sale/customer/data.ts
index eb3230a..65cf5dc 100644
--- a/src/views/erp/sale/customer/data.ts
+++ b/src/views/erp/sale/customer/data.ts
@@ -229,7 +229,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/erp/sale/out/data.ts b/src/views/erp/sale/out/data.ts
index f79df7d..0dea3bc 100644
--- a/src/views/erp/sale/out/data.ts
+++ b/src/views/erp/sale/out/data.ts
@@ -45,8 +45,8 @@
componentProps: {
disabled: formType === 'detail',
placeholder: '閫夋嫨鍑哄簱鏃堕棿',
- showTime: true,
- format: 'YYYY-MM-DD HH:mm:ss',
+ showTime: false,
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
diff --git a/src/views/erp/sale/return/data.ts b/src/views/erp/sale/return/data.ts
index 402c46a..86fd65c 100644
--- a/src/views/erp/sale/return/data.ts
+++ b/src/views/erp/sale/return/data.ts
@@ -45,8 +45,8 @@
componentProps: {
disabled: formType === 'detail',
placeholder: '閫夋嫨閫�璐ф椂闂�',
- showTime: true,
- format: 'YYYY-MM-DD HH:mm:ss',
+ showTime: false,
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
diff --git a/src/views/erp/stock/check/data.ts b/src/views/erp/stock/check/data.ts
index 1d594d5..eea20b8 100644
--- a/src/views/erp/stock/check/data.ts
+++ b/src/views/erp/stock/check/data.ts
@@ -40,8 +40,8 @@
component: 'DatePicker',
componentProps: {
placeholder: '閫夋嫨鐩樼偣鏃堕棿',
- showTime: true,
- format: 'YYYY-MM-DD HH:mm:ss',
+ showTime: false,
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
diff --git a/src/views/erp/stock/in/data.ts b/src/views/erp/stock/in/data.ts
index 636c875..f57770d 100644
--- a/src/views/erp/stock/in/data.ts
+++ b/src/views/erp/stock/in/data.ts
@@ -41,8 +41,8 @@
component: 'DatePicker',
componentProps: {
placeholder: '閫夋嫨鍏ュ簱鏃堕棿',
- showTime: true,
- format: 'YYYY-MM-DD HH:mm:ss',
+ showTime: false,
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
diff --git a/src/views/erp/stock/move/data.ts b/src/views/erp/stock/move/data.ts
index c48e3d7..9e640d5 100644
--- a/src/views/erp/stock/move/data.ts
+++ b/src/views/erp/stock/move/data.ts
@@ -40,8 +40,8 @@
component: 'DatePicker',
componentProps: {
placeholder: '閫夋嫨璋冨害鏃堕棿',
- showTime: true,
- format: 'YYYY-MM-DD HH:mm:ss',
+ showTime: false,
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
diff --git a/src/views/erp/stock/out/data.ts b/src/views/erp/stock/out/data.ts
index 594fe54..595bae6 100644
--- a/src/views/erp/stock/out/data.ts
+++ b/src/views/erp/stock/out/data.ts
@@ -41,8 +41,8 @@
component: 'DatePicker',
componentProps: {
placeholder: '閫夋嫨鍑哄簱鏃堕棿',
- showTime: true,
- format: 'YYYY-MM-DD HH:mm:ss',
+ showTime: false,
+ format: 'YYYY-MM-DD',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
diff --git a/src/views/erp/stock/record/data.ts b/src/views/erp/stock/record/data.ts
index 25b9b03..f1ba6f7 100644
--- a/src/views/erp/stock/record/data.ts
+++ b/src/views/erp/stock/record/data.ts
@@ -107,7 +107,7 @@
field: 'createTime',
title: '鍑哄叆搴撴棩鏈�',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'count',
diff --git a/src/views/erp/stock/warehouse/data.ts b/src/views/erp/stock/warehouse/data.ts
index 5fa2462..40033c5 100644
--- a/src/views/erp/stock/warehouse/data.ts
+++ b/src/views/erp/stock/warehouse/data.ts
@@ -196,7 +196,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/erp/stock/warehouseMapping/data.ts b/src/views/erp/stock/warehouseMapping/data.ts
index 219c3bc..4b41161 100644
--- a/src/views/erp/stock/warehouseMapping/data.ts
+++ b/src/views/erp/stock/warehouseMapping/data.ts
@@ -84,7 +84,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/hrm/attendance/exception/data.ts b/src/views/hrm/attendance/exception/data.ts
index 6c6784d..ae61c76 100644
--- a/src/views/hrm/attendance/exception/data.ts
+++ b/src/views/hrm/attendance/exception/data.ts
@@ -129,7 +129,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/hrm/attendance/exception/detail/approve/index.vue b/src/views/hrm/attendance/exception/detail/approve/index.vue
index e0fef3a..b2fb2fb 100644
--- a/src/views/hrm/attendance/exception/detail/approve/index.vue
+++ b/src/views/hrm/attendance/exception/detail/approve/index.vue
@@ -6,7 +6,7 @@
import { ContentWrap } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
-import { formatDateTime } from '@vben/utils';
+import { formatDateTime, formatDate } from '@vben/utils';
import { Spin } from 'ant-design-vue';
@@ -49,7 +49,7 @@
{
label: '鍒涘缓鏃堕棿',
field: 'createTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
] as DescriptionItemSchema[],
});
diff --git a/src/views/hrm/attendance/holiday/data.ts b/src/views/hrm/attendance/holiday/data.ts
index 9ae34ac..29f871a 100644
--- a/src/views/hrm/attendance/holiday/data.ts
+++ b/src/views/hrm/attendance/holiday/data.ts
@@ -155,7 +155,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/hrm/employee/contract/data.ts b/src/views/hrm/employee/contract/data.ts
index a978d4c..aa828d8 100644
--- a/src/views/hrm/employee/contract/data.ts
+++ b/src/views/hrm/employee/contract/data.ts
@@ -285,7 +285,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/hrm/employee/data.ts b/src/views/hrm/employee/data.ts
index 7474ca7..93cc220 100644
--- a/src/views/hrm/employee/data.ts
+++ b/src/views/hrm/employee/data.ts
@@ -385,7 +385,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/hrm/leave/data.ts b/src/views/hrm/leave/data.ts
index 6e8570e..4f2d0bf 100644
--- a/src/views/hrm/leave/data.ts
+++ b/src/views/hrm/leave/data.ts
@@ -173,7 +173,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/hrm/leave/detail/approve/index.vue b/src/views/hrm/leave/detail/approve/index.vue
index 0573837..bbeefb0 100644
--- a/src/views/hrm/leave/detail/approve/index.vue
+++ b/src/views/hrm/leave/detail/approve/index.vue
@@ -6,7 +6,7 @@
import { ContentWrap } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
-import { formatDateTime } from '@vben/utils';
+import { formatDateTime, formatDate } from '@vben/utils';
import { Spin } from 'ant-design-vue';
@@ -60,7 +60,7 @@
{
label: '鍒涘缓鏃堕棿',
field: 'createTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
] as DescriptionItemSchema[],
});
diff --git a/src/views/hrm/overtime/data.ts b/src/views/hrm/overtime/data.ts
index a4985b5..8c33fc7 100644
--- a/src/views/hrm/overtime/data.ts
+++ b/src/views/hrm/overtime/data.ts
@@ -308,7 +308,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/hrm/overtime/detail/approve/index.vue b/src/views/hrm/overtime/detail/approve/index.vue
index bfab940..f35e716 100644
--- a/src/views/hrm/overtime/detail/approve/index.vue
+++ b/src/views/hrm/overtime/detail/approve/index.vue
@@ -6,7 +6,7 @@
import { ContentWrap } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { Spin, Tag } from 'ant-design-vue';
@@ -54,7 +54,7 @@
field: 'status',
render: (value) => h(DictTag, { type: DICT_TYPE.HRM_AUDIT_STATUS, value }),
},
- { label: '鍒涘缓鏃堕棿', field: 'createTime', render: (value) => formatDateTime(value) as string },
+ { label: '鍒涘缓鏃堕棿', field: 'createTime', render: (value) => formatDate(value) as string },
] as DescriptionItemSchema[],
});
diff --git a/src/views/hrm/resignation/data.ts b/src/views/hrm/resignation/data.ts
index 3131c33..dc7a0fe 100644
--- a/src/views/hrm/resignation/data.ts
+++ b/src/views/hrm/resignation/data.ts
@@ -157,7 +157,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/hrm/resignation/detail/approve/index.vue b/src/views/hrm/resignation/detail/approve/index.vue
index 4e3a587..e9c9619 100644
--- a/src/views/hrm/resignation/detail/approve/index.vue
+++ b/src/views/hrm/resignation/detail/approve/index.vue
@@ -6,7 +6,7 @@
import { ContentWrap } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { Spin } from 'ant-design-vue';
@@ -42,7 +42,7 @@
{
label: '棰勮绂昏亴鏃ユ湡',
field: 'expectedDate',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{ label: '绂昏亴鍘熷洜', field: 'reason', render: textRender },
{ label: '浜ゆ帴浜�', field: 'handoverUserName', render: textRender },
@@ -62,7 +62,7 @@
{
label: '鍒涘缓鏃堕棿',
field: 'createTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
] as DescriptionItemSchema[],
});
diff --git a/src/views/hrm/salary/employee-social-security/data.ts b/src/views/hrm/salary/employee-social-security/data.ts
index 8d0bcac..085a4b8 100644
--- a/src/views/hrm/salary/employee-social-security/data.ts
+++ b/src/views/hrm/salary/employee-social-security/data.ts
@@ -166,7 +166,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/hrm/salary/leave-type-config/data.ts b/src/views/hrm/salary/leave-type-config/data.ts
index 14cb42d..d4cd791 100644
--- a/src/views/hrm/salary/leave-type-config/data.ts
+++ b/src/views/hrm/salary/leave-type-config/data.ts
@@ -106,7 +106,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/hrm/salary/payment/data.ts b/src/views/hrm/salary/payment/data.ts
index b9e1873..29b66d6 100644
--- a/src/views/hrm/salary/payment/data.ts
+++ b/src/views/hrm/salary/payment/data.ts
@@ -65,7 +65,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/hrm/salary/social-security-scheme/data.ts b/src/views/hrm/salary/social-security-scheme/data.ts
index 2e363b8..1981c08 100644
--- a/src/views/hrm/salary/social-security-scheme/data.ts
+++ b/src/views/hrm/salary/social-security-scheme/data.ts
@@ -316,7 +316,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/hrm/salary/structure/data.ts b/src/views/hrm/salary/structure/data.ts
index 68d1ddf..77c2144 100644
--- a/src/views/hrm/salary/structure/data.ts
+++ b/src/views/hrm/salary/structure/data.ts
@@ -150,7 +150,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'actions',
diff --git a/src/views/hrm/transfer/data.ts b/src/views/hrm/transfer/data.ts
index e6f2411..c0e1cf3 100644
--- a/src/views/hrm/transfer/data.ts
+++ b/src/views/hrm/transfer/data.ts
@@ -203,7 +203,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/hrm/transfer/detail/approve/index.vue b/src/views/hrm/transfer/detail/approve/index.vue
index 5d983ef..03278c6 100644
--- a/src/views/hrm/transfer/detail/approve/index.vue
+++ b/src/views/hrm/transfer/detail/approve/index.vue
@@ -6,7 +6,7 @@
import { ContentWrap } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { Spin } from 'ant-design-vue';
@@ -44,7 +44,7 @@
{
label: '鐢熸晥鏃ユ湡',
field: 'effectiveDate',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{ label: '璋冨矖鍘熷洜', field: 'reason', render: textRender },
{
@@ -57,7 +57,7 @@
{
label: '鍒涘缓鏃堕棿',
field: 'createTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
] as DescriptionItemSchema[],
});
diff --git a/src/views/mes/cal/plan/data.ts b/src/views/mes/cal/plan/data.ts
index 1d98d19..eb29f08 100644
--- a/src/views/mes/cal/plan/data.ts
+++ b/src/views/mes/cal/plan/data.ts
@@ -289,7 +289,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/cal/team/data.ts b/src/views/mes/cal/team/data.ts
index 8ca77d0..311de6b 100644
--- a/src/views/mes/cal/team/data.ts
+++ b/src/views/mes/cal/team/data.ts
@@ -151,7 +151,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/dv/checkplan/data.ts b/src/views/mes/dv/checkplan/data.ts
index 40b6629..5fcbbe1 100644
--- a/src/views/mes/dv/checkplan/data.ts
+++ b/src/views/mes/dv/checkplan/data.ts
@@ -255,7 +255,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/dv/checkrecord/data.ts b/src/views/mes/dv/checkrecord/data.ts
index dc71a89..1e84785 100644
--- a/src/views/mes/dv/checkrecord/data.ts
+++ b/src/views/mes/dv/checkrecord/data.ts
@@ -76,9 +76,9 @@
label: '鐐规鏃堕棿',
component: 'DatePicker',
componentProps: {
- format: 'YYYY-MM-DD HH:mm:ss',
+ format: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨鐐规鏃堕棿',
- showTime: true,
+ showTime: false,
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
@@ -146,7 +146,7 @@
field: 'checkTime',
title: '鐐规鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{ field: 'nickname', title: '鐐规浜�', minWidth: 120 },
{
@@ -162,7 +162,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/dv/machinery/data.ts b/src/views/mes/dv/machinery/data.ts
index 8b39782..ad0c421 100644
--- a/src/views/mes/dv/machinery/data.ts
+++ b/src/views/mes/dv/machinery/data.ts
@@ -150,8 +150,8 @@
componentProps: {
class: '!w-full',
disabled: true,
- format: 'YYYY-MM-DD HH:mm:ss',
- showTime: true,
+ format: 'YYYY-MM-DD',
+ showTime: false,
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
dependencies: {
@@ -166,8 +166,8 @@
componentProps: {
class: '!w-full',
disabled: true,
- format: 'YYYY-MM-DD HH:mm:ss',
- showTime: true,
+ format: 'YYYY-MM-DD',
+ showTime: false,
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
dependencies: {
@@ -262,19 +262,19 @@
field: 'lastCheckTime',
title: '鏈�杩戠偣妫�鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'lastMaintenTime',
title: '鏈�杩戜繚鍏绘椂闂�',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
@@ -368,7 +368,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 160,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
];
}
diff --git a/src/views/mes/dv/machinery/modules/check-record-list.vue b/src/views/mes/dv/machinery/modules/check-record-list.vue
index 98dfd1f..66bff53 100644
--- a/src/views/mes/dv/machinery/modules/check-record-list.vue
+++ b/src/views/mes/dv/machinery/modules/check-record-list.vue
@@ -28,7 +28,7 @@
field: 'checkTime',
title: '鐐规鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{ field: 'nickname', title: '鎿嶄綔浜�', minWidth: 120 },
{
diff --git a/src/views/mes/dv/machinery/modules/mainten-record-list.vue b/src/views/mes/dv/machinery/modules/mainten-record-list.vue
index 8db9331..fa446b9 100644
--- a/src/views/mes/dv/machinery/modules/mainten-record-list.vue
+++ b/src/views/mes/dv/machinery/modules/mainten-record-list.vue
@@ -28,7 +28,7 @@
field: 'maintenTime',
title: '淇濆吇鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{ field: 'nickname', title: '鎿嶄綔浜�', minWidth: 120 },
{
diff --git a/src/views/mes/dv/machinery/modules/repair-list.vue b/src/views/mes/dv/machinery/modules/repair-list.vue
index 9ec68af..4919beb 100644
--- a/src/views/mes/dv/machinery/modules/repair-list.vue
+++ b/src/views/mes/dv/machinery/modules/repair-list.vue
@@ -29,7 +29,7 @@
field: 'requireDate',
title: '鎶ヤ慨鏃ユ湡',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{ field: 'nickname', title: '鎿嶄綔浜�', minWidth: 120 },
{
diff --git a/src/views/mes/dv/machinery/type/data.ts b/src/views/mes/dv/machinery/type/data.ts
index 40ff3fc..6cea515 100644
--- a/src/views/mes/dv/machinery/type/data.ts
+++ b/src/views/mes/dv/machinery/type/data.ts
@@ -178,7 +178,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/dv/maintenrecord/data.ts b/src/views/mes/dv/maintenrecord/data.ts
index d7359d6..dfb5cef 100644
--- a/src/views/mes/dv/maintenrecord/data.ts
+++ b/src/views/mes/dv/maintenrecord/data.ts
@@ -76,9 +76,9 @@
label: '淇濆吇鏃堕棿',
component: 'DatePicker',
componentProps: {
- format: 'YYYY-MM-DD HH:mm:ss',
+ format: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨淇濆吇鏃堕棿',
- showTime: true,
+ showTime: false,
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
@@ -146,7 +146,7 @@
field: 'maintenTime',
title: '淇濆吇鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{ field: 'nickname', title: '淇濆吇浜�', minWidth: 120 },
{
@@ -162,7 +162,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/dv/metering/data.ts b/src/views/mes/dv/metering/data.ts
index 1f57561..5cb07b7 100644
--- a/src/views/mes/dv/metering/data.ts
+++ b/src/views/mes/dv/metering/data.ts
@@ -361,7 +361,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/dv/meteringcheck/data.ts b/src/views/mes/dv/meteringcheck/data.ts
index 5c88821..aa95cb1 100644
--- a/src/views/mes/dv/meteringcheck/data.ts
+++ b/src/views/mes/dv/meteringcheck/data.ts
@@ -201,7 +201,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/dv/repair/data.ts b/src/views/mes/dv/repair/data.ts
index 6d9e47b..a185c3d 100644
--- a/src/views/mes/dv/repair/data.ts
+++ b/src/views/mes/dv/repair/data.ts
@@ -300,13 +300,13 @@
field: 'requireDate',
title: '鎶ヤ慨鏃ユ湡',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'finishDate',
title: '瀹屾垚鏃ユ湡',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'result',
@@ -330,7 +330,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/dv/subject/data.ts b/src/views/mes/dv/subject/data.ts
index 80cc2bb..2a1870d 100644
--- a/src/views/mes/dv/subject/data.ts
+++ b/src/views/mes/dv/subject/data.ts
@@ -196,7 +196,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/md/autocode/data.ts b/src/views/mes/md/autocode/data.ts
index debd894..c639c01 100644
--- a/src/views/mes/md/autocode/data.ts
+++ b/src/views/mes/md/autocode/data.ts
@@ -214,7 +214,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/md/item/data.ts b/src/views/mes/md/item/data.ts
index bf649b1..f477734 100644
--- a/src/views/mes/md/item/data.ts
+++ b/src/views/mes/md/item/data.ts
@@ -327,7 +327,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
@@ -417,7 +417,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
];
}
diff --git a/src/views/mes/md/item/type/data.ts b/src/views/mes/md/item/type/data.ts
index f36b63a..911080d 100644
--- a/src/views/mes/md/item/type/data.ts
+++ b/src/views/mes/md/item/type/data.ts
@@ -213,7 +213,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/md/workstation/data.ts b/src/views/mes/md/workstation/data.ts
index 5e68e33..9f68fa0 100644
--- a/src/views/mes/md/workstation/data.ts
+++ b/src/views/mes/md/workstation/data.ts
@@ -277,7 +277,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/pd/archive/data.ts b/src/views/mes/pd/archive/data.ts
index c8e697e..f3555a9 100644
--- a/src/views/mes/pd/archive/data.ts
+++ b/src/views/mes/pd/archive/data.ts
@@ -64,14 +64,14 @@
field: 'archiveTime',
title: '褰掓。鏃堕棿',
minWidth: 160,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{ field: 'updaterNickname', title: '鏇存柊浜�', minWidth: 100 },
{
field: 'updateTime',
title: '鏇存柊鏃堕棿',
minWidth: 160,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
diff --git a/src/views/mes/pd/project/data.ts b/src/views/mes/pd/project/data.ts
index 3ac91aa..87d7990 100644
--- a/src/views/mes/pd/project/data.ts
+++ b/src/views/mes/pd/project/data.ts
@@ -268,7 +268,7 @@
field: "createTime",
title: "鍒涘缓鏃堕棿",
minWidth: 160,
- formatter: "formatDateTime",
+ formatter: 'formatDate',
},
{
field: "action",
@@ -454,7 +454,7 @@
field: "uploadTime",
title: "涓婁紶鏃堕棿",
minWidth: 160,
- formatter: "formatDateTime",
+ formatter: 'formatDate',
},
{
field: "action",
diff --git a/src/views/mes/pd/project/detail/data.ts b/src/views/mes/pd/project/detail/data.ts
index 6215e13..01078a0 100644
--- a/src/views/mes/pd/project/detail/data.ts
+++ b/src/views/mes/pd/project/detail/data.ts
@@ -3,7 +3,7 @@
import { h } from 'vue';
import { DICT_TYPE } from '#/packages/constants/src';
-import { formatDate, formatDateTime } from '#/packages/utils/src';
+import { formatDate } from '#/packages/utils/src';
import { DictTag } from '#/components/dict-tag';
@@ -31,7 +31,7 @@
{
field: 'createTime',
label: '鍒涘缓鏃堕棿',
- render: (val) => (val ? formatDateTime(val) : '-'),
+ render: (val) => (val ? formatDate(val) : '-'),
},
{ field: 'remark', label: '澶囨敞' },
];
diff --git a/src/views/mes/pd/project/modules/task/data.ts b/src/views/mes/pd/project/modules/task/data.ts
index b319a71..a02076b 100644
--- a/src/views/mes/pd/project/modules/task/data.ts
+++ b/src/views/mes/pd/project/modules/task/data.ts
@@ -57,7 +57,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 160,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'action',
diff --git a/src/views/mes/pd/project/modules/version-change/data.ts b/src/views/mes/pd/project/modules/version-change/data.ts
index 9de9e96..f1a8f79 100644
--- a/src/views/mes/pd/project/modules/version-change/data.ts
+++ b/src/views/mes/pd/project/modules/version-change/data.ts
@@ -54,7 +54,7 @@
field: 'createTime',
title: '鐢宠鏃堕棿',
minWidth: 160,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
];
diff --git a/src/views/mes/pro/andon/record/data.ts b/src/views/mes/pro/andon/record/data.ts
index e8c8a4a..f660e23 100644
--- a/src/views/mes/pro/andon/record/data.ts
+++ b/src/views/mes/pro/andon/record/data.ts
@@ -89,7 +89,7 @@
field: 'createTime',
title: '鍙戣捣鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{ field: 'reason', title: '鍛煎彨鍘熷洜', minWidth: 160 },
{
diff --git a/src/views/mes/pro/feedback/data.ts b/src/views/mes/pro/feedback/data.ts
index 32056e7..3e25ee4 100644
--- a/src/views/mes/pro/feedback/data.ts
+++ b/src/views/mes/pro/feedback/data.ts
@@ -13,6 +13,7 @@
MesProWorkOrderStatusEnum,
} from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
+import { formatDate } from '@vben/utils';
import { Button } from 'ant-design-vue';
@@ -20,6 +21,7 @@
import { getRouteProcessByRouteAndProcess } from '#/api/mes/pro/route/process';
import { getSimpleUserList } from '#/api/system/user';
import { loadParamDetails } from './param-state';
+
import { getRangePickerDefaultProps } from '#/utils';
import { MdItemSelect } from '#/views/mes/md/item/components';
import { MdWorkstationSelect } from '#/views/mes/md/workstation/components';
@@ -147,7 +149,7 @@
field: 'feedbackTime',
title: '鎶ュ伐鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{ field: 'approveUserNickname', title: '瀹℃牳浜�', width: 100 },
{
@@ -488,7 +490,11 @@
{ field: 'materialScrapQuantity', label: '鏂欏簾鏁伴噺' },
{ field: 'otherScrapQuantity', label: '鍏朵粬搴熷搧' },
{ field: 'feedbackUserNickname', label: '鎶ュ伐浜�' },
- { field: 'feedbackTime', label: '鎶ュ伐鏃堕棿' },
+ {
+ field: 'feedbackTime',
+ label: '鎶ュ伐鏃堕棿',
+ render: (val) => formatDate(val) as string,
+ },
{ field: 'approveUserNickname', label: '瀹℃牳浜�' },
{ field: 'remark', label: '澶囨敞' },
];
diff --git a/src/views/mes/pro/feedback/modules/batch-input-dialog.vue b/src/views/mes/pro/feedback/modules/batch-input-dialog.vue
index 922e79b..5e8b4ab 100644
--- a/src/views/mes/pro/feedback/modules/batch-input-dialog.vue
+++ b/src/views/mes/pro/feedback/modules/batch-input-dialog.vue
@@ -65,7 +65,7 @@
fieldName: 'expireDate',
label: '鏈夋晥鏈�',
component: 'DatePicker',
- componentProps: { class: 'w-full', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD HH:mm:ss', showTime: true, placeholder: '璇烽�夋嫨鏈夋晥鏈�' },
+ componentProps: { class: 'w-full', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD HH:mm:ss', showTime: false, placeholder: '璇烽�夋嫨鏈夋晥鏈�' },
rules: 'required',
});
}
@@ -74,7 +74,7 @@
fieldName: 'receiptDate',
label: '鍏ュ簱鏃ユ湡',
component: 'DatePicker',
- componentProps: { class: 'w-full', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD HH:mm:ss', showTime: true, placeholder: '璇烽�夋嫨鍏ュ簱鏃ユ湡' },
+ componentProps: { class: 'w-full', format: 'YYYY-MM-DD', valueFormat: 'YYYY-MM-DD HH:mm:ss', showTime: false, placeholder: '璇烽�夋嫨鍏ュ簱鏃ユ湡' },
rules: 'required',
});
}
diff --git a/src/views/mes/pro/mps/data.ts b/src/views/mes/pro/mps/data.ts
index 8afc6da..c4b2d5f 100644
--- a/src/views/mes/pro/mps/data.ts
+++ b/src/views/mes/pro/mps/data.ts
@@ -287,7 +287,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/pro/process/data.ts b/src/views/mes/pro/process/data.ts
index 1cf6134..bb21dc5 100644
--- a/src/views/mes/pro/process/data.ts
+++ b/src/views/mes/pro/process/data.ts
@@ -161,7 +161,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/pro/route/data.ts b/src/views/mes/pro/route/data.ts
index 6d8a693..ba20842 100644
--- a/src/views/mes/pro/route/data.ts
+++ b/src/views/mes/pro/route/data.ts
@@ -167,7 +167,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/pro/workorder/data.ts b/src/views/mes/pro/workorder/data.ts
index de3d920..0547ca2 100644
--- a/src/views/mes/pro/workorder/data.ts
+++ b/src/views/mes/pro/workorder/data.ts
@@ -504,7 +504,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/pro/workrecord/data.ts b/src/views/mes/pro/workrecord/data.ts
index 685fb6a..59167e0 100644
--- a/src/views/mes/pro/workrecord/data.ts
+++ b/src/views/mes/pro/workrecord/data.ts
@@ -101,7 +101,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
];
}
diff --git a/src/views/mes/process-design/parameter/data.ts b/src/views/mes/process-design/parameter/data.ts
index c59fa12..fc43209 100644
--- a/src/views/mes/process-design/parameter/data.ts
+++ b/src/views/mes/process-design/parameter/data.ts
@@ -166,7 +166,7 @@
field: "createTime",
title: "鍒涘缓鏃堕棿",
width: 180,
- formatter: "formatDateTime",
+ formatter: 'formatDate',
},
{
title: "鎿嶄綔",
diff --git a/src/views/mes/process-design/process/data.ts b/src/views/mes/process-design/process/data.ts
index 1cf6134..bb21dc5 100644
--- a/src/views/mes/process-design/process/data.ts
+++ b/src/views/mes/process-design/process/data.ts
@@ -161,7 +161,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/process-design/route/data.ts b/src/views/mes/process-design/route/data.ts
index 3f99c03..6d0e614 100644
--- a/src/views/mes/process-design/route/data.ts
+++ b/src/views/mes/process-design/route/data.ts
@@ -154,7 +154,7 @@
field: "createTime",
title: "鍒涘缓鏃堕棿",
width: 180,
- formatter: "formatDateTime",
+ formatter: 'formatDate',
},
{
title: "鎿嶄綔",
diff --git a/src/views/mes/process-design/template/data.ts b/src/views/mes/process-design/template/data.ts
index e5dabf1..62f197d 100644
--- a/src/views/mes/process-design/template/data.ts
+++ b/src/views/mes/process-design/template/data.ts
@@ -125,7 +125,7 @@
field: "createTime",
title: "鍒涘缓鏃堕棿",
width: 180,
- formatter: "formatDateTime",
+ formatter: 'formatDate',
},
{
title: "鎿嶄綔",
diff --git a/src/views/mes/qc/batchtrace/data.ts b/src/views/mes/qc/batchtrace/data.ts
index 3013c2e..4af7ebe 100644
--- a/src/views/mes/qc/batchtrace/data.ts
+++ b/src/views/mes/qc/batchtrace/data.ts
@@ -242,7 +242,7 @@
field: 'receiptDate',
title: '鍏ュ簱鏃ユ湡',
minWidth: 160,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'purchaseOrderCode',
@@ -303,7 +303,7 @@
field: 'salesDate',
title: '鍑哄簱鏃ユ湡',
minWidth: 160,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'salesOrderCode',
diff --git a/src/views/mes/qc/defect/data.ts b/src/views/mes/qc/defect/data.ts
index 14e8457..7a0b0c1 100644
--- a/src/views/mes/qc/defect/data.ts
+++ b/src/views/mes/qc/defect/data.ts
@@ -170,7 +170,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/qc/indicator/data.ts b/src/views/mes/qc/indicator/data.ts
index 947d209..dba7ba9 100644
--- a/src/views/mes/qc/indicator/data.ts
+++ b/src/views/mes/qc/indicator/data.ts
@@ -323,7 +323,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/qc/ledger/data.ts b/src/views/mes/qc/ledger/data.ts
index 8bf9f20..e090a6e 100644
--- a/src/views/mes/qc/ledger/data.ts
+++ b/src/views/mes/qc/ledger/data.ts
@@ -179,7 +179,7 @@
field: 'inspectDate',
title: '妫�娴嬫棩鏈�',
width: 170,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'status',
diff --git a/src/views/mes/qc/ncr/data.ts b/src/views/mes/qc/ncr/data.ts
index f6bdbfb..636c23b 100644
--- a/src/views/mes/qc/ncr/data.ts
+++ b/src/views/mes/qc/ncr/data.ts
@@ -363,7 +363,7 @@
allowClear: true,
class: '!w-full',
placeholder: '璇烽�夋嫨鍒涘缓鏃堕棿',
- showTime: true,
+ showTime: false,
type: 'date',
},
},
@@ -435,7 +435,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/qc/report/instance/data.ts b/src/views/mes/qc/report/instance/data.ts
index b41b555..a12a157 100644
--- a/src/views/mes/qc/report/instance/data.ts
+++ b/src/views/mes/qc/report/instance/data.ts
@@ -153,7 +153,7 @@
field: 'createTime',
title: '鐢熸垚鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/qc/report/template/data.ts b/src/views/mes/qc/report/template/data.ts
index fe46ea3..001474d 100644
--- a/src/views/mes/qc/report/template/data.ts
+++ b/src/views/mes/qc/report/template/data.ts
@@ -217,7 +217,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/qc/rqc/data.ts b/src/views/mes/qc/rqc/data.ts
index 945d573..b7ca107 100644
--- a/src/views/mes/qc/rqc/data.ts
+++ b/src/views/mes/qc/rqc/data.ts
@@ -246,9 +246,9 @@
label: '妫�娴嬫棩鏈�',
component: 'DatePicker',
componentProps: {
- format: 'YYYY-MM-DD HH:mm:ss',
+ format: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨妫�娴嬫棩鏈�',
- showTime: true,
+ showTime: false,
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
@@ -442,7 +442,7 @@
field: 'inspectDate',
title: '妫�娴嬫棩鏈�',
width: 160,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'inspectorNickname',
diff --git a/src/views/mes/qc/template/data.ts b/src/views/mes/qc/template/data.ts
index 5cf1673..3586d4c 100644
--- a/src/views/mes/qc/template/data.ts
+++ b/src/views/mes/qc/template/data.ts
@@ -185,7 +185,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/tm/tool/data.ts b/src/views/mes/tm/tool/data.ts
index af2c051..682b7f9 100644
--- a/src/views/mes/tm/tool/data.ts
+++ b/src/views/mes/tm/tool/data.ts
@@ -11,7 +11,7 @@
MesToolStatusEnum,
} from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { Button } from 'ant-design-vue';
@@ -181,8 +181,8 @@
label: '涓嬫淇濆吇鏃ユ湡',
component: 'DatePicker',
componentProps: {
- format: 'YYYY-MM-DD HH:mm:ss',
- showTime: true,
+ format: 'YYYY-MM-DD',
+ showTime: false,
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
dependencies: {
@@ -302,7 +302,7 @@
formatter: ({ row }) => {
if (row.maintenType === MesMaintenTypeEnum.REGULAR) {
return row.nextMaintenDate
- ? formatDateTime(row.nextMaintenDate)
+ ? formatDate(row.nextMaintenDate)
: '-';
}
if (row.maintenType === MesMaintenTypeEnum.USAGE) {
@@ -326,7 +326,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
@@ -416,7 +416,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
];
}
diff --git a/src/views/mes/tm/tool/type/data.ts b/src/views/mes/tm/tool/type/data.ts
index be84c70..c156d7b 100644
--- a/src/views/mes/tm/tool/type/data.ts
+++ b/src/views/mes/tm/tool/type/data.ts
@@ -211,7 +211,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
index 40fe4f8..7edccdf 100644
--- a/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
+++ b/src/views/mes/workbench/components/tabs/FeedbackHistoryTab.vue
@@ -191,7 +191,7 @@
field: 'feedbackTime',
title: '鎶ュ伐鏃堕棿',
width: 170,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/srm/supplierApply/detail/index.vue b/src/views/srm/supplierApply/detail/index.vue
index bdccd5c..f4f0e73 100644
--- a/src/views/srm/supplierApply/detail/index.vue
+++ b/src/views/srm/supplierApply/detail/index.vue
@@ -5,7 +5,7 @@
import { h, onMounted, ref } from 'vue';
import { ContentWrap } from '@vben/common-ui';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { Spin, Tag } from 'ant-design-vue';
@@ -44,7 +44,7 @@
{
label: '鐢宠鏃堕棿',
field: 'applyTime',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{ label: '渚涘簲鍟嗗悕绉�', field: 'supplierName', render: textRender },
{ label: '渚涘簲鍟嗙被鍨�', field: 'supplierType', render: textRender },
diff --git a/src/views/system/dept/data.ts b/src/views/system/dept/data.ts
index 9fe39e2..7537d23 100644
--- a/src/views/system/dept/data.ts
+++ b/src/views/system/dept/data.ts
@@ -175,7 +175,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/system/dict/data.ts b/src/views/system/dict/data.ts
index cfa455a..2dc93cb 100644
--- a/src/views/system/dict/data.ts
+++ b/src/views/system/dict/data.ts
@@ -137,7 +137,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
@@ -342,7 +342,7 @@
title: '鍒涘缓鏃堕棿',
field: 'createTime',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/system/loginlog/data.ts b/src/views/system/loginlog/data.ts
index 386d832..a7db14d 100644
--- a/src/views/system/loginlog/data.ts
+++ b/src/views/system/loginlog/data.ts
@@ -5,7 +5,7 @@
import { h } from 'vue';
import { DICT_TYPE } from '@vben/constants';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { DictTag } from '#/components/dict-tag';
import { getRangePickerDefaultProps } from '#/utils';
@@ -88,7 +88,7 @@
field: 'createTime',
title: '鐧诲綍鏃ユ湡',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
@@ -141,7 +141,7 @@
{
field: 'createTime',
label: '鐧诲綍鏃ユ湡',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
];
}
diff --git a/src/views/system/operatelog/data.ts b/src/views/system/operatelog/data.ts
index c75d4c2..e98e6b4 100644
--- a/src/views/system/operatelog/data.ts
+++ b/src/views/system/operatelog/data.ts
@@ -5,7 +5,7 @@
import { h } from 'vue';
import { DICT_TYPE } from '@vben/constants';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { getSimpleUserList } from '#/api/system/user';
import { DictTag } from '#/components/dict-tag';
@@ -106,7 +106,7 @@
field: 'createTime',
title: '鎿嶄綔鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'bizId',
@@ -190,7 +190,7 @@
{
field: 'createTime',
label: '鎿嶄綔鏃堕棿',
- render: (val) => formatDateTime(val) as string,
+ render: (val) => formatDate(val) as string,
},
{
field: 'bizId',
diff --git a/src/views/system/post/data.ts b/src/views/system/post/data.ts
index ca71395..3366e04 100644
--- a/src/views/system/post/data.ts
+++ b/src/views/system/post/data.ts
@@ -168,7 +168,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/system/role/data.ts b/src/views/system/role/data.ts
index b8efae8..ea76b9b 100644
--- a/src/views/system/role/data.ts
+++ b/src/views/system/role/data.ts
@@ -253,7 +253,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/system/user/data.ts b/src/views/system/user/data.ts
index 8506c40..d67b4f9 100644
--- a/src/views/system/user/data.ts
+++ b/src/views/system/user/data.ts
@@ -342,7 +342,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
minWidth: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/wls/barcode/data.ts b/src/views/wls/barcode/data.ts
index c34a07b..069d12f 100644
--- a/src/views/wls/barcode/data.ts
+++ b/src/views/wls/barcode/data.ts
@@ -13,7 +13,7 @@
MesProWorkOrderStatusEnum,
} from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
-import { formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { z } from '#/adapter/form';
import { generateBarcodeContent } from '#/api/mes/wm/barcode';
@@ -674,7 +674,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
@@ -730,7 +730,7 @@
{
field: 'createTime',
label: '鍒涘缓鏃堕棿',
- render: (value) => formatDateTime(value) || '-',
+ render: (value) => formatDate(value) || '-',
},
];
}
diff --git a/src/views/wls/materialstock/data.ts b/src/views/wls/materialstock/data.ts
index 8cc4eb3..9c0ec40 100644
--- a/src/views/wls/materialstock/data.ts
+++ b/src/views/wls/materialstock/data.ts
@@ -173,7 +173,7 @@
field: 'receiptTime',
title: '鍏ュ簱鏃ユ湡',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'frozen',
@@ -373,7 +373,7 @@
field: 'receiptTime',
title: '鍏ュ簱鏃ユ湡',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'frozen',
diff --git a/src/views/wls/productissue/data.ts b/src/views/wls/productissue/data.ts
index 896c624..5ef003a 100644
--- a/src/views/wls/productissue/data.ts
+++ b/src/views/wls/productissue/data.ts
@@ -100,9 +100,9 @@
component: 'DatePicker',
componentProps: {
class: '!w-full',
- format: 'YYYY-MM-DD HH:mm:ss',
+ format: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨闇�姹傛椂闂�',
- showTime: true,
+ showTime: false,
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
@@ -242,7 +242,7 @@
field: 'requiredTime',
title: '闇�姹傛椂闂�',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'status',
diff --git a/src/views/wls/returnissue/data.ts b/src/views/wls/returnissue/data.ts
index 691b573..22549d5 100644
--- a/src/views/wls/returnissue/data.ts
+++ b/src/views/wls/returnissue/data.ts
@@ -127,9 +127,9 @@
component: 'DatePicker',
componentProps: {
class: '!w-full',
- format: 'YYYY-MM-DD HH:mm:ss',
+ format: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨閫�鏂欐棩鏈�',
- showTime: true,
+ showTime: false,
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
},
@@ -225,7 +225,7 @@
field: 'returnDate',
title: '閫�鏂欐棩鏈�',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'status',
diff --git a/src/views/wls/returnvendor/data.ts b/src/views/wls/returnvendor/data.ts
index 7a4442d..a337f07 100644
--- a/src/views/wls/returnvendor/data.ts
+++ b/src/views/wls/returnvendor/data.ts
@@ -134,9 +134,9 @@
component: 'DatePicker',
componentProps: {
class: '!w-full',
- format: 'YYYY-MM-DD HH:mm:ss',
+ format: 'YYYY-MM-DD',
placeholder: '璇烽�夋嫨閫�璐ф棩鏈�',
- showTime: true,
+ showTime: false,
valueFormat: 'YYYY-MM-DD HH:mm:ss',
},
rules: 'required',
@@ -254,7 +254,7 @@
field: 'returnDate',
title: '閫�璐ф棩鏈�',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
field: 'status',
diff --git a/src/views/wls/sn/data.ts b/src/views/wls/sn/data.ts
index 2023366..eb64e14 100644
--- a/src/views/wls/sn/data.ts
+++ b/src/views/wls/sn/data.ts
@@ -123,7 +123,7 @@
field: 'createTime',
title: '鐢熸垚鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
@@ -171,7 +171,7 @@
field: 'createTime',
title: '鐢熸垚鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/wls/transaction/data.ts b/src/views/wls/transaction/data.ts
index 117aa3f..75af4b8 100644
--- a/src/views/wls/transaction/data.ts
+++ b/src/views/wls/transaction/data.ts
@@ -203,7 +203,7 @@
field: 'transactionTime',
title: '浜嬪姟鏃堕棿',
width: 160,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
];
}
diff --git a/src/views/wls/warehouse/area/data.ts b/src/views/wls/warehouse/area/data.ts
index 383994b..b54e701 100644
--- a/src/views/wls/warehouse/area/data.ts
+++ b/src/views/wls/warehouse/area/data.ts
@@ -327,7 +327,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/wls/warehouse/data.ts b/src/views/wls/warehouse/data.ts
index 8c449ce..c702cd9 100644
--- a/src/views/wls/warehouse/data.ts
+++ b/src/views/wls/warehouse/data.ts
@@ -210,7 +210,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/wls/warehouse/location/data.ts b/src/views/wls/warehouse/location/data.ts
index 4aeb226..de9efac 100644
--- a/src/views/wls/warehouse/location/data.ts
+++ b/src/views/wls/warehouse/location/data.ts
@@ -182,7 +182,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/wms/md/item/brand/data.ts b/src/views/wms/md/item/brand/data.ts
index e04dc51..350bb69 100644
--- a/src/views/wms/md/item/brand/data.ts
+++ b/src/views/wms/md/item/brand/data.ts
@@ -96,7 +96,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/wms/md/item/category/data.ts b/src/views/wms/md/item/category/data.ts
index 3596855..ff6cbe5 100644
--- a/src/views/wms/md/item/category/data.ts
+++ b/src/views/wms/md/item/category/data.ts
@@ -174,7 +174,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/wms/md/warehouse/data.ts b/src/views/wms/md/warehouse/data.ts
index a286b35..16828e3 100644
--- a/src/views/wms/md/warehouse/data.ts
+++ b/src/views/wms/md/warehouse/data.ts
@@ -127,7 +127,7 @@
field: 'createTime',
title: '鍒涘缓鏃堕棿',
width: 180,
- formatter: 'formatDateTime',
+ formatter: 'formatDate',
},
{
title: '鎿嶄綔',
diff --git a/src/views/wms/order/check/data.ts b/src/views/wms/order/check/data.ts
index 3e3ba5b..44a4318 100644
--- a/src/views/wms/order/check/data.ts
+++ b/src/views/wms/order/check/data.ts
@@ -7,7 +7,7 @@
import { DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
-import { formatDate, formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { z } from '#/adapter/form';
import { getSimpleUserList } from '#/api/system/user';
@@ -334,7 +334,7 @@
{
field: 'createTime',
label: '鍒涘缓鏃堕棿',
- render: (val) => formatDateTime(val) || '-',
+ render: (val) => formatDate(val) || '-',
},
{
field: 'creatorName',
@@ -344,7 +344,7 @@
{
field: 'updateTime',
label: '鏇存柊鏃堕棿',
- render: (val) => formatDateTime(val) || '-',
+ render: (val) => formatDate(val) || '-',
},
{
field: 'updaterName',
diff --git a/src/views/wms/order/check/index.vue b/src/views/wms/order/check/index.vue
index 9d1f868..80f1f8d 100644
--- a/src/views/wms/order/check/index.vue
+++ b/src/views/wms/order/check/index.vue
@@ -11,7 +11,7 @@
OrderStatusEnum,
OrderUpdateStatusList,
} from '@vben/constants';
-import { downloadFileFromBlobPart, formatDateTime } from '@vben/utils';
+import { downloadFileFromBlobPart, formatDate } from '@vben/utils';
import { message } from 'ant-design-vue';
@@ -326,11 +326,11 @@
</template>
<template #operateInfo="{ row }">
<div>
- 鍒涘缓锛歿{ formatDateTime(row.createTime) || '-' }} /
+ 鍒涘缓锛歿{ formatDate(row.createTime) || '-' }} /
{{ row.creatorName || row.creator || '-' }}
</div>
<div>
- 鏇存柊锛歿{ formatDateTime(row.updateTime) || '-' }} /
+ 鏇存柊锛歿{ formatDate(row.updateTime) || '-' }} /
{{ row.updaterName || row.updater || '-' }}
</div>
</template>
diff --git a/src/views/wms/order/check/modules/print.vue b/src/views/wms/order/check/modules/print.vue
index f206f99..ae6b194 100644
--- a/src/views/wms/order/check/modules/print.vue
+++ b/src/views/wms/order/check/modules/print.vue
@@ -7,7 +7,7 @@
import { Barcode, BarcodeFormatEnum } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
import { getDictLabel } from '@vben/hooks';
-import { formatDate, formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import {
getCheckOrder,
@@ -144,11 +144,11 @@
</div>
<div class="col-span-3 grid grid-cols-2 gap-x-6">
<div>
- 鍒涘缓锛歿{ formatDateTime(printData.createTime) || '-' }} /
+ 鍒涘缓锛歿{ formatDate(printData.createTime) || '-' }} /
{{ printData.creatorName || printData.creator || '-' }}
</div>
<div>
- 鏇存柊锛歿{ formatDateTime(printData.updateTime) || '-' }} /
+ 鏇存柊锛歿{ formatDate(printData.updateTime) || '-' }} /
{{ printData.updaterName || printData.updater || '-' }}
</div>
</div>
diff --git a/src/views/wms/order/movement/data.ts b/src/views/wms/order/movement/data.ts
index 4fcb2c2..14746e7 100644
--- a/src/views/wms/order/movement/data.ts
+++ b/src/views/wms/order/movement/data.ts
@@ -7,7 +7,7 @@
import { DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
-import { formatDate, formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { z } from '#/adapter/form';
import { getSimpleUserList } from '#/api/system/user';
@@ -240,7 +240,7 @@
{
field: 'createTime',
label: '鍒涘缓鏃堕棿',
- render: (val) => formatDateTime(val) || '-',
+ render: (val) => formatDate(val) || '-',
},
{
field: 'creatorName',
@@ -250,7 +250,7 @@
{
field: 'updateTime',
label: '鏇存柊鏃堕棿',
- render: (val) => formatDateTime(val) || '-',
+ render: (val) => formatDate(val) || '-',
},
{
field: 'updaterName',
diff --git a/src/views/wms/order/movement/index.vue b/src/views/wms/order/movement/index.vue
index fb2c219..701b043 100644
--- a/src/views/wms/order/movement/index.vue
+++ b/src/views/wms/order/movement/index.vue
@@ -11,7 +11,7 @@
OrderStatusEnum,
OrderUpdateStatusList,
} from '@vben/constants';
-import { downloadFileFromBlobPart, formatDateTime } from '@vben/utils';
+import { downloadFileFromBlobPart, formatDate } from '@vben/utils';
import { message } from 'ant-design-vue';
@@ -295,11 +295,11 @@
</template>
<template #operateInfo="{ row }">
<div>
- 鍒涘缓锛歿{ formatDateTime(row.createTime) || '-' }} /
+ 鍒涘缓锛歿{ formatDate(row.createTime) || '-' }} /
{{ row.creatorName || row.creator || '-' }}
</div>
<div>
- 鏇存柊锛歿{ formatDateTime(row.updateTime) || '-' }} /
+ 鏇存柊锛歿{ formatDate(row.updateTime) || '-' }} /
{{ row.updaterName || row.updater || '-' }}
</div>
</template>
diff --git a/src/views/wms/order/movement/modules/print.vue b/src/views/wms/order/movement/modules/print.vue
index 44c75ad..74dac2f 100644
--- a/src/views/wms/order/movement/modules/print.vue
+++ b/src/views/wms/order/movement/modules/print.vue
@@ -7,7 +7,7 @@
import { Barcode, BarcodeFormatEnum } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
import { getDictLabel } from '@vben/hooks';
-import { formatDate, formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import {
getMovementOrder,
@@ -112,11 +112,11 @@
<div>鎬婚噾棰濓細{{ formatPrice(printData.totalPrice) || '-' }}</div>
<div class="col-span-3 grid grid-cols-2 gap-x-6">
<div>
- 鍒涘缓锛歿{ formatDateTime(printData.createTime) || '-' }} /
+ 鍒涘缓锛歿{ formatDate(printData.createTime) || '-' }} /
{{ printData.creatorName || printData.creator || '-' }}
</div>
<div>
- 鏇存柊锛歿{ formatDateTime(printData.updateTime) || '-' }} /
+ 鏇存柊锛歿{ formatDate(printData.updateTime) || '-' }} /
{{ printData.updaterName || printData.updater || '-' }}
</div>
</div>
diff --git a/src/views/wms/order/receipt/data.ts b/src/views/wms/order/receipt/data.ts
index e31e002..0bd8962 100644
--- a/src/views/wms/order/receipt/data.ts
+++ b/src/views/wms/order/receipt/data.ts
@@ -6,7 +6,7 @@
import { DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
-import { formatDate, formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { z } from '#/adapter/form';
import { getSimpleUserList } from '#/api/system/user';
@@ -289,7 +289,7 @@
{
field: 'createTime',
label: '鍒涘缓鏃堕棿',
- render: (val) => formatDateTime(val) || '-',
+ render: (val) => formatDate(val) || '-',
},
{
field: 'creatorName',
@@ -299,7 +299,7 @@
{
field: 'updateTime',
label: '鏇存柊鏃堕棿',
- render: (val) => formatDateTime(val) || '-',
+ render: (val) => formatDate(val) || '-',
},
{
field: 'updaterName',
diff --git a/src/views/wms/order/receipt/index.vue b/src/views/wms/order/receipt/index.vue
index 2d86d8b..52a2b1c 100644
--- a/src/views/wms/order/receipt/index.vue
+++ b/src/views/wms/order/receipt/index.vue
@@ -11,7 +11,7 @@
OrderStatusEnum,
OrderUpdateStatusList,
} from '@vben/constants';
-import { downloadFileFromBlobPart, formatDateTime } from '@vben/utils';
+import { downloadFileFromBlobPart, formatDate } from '@vben/utils';
import { message } from 'ant-design-vue';
@@ -300,11 +300,11 @@
</template>
<template #operateInfo="{ row }">
<div>
- 鍒涘缓锛歿{ formatDateTime(row.createTime) || '-' }} /
+ 鍒涘缓锛歿{ formatDate(row.createTime) || '-' }} /
{{ row.creatorName || row.creator || '-' }}
</div>
<div>
- 鏇存柊锛歿{ formatDateTime(row.updateTime) || '-' }} /
+ 鏇存柊锛歿{ formatDate(row.updateTime) || '-' }} /
{{ row.updaterName || row.updater || '-' }}
</div>
</template>
diff --git a/src/views/wms/order/receipt/modules/print.vue b/src/views/wms/order/receipt/modules/print.vue
index e8e1d32..b0889f5 100644
--- a/src/views/wms/order/receipt/modules/print.vue
+++ b/src/views/wms/order/receipt/modules/print.vue
@@ -7,7 +7,7 @@
import { Barcode, BarcodeFormatEnum } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
import { getDictLabel } from '@vben/hooks';
-import { formatDate, formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import {
getReceiptOrder,
@@ -118,11 +118,11 @@
<div>鎬婚噾棰濓細{{ formatPrice(printData.totalPrice) || '-' }}</div>
<div class="col-span-3 grid grid-cols-2 gap-x-6">
<div>
- 鍒涘缓锛歿{ formatDateTime(printData.createTime) || '-' }} /
+ 鍒涘缓锛歿{ formatDate(printData.createTime) || '-' }} /
{{ printData.creatorName || printData.creator || '-' }}
</div>
<div>
- 鏇存柊锛歿{ formatDateTime(printData.updateTime) || '-' }} /
+ 鏇存柊锛歿{ formatDate(printData.updateTime) || '-' }} /
{{ printData.updaterName || printData.updater || '-' }}
</div>
</div>
diff --git a/src/views/wms/order/shipment/data.ts b/src/views/wms/order/shipment/data.ts
index 7d41840..f4f2278 100644
--- a/src/views/wms/order/shipment/data.ts
+++ b/src/views/wms/order/shipment/data.ts
@@ -7,7 +7,7 @@
import { DICT_TYPE } from '@vben/constants';
import { getDictOptions } from '@vben/hooks';
-import { formatDate, formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import { z } from '#/adapter/form';
import { getSimpleUserList } from '#/api/system/user';
@@ -290,7 +290,7 @@
{
field: 'createTime',
label: '鍒涘缓鏃堕棿',
- render: (val) => formatDateTime(val) || '-',
+ render: (val) => formatDate(val) || '-',
},
{
field: 'creatorName',
@@ -300,7 +300,7 @@
{
field: 'updateTime',
label: '鏇存柊鏃堕棿',
- render: (val) => formatDateTime(val) || '-',
+ render: (val) => formatDate(val) || '-',
},
{
field: 'updaterName',
diff --git a/src/views/wms/order/shipment/index.vue b/src/views/wms/order/shipment/index.vue
index 14550a2..cc85985 100644
--- a/src/views/wms/order/shipment/index.vue
+++ b/src/views/wms/order/shipment/index.vue
@@ -11,7 +11,7 @@
OrderStatusEnum,
OrderUpdateStatusList,
} from '@vben/constants';
-import { downloadFileFromBlobPart, formatDateTime } from '@vben/utils';
+import { downloadFileFromBlobPart, formatDate } from '@vben/utils';
import { message } from 'ant-design-vue';
@@ -298,11 +298,11 @@
</template>
<template #operateInfo="{ row }">
<div>
- 鍒涘缓锛歿{ formatDateTime(row.createTime) || '-' }} /
+ 鍒涘缓锛歿{ formatDate(row.createTime) || '-' }} /
{{ row.creatorName || row.creator || '-' }}
</div>
<div>
- 鏇存柊锛歿{ formatDateTime(row.updateTime) || '-' }} /
+ 鏇存柊锛歿{ formatDate(row.updateTime) || '-' }} /
{{ row.updaterName || row.updater || '-' }}
</div>
</template>
diff --git a/src/views/wms/order/shipment/modules/print.vue b/src/views/wms/order/shipment/modules/print.vue
index e8faa62..6d2b29e 100644
--- a/src/views/wms/order/shipment/modules/print.vue
+++ b/src/views/wms/order/shipment/modules/print.vue
@@ -7,7 +7,7 @@
import { Barcode, BarcodeFormatEnum } from '@vben/common-ui';
import { DICT_TYPE } from '@vben/constants';
import { getDictLabel } from '@vben/hooks';
-import { formatDate, formatDateTime } from '@vben/utils';
+import { formatDate } from '@vben/utils';
import {
getShipmentOrder,
@@ -118,11 +118,11 @@
<div>鎬婚噾棰濓細{{ formatPrice(printData.totalPrice) || '-' }}</div>
<div class="col-span-3 grid grid-cols-2 gap-x-6">
<div>
- 鍒涘缓锛歿{ formatDateTime(printData.createTime) || '-' }} /
+ 鍒涘缓锛歿{ formatDate(printData.createTime) || '-' }} /
{{ printData.creatorName || printData.creator || '-' }}
</div>
<div>
- 鏇存柊锛歿{ formatDateTime(printData.updateTime) || '-' }} /
+ 鏇存柊锛歿{ formatDate(printData.updateTime) || '-' }} /
{{ printData.updaterName || printData.updater || '-' }}
</div>
</div>
--
Gitblit v1.9.3