From 37818cb1e67394d175219c33e462f5313edcef73 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Wed, 19 Jun 2024 17:16:34 +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

---
 src/api/clue/sign.js                          |  5 ++++
 src/views/Clue/Order/Comp/AfterSales.vue      |  2 +-
 .../Clue/Order/Comp/DialogAfterSaleDetail.vue |  2 +-
 src/views/Clue/Order/Comp/DialogFeeback.vue   |  6 ++--
 .../Clue/Order/Comp/DialogFeebackDetail.vue   |  2 +-
 src/views/Clue/Order/Comp/OrderList.vue       | 30 +++++++++++++++++--
 src/views/Clue/Order/Comp/Reback.vue          |  2 +-
 src/views/Clue/Pool/Comp/DrawerClue.vue       |  3 +-
 src/views/Clue/Pool/index.vue                 |  1 +
 src/views/Clue/Set/index.vue                  |  8 ++---
 10 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/src/api/clue/sign.js b/src/api/clue/sign.js
index 0a3fbdf..acaf215 100644
--- a/src/api/clue/sign.js
+++ b/src/api/clue/sign.js
@@ -14,3 +14,8 @@ export const getSign = async (id) => {
 export const createSign = async (data) => {
   return await request.post({ url: '/admin-api/crm/sign/create', data: data })
 }
+
+// 取消登记
+export const cancelDeal = async (id) => {
+  return await request.delete({ url: '/admin-api/crm/sign/delete?id=' + id })
+}
diff --git a/src/views/Clue/Order/Comp/AfterSales.vue b/src/views/Clue/Order/Comp/AfterSales.vue
index 04869c9..3e5736a 100644
--- a/src/views/Clue/Order/Comp/AfterSales.vue
+++ b/src/views/Clue/Order/Comp/AfterSales.vue
@@ -189,7 +189,7 @@ async function getList() {
 
 const batchIds = ref([])
 function handleSelectionChange(val) {
-  batchIds.value = val
+  batchIds.value = val.map((it) => it.id)
 }
 
 const batchAuditDialog = ref()
diff --git a/src/views/Clue/Order/Comp/DialogAfterSaleDetail.vue b/src/views/Clue/Order/Comp/DialogAfterSaleDetail.vue
index 83277ad..66f46ba 100644
--- a/src/views/Clue/Order/Comp/DialogAfterSaleDetail.vue
+++ b/src/views/Clue/Order/Comp/DialogAfterSaleDetail.vue
@@ -90,7 +90,7 @@ const auditSchema = [
     span: 1
   },
   {
-    field: 'checkUserName',
+    field: 'checkUser',
     label: '审核人',
     span: 1
   },
diff --git a/src/views/Clue/Order/Comp/DialogFeeback.vue b/src/views/Clue/Order/Comp/DialogFeeback.vue
index 2907467..72d4819 100644
--- a/src/views/Clue/Order/Comp/DialogFeeback.vue
+++ b/src/views/Clue/Order/Comp/DialogFeeback.vue
@@ -18,8 +18,8 @@
       </el-form-item>
       <el-form-item label="是否结清" prop="isPayoff">
         <el-radio-group v-model="form.isPayoff">
-          <el-radio label="结清"> 结清 </el-radio>
-          <el-radio label="未结清"> 未结清 </el-radio>
+          <el-radio :label="true"> 结清 </el-radio>
+          <el-radio :label="false"> 未结清 </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="备注">
@@ -69,7 +69,7 @@ function handleAdd() {
   form.value = {
     signId: orderId.value,
     money: undefined,
-    isPayoff: '结清',
+    isPayoff: true,
     remark: undefined
   }
 }
diff --git a/src/views/Clue/Order/Comp/DialogFeebackDetail.vue b/src/views/Clue/Order/Comp/DialogFeebackDetail.vue
index f524eb9..3f16d12 100644
--- a/src/views/Clue/Order/Comp/DialogFeebackDetail.vue
+++ b/src/views/Clue/Order/Comp/DialogFeebackDetail.vue
@@ -80,7 +80,7 @@ const auditSchema = [
     span: 1
   },
   {
-    field: 'checkUserName',
+    field: 'checkUser',
     label: '审核人',
     span: 1
   },
diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue
index 64420b8..c3112f4 100644
--- a/src/views/Clue/Order/Comp/OrderList.vue
+++ b/src/views/Clue/Order/Comp/OrderList.vue
@@ -121,7 +121,7 @@
         :label="item.label"
         min-width="120px"
       />
-      <el-table-column label="操作" width="200px" fixed="right">
+      <el-table-column label="操作" width="240px" fixed="right">
         <template #default="scope">
           <el-button
             type="primary"
@@ -158,12 +158,22 @@
             class="mr-10px"
             link
             style="padding: 0; margin-left: 0"
-            v-if="scope.row.isPayoff == '未结清'"
+            v-if="scope.row.isPayoff == false"
             v-hasPermi="['clue:order:return']"
             @click="feeBack(scope.row)"
           >
             回款
           </el-button>
+          <el-button
+            type="primary"
+            class="mr-10px"
+            link
+            style="padding: 0; margin-left: 0"
+            v-hasPermi="['clue:pool:enroll']"
+            @click="cancelDeal(scope.row)"
+          >
+            取消登记
+          </el-button>
         </template>
       </el-table-column>
     </SSTable>
@@ -191,6 +201,7 @@ import { removeNullField } from '@/utils'
 import { useAppStore } from '@/store/modules/app'
 
 const appStore = useAppStore()
+const message = useMessage() // 消息弹窗
 
 const allSchemas = ref({})
 
@@ -297,6 +308,21 @@ function feeBack(row) {
   feedbackDialog.value.open(row.signId)
 }
 
+// 取消登记
+async function cancelDeal(row) {
+  try {
+    // 二次确认
+    await message.confirm('是否确认取消登记该线索？')
+    // 发起删除
+    await SignApi.cancelDeal(row.signId)
+    message.success('取消登记成功！')
+    // 刷新列表
+    await getTableList()
+  } catch (err) {
+    console.log(err)
+  }
+}
+
 function changeSchool() {
   searchForm.value.signPlace = undefined
   searchForm.value.signClass = undefined
diff --git a/src/views/Clue/Order/Comp/Reback.vue b/src/views/Clue/Order/Comp/Reback.vue
index 26be7e2..74c6903 100644
--- a/src/views/Clue/Order/Comp/Reback.vue
+++ b/src/views/Clue/Order/Comp/Reback.vue
@@ -188,7 +188,7 @@ async function getList() {
 
 const batchIds = ref([])
 function handleSelectionChange(val) {
-  batchIds.value = val
+  batchIds.value = val.map((it) => it.id)
 }
 
 const batchAuditDialog = ref()
diff --git a/src/views/Clue/Pool/Comp/DrawerClue.vue b/src/views/Clue/Pool/Comp/DrawerClue.vue
index 1147c6b..9bbff93 100644
--- a/src/views/Clue/Pool/Comp/DrawerClue.vue
+++ b/src/views/Clue/Pool/Comp/DrawerClue.vue
@@ -99,7 +99,8 @@
                   <span>操作人：{{ item.operateUserName }}</span>
                 </div>
                 <div class="pt-5px pb-5px">
-                  <span>{{ item.content }}</span>
+                  <!-- <span>{{ item.content }}</span> -->
+                  <span v-dompurify-html="item.content"></span>
                 </div>
                 <div class="flex" style="align-items: center">
                   <Icon icon="ep:clock" class="mr-5px" />
diff --git a/src/views/Clue/Pool/index.vue b/src/views/Clue/Pool/index.vue
index 99d1933..2b7d8c5 100644
--- a/src/views/Clue/Pool/index.vue
+++ b/src/views/Clue/Pool/index.vue
@@ -109,6 +109,7 @@
             <el-button
               type="primary"
               link
+              :disabled="scope.row.state"
               @click="handleSuccess(scope.row)"
               v-hasPermi="['clue:pool:enroll']"
             >
diff --git a/src/views/Clue/Set/index.vue b/src/views/Clue/Set/index.vue
index cdea82d..3428c33 100644
--- a/src/views/Clue/Set/index.vue
+++ b/src/views/Clue/Set/index.vue
@@ -10,20 +10,20 @@
       <el-tab-pane label="线索来源" :name="15" v-if="checkPermi(['clue:setting:clue-resource'])">
         <ClueSource v-if="tabIndex == 15" />
       </el-tab-pane>
-      <!-- <el-tab-pane
+      <el-tab-pane
         label="线索获取规则"
         :name="20"
         v-if="checkPermi(['clue:setting:clue-get-rules'])"
       >
         <ClueGet v-if="tabIndex == 20" />
-      </el-tab-pane> -->
-      <!-- <el-tab-pane
+      </el-tab-pane>
+      <el-tab-pane
         label="线索分配规则"
         :name="30"
         v-if="checkPermi(['clue:setting:clue-send-rules'])"
       >
         <ClueSend v-if="tabIndex == 30" />
-      </el-tab-pane> -->
+      </el-tab-pane>
       <el-tab-pane label="意向状态" :name="35" v-if="checkPermi(['clue:setting:intention-status'])">
         <IntentionStatus v-if="tabIndex == 35" />
       </el-tab-pane>