From a3dc76e6a80de91b609be77273a2c7ef8674ae1c Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 9 Aug 2024 11:47:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Clue/Order/Comp/DialogFeebackAudit.vue    |  2 +-
 src/views/Clue/Order/Comp/MallOrderList.vue   | 19 ++++++++-----------
 src/views/Clue/Order/Comp/OrderList.vue       | 19 ++++++++-----------
 src/views/Clue/Pool/Comp/DialogClue.vue       |  2 ++
 src/views/Clue/Pool/Comp/DialogSuccess.vue    |  4 ++--
 5 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/views/Clue/Order/Comp/DialogFeebackAudit.vue b/src/views/Clue/Order/Comp/DialogFeebackAudit.vue
index 2cdfbe8..da09012 100644
--- a/src/views/Clue/Order/Comp/DialogFeebackAudit.vue
+++ b/src/views/Clue/Order/Comp/DialogFeebackAudit.vue
@@ -1,7 +1,7 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
     <Descriptions :data="orderInfo" :schema="schema" :columns="2" labelWidth="130px" />
-    <el-table :data="followList" size="small" border class="mt-10px">
+    <el-table :data="followList" size="small" border class="mt-10px mb-10px">
       <el-table-column prop="userName" label="跟进人" />
       <el-table-column prop="followTime" label="最新跟进时间" :formatter="dateFormatter" />
       <el-table-column prop="signSate" label="成交状态" />
diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue
index f0b2cc3..9b6800f 100644
--- a/src/views/Clue/Order/Comp/MallOrderList.vue
+++ b/src/views/Clue/Order/Comp/MallOrderList.vue
@@ -115,17 +115,14 @@
         min-width="120px"
       >
         <template #default="{ row }">
-          <el-popover
-            placement="top"
-            width="500px"
-            trigger="click"
-            v-if="item.field == 'remark' && row.remark"
-          >
-            <template #reference>
-              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
-            </template>
-            <div v-dompurify-html="row.remark"></div>
-          </el-popover>
+          <div v-if="item.field == 'remark' || item.form?.component == 'Editor'">
+            <el-popover placement="top" width="500px" trigger="click" v-if="row[item.field]">
+              <template #reference>
+                <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+              </template>
+              <div v-dompurify-html="row[item.field]"></div>
+            </el-popover>
+          </div>
           <span v-else-if="item.form?.component == 'DatePicker'">
             {{ formatDate(row[item.field]) }}
           </span>
diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue
index 388b822..1059b43 100644
--- a/src/views/Clue/Order/Comp/OrderList.vue
+++ b/src/views/Clue/Order/Comp/OrderList.vue
@@ -89,17 +89,14 @@
         min-width="120px"
       >
         <template #default="{ row }">
-          <el-popover
-            placement="top"
-            width="500px"
-            trigger="click"
-            v-if="item.field == 'remark' && row[item.field]"
-          >
-            <template #reference>
-              <el-button type="primary" style="padding: 0" text>点击查看</el-button>
-            </template>
-            <div v-dompurify-html="row.remark"></div>
-          </el-popover>
+          <div v-if="item.field == 'remark' || item.form?.component == 'Editor'">
+            <el-popover placement="top" width="500px" trigger="click" v-if="row[item.field]">
+              <template #reference>
+                <el-button type="primary" style="padding: 0" text>点击查看</el-button>
+              </template>
+              <div v-dompurify-html="row[item.field]"></div>
+            </el-popover>
+          </div>
           <span v-else-if="item.form?.component == 'DatePicker'">
             {{ formatDate(row[item.field]) }}
           </span>
diff --git a/src/views/Clue/Pool/Comp/DialogClue.vue b/src/views/Clue/Pool/Comp/DialogClue.vue
index 61cb2a6..174a5c2 100644
--- a/src/views/Clue/Pool/Comp/DialogClue.vue
+++ b/src/views/Clue/Pool/Comp/DialogClue.vue
@@ -171,6 +171,8 @@ const formSchema = computed(() => {
       it.componentProps['disabled-date'] = dateAfterToday
       // it.componentProps['disabled'] = formType.value != 'create'
       it.componentProps['disabled'] = true
+    } else if (it.field == 'convertPeople' && formType.value == 'update') {
+      it.componentProps['disabled'] = true
     }
     if (it.field == 'convertPeople') {
       it.options = props.allUserOptions.map((it) => ({ ...it, name: it.nickname }))
diff --git a/src/views/Clue/Pool/Comp/DialogSuccess.vue b/src/views/Clue/Pool/Comp/DialogSuccess.vue
index b525aba..f057e58 100644
--- a/src/views/Clue/Pool/Comp/DialogSuccess.vue
+++ b/src/views/Clue/Pool/Comp/DialogSuccess.vue
@@ -11,7 +11,7 @@
       labelWidth="130px"
       :defaultShow="false"
     />
-    <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" class="mt-20px">
+    <el-form :model="form" ref="formRef" :rules="rules" label-width="100px" class="mt-20px">
       <el-row :gutter="20">
         <!-- 驾校招生模式 -->
         <template v-if="appStore.getAppInfo?.instanceType == 1">
@@ -131,7 +131,7 @@
           </el-form-item>
         </el-col>
         <el-col
-          :span="8"
+          :span="fieldItem.component == 'Editor' ? 24 : 8"
           :offset="0"
           v-for="fieldItem in diyFieldList"
           :key="fieldItem.clueParamId"