From 83536596d16bbd4e01ba62147164a977e270aa3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=91=E5=9D=A4?= <yuankun1102@126.com>
Date: Thu, 1 May 2025 18:29:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crm/backlog/components/CustomerFollowList.vue      |  9 +++++----
 .../backlog/components/CustomerPutPoolRemindList.vue   |  9 +++++----
 .../backlog/components/CustomerTodayContactList.vue    |  9 +++++----
 src/views/crm/backlog/index.vue                        | 10 +++++-----
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/views/crm/backlog/components/CustomerFollowList.vue b/src/views/crm/backlog/components/CustomerFollowList.vue
index 0f367a3f6..17f93e5b7 100644
--- a/src/views/crm/backlog/components/CustomerFollowList.vue
+++ b/src/views/crm/backlog/components/CustomerFollowList.vue
@@ -31,21 +31,22 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
-      <el-table-column align="center" label="客户名称" fixed="left" prop="name" width="160">
+      <el-table-column align="center" label="客户名称" fixed="left" prop="name" width="220">
         <template #default="scope">
           <el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
             {{ scope.row.name }}
           </el-link>
         </template>
       </el-table-column>
+      <el-table-column align="center" label="信用统一代码" prop="creditNo" width="180" />
       <el-table-column align="center" label="客户来源" prop="source" width="100">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" />
         </template>
       </el-table-column>
-      <el-table-column label="手机" align="center" prop="mobile" width="120" />
-      <el-table-column label="电话" align="center" prop="telephone" width="130" />
-      <el-table-column label="邮箱" align="center" prop="email" width="180" />
+<!--      <el-table-column label="手机" align="center" prop="mobile" width="120" />-->
+<!--      <el-table-column label="电话" align="center" prop="telephone" width="130" />-->
+<!--      <el-table-column label="邮箱" align="center" prop="email" width="180" />-->
       <el-table-column align="center" label="客户级别" prop="level" width="135">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="scope.row.level" />
diff --git a/src/views/crm/backlog/components/CustomerPutPoolRemindList.vue b/src/views/crm/backlog/components/CustomerPutPoolRemindList.vue
index 17f8df6b5..5c326edac 100644
--- a/src/views/crm/backlog/components/CustomerPutPoolRemindList.vue
+++ b/src/views/crm/backlog/components/CustomerPutPoolRemindList.vue
@@ -29,21 +29,22 @@
   </ContentWrap>
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
-      <el-table-column align="center" label="客户名称" fixed="left" prop="name" width="160">
+      <el-table-column align="center" label="客户名称" fixed="left" prop="name" width="220">
         <template #default="scope">
           <el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
             {{ scope.row.name }}
           </el-link>
         </template>
       </el-table-column>
+      <el-table-column align="center" label="信用统一代码" prop="creditNo" width="180" />
       <el-table-column align="center" label="客户来源" prop="source" width="100">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" />
         </template>
       </el-table-column>
-      <el-table-column label="手机" align="center" prop="mobile" width="120" />
-      <el-table-column label="电话" align="center" prop="telephone" width="130" />
-      <el-table-column label="邮箱" align="center" prop="email" width="180" />
+<!--      <el-table-column label="手机" align="center" prop="mobile" width="120" />-->
+<!--      <el-table-column label="电话" align="center" prop="telephone" width="130" />-->
+<!--      <el-table-column label="邮箱" align="center" prop="email" width="180" />-->
       <el-table-column align="center" label="客户级别" prop="level" width="135">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="scope.row.level" />
diff --git a/src/views/crm/backlog/components/CustomerTodayContactList.vue b/src/views/crm/backlog/components/CustomerTodayContactList.vue
index 87aa31d71..468da176e 100644
--- a/src/views/crm/backlog/components/CustomerTodayContactList.vue
+++ b/src/views/crm/backlog/components/CustomerTodayContactList.vue
@@ -43,21 +43,22 @@
   </ContentWrap>
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
-      <el-table-column align="center" label="客户名称" fixed="left" prop="name" width="160">
+      <el-table-column align="center" label="客户名称" fixed="left" prop="name" width="220">
         <template #default="scope">
           <el-link :underline="false" type="primary" @click="openDetail(scope.row.id)">
             {{ scope.row.name }}
           </el-link>
         </template>
       </el-table-column>
