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/crm/customer/data.ts |   46 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 40 insertions(+), 6 deletions(-)

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,
     },
     {

--
Gitblit v1.9.3