From 48e9b7d100ddd91a13e79e09bb5d992a62ffd026 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 13 十月 2026 14:34:16 +0800
Subject: [PATCH] fix(crm): 统一日期格式化并添加客户公海配置选项
---
src/components/operate-log/typing.ts | 2
src/views/crm/business/data.ts | 10 +-
src/views/crm/business/detail/index.vue | 2
src/views/crm/receivable/data.ts | 6
src/views/crm/receivable/plan/components/data.ts | 4
src/views/crm/salesTarget/data.ts | 2
src/views/crm/customer/limitConfig/data.ts | 2
src/views/crm/customer/detail/index.vue | 2
src/components/operate-log/operate-log.vue | 5
src/views/crm/receivable/components/data.ts | 2
src/views/crm/statistics/portrait/data.ts | 1
src/views/crm/clue/detail/index.vue | 2
src/views/crm/product/detail/index.vue | 2
src/views/crm/business/detail/data.ts | 8
src/views/crm/product/data.ts | 4
src/views/crm/product/category/data.ts | 2
src/views/crm/receivable/detail/data.ts | 10 +-
src/views/crm/contract/detail/index.vue | 2
src/views/crm/permission/modules/data.ts | 2
src/views/crm/receivable/plan/detail/index.vue | 2
src/views/crm/invoice/data.ts | 6
src/views/crm/contact/detail/index.vue | 2
src/views/crm/receivable/plan/detail/data.ts | 12 +-
src/views/crm/invoice/detail/data.ts | 10 +-
src/views/crm/clue/detail/data.ts | 6
src/views/crm/followup/data.ts | 14 +-
src/views/crm/contact/detail/data.ts | 6
src/views/crm/customer/detail/data.ts | 11 +
src/views/crm/statistics/funnel/data.ts | 17 +-
src/views/crm/saleQuotation/modules/ocr-upload.vue | 3
src/api/crm/customer/index.ts | 1
src/views/crm/invoice/detail/approve/index.vue | 6
src/views/crm/receivable/plan/data.ts | 10 +-
src/views/crm/contact/data.ts | 10 +-
src/views/crm/business/status/data.ts | 2
src/views/crm/invoice/detail/index.vue | 2
src/views/crm/receivable/detail/approve/index.vue | 6
src/views/crm/receivable/detail/index.vue | 2
src/views/crm/statistics/rank/data.ts | 1
src/views/crm/customer/pool/data.ts | 8
src/views/crm/customer/data.ts | 46 ++++++++-
src/views/crm/statistics/customer/data.ts | 5
src/views/crm/clue/data.ts | 11 +-
43 files changed, 159 insertions(+), 110 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/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..728bf70 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: '鏈�鍚庤窡杩涜褰�',
@@ -145,13 +145,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/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..0eb73fc 100644
--- a/src/views/crm/invoice/detail/index.vue
+++ b/src/views/crm/invoice/detail/index.vue
@@ -111,7 +111,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/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))),
--
Gitblit v1.9.3