+      <el-table-column align="center" label="信用统一代码" prop="creditNo" width="180" />
       <el-table-column align="center" label="客户来源" prop="source" width="100">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" />
         </template>
       </el-table-column>
-      <el-table-column label="手机" align="center" prop="mobile" width="120" />
-      <el-table-column label="电话" align="center" prop="telephone" width="130" />
-      <el-table-column label="邮箱" align="center" prop="email" width="180" />
+<!--      <el-table-column label="手机" align="center" prop="mobile" width="120" />-->
+<!--      <el-table-column label="电话" align="center" prop="telephone" width="130" />-->
+<!--      <el-table-column label="邮箱" align="center" prop="email" width="180" />-->
       <el-table-column align="center" label="客户级别" prop="level" width="135">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="scope.row.level" />
diff --git a/src/views/crm/backlog/index.vue b/src/views/crm/backlog/index.vue
index 7c91b3c75..21e77f18a 100644
--- a/src/views/crm/backlog/index.vue
+++ b/src/views/crm/backlog/index.vue
@@ -93,11 +93,11 @@ const leftSides = ref([
   //   menu: 'receivablePlanRemind',
   //   count: receivablePlanRemindCount
   // },
-  // {
-  //   name: '即将到期的合同',
-  //   menu: 'contractRemind',
-  //   count: contractRemindCount
-  // }
+  {
+    name: '即将到期的合同',
+    menu: 'contractRemind',
+    count: contractRemindCount
+  }
 ])
 
 /** 侧边点击 */

From af6b4e035d68614f9a328ac255621d59e2d567ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=91=E5=9D=A4?= <yuankun1102@126.com>
Date: Thu, 1 May 2025 18:55:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/business/BusinessForm.vue              |  6 +++---
 .../crm/business/components/BusinessProductForm.vue  | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/crm/business/BusinessForm.vue b/src/views/crm/business/BusinessForm.vue
index 6e114fe63..6143c69e9 100644
--- a/src/views/crm/business/BusinessForm.vue
+++ b/src/views/crm/business/BusinessForm.vue
@@ -203,7 +203,7 @@
       </ContentWrap>
       <el-row>
         <el-col :span="8">
-          <el-form-item label="线上总金额" prop="onlinePrice">
+          <el-form-item label="线上总金额（元）" prop="onlinePrice">
             <el-input
               disabled
               v-model="formData.onlinePrice"
@@ -212,7 +212,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="线下总金额" prop="offlinePrice">
+          <el-form-item label="线下总金额（元）" prop="offlinePrice">
             <el-input
               disabled
               v-model="formData.offlinePrice"
@@ -221,7 +221,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="总金额" prop="totalPrice">
+          <el-form-item label="总金额（元）" prop="totalPrice">
             <el-input
               disabled
               v-model="formData.totalPrice"
diff --git a/src/views/crm/business/components/BusinessProductForm.vue b/src/views/crm/business/components/BusinessProductForm.vue
index 82483a0df..7164123c2 100644
--- a/src/views/crm/business/components/BusinessProductForm.vue
+++ b/src/views/crm/business/components/BusinessProductForm.vue
@@ -10,14 +10,14 @@
   >
     <el-table :data="formData" class="-mt-10px">
       <el-table-column label="序号" type="index" align="center" width="60" />
-            <el-table-column label="产品名称" align="center" prop="productName" />
+            <el-table-column label="产品名称" align="left" prop="productName" width="200" />
 
       <el-table-column label="产品类别" align="center" prop="category" width="160">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CRM_PRODUCT_CATEGORY" :value="scope.row.category" />
         </template>
       </el-table-column>
-      <el-table-column label="产品明细" align="center" prop="detailType" width="160">
+      <el-table-column label="产品明细" align="center" prop="detailType" width="240">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.detailType`" :rules="formRules.detailType" class="mb-0px!">
             <el-select v-model="row.detailType" placeholder="请选择状态" >
@@ -31,12 +31,12 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="单位" min-width="80">
+      <el-table-column label="单位" align="center" min-width="80">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.CRM_PRODUCT_UNIT" :value="scope.row.productUnit" />
         </template>
       </el-table-column>
-      <el-table-column label="线上价格（元）" fixed="right" min-width="140">
+      <el-table-column label="线上价格（元）" fixed="right" min-width="100">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.onlinePrice`" :rules="formRules.onlinePrice" class="mb-0px!">
             <el-input-number
@@ -49,7 +49,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="线下价格（元）" fixed="right" min-width="140">
+      <el-table-column label="线下价格（元）" fixed="right" min-width="100">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.offlinePrice`" :rules="formRules.offlinePrice" class="mb-0px!">
             <el-input-number
@@ -62,7 +62,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="合计" prop="totalPrice" fixed="right" min-width="140">
+      <el-table-column label="合计(元)" prop="totalPrice" fixed="right" min-width="100">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.totalPrice`" class="mb-0px!">
             <el-input disabled v-model="row.totalPrice" :formatter="erpPriceInputFormatter" />

From 6d28eb51f6606934acd7411c8df7cf71e268e296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=91=E5=9D=A4?= <yuankun1102@126.com>
Date: Thu, 1 May 2025 19:11:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/QuotationProductForm.vue       | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/crm/quotation/components/QuotationProductForm.vue b/src/views/crm/quotation/components/QuotationProductForm.vue
index 97fdb40e7..750240739 100644
--- a/src/views/crm/quotation/components/QuotationProductForm.vue
+++ b/src/views/crm/quotation/components/QuotationProductForm.vue
@@ -8,12 +8,13 @@
     :inline-message="true"
   >
     <el-table :data="formData" class="-mt-10px">
-      <el-table-column label="序号" type="index" width="100" />
-      <el-table-column label="产品名称" min-width="150">
+      <el-table-column label="序号" type="index" width="80" />
+      <el-table-column label="产品名称" min-width="240">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.productName`" :rules="formRules.productName" class="mb-0px!">
             <el-input v-model="row.productName" placeholder="请输入产品名称" disabled />
           </el-form-item>
+
         </template>
       </el-table-column>
        <el-table-column label="产品类型" min-width="150">
@@ -31,7 +32,7 @@
         </template>
       </el-table-column>
       
-      <el-table-column label="产品明细类型" min-width="150">
+      <el-table-column label="产品明细" min-width="220">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.detailType`" :rules="formRules.detailType" class="mb-0px!">
             <el-select v-model="row.detailType" placeholder="请选择状态"  class="!w-240px">
@@ -59,21 +60,21 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="线上价格" min-width="150">
+      <el-table-column label="线上价格（元）" min-width="120">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.onlinePrice`" :rules="formRules.onlinePrice" class="mb-0px!">
             <el-input v-model="row.onlinePrice" placeholder="请输入线上价格"  />
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="线下价格" min-width="150">
+      <el-table-column label="线下价格（元）" min-width="120">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.offlinePrice`" :rules="formRules.offlinePrice" class="mb-0px!">
             <el-input v-model="row.offlinePrice" placeholder="请输入线下价格"  />
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="总计价格" min-width="150">
+      <el-table-column label="总计价格（元）" min-width="120">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.totalPrice`" :rules="formRules.totalPrice" class="mb-0px!">
             <el-input v-model="row.totalPrice" placeholder="请输入总计价格" disabled />
@@ -94,7 +95,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="产品开具项目" min-width="160">
+      <el-table-column label="产品开具项目" min-width="220">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.productInvoiceItem`" :rules="formRules.productInvoiceItem" class="mb-0px!">
             <el-select v-model="row.productInvoiceItem" placeholder="请选择状态" clearable class="!w-240px">
@@ -122,7 +123,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="服务开具项目" min-width="160">
+      <el-table-column label="服务开具项目" min-width="240">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.serviceInvoiceItem`" :rules="formRules.serviceInvoiceItem" class="mb-0px!">
             <el-select v-model="row.serviceInvoiceItem" placeholder="请选择状态" clearable class="!w-240px">
@@ -307,4 +308,4 @@ const getData = () => {
 }
 
 defineExpose({ validate, getData })
-</script>
\ No newline at end of file
+</script>