From 35598b4d6d7dd62a36e804dddf1cea4e357a6656 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 17 Jun 2024 11:31:14 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/set/index.js                   |  7 +-
 src/views/Basic/GeneralSet/Comp/BSClue.vue    | 76 ++++++++++----
 .../GeneralSet/Comp/BSSalerComission.vue      | 75 +++++++++++---
 src/views/Clue/Set/Comp/GeneralSet.vue        | 99 ++++++++++++++-----
 .../MiniMall/MallSet/Comp/GeneralSet.vue      | 50 ++++++----
 5 files changed, 233 insertions(+), 74 deletions(-)

diff --git a/src/api/system/set/index.js b/src/api/system/set/index.js
index 10d7c18..2f83861 100644
--- a/src/api/system/set/index.js
+++ b/src/api/system/set/index.js
@@ -7,5 +7,10 @@ export const getConfigByConfigKey = (params) => {
 
 // 保存配置项
 export const updateConfig = (data) => {
-  return request.put({ url: '/admin-api/crm/config/update', data })
+  return request.put({ url: '/admin-api/crm/config/batchUpdateConfigValue', data })
+}
+
+// 根据模块获取配置列表
+export const getConfigList = (params) => {
+  return request.get({ url: '/admin-api/crm/config/query', params })
 }
diff --git a/src/views/Basic/GeneralSet/Comp/BSClue.vue b/src/views/Basic/GeneralSet/Comp/BSClue.vue
index d61e7f6..570e20d 100644
--- a/src/views/Basic/GeneralSet/Comp/BSClue.vue
+++ b/src/views/Basic/GeneralSet/Comp/BSClue.vue
@@ -1,18 +1,39 @@
 <template>
   <el-form :model="form" ref="formRef" label-width="auto">
-    <el-form-item>
+    <el-form-item v-if="getConfig('usePhoneConfig')">
       <template #label>
-        <Tooltip message="请联系客服开通或关闭，客服电话:15955599959" />使用外呼
+        <Tooltip
+          v-if="getConfig('usePhoneConfig').remark"
+          :message="getConfig('usePhoneConfig').remark"
+        />
+        <span>使用外呼</span>
       </template>
-      <el-radio-group v-model="form.callEnable" disabled>
-        <el-radio :label="1"> 使用 </el-radio>
-        <el-radio :label="0"> 不使用 </el-radio>
+      <el-radio-group v-model="form.usePhoneConfig">
+        <el-radio
+          v-for="(item, index) in getConfig('usePhoneConfig').options"
+          :key="index"
+          :label="item.id"
+        >
+          {{ item.name }}
+        </el-radio>
       </el-radio-group>
     </el-form-item>
-    <el-form-item label="跟进信息">
-      <el-radio-group v-model="form.followType">
-        <el-radio :label="1"> 展示所有 </el-radio>
-        <el-radio :label="2"> 仅展示本人 </el-radio>
+    <el-form-item v-if="getConfig('showFollowConfig')">
+      <template #label>
+        <Tooltip
+          v-if="getConfig('showFollowConfig').remark"
+          :message="getConfig('showFollowConfig').remark"
+        />
+        <span>跟进信息</span>
+      </template>
+      <el-radio-group v-model="form.showFollowConfig">
+        <el-radio
+          v-for="(item, index) in getConfig('showFollowConfig').options"
+          :key="index"
+          :label="item.id"
+        >
+          {{ item.name }}
+        </el-radio>
       </el-radio-group>
     </el-form-item>
     <el-form-item>
@@ -23,23 +44,42 @@
 </template>
 
 <script setup name="BasicSettingClue">
+import * as ConfigApi from '@/api/system/set'
+
 const message = useMessage()
 
-const form = ref({
-  followType: 1,
-  callEnable: 1
-})
+const form = ref({})
+
+const configList = ref([])
+
+function getConfig(val) {
+  return configList.value.find((it) => it.configKey == val)
+}
 
 function getData() {
-  form.value = {
-    followType: 1,
-    callEnable: 1
-  }
+  ConfigApi.getConfigList({ module: 100 }).then((data) => {
+    configList.value = data
+    // 获取所有配置项
+    data.map((it) => {
+      form.value[it.configKey] = it.configValue
+    })
+  })
 }
 
 function onSubmit() {
-  message.success('保存成功')
+  const params = configList.value.map((it) => ({
+    configId: it.configId,
+    configKey: it.configKey,
+    configValue: form.value[it.configKey]
+  }))
+  ConfigApi.updateConfig(params).then(() => {
+    message.success('保存成功')
+  })
 }
+
+onMounted(() => {
+  getData()
+})
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/Basic/GeneralSet/Comp/BSSalerComission.vue b/src/views/Basic/GeneralSet/Comp/BSSalerComission.vue
index 7f0842a..3005ee0 100644
--- a/src/views/Basic/GeneralSet/Comp/BSSalerComission.vue
+++ b/src/views/Basic/GeneralSet/Comp/BSSalerComission.vue
@@ -1,16 +1,31 @@
 <template>
   <el-form :model="form" ref="formRef" label-width="auto">
-    <el-form-item label="是否关联成交率">
-      <el-radio-group v-model="form.withSuccess">
-        <el-radio :label="1"> 是 </el-radio>
-        <el-radio :label="0"> 否 </el-radio>
+    <el-form-item v-if="getConfig('saleCommissionRelateDealConfig')">
+      <template #label>
+        <Tooltip
+          v-if="getConfig('saleCommissionRelateDealConfig').remark"
+          :message="getConfig('saleCommissionRelateDealConfig').remark"
+        />
+        <span>是否关联成交率</span>
+      </template>
+      <el-radio-group
+        v-model="form.saleCommissionRelateDealConfig"
+        @change="form.saleCommissionRelateRulesConfig = []"
+      >
+        <el-radio
+          v-for="(item, index) in getConfig('saleCommissionRelateDealConfig').options"
+          :key="index"
+          :label="item.id"
+        >
+          {{ item.name }}
+        </el-radio>
       </el-radio-group>
     </el-form-item>
-    <el-form-item label="关联规则" v-if="form.withSuccess">
+    <el-form-item label="关联规则" v-if="form.saleCommissionRelateDealConfig == 'true'">
       <div>
-        <el-button @click="form.rules.push({})">新增规则</el-button>
+        <el-button @click="form.saleCommissionRelateRulesConfig.push({})">新增规则</el-button>
         <div
-          v-for="(item, index) in form.rules"
+          v-for="(item, index) in form.saleCommissionRelateRulesConfig"
           :key="index"
           class="mt-10px flex justify-center items-center"
         >
@@ -48,22 +63,52 @@
 </template>
 
 <script setup name="BasicSettingClue">
+import * as ConfigApi from '@/api/system/set'
+
 const message = useMessage()
 
-const form = ref({
-  withSuccess: 1,
-  rules: []
-})
+const form = ref({})
+const configList = ref([])
+
+const jsonArr = ['saleCommissionRelateRulesConfig']
+
+function getConfig(val) {
+  return configList.value.find((it) => it.configKey == val)
+}
 
 function getData() {
-  form.value = {
-    withSuccess: 1
-  }
+  ConfigApi.getConfigList({ module: 101 }).then((data) => {
+    configList.value = data
+    // 获取所有配置项
+    data.map((it) => {
+      form.value[it.configKey] = it.configValue
+      if (it.configKey == 'saleCommissionRelateRulesConfig') {
+        if (!form.value[it.configKey]) {
+          form.value[it.configKey] = []
+        } else {
+          form.value[it.configKey] = JSON.parse(it.configValue)
+        }
+      }
+    })
+  })
 }
 
 function onSubmit() {
-  message.success('保存成功')
+  const params = configList.value.map((it) => ({
+    configId: it.configId,
+    configKey: it.configKey,
+    configValue: jsonArr.includes(it.configKey)
+      ? JSON.stringify(form.value[it.configKey])
+      : form.value[it.configKey]
+  }))
+  ConfigApi.updateConfig(params).then(() => {
+    message.success('保存成功')
+  })
 }
+
+onMounted(() => {
+  getData()
+})
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/Clue/Set/Comp/GeneralSet.vue b/src/views/Clue/Set/Comp/GeneralSet.vue
index e2e1de8..9f0135c 100644
--- a/src/views/Clue/Set/Comp/GeneralSet.vue
+++ b/src/views/Clue/Set/Comp/GeneralSet.vue
@@ -1,21 +1,57 @@
 <template>
   <el-form :model="form" ref="formRef" label-width="auto">
-    <el-form-item label="售后申请自动通过">
-      <el-radio-group v-model="form.autoAudiAfterSale">
-        <el-radio :label="0"> 是 </el-radio>
-        <el-radio :label="1"> 否 </el-radio>
+    <el-form-item v-if="getConfig('afterSalesAuditAutoCompleteConfig')">
+      <template #label>
+        <Tooltip
+          v-if="getConfig('afterSalesAuditAutoCompleteConfig').remark"
+          :message="getConfig('afterSalesAuditAutoCompleteConfig').remark"
+        />
+        <span>售后申请自动通过</span>
+      </template>
+      <el-radio-group v-model="form.afterSalesAuditAutoCompleteConfig">
+        <el-radio
+          v-for="(item, index) in getConfig('afterSalesAuditAutoCompleteConfig').options"
+          :key="index"
+          :label="item.id"
+        >
+          {{ item.name }}
+        </el-radio>
       </el-radio-group>
     </el-form-item>
-    <el-form-item label="发货自动发起采购">
-      <el-radio-group v-model="form.autoSend">
-        <el-radio :label="0"> 是 </el-radio>
-        <el-radio :label="1"> 否 </el-radio>
+    <el-form-item v-if="getConfig('deliveryAutoStartPurchaseConfig')">
+      <template #label>
+        <Tooltip
+          v-if="getConfig('deliveryAutoStartPurchaseConfig').remark"
+          :message="getConfig('deliveryAutoStartPurchaseConfig').remark"
+        />
+        <span>发货自动发起采购</span>
+      </template>
+      <el-radio-group v-model="form.deliveryAutoStartPurchaseConfig">
+        <el-radio
+          v-for="(item, index) in getConfig('deliveryAutoStartPurchaseConfig').options"
+          :key="index"
+          :label="item.id"
+        >
+          {{ item.name }}
+        </el-radio>
       </el-radio-group>
     </el-form-item>
-    <el-form-item label="回款申请自动通过">
-      <el-radio-group v-model="form.autoAuditReturn">
-        <el-radio :label="0"> 是 </el-radio>
-        <el-radio :label="1"> 否 </el-radio>
+    <el-form-item v-if="getConfig('repaymentAuditAutoCompleteConfig')">
+      <template #label>
+        <Tooltip
+          v-if="getConfig('repaymentAuditAutoCompleteConfig').remark"
+          :message="getConfig('repaymentAuditAutoCompleteConfig').remark"
+        />
+        <span>回款申请自动通过</span>
+      </template>
+      <el-radio-group v-model="form.repaymentAuditAutoCompleteConfig">
+        <el-radio
+          v-for="(item, index) in getConfig('repaymentAuditAutoCompleteConfig').options"
+          :key="index"
+          :label="item.id"
+        >
+          {{ item.name }}
+        </el-radio>
       </el-radio-group>
     </el-form-item>
     <el-form-item>
@@ -26,25 +62,42 @@
 </template>
 
 <script setup name="GeneralClue">
+import * as ConfigApi from '@/api/system/set'
+
 const message = useMessage()
 
-const form = ref({
-  autoAudiAfterSale: 0,
-  autoSend: 0,
-  autoAuditReturn: 0
-})
+const form = ref({})
+
+const configList = ref([])
+
+function getConfig(val) {
+  return configList.value.find((it) => it.configKey == val)
+}
 
 function getData() {
-  form.value = {
-    autoAudiAfterSale: 0,
-    autoSend: 0,
-    autoAuditReturn: 0
-  }
+  ConfigApi.getConfigList({ module: 1 }).then((data) => {
+    configList.value = data
+    // 获取所有配置项
+    data.map((it) => {
+      form.value[it.configKey] = it.configValue
+    })
+  })
 }
 
 function onSubmit() {
-  message.success('保存成功')
+  const params = configList.value.map((it) => ({
+    configId: it.configId,
+    configKey: it.configKey,
+    configValue: form.value[it.configKey]
+  }))
+  ConfigApi.updateConfig(params).then(() => {
+    message.success('保存成功')
+  })
 }
+
+onMounted(() => {
+  getData()
+})
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/MiniMall/MallSet/Comp/GeneralSet.vue b/src/views/MiniMall/MallSet/Comp/GeneralSet.vue
index 1258648..c9ced81 100644
--- a/src/views/MiniMall/MallSet/Comp/GeneralSet.vue
+++ b/src/views/MiniMall/MallSet/Comp/GeneralSet.vue
@@ -1,9 +1,21 @@
 <template>
   <el-form :model="form" ref="formRef" label-width="auto">
-    <el-form-item label="采购申请自动通过">
+    <el-form-item v-if="getConfig('purchaseAuditAutoCompleteConfig')">
+      <template #label>
+        <Tooltip
+          v-if="getConfig('purchaseAuditAutoCompleteConfig').remark"
+          :message="getConfig('purchaseAuditAutoCompleteConfig').remark"
+        />
+        <span>采购申请自动通过</span>
+      </template>
       <el-radio-group v-model="form.purchaseAuditAutoCompleteConfig">
-        <el-radio label="true"> 是 </el-radio>
-        <el-radio label="false"> 否 </el-radio>
+        <el-radio
+          v-for="(item, index) in getConfig('purchaseAuditAutoCompleteConfig').options"
+          :key="index"
+          :label="item.id"
+        >
+          {{ item.name }}
+        </el-radio>
       </el-radio-group>
     </el-form-item>
     <el-form-item>
@@ -17,27 +29,31 @@ import * as ConfigApi from '@/api/system/set'
 
 const message = useMessage()
 
-const form = ref({
-  purchaseAuditAutoCompleteConfig: 'true'
-})
+const form = ref({})
 
-const info = ref({})
+const configList = ref([])
+
+function getConfig(val) {
+  return configList.value.find((it) => it.configKey == val)
+}
 
 function getData() {
-  ConfigApi.getConfigByConfigKey({ configKey: 'purchaseAuditAutoCompleteConfig' }).then((data) => {
-    info.value = data
-    form.value = {
-      purchaseAuditAutoCompleteConfig: data.configValue
-    }
+  ConfigApi.getConfigList({ module: 3 }).then((data) => {
+    configList.value = data
+    // 获取所有配置项
+    data.map((it) => {
+      form.value[it.configKey] = it.configValue
+    })
   })
 }
 
 function onSubmit() {
-  const data = {
-    ...info,
-    purchaseAuditAutoCompleteConfig: form.value.purchaseAuditAutoCompleteConfig
-  }
-  ConfigApi.updateConfig(data).then(() => {
+  const params = configList.value.map((it) => ({
+    configId: it.configId,
+    configKey: it.configKey,
+    configValue: form.value[it.configKey]
+  }))
+  ConfigApi.updateConfig(params).then(() => {
     message.success('保存成功')
   })
 }

From 1c37dbc5f80cd960f7d58241a4094675a680cebe Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 17 Jun 2024 16:02:52 +0800
Subject: [PATCH 2/9] =?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/views/Clue/Order/index.vue             | 54 +++++++++++++++++++---
 src/views/Clue/Pool/Comp/DialogSuccess.vue | 28 +++++++----
 src/views/Clue/Pool/index.vue              |  7 ++-
 3 files changed, 74 insertions(+), 15 deletions(-)

diff --git a/src/views/Clue/Order/index.vue b/src/views/Clue/Order/index.vue
index c8b7b21..9742db3 100644
--- a/src/views/Clue/Order/index.vue
+++ b/src/views/Clue/Order/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 搜索工作栏 -->
-    <Search :schema="allSchemas.searchSchema" labelWidth="0">
+    <Search v-if="!loading" ref="searchRef" :schema="allSchemas.searchSchema" labelWidth="0">
       <template #actionMore>
         <el-button @click="getTableList" v-hasPermi="['clue:order:search']"> 搜索 </el-button>
         <el-button @click="resetQuery" v-hasPermi="['clue:order:reset']"> 重置 </el-button>
@@ -9,6 +9,7 @@
     </Search>
     <!-- 列表 -->
     <SSTable
+      v-if="!loading"
       class="mt-20px"
       v-model:tableObject="tableObject"
       :tableColumns="allSchemas.tableColumns"
@@ -77,10 +78,17 @@
 </template>
 
 <script setup name="ClueOrder">
-import { allSchemas } from './order.data'
+import { getSimpleFieldList } from '@/api/clue/orderField'
+import * as SignApi from '@/api/clue/sign'
+
+import { removeNullField } from '@/utils'
+
+const allSchemas = ref({})
+
+const searchRef = ref()
 
 const tableObject = ref({
-  tableList: [{ name: '测试', contact: '18888888888' }],
+  tableList: [],
   loading: false,
   total: 1,
   pageSize: 20,
@@ -88,17 +96,51 @@ const tableObject = ref({
 })
 
 function resetQuery() {
-  // 方法体
+  searchRef.value.reset()
+  tableObject.value.currentPage = 1
+  getTableList()
 }
 // 查询
-function getTableList() {
-  // 方法体
+async function getTableList() {
+  // 查询
+  tableObject.value.loading = true
+  try {
+    const queryParams = await searchRef.value.getFormModel()
+    const params = {
+      ...queryParams,
+      pageNo: tableObject.value.currentPage,
+      pageSize: tableObject.value.pageSize
+    }
+    const data = await SignApi.getSignPage(removeNullField(params))
+    tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams }))
+    tableObject.value.total = data.total
+  } finally {
+    tableObject.value.loading = false
+  }
+}
+
+const loading = ref(true)
+async function getCurdSchemas() {
+  loading.value = true
+  try {
+    const data = await getSimpleFieldList()
+    allSchemas.value = useCrudSchemas(data).allSchemas
+  } finally {
+    loading.value = false
+    nextTick(() => {
+      getTableList()
+    })
+  }
 }
 
 // 售后
 function sellAfter() {
   // 方法体
 }
+
+onMounted(() => {
+  getCurdSchemas()
+})
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/Clue/Pool/Comp/DialogSuccess.vue b/src/views/Clue/Pool/Comp/DialogSuccess.vue
index beef045..000b5ab 100644
--- a/src/views/Clue/Pool/Comp/DialogSuccess.vue
+++ b/src/views/Clue/Pool/Comp/DialogSuccess.vue
@@ -128,11 +128,13 @@
             class="mb-5px"
             type="primary"
             size="small"
-            @click="form.signProduct.push({ productId: undefined, specsId: undefined, signNum: 0 })"
+            @click="
+              form.signProducts.push({ productId: undefined, specsId: undefined, signNum: 0 })
+            "
           >
             添加成交产品
           </el-button>
-          <el-table :data="form.signProduct" border size="small">
+          <el-table :data="form.signProducts" border size="small">
             <el-table-column type="index" width="50" />
             <el-table-column prop="productId" label="产品">
               <template #default="{ row }">
@@ -189,7 +191,7 @@
                 <Icon
                   icon="ep:remove-filled"
                   class="text-red-500"
-                  @click="handleRemove('signProduct', $index)"
+                  @click="handleRemove('signProducts', $index)"
                 />
               </template>
             </el-table-column>
@@ -255,7 +257,7 @@
     <template #footer>
       <span>
         <el-button @click="show = false">取 消</el-button>
-        <el-button type="primary" @click="handleSave">保 存</el-button>
+        <el-button :disabled="formLoading" type="primary" @click="handleSave">保 存</el-button>
       </span>
     </template>
   </Dialog>
@@ -339,7 +341,7 @@ function resetForm(id) {
     payAmount: 0,
     remark: undefined,
     extraPay: [],
-    signProduct: []
+    signProducts: []
   }
 }
 
@@ -355,7 +357,7 @@ async function handleSave() {
     return
   }
 
-  if (form.value.signProduct.some((it) => !it.schoolId || !item.specsId || !it.signNum)) {
+  if (form.value.signProducts.some((it) => !it.productId || !item.specsId || !it.signNum)) {
     message.info('请将成交产品信息填写完整！')
     return
   }
@@ -363,9 +365,19 @@ async function handleSave() {
   // 提交请求
   formLoading.value = true
   try {
-    await createSign(form.value)
+    const params = { ...form.value }
+    params.diyParams = {}
+    diyFieldList.value.map((it) => {
+      params.diyParams[it.field] = undefined
+    })
+    for (const key in params.diyParams) {
+      if (Object.hasOwnProperty.call(params, key)) {
+        params.diyParams[key] = params[key]
+      }
+    }
+    await createSign(params)
     message.success(t('common.createSuccess'))
-    dialogVisible.value = false
+    show.value = false
     // 发送操作成功的事件
     emit('success')
   } finally {
diff --git a/src/views/Clue/Pool/index.vue b/src/views/Clue/Pool/index.vue
index 98d9ac5..e537d39 100644
--- a/src/views/Clue/Pool/index.vue
+++ b/src/views/Clue/Pool/index.vue
@@ -187,6 +187,11 @@ async function getCurdSchemas() {
   loading.value = true
   try {
     const data = await getSimpleFieldList()
+    data.forEach((elem) => {
+      if (elem.field == 'followUser') {
+        elem.search.options = userOptions.value
+      }
+    })
     allSchemas.value = useCrudSchemas(data).allSchemas
   } finally {
     loading.value = false
@@ -314,8 +319,8 @@ const userOptions = ref([])
 onMounted(() => {
   getUserOption().then((data) => {
     userOptions.value = data
+    getCurdSchemas()
   })
-  getCurdSchemas()
 })
 </script>
 

From e3c85cbaae6cd0187ec806c59f3d8fc568aa0cf2 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 18 Jun 2024 15:16:04 +0800
Subject: [PATCH 3/9] =?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/index.js                         |   5 +
 src/api/clue/payment.js                       |  16 +
 .../Descriptions/src/Descriptions.vue         |   5 +-
 src/views/Clue/Order/Comp/AfterSales.vue      | 150 ++++++++
 src/views/Clue/Order/Comp/Delivery.vue        |   0
 src/views/Clue/Order/Comp/DialogOrder.vue     | 107 ++++++
 src/views/Clue/Order/Comp/OrderList.vue       | 335 ++++++++++++++++++
 src/views/Clue/Order/Comp/Reback.vue          | 148 ++++++++
 src/views/Clue/Order/index.vue                | 158 ++-------
 src/views/Clue/Pool/Comp/DialogSuccess.vue    |   3 +-
 src/views/Clue/Pool/Comp/DrawerClue.vue       |  30 +-
 src/views/Clue/Pool/index.vue                 |   4 +-
 src/views/Clue/Skill/index.vue                |   4 +-
 13 files changed, 801 insertions(+), 164 deletions(-)
 create mode 100644 src/api/clue/payment.js
 create mode 100644 src/views/Clue/Order/Comp/AfterSales.vue
 create mode 100644 src/views/Clue/Order/Comp/Delivery.vue
 create mode 100644 src/views/Clue/Order/Comp/DialogOrder.vue
 create mode 100644 src/views/Clue/Order/Comp/OrderList.vue
 create mode 100644 src/views/Clue/Order/Comp/Reback.vue

diff --git a/src/api/clue/index.js b/src/api/clue/index.js
index 3e2def3..85e4464 100644
--- a/src/api/clue/index.js
+++ b/src/api/clue/index.js
@@ -49,3 +49,8 @@ export const getOpearateRecord = async (params) => {
 export const getPublicClue = async (data) => {
   return await request.put({ url: '/admin-api/crm/sch-clue/public/save', data })
 }
+
+// 获得线索跟进用户信息
+export const getFollowUserList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sch-clue/get-follow-user', params })
+}
diff --git a/src/api/clue/payment.js b/src/api/clue/payment.js
new file mode 100644
index 0000000..afbb76a
--- /dev/null
+++ b/src/api/clue/payment.js
@@ -0,0 +1,16 @@
+import request from '@/config/axios'
+
+// 查询（精简)列表
+export const getPaymentList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-pay-record/list', params })
+}
+
+// 新增
+export const createPayment = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-pay-record/create', data })
+}
+
+// 审核
+export const auditPayment = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-pay-record/check', data })
+}
diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue
index 5577839..d11d4ee 100644
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -27,7 +27,8 @@ const props = defineProps({
   data: {
     type: Object as PropType<any>,
     default: () => ({})
-  }
+  },
+  defaultShow: propTypes.bool.def(true)
 })
 
 const { getPrefixCls } = useDesign()
@@ -57,7 +58,7 @@ const getBindItemValue = (item: DescriptionsSchema) => {
 }
 
 // 折叠
-const show = ref(true)
+const show = ref(props.defaultShow)
 
 const toggleClick = () => {
   if (props.collapse) {
diff --git a/src/views/Clue/Order/Comp/AfterSales.vue b/src/views/Clue/Order/Comp/AfterSales.vue
new file mode 100644
index 0000000..11c2d3e
--- /dev/null
+++ b/src/views/Clue/Order/Comp/AfterSales.vue
@@ -0,0 +1,150 @@
+<template>
+  <div>
+    <el-form :model="searchForm" label-width="0" inline>
+      <el-form-item>
+        <el-input v-model="searchForm.signId" placeholder="成交单号" />
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="searchForm.name" placeholder="线索名称" />
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.dealUser" placeholder="登记人" clearable filterable>
+          <el-option
+            v-for="item in userOptions"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.dealDate"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="登记日期"
+          end-placeholder="登记日期"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.createUser" placeholder="申请人" clearable filterable>
+          <el-option
+            v-for="item in userOptions"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.createDate"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="申请日期"
+          end-placeholder="申请日期"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+        <el-button @click="batchAudit">批量审核</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table :data="tableList" border>
+      <el-table-column prop="signId" label="成交单号" width="150px" />
+      <el-table-column prop="name" label="线索名称" width="120px" />
+      <el-table-column prop="phone" label="联系方式" width="150px" />
+      <el-table-column prop="signId" label="售后原因" width="150px" />
+      <el-table-column prop="signId" label="退款金额" width="90px" />
+      <el-table-column prop="signId" label="是否退货" width="90px" />
+      <el-table-column prop="signId" label="解决方案" width="150px" />
+      <el-table-column prop="signId" label="备注" width="200px" />
+      <el-table-column prop="signId" label="登记人" />
+      <el-table-column prop="signId" label="登记时间" width="150px" />
+      <el-table-column prop="signId" label="申请人" />
+      <el-table-column prop="signId" label="申请时间" width="150px" />
+      <el-table-column prop="signId" label="审核状态" fixed="right" width="90px" />
+      <el-table-column label="操作" width="150px" fixed="right">
+        <template #default="{ row }">
+          <el-button type="primary" style="padding: 0" text @click="handleDetail(row.id)">
+            详情
+          </el-button>
+          <el-button type="primary" style="padding: 0" text @click="handleCancel(row.id)">
+            撤销
+          </el-button>
+          <el-button type="primary" style="padding: 0" text @click="handleAudit(row.id)">
+            审核
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination
+      v-model:limit="searchForm.pageSize"
+      v-model:page="searchForm.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script setup name="AfterSales">
+const searchForm = ref({
+  signId: undefined,
+  name: undefined,
+  dealDate: [],
+  dealUser: undefined,
+  createDate: [],
+  createUser: undefined,
+  pageNo: 1,
+  pageSize: 20
+})
+
+const userOptions = ref([])
+
+const tableList = ref([])
+const total = ref(0)
+
+function handleSearch() {
+  searchForm.value.pageNo = 1
+  getList()
+}
+
+function handleReset() {
+  searchForm.value = {
+    signId: undefined,
+    name: undefined,
+    dealDate: [],
+    dealUser: undefined,
+    createDate: [],
+    createUser: undefined,
+    pageNo: 1,
+    pageSize: 20
+  }
+}
+
+function getList() {
+  tableList.value = [{ name: '测试' }]
+}
+
+function batchAudit() {
+  console.log(123)
+}
+
+function handleDetail(id) {
+  console.log(id)
+}
+function handleCancel(id) {
+  console.log(id)
+}
+function handleAudit(id) {
+  console.log(id)
+}
+
+onMounted(() => {
+  handleSearch()
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/Clue/Order/Comp/Delivery.vue b/src/views/Clue/Order/Comp/Delivery.vue
new file mode 100644
index 0000000..e69de29
diff --git a/src/views/Clue/Order/Comp/DialogOrder.vue b/src/views/Clue/Order/Comp/DialogOrder.vue
new file mode 100644
index 0000000..506672f
--- /dev/null
+++ b/src/views/Clue/Order/Comp/DialogOrder.vue
@@ -0,0 +1,107 @@
+<template>
+  <Dialog title="成交详情" v-model="show" width="800px">
+    <el-tabs v-model="tabName">
+      <el-tab-pane label="线索信息" name="clueInfo">
+        <Descriptions :data="clueInfo" :schema="clueSchema" :columns="2" labelWidth="130px" />
+      </el-tab-pane>
+      <el-tab-pane label="成交信息" name="orderInfo">
+        <Descriptions :data="orderInfo" :schema="orderSchema" :columns="2" labelWidth="130px" />
+        <el-divider direction="horizontal" content-position="left">额外支出</el-divider>
+        <el-table :data="orderInfo.extraPay" border stripe>
+          <el-table-column type="index" width="50" />
+          <el-table-column prop="extraPayType" label="额外支出项" />
+          <el-table-column prop="extraPayMoney" label="支出金额" />
+          <el-table-column prop="remark" label="备注" />
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="回款记录" name="returnRecord">
+        <el-table :data="returnRecord" border stripe>
+          <el-table-column type="index" width="50" />
+          <el-table-column prop="money" label="回款金额" />
+          <el-table-column prop="" label="回款日期" />
+          <el-table-column prop="" label="是否结清" />
+          <el-table-column prop="remark" label="备注" />
+          <el-table-column prop="" label="审核状态" />
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+    <div class="mb-15px"></div>
+  </Dialog>
+</template>
+
+<script setup name="DialogOrder">
+import * as ClueApi from '@/api/clue'
+import * as OrderApi from '@/api/clue/sign'
+import { getSimpleFieldList as getClueFieldList } from '@/api/clue/clueField'
+import { getSimpleFieldList as getOrderFieldList } from '@/api/clue/orderField'
+import { getPaymentList } from '@/api/clue/payment'
+
+import { formatDate } from '@/utils/formatTime'
+
+const tabName = ref('clueInfo')
+const show = ref(false)
+const clueInfo = ref({})
+const orderInfo = ref({})
+const returnRecord = ref([])
+
+function open(clueId, orderId) {
+  try {
+    show.value = true
+    tabName.value = 'clueInfo'
+    getFields()
+    ClueApi.getClue(clueId).then((data) => {
+      clueInfo.value = { ...data, ...data.diyParams }
+    })
+    OrderApi.getSign(orderId).then((data) => {
+      orderInfo.value = { ...data, ...data.diyParams }
+      orderInfo.value.dealDate = formatDate(orderInfo.value.dealDate, 'YYYY-MM-DD HH:mm')
+    })
+    getPaymentList({ signId: orderId }).then((data) => {
+      returnRecord.value = data
+    })
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+const clueSchema = ref([])
+const orderSchema = ref([])
+function getFields() {
+  getClueFieldList().then((data) => {
+    const arr = useCrudSchemas(data).allSchemas.detailSchema
+    clueSchema.value = [
+      ...arr,
+      {
+        field: 'requirement',
+        label: '诉求',
+        span: 2
+      },
+      {
+        field: 'remark',
+        label: '备注',
+        span: 2,
+        isEditor: true
+      }
+    ]
+  })
+
+  getOrderFieldList().then((data) => {
+    const arr = useCrudSchemas(data).allSchemas.detailSchema
+    orderSchema.value = [
+      ...arr,
+      {
+        field: 'remark',
+        label: '备注',
+        span: 2,
+        isEditor: true
+      }
+    ]
+  })
+}
+
+defineExpose({
+  open
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue
new file mode 100644
index 0000000..37c2639
--- /dev/null
+++ b/src/views/Clue/Order/Comp/OrderList.vue
@@ -0,0 +1,335 @@
+<template>
+  <div>
+    <!-- 搜索工作栏 -->
+    <div>
+      <el-form :model="searchForm" ref="moreSearchRef" inline label-width="0">
+        <template v-if="appStore.getAppInfo?.instanceType == 1">
+          <el-form-item>
+            <el-select
+              v-model="searchForm.signSchool"
+              placeholder="选择驾校"
+              filterable
+              clearable
+              @change="changeSchool"
+            >
+              <el-option
+                v-for="item in schoolOptions"
+                :key="item.schoolId"
+                :label="item.schoolName"
+                :value="item.schoolId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-select
+              v-model="searchForm.signPlace"
+              placeholder="选择场地"
+              filterable
+              clearable
+              :disabled="!searchForm.signSchool"
+              @change="changePlace"
+            >
+              <el-option
+                v-for="item in placeOptions"
+                :key="item.placeId"
+                :label="item.name"
+                :value="item.placeId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-select
+              v-model="searchForm.signClass"
+              :disabled="!searchForm.signPlace"
+              placeholder="选择班型"
+              filterable
+              clearable
+            >
+              <el-option
+                v-for="item in classOptions"
+                :key="item.typeId"
+                :label="item.typeName"
+                :value="item.typeId"
+              />
+            </el-select>
+          </el-form-item>
+        </template>
+        <template v-else-if="appStore.getAppInfo?.instanceType == 2">
+          <el-form-item>
+            <el-select
+              v-model="searchForm.signProduct"
+              placeholder="选择成交产品"
+              filterable
+              @change="searchForm.specsId = undefined"
+            >
+              <el-option
+                v-for="item in prodOptions"
+                :key="item.productId"
+                :label="item.productName"
+                :value="item.productId"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-select
+              v-model="searchForm.specsId"
+              placeholder="选择规格"
+              filterable
+              :disabled="!searchForm.signProduct"
+            >
+              <el-option
+                v-for="item in specsOptions(searchForm.signProduct)"
+                :key="item.specsId"
+                :label="item.specsName"
+                :value="item.specsId"
+              />
+            </el-select>
+          </el-form-item>
+        </template>
+      </el-form>
+      <Search v-if="!loading" ref="searchRef" :schema="allSchemas.searchSchema" labelWidth="0">
+        <template #actionMore>
+          <el-button @click="getTableList" v-hasPermi="['clue:order:search']"> 搜索 </el-button>
+          <el-button @click="resetQuery" v-hasPermi="['clue:order:reset']"> 重置 </el-button>
+        </template>
+      </Search>
+    </div>
+    <!-- 列表 -->
+    <SSTable
+      v-if="!loading"
+      class="mt-20px"
+      v-model:tableObject="tableObject"
+      :tableColumns="allSchemas.tableColumns"
+      @get-list="getTableList"
+    >
+      <el-table-column
+        v-for="item in allSchemas.tableColumns"
+        :key="item.field"
+        :prop="item.field"
+        :label="item.label"
+        min-width="120px"
+      />
+      <el-table-column label="操作" width="200px" fixed="right">
+        <template #default="scope">
+          <el-button
+            type="primary"
+            class="mr-10px"
+            link
+            style="padding: 0; margin-left: 0"
+            v-hasPermi="['clue:order:detail']"
+            @click="handleDetail(scope.row)"
+          >
+            详情
+          </el-button>
+          <el-button
+            type="primary"
+            class="mr-10px"
+            link
+            style="padding: 0; margin-left: 0"
+            v-hasPermi="['clue:order:after-sale']"
+            @click="sellAfter(scope.row)"
+          >
+            售后
+          </el-button>
+          <el-button
+            type="primary"
+            class="mr-10px"
+            link
+            style="padding: 0; margin-left: 0"
+            v-hasPermi="['clue:order:after-sale-audit']"
+          >
+            售后审核
+          </el-button>
+          <el-button
+            type="primary"
+            class="mr-10px"
+            link
+            v-if="appStore.getAppInfo?.instanceType == 2"
+            style="padding: 0; margin-left: 0"
+            v-hasPermi="['clue:order:send']"
+          >
+            发货
+          </el-button>
+          <el-button
+            type="primary"
+            class="mr-10px"
+            link
+            style="padding: 0; margin-left: 0"
+            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:order:return-audit']"
+          >
+            回款确认
+          </el-button>
+        </template>
+      </el-table-column>
+    </SSTable>
+
+    <!-- 详情 -->
+    <DialogOrder ref="orderDetailDialog" />
+  </div>
+</template>
+
+<script setup name="ClueOrderList">
+import { getSimpleFieldList } from '@/api/clue/orderField'
+import * as SignApi from '@/api/clue/sign'
+import { getSimpleUserList as getUserOption } from '@/api/system/user'
+import { getPlaceList } from '@/api/school/place'
+import { getClassTypePage } from '@/api/school/class'
+import { getSimpleProductList } from '@/api/mall/product'
+
+import DialogOrder from './DialogOrder.vue'
+
+import { removeNullField } from '@/utils'
+import { useAppStore } from '@/store/modules/app'
+
+const appStore = useAppStore()
+
+const allSchemas = ref({})
+
+const orderDetailDialog = ref()
+const searchRef = ref()
+const schoolOptions = ref([])
+const allPlaceOptions = ref([])
+const prodOptions = ref([])
+
+const specsOptions = computed({
+  get() {
+    return (prodId) => {
+      if (prodId) {
+        return prodOptions.value.find((it) => it.productId == prodId).productSpecList
+      }
+      return []
+    }
+  }
+})
+
+const searchForm = ref({
+  signSchool: undefined,
+  signPlace: undefined,
+  signClass: undefined,
+  signProduct: undefined
+})
+
+const tableObject = ref({
+  tableList: [],
+  loading: false,
+  total: 1,
+  pageSize: 20,
+  currentPage: 1
+})
+
+const placeOptions = computed(() => {
+  return allPlaceOptions.value.filter((it) => it.schoolId == searchForm.value.signSchool)
+})
+
+function resetQuery() {
+  searchForm.value = {
+    signSchool: undefined,
+    signPlace: undefined,
+    signClass: undefined,
+    signProduct: undefined
+  }
+  searchRef.value.reset()
+  tableObject.value.currentPage = 1
+  getTableList()
+}
+// 查询
+async function getTableList() {
+  // 查询
+  tableObject.value.loading = true
+  try {
+    const queryParams = await searchRef.value.getFormModel()
+    const params = {
+      ...queryParams,
+      ...searchForm.value,
+      pageNo: tableObject.value.currentPage,
+      pageSize: tableObject.value.pageSize
+    }
+    const data = await SignApi.getSignPage(removeNullField(params))
+    tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams }))
+    tableObject.value.total = data.total
+  } finally {
+    tableObject.value.loading = false
+  }
+}
+
+const loading = ref(true)
+async function getCurdSchemas() {
+  loading.value = true
+  try {
+    const data = await getSimpleFieldList()
+    data.forEach((elem) => {
+      if (elem.field == 'createUser') {
+        elem.search.options = userOptions.value
+      }
+    })
+    allSchemas.value = useCrudSchemas(data).allSchemas
+  } finally {
+    loading.value = false
+    nextTick(() => {
+      getTableList()
+    })
+  }
+}
+
+// 详情
+function handleDetail(row) {
+  orderDetailDialog.value.open(row.clueId, row.signId)
+}
+
+// 售后
+function sellAfter() {
+  // 方法体
+}
+
+function changeSchool() {
+  searchForm.value.signPlace = undefined
+  searchForm.value.signClass = undefined
+}
+
+function changePlace() {
+  searchForm.value.signClass = undefined
+  getClassTypeOptions()
+}
+
+const classOptions = ref([])
+async function getClassTypeOptions() {
+  const data = await getClassTypePage({ placeId: searchForm.value.signPlace })
+  classOptions.value = data.list
+}
+
+function getOptions() {
+  if (appStore.getAppInfo?.instanceType == 1) {
+    // 驾校
+    getPlaceList().then((data) => {
+      schoolOptions.value = data.schoolList
+      allPlaceOptions.value = data.placeList
+    })
+  } else {
+    // 产品
+    getSimpleProductList().then((data) => {
+      prodOptions.value = data
+    })
+  }
+}
+
+const userOptions = ref([])
+onMounted(() => {
+  getUserOption().then((data) => {
+    userOptions.value = data
+    getCurdSchemas()
+  })
+  getOptions()
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/Clue/Order/Comp/Reback.vue b/src/views/Clue/Order/Comp/Reback.vue
new file mode 100644
index 0000000..401c37d
--- /dev/null
+++ b/src/views/Clue/Order/Comp/Reback.vue
@@ -0,0 +1,148 @@
+<template>
+  <div>
+    <el-form :model="searchForm" label-width="0" inline>
+      <el-form-item>
+        <el-input v-model="searchForm.signId" placeholder="成交单号" />
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="searchForm.name" placeholder="线索名称" />
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.dealUser" placeholder="登记人" clearable filterable>
+          <el-option
+            v-for="item in userOptions"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.dealDate"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="登记日期"
+          end-placeholder="登记日期"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.createUser" placeholder="申请人" clearable filterable>
+          <el-option
+            v-for="item in userOptions"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-date-picker
+          v-model="searchForm.createDate"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="申请日期"
+          end-placeholder="申请日期"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleSearch">查询</el-button>
+        <el-button @click="handleReset">重置</el-button>
+        <el-button @click="batchAudit">批量审核</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table :data="tableList" border>
+      <el-table-column prop="signId" label="成交单号" width="150px" />
+      <el-table-column prop="name" label="线索名称" />
+      <el-table-column prop="phone" label="联系方式" width="150px" />
+      <el-table-column prop="signId" label="回款金额" />
+      <el-table-column prop="signId" label="是否结清" />
+      <el-table-column prop="signId" label="备注" width="200px" />
+      <el-table-column prop="signId" label="登记人" />
+      <el-table-column prop="signId" label="登记时间" width="150px" />
+      <el-table-column prop="signId" label="申请人" />
+      <el-table-column prop="signId" label="申请时间" width="150px" />
+      <el-table-column prop="signId" label="审核状态" fixed="right" />
+      <el-table-column label="操作" width="150px" fixed="right">
+        <template #default="{ row }">
+          <el-button type="primary" style="padding: 0" text @click="handleDetail(row.id)"
+            >详情</el-button
+          >
+          <el-button type="primary" style="padding: 0" text @click="handleCancel(row.id)"
+            >撤销</el-button
+          >
+          <el-button type="primary" style="padding: 0" text @click="handleAudit(row.id)"
+            >审核</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <Pagination
+      v-model:limit="searchForm.pageSize"
+      v-model:page="searchForm.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script setup name="Reback">
+const searchForm = ref({
+  signId: undefined,
+  name: undefined,
+  dealDate: [],
+  dealUser: undefined,
+  createDate: [],
+  createUser: undefined,
+  pageNo: 1,
+  pageSize: 20
+})
+
+const userOptions = ref([])
+
+const tableList = ref([])
+const total = ref(0)
+
+function handleSearch() {
+  searchForm.value.pageNo = 1
+  getList()
+}
+
+function handleReset() {
+  searchForm.value = {
+    signId: undefined,
+    name: undefined,
+    dealDate: [],
+    dealUser: undefined,
+    createDate: [],
+    createUser: undefined,
+    pageNo: 1,
+    pageSize: 20
+  }
+}
+
+function getList() {
+  tableList.value = [{ name: '测试' }]
+}
+
+function batchAudit() {
+  console.log(123)
+}
+
+function handleDetail(id) {
+  console.log(id)
+}
+function handleCancel(id) {
+  console.log(id)
+}
+function handleAudit(id) {
+  console.log(id)
+}
+
+onMounted(() => {
+  handleSearch()
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/Clue/Order/index.vue b/src/views/Clue/Order/index.vue
index 9742db3..16bfd20 100644
--- a/src/views/Clue/Order/index.vue
+++ b/src/views/Clue/Order/index.vue
@@ -1,146 +1,28 @@
 <template>
-  <div>
-    <!-- 搜索工作栏 -->
-    <Search v-if="!loading" ref="searchRef" :schema="allSchemas.searchSchema" labelWidth="0">
-      <template #actionMore>
-        <el-button @click="getTableList" v-hasPermi="['clue:order:search']"> 搜索 </el-button>
-        <el-button @click="resetQuery" v-hasPermi="['clue:order:reset']"> 重置 </el-button>
-      </template>
-    </Search>
-    <!-- 列表 -->
-    <SSTable
-      v-if="!loading"
-      class="mt-20px"
-      v-model:tableObject="tableObject"
-      :tableColumns="allSchemas.tableColumns"
-      @get-list="getTableList"
-    >
-      <el-table-column
-        v-for="item in allSchemas.tableColumns"
-        :key="item.field"
-        :prop="item.field"
-        :label="item.label"
-        min-width="120px"
-      />
-      <el-table-column label="操作" width="200px" fixed="right">
-        <template #default="scope">
-          <el-button
-            type="primary"
-            class="mr-10px"
-            link
-            style="padding: 0; margin-left: 0"
-            v-hasPermi="['clue:order:after-sale']"
-            @click="sellAfter(scope.row)"
-          >
-            售后
-          </el-button>
-          <el-button
-            type="primary"
-            class="mr-10px"
-            link
-            style="padding: 0; margin-left: 0"
-            v-hasPermi="['clue:order:after-sale-audit']"
-          >
-            售后审核
-          </el-button>
-          <el-button
-            type="primary"
-            class="mr-10px"
-            link
-            style="padding: 0; margin-left: 0"
-            v-hasPermi="['clue:order:send']"
-          >
-            发货(进销存)
-          </el-button>
-          <el-button
-            type="primary"
-            class="mr-10px"
-            link
-            style="padding: 0; margin-left: 0"
-            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:order:return-audit']"
-          >
-            回款确认
-          </el-button>
-        </template>
-      </el-table-column>
-    </SSTable>
-  </div>
+  <el-tabs v-model="tabName">
+    <el-tab-pane label="成交列表" name="list">
+      <OrderList v-if="tabName == 'list'" />
+    </el-tab-pane>
+    <el-tab-pane label="回款申请" name="commission">
+      <Reback v-if="tabName == 'commission'" />
+    </el-tab-pane>
+    <el-tab-pane label="售后申请" name="aftersale">
+      <AfterSales v-if="tabName == 'aftersale'" />
+    </el-tab-pane>
+    <el-tab-pane label="发货列表" name="delivery" v-if="appStore.getAppInfo?.instanceType == 2">
+      <OrderList v-if="tabName == 'delivery'" />
+    </el-tab-pane>
+  </el-tabs>
 </template>
 
 <script setup name="ClueOrder">
-import { getSimpleFieldList } from '@/api/clue/orderField'
-import * as SignApi from '@/api/clue/sign'
+import { useAppStore } from '@/store/modules/app'
+import OrderList from './Comp/OrderList.vue'
+import Reback from './Comp/Reback.vue'
+import AfterSales from './Comp/AfterSales.vue'
 
-import { removeNullField } from '@/utils'
-
-const allSchemas = ref({})
-
-const searchRef = ref()
-
-const tableObject = ref({
-  tableList: [],
-  loading: false,
-  total: 1,
-  pageSize: 20,
-  currentPage: 1
-})
-
-function resetQuery() {
-  searchRef.value.reset()
-  tableObject.value.currentPage = 1
-  getTableList()
-}
-// 查询
-async function getTableList() {
-  // 查询
-  tableObject.value.loading = true
-  try {
-    const queryParams = await searchRef.value.getFormModel()
-    const params = {
-      ...queryParams,
-      pageNo: tableObject.value.currentPage,
-      pageSize: tableObject.value.pageSize
-    }
-    const data = await SignApi.getSignPage(removeNullField(params))
-    tableObject.value.tableList = data.list.map((it) => ({ ...it, ...it.diyParams }))
-    tableObject.value.total = data.total
-  } finally {
-    tableObject.value.loading = false
-  }
-}
-
-const loading = ref(true)
-async function getCurdSchemas() {
-  loading.value = true
-  try {
-    const data = await getSimpleFieldList()
-    allSchemas.value = useCrudSchemas(data).allSchemas
-  } finally {
-    loading.value = false
-    nextTick(() => {
-      getTableList()
-    })
-  }
-}
-
-// 售后
-function sellAfter() {
-  // 方法体
-}
-
-onMounted(() => {
-  getCurdSchemas()
-})
+const appStore = useAppStore()
+const tabName = ref('list')
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/Clue/Pool/Comp/DialogSuccess.vue b/src/views/Clue/Pool/Comp/DialogSuccess.vue
index 000b5ab..2a9fb6e 100644
--- a/src/views/Clue/Pool/Comp/DialogSuccess.vue
+++ b/src/views/Clue/Pool/Comp/DialogSuccess.vue
@@ -1,11 +1,12 @@
 <template>
   <Dialog title="成交登记" v-model="show" width="820px">
     <Descriptions
-      title="线索信息"
+      :title="`线索信息-${info.name}`"
       :data="info"
       :schema="showSchema"
       :columns="2"
       labelWidth="130px"
+      :defaultShow="false"
     />
     <el-form :model="form" ref="formRef" :rules="rules" label-width="80px" class="mt-20px">
       <el-row :gutter="20">
diff --git a/src/views/Clue/Pool/Comp/DrawerClue.vue b/src/views/Clue/Pool/Comp/DrawerClue.vue
index 733fc08..1147c6b 100644
--- a/src/views/Clue/Pool/Comp/DrawerClue.vue
+++ b/src/views/Clue/Pool/Comp/DrawerClue.vue
@@ -31,10 +31,10 @@
     <!-- 基础信息 -->
     <el-skeleton :loading="loading" animated>
       <el-table :data="followList" size="small" border class="mt-10px">
-        <el-table-column prop="name" label="跟进人" />
-        <el-table-column prop="latestFollowTime" label="最新跟进时间" />
+        <el-table-column prop="userName" label="跟进人" />
+        <el-table-column prop="followTime" label="最新跟进时间" :formatter="dateFormatter" />
         <el-table-column prop="nextFollowTime" label="下次跟进时间" />
-        <el-table-column prop="saleStatus" label="成交状态" />
+        <el-table-column prop="signSate" label="成交状态" />
       </el-table>
     </el-skeleton>
     <el-divider direction="horizontal" />
@@ -124,7 +124,7 @@ import { getPlaceList } from '@/api/school/place'
 
 import DialogFollow from './DialogFollow.vue'
 import AMapLoader from '@amap/amap-jsapi-loader'
-import { formatDate } from '@/utils/formatTime'
+import { formatDate, dateFormatter } from '@/utils/formatTime'
 
 import ImgPostion from '@/assets/imgs/flag/position_blue.png'
 import FlagRed from '@/assets/imgs/flag/flag_red.png'
@@ -165,20 +165,7 @@ const showSchema = computed(() => {
   return [...props.schema, ...arr]
 })
 
-const followList = ref([
-  {
-    name: '李四',
-    latestFollowTime: '2024-02-01',
-    nextFollowTime: '2024-04-01',
-    saleStatus: '未成交'
-  },
-  {
-    name: '王二',
-    latestFollowTime: '2024-03-01',
-    nextFollowTime: '2024-04-11',
-    saleStatus: '已成交'
-  }
-])
+const followList = ref([])
 
 const followRecordList = ref([])
 const operateRecordList = ref([])
@@ -201,9 +188,16 @@ function getFollowList() {
   })
 }
 
+function getFollowUsers(id) {
+  ClueApi.getFollowUserList({ id }).then((data) => {
+    followList.value = data
+  })
+}
+
 async function open(id) {
   clueId.value = id
   try {
+    getFollowUsers(id)
     getFollowList()
     ClueApi.getOpearateRecord({ clueId: id }).then((data) => {
       operateRecordList.value = data.map((item) => ({
diff --git a/src/views/Clue/Pool/index.vue b/src/views/Clue/Pool/index.vue
index e537d39..99d1933 100644
--- a/src/views/Clue/Pool/index.vue
+++ b/src/views/Clue/Pool/index.vue
@@ -147,11 +147,11 @@
     <DrawerClue
       v-if="!loading"
       ref="drawerRef"
-      :schema="allSchemas.formSchema"
+      :schema="allSchemas.detailSchema"
       @get-list="getTableList"
       @update="handleEdit"
     />
-    <DialogSuccess ref="successRef" :schema="allSchemas.formSchema" @success="getTableList" />
+    <DialogSuccess ref="successRef" :schema="allSchemas.detailSchema" @success="getTableList" />
     <DialogFollow ref="followRef" @success="getTableList" />
   </div>
 </template>
diff --git a/src/views/Clue/Skill/index.vue b/src/views/Clue/Skill/index.vue
index 731266c..ccf377d 100644
--- a/src/views/Clue/Skill/index.vue
+++ b/src/views/Clue/Skill/index.vue
@@ -11,9 +11,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" @click="handleQuery" v-hasPermi="['clue:skill:search']">
-          搜索
-        </el-button>
+        <el-button @click="handleQuery" v-hasPermi="['clue:skill:search']">搜索</el-button>
         <el-button @click="resetQuery" v-hasPermi="['clue:skill:reset']">重置</el-button>
         <el-button type="primary" plain @click="handleAdd" v-hasPermi="['clue:skill:add']">
           新增

From 5aab5c0f823af3766c41a7918aad4a6ea19496d3 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Wed, 19 Jun 2024 00:31:40 +0800
Subject: [PATCH 4/9] =?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/afterSale.js                     |  26 ++++
 src/api/clue/payment.js                       |  10 ++
 src/views/Clue/Order/Comp/AfterSales.vue      | 104 +++++++++++----
 src/views/Clue/Order/Comp/DialogAfterSale.vue | 122 +++++++++++++++++
 src/views/Clue/Order/Comp/DialogFeeback.vue   | 101 ++++++++++++++
 src/views/Clue/Order/Comp/DialogOrder.vue     |  32 +++--
 src/views/Clue/Order/Comp/OrderList.vue       |  34 ++---
 src/views/Clue/Order/Comp/Reback.vue          | 125 +++++++++++++-----
 8 files changed, 467 insertions(+), 87 deletions(-)
 create mode 100644 src/api/clue/afterSale.js
 create mode 100644 src/views/Clue/Order/Comp/DialogAfterSale.vue
 create mode 100644 src/views/Clue/Order/Comp/DialogFeeback.vue

diff --git a/src/api/clue/afterSale.js b/src/api/clue/afterSale.js
new file mode 100644
index 0000000..b9b8056
--- /dev/null
+++ b/src/api/clue/afterSale.js
@@ -0,0 +1,26 @@
+import request from '@/config/axios'
+
+// 查询（精简)列表
+export const getAfterSaleList = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-after-sale/list', params })
+}
+
+// 查询（精简)列表
+export const getAfterSalePage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-after-sale/page', params })
+}
+
+// 新增
+export const createAfterSale = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-after-sale/create', data })
+}
+
+// 审核
+export const auditAfterSale = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-after-sale/check', data })
+}
+
+// 撤销
+export const cancelApplyAfterSale = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-after-sale/revoke', data })
+}
diff --git a/src/api/clue/payment.js b/src/api/clue/payment.js
index afbb76a..5e8f613 100644
--- a/src/api/clue/payment.js
+++ b/src/api/clue/payment.js
@@ -5,6 +5,11 @@ export const getPaymentList = async (params) => {
   return await request.get({ url: '/admin-api/crm/sign-pay-record/list', params })
 }
 
+// 查询（精简)列表
+export const getPaymentPage = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-pay-record/page', params })
+}
+
 // 新增
 export const createPayment = async (data) => {
   return await request.post({ url: '/admin-api/crm/sign-pay-record/create', data })
@@ -14,3 +19,8 @@ export const createPayment = async (data) => {
 export const auditPayment = async (data) => {
   return await request.post({ url: '/admin-api/crm/sign-pay-record/check', data })
 }
+
+// 撤销
+export const cancelApplyPayment = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-pay-record/revoke', data })
+}
diff --git a/src/views/Clue/Order/Comp/AfterSales.vue b/src/views/Clue/Order/Comp/AfterSales.vue
index 11c2d3e..1c11aaa 100644
--- a/src/views/Clue/Order/Comp/AfterSales.vue
+++ b/src/views/Clue/Order/Comp/AfterSales.vue
@@ -2,13 +2,21 @@
   <div>
     <el-form :model="searchForm" label-width="0" inline>
       <el-form-item>
-        <el-input v-model="searchForm.signId" placeholder="成交单号" />
+        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.name" placeholder="线索名称" />
+        <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.dealUser" placeholder="登记人" clearable filterable>
+        <el-select v-model="searchForm.state" placeholder="审核状态" clearable>
+          <el-option label="待审核" :value="1" />
+          <el-option label="已撤销" :value="2" />
+          <el-option label="已通过" :value="3" />
+          <el-option label="已驳回" :value="4" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -27,7 +35,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.createUser" placeholder="申请人" clearable filterable>
+        <el-select v-model="searchForm.applyUser" placeholder="申请人" clearable filterable>
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -38,7 +46,7 @@
       </el-form-item>
       <el-form-item>
         <el-date-picker
-          v-model="searchForm.createDate"
+          v-model="searchForm.applyTime"
           type="daterange"
           range-separator="-"
           start-placeholder="申请日期"
@@ -53,28 +61,41 @@
     </el-form>
 
     <el-table :data="tableList" border>
-      <el-table-column prop="signId" label="成交单号" width="150px" />
-      <el-table-column prop="name" label="线索名称" width="120px" />
-      <el-table-column prop="phone" label="联系方式" width="150px" />
-      <el-table-column prop="signId" label="售后原因" width="150px" />
-      <el-table-column prop="signId" label="退款金额" width="90px" />
-      <el-table-column prop="signId" label="是否退货" width="90px" />
-      <el-table-column prop="signId" label="解决方案" width="150px" />
-      <el-table-column prop="signId" label="备注" width="200px" />
-      <el-table-column prop="signId" label="登记人" />
-      <el-table-column prop="signId" label="登记时间" width="150px" />
-      <el-table-column prop="signId" label="申请人" />
-      <el-table-column prop="signId" label="申请时间" width="150px" />
-      <el-table-column prop="signId" label="审核状态" fixed="right" width="90px" />
+      <el-table-column prop="signId" label="成交单号" min-width="150px" />
+      <el-table-column prop="name" label="线索名称" min-width="200px" />
+      <el-table-column prop="phone" label="联系方式" min-width="150px" />
+      <el-table-column prop="reason" label="售后原因" min-width="150px" />
+      <el-table-column prop="refundAmount" label="退款金额" min-width="90px" />
+      <el-table-column prop="isReturns" label="是否退货" min-width="90px" />
+      <el-table-column prop="solution" label="解决方案" min-width="150px" />
+      <el-table-column prop="signUserName" label="登记人" min-width="90px" />
+      <el-table-column prop="dealDate" label="登记时间" min-width="150px" />
+      <el-table-column prop="applyUserName" label="申请人" min-width="90px" />
+      <el-table-column prop="applyTime" label="申请时间" min-width="150px" />
+      <el-table-column prop="stateName" label="审核状态" fixed="right" min-width="90px" />
       <el-table-column label="操作" width="150px" fixed="right">
         <template #default="{ row }">
           <el-button type="primary" style="padding: 0" text @click="handleDetail(row.id)">
             详情
           </el-button>
-          <el-button type="primary" style="padding: 0" text @click="handleCancel(row.id)">
+          <el-button
+            type="primary"
+            style="padding: 0"
+            text
+            v-if="row.state == 1 && currentUserId == row.applyUser"
+            v-hasPermi="['clue:order:after-sale']"
+            @click="handleCancel(row.id)"
+          >
             撤销
           </el-button>
-          <el-button type="primary" style="padding: 0" text @click="handleAudit(row.id)">
+          <el-button
+            type="primary"
+            style="padding: 0"
+            text
+            v-if="row.state == 1"
+            v-hasPermi="['clue:order:after-sale-audit']"
+            @click="handleAudit(row.id)"
+          >
             审核
           </el-button>
         </template>
@@ -90,10 +111,20 @@
 </template>
 
 <script setup name="AfterSales">
+import * as AfterSaleApi from '@/api/clue/afterSale'
+import { getSimpleUserList as getUserOption } from '@/api/system/user'
+import { useUserStore } from '@/store/modules/user'
+
+const userStore = useUserStore()
+const message = useMessage() // 消息弹窗
+
+const currentUserId = userStore.getUser.id
+
 const searchForm = ref({
   signId: undefined,
   name: undefined,
   dealDate: [],
+  state: undefined,
   dealUser: undefined,
   createDate: [],
   createUser: undefined,
@@ -115,6 +146,7 @@ function handleReset() {
   searchForm.value = {
     signId: undefined,
     name: undefined,
+    state: undefined,
     dealDate: [],
     dealUser: undefined,
     createDate: [],
@@ -124,8 +156,16 @@ function handleReset() {
   }
 }
 
-function getList() {
-  tableList.value = [{ name: '测试' }]
+const loading = ref(false)
+async function getList() {
+  loading.value = true
+  try {
+    const data = await AfterSaleApi.getAfterSalePage(searchForm.value)
+    tableList.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
 }
 
 function batchAudit() {
@@ -135,14 +175,30 @@ function batchAudit() {
 function handleDetail(id) {
   console.log(id)
 }
-function handleCancel(id) {
-  console.log(id)
+async function handleCancel(id) {
+  try {
+    // 删除的二次确认
+    await message.confirm('是否确认撤销申请？')
+    // 发起删除
+    await AfterSaleApi.cancelApplyAfterSale({ id })
+    message.success('撤销成功！')
+    // 刷新列表
+    await getList()
+  } catch (err) {
+    console.log(err)
+  }
 }
 function handleAudit(id) {
   console.log(id)
 }
 
+function getOptions() {
+  getUserOption().then((data) => {
+    userOptions.value = data
+  })
+}
 onMounted(() => {
+  getOptions()
   handleSearch()
 })
 </script>
diff --git a/src/views/Clue/Order/Comp/DialogAfterSale.vue b/src/views/Clue/Order/Comp/DialogAfterSale.vue
new file mode 100644
index 0000000..c8f1081
--- /dev/null
+++ b/src/views/Clue/Order/Comp/DialogAfterSale.vue
@@ -0,0 +1,122 @@
+<template>
+  <Dialog title="售后记录" v-model="show" width="800px">
+    <el-table :data="aftersaleList" border stripe>
+      <el-table-column type="index" width="50" />
+      <el-table-column prop="reason" label="售后原因" />
+      <el-table-column prop="refundAmount" label="退款金额" />
+      <el-table-column prop="isReturns" label="是否退货" />
+      <el-table-column prop="applyTime" label="申请日期" width="180px" />
+      <el-table-column prop="stateName" label="审核状态" />
+    </el-table>
+    <el-divider direction="horizontal" />
+
+    <el-button v-show="showAdd" class="mb-10px" type="primary" @click="handleAdd">
+      新增售后
+    </el-button>
+    <el-form v-if="!showAdd" :model="form" ref="formRef" :rules="rules" label-width="80px">
+      <el-form-item label="退款原因" prop="reason">
+        <el-input v-model="form.reason" placeholder="请输入退款原因" />
+      </el-form-item>
+      <el-form-item label="退款金额" prop="refundAmount">
+        <el-input-number
+          v-model="form.refundAmount"
+          :min="0"
+          :controls="false"
+          placeholder="请输入金额"
+        />
+      </el-form-item>
+      <el-form-item label="是否退货" prop="isReturns">
+        <el-radio-group v-model="form.isReturns">
+          <el-radio :label="true"> 退货 </el-radio>
+          <el-radio :label="false"> 不退货 </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="解决方案" prop="solution">
+        <el-input
+          type="textarea"
+          :autoSize="{ minRows: 3 }"
+          v-model="form.solution"
+          placeholder="请输入退款原因"
+        />
+      </el-form-item>
+      <el-form-item label="备注">
+        <Editor v-model:modelValue="form.remark" />
+      </el-form-item>
+      <el-form-item>
+        <el-button :disabled="formLoading" type="primary" @click="onSubmit">保存</el-button>
+        <el-button @click="showAdd = true">取消</el-button>
+      </el-form-item>
+    </el-form>
+  </Dialog>
+</template>
+
+<script setup name="DialogAfterSale">
+import { getAfterSalePage, createAfterSale } from '@/api/clue/afterSale'
+
+const message = useMessage() // 消息弹窗
+
+const show = ref(false)
+const aftersaleList = ref([])
+const orderId = ref('')
+
+function open(signId) {
+  show.value = true
+  orderId.value = signId
+  try {
+    getList()
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+const showAdd = ref(true)
+const form = ref({})
+const rules = {
+  refundAmount: { required: true, message: '回款金额不可为空', trigger: 'blur' },
+  reason: { required: true, message: '售后原因不可为空', trigger: 'blur' },
+  solution: { required: true, message: '解决方案不可为空', trigger: 'blur' }
+}
+
+function getList() {
+  getAfterSalePage({ signId: orderId.value, pageNo: 1, pageSize: 100 }).then((data) => {
+    aftersaleList.value = data.list
+  })
+}
+
+function handleAdd() {
+  showAdd.value = false
+  form.value = {
+    signId: orderId.value,
+    reason: undefined,
+    solution: undefined,
+    refundAmount: undefined,
+    isReturns: false,
+    remark: undefined
+  }
+}
+
+const formRef = ref()
+const formLoading = ref(false)
+async function onSubmit() {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    await createAfterSale(form.value)
+    message.success('申请成功！')
+    getList()
+    showAdd.value = true
+  } finally {
+    formLoading.value = false
+  }
+}
+
+defineExpose({
+  open
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/Clue/Order/Comp/DialogFeeback.vue b/src/views/Clue/Order/Comp/DialogFeeback.vue
new file mode 100644
index 0000000..2907467
--- /dev/null
+++ b/src/views/Clue/Order/Comp/DialogFeeback.vue
@@ -0,0 +1,101 @@
+<template>
+  <Dialog title="回款记录" v-model="show" width="800px">
+    <el-table :data="feebackList" border stripe>
+      <el-table-column type="index" width="50" />
+      <el-table-column prop="money" label="回款金额" />
+      <el-table-column prop="applyTime" label="申请日期" />
+      <el-table-column prop="isPayoff" label="是否结清" />
+      <el-table-column prop="stateName" label="审核状态" />
+    </el-table>
+    <el-divider direction="horizontal" />
+
+    <el-button v-show="showAdd" class="mb-10px" type="primary" @click="handleAdd">
+      新增回款
+    </el-button>
+    <el-form v-if="!showAdd" :model="form" ref="formRef" :rules="rules" label-width="80px">
+      <el-form-item label="回款金额" prop="money">
+        <el-input-number v-model="form.money" :min="0" :controls="false" placeholder="请输入金额" />
+      </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-group>
+      </el-form-item>
+      <el-form-item label="备注">
+        <Editor v-model:modelValue="form.remark" />
+      </el-form-item>
+      <el-form-item>
+        <el-button :disabled="formLoading" type="primary" @click="onSubmit">保存</el-button>
+        <el-button @click="showAdd = true">取消</el-button>
+      </el-form-item>
+    </el-form>
+  </Dialog>
+</template>
+
+<script setup name="DialogFeeback">
+import { getPaymentPage, createPayment } from '@/api/clue/payment'
+
+const message = useMessage() // 消息弹窗
+
+const show = ref(false)
+const feebackList = ref([])
+const orderId = ref('')
+
+function open(signId) {
+  show.value = true
+  orderId.value = signId
+  try {
+    getList()
+  } catch (error) {
+    console.log(error)
+  }
+}
+
+const showAdd = ref(true)
+const form = ref({})
+const rules = {
+  money: { required: true, message: '回款金额不可为空', trigger: 'blur' }
+}
+
+function getList() {
+  getPaymentPage({ signId: orderId.value, pageNo: 1, pageSize: 100 }).then((data) => {
+    feebackList.value = data.list
+  })
+}
+
+function handleAdd() {
+  showAdd.value = false
+  form.value = {
+    signId: orderId.value,
+    money: undefined,
+    isPayoff: '结清',
+    remark: undefined
+  }
+}
+
+const formRef = ref()
+const formLoading = ref(false)
+async function onSubmit() {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    await createPayment(form.value)
+    message.success('申请成功！')
+    getList()
+    showAdd.value = true
+  } finally {
+    formLoading.value = false
+  }
+}
+
+defineExpose({
+  open
+})
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/Clue/Order/Comp/DialogOrder.vue b/src/views/Clue/Order/Comp/DialogOrder.vue
index 506672f..6497ff6 100644
--- a/src/views/Clue/Order/Comp/DialogOrder.vue
+++ b/src/views/Clue/Order/Comp/DialogOrder.vue
@@ -15,13 +15,22 @@
         </el-table>
       </el-tab-pane>
       <el-tab-pane label="回款记录" name="returnRecord">
-        <el-table :data="returnRecord" border stripe>
+        <el-table :data="returnRecordList" border stripe>
           <el-table-column type="index" width="50" />
           <el-table-column prop="money" label="回款金额" />
-          <el-table-column prop="" label="回款日期" />
-          <el-table-column prop="" label="是否结清" />
-          <el-table-column prop="remark" label="备注" />
-          <el-table-column prop="" label="审核状态" />
+          <el-table-column prop="applyTime" label="申请日期" />
+          <el-table-column prop="isPayoff" label="是否结清" />
+          <el-table-column prop="stateName" label="审核状态" />
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="售后记录" name="afterSale">
+        <el-table :data="aftersaleList" border stripe>
+          <el-table-column type="index" width="50" />
+          <el-table-column prop="reason" label="售后原因" />
+          <el-table-column prop="refundAmount" label="退款金额" />
+          <el-table-column prop="isReturns" label="是否退货" />
+          <el-table-column prop="applyTime" label="申请日期" width="180px" />
+          <el-table-column prop="stateName" label="审核状态" />
         </el-table>
       </el-tab-pane>
     </el-tabs>
@@ -34,7 +43,8 @@ import * as ClueApi from '@/api/clue'
 import * as OrderApi from '@/api/clue/sign'
 import { getSimpleFieldList as getClueFieldList } from '@/api/clue/clueField'
 import { getSimpleFieldList as getOrderFieldList } from '@/api/clue/orderField'
-import { getPaymentList } from '@/api/clue/payment'
+import { getPaymentPage } from '@/api/clue/payment'
+import { getAfterSalePage } from '@/api/clue/afterSale'
 
 import { formatDate } from '@/utils/formatTime'
 
@@ -42,7 +52,8 @@ const tabName = ref('clueInfo')
 const show = ref(false)
 const clueInfo = ref({})
 const orderInfo = ref({})
-const returnRecord = ref([])
+const returnRecordList = ref([])
+const aftersaleList = ref([])
 
 function open(clueId, orderId) {
   try {
@@ -56,8 +67,11 @@ function open(clueId, orderId) {
       orderInfo.value = { ...data, ...data.diyParams }
       orderInfo.value.dealDate = formatDate(orderInfo.value.dealDate, 'YYYY-MM-DD HH:mm')
     })
-    getPaymentList({ signId: orderId }).then((data) => {
-      returnRecord.value = data
+    getPaymentPage({ signId: orderId, pageNo: 1, pageSize: 100 }).then((data) => {
+      returnRecordList.value = data.list
+    })
+    getAfterSalePage({ signId: orderId, pageNo: 1, pageSize: 100 }).then((data) => {
+      aftersaleList.value = data.list
     })
   } catch (error) {
     console.log(error)
diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue
index 37c2639..36c2771 100644
--- a/src/views/Clue/Order/Comp/OrderList.vue
+++ b/src/views/Clue/Order/Comp/OrderList.vue
@@ -131,15 +131,6 @@
           >
             售后
           </el-button>
-          <el-button
-            type="primary"
-            class="mr-10px"
-            link
-            style="padding: 0; margin-left: 0"
-            v-hasPermi="['clue:order:after-sale-audit']"
-          >
-            售后审核
-          </el-button>
           <el-button
             type="primary"
             class="mr-10px"
@@ -155,26 +146,20 @@
             class="mr-10px"
             link
             style="padding: 0; margin-left: 0"
+            v-if="scope.row.isPayoff == '未结清'"
             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:order:return-audit']"
-          >
-            回款确认
-          </el-button>
         </template>
       </el-table-column>
     </SSTable>
 
     <!-- 详情 -->
     <DialogOrder ref="orderDetailDialog" />
+    <DialogFeeback ref="feedbackDialog" />
+    <DialogAfterSale ref="afterSaleDialog" />
   </div>
 </template>
 
@@ -187,6 +172,8 @@ import { getClassTypePage } from '@/api/school/class'
 import { getSimpleProductList } from '@/api/mall/product'
 
 import DialogOrder from './DialogOrder.vue'
+import DialogFeeback from './DialogFeeback.vue'
+import DialogAfterSale from './DialogAfterSale.vue'
 
 import { removeNullField } from '@/utils'
 import { useAppStore } from '@/store/modules/app'
@@ -286,9 +273,16 @@ function handleDetail(row) {
   orderDetailDialog.value.open(row.clueId, row.signId)
 }
 
+const feedbackDialog = ref()
+const afterSaleDialog = ref()
 // 售后
-function sellAfter() {
-  // 方法体
+function sellAfter(row) {
+  afterSaleDialog.value.open(row.signId)
+}
+
+// 回款
+function feeBack(row) {
+  feedbackDialog.value.open(row.signId)
 }
 
 function changeSchool() {
diff --git a/src/views/Clue/Order/Comp/Reback.vue b/src/views/Clue/Order/Comp/Reback.vue
index 401c37d..427c973 100644
--- a/src/views/Clue/Order/Comp/Reback.vue
+++ b/src/views/Clue/Order/Comp/Reback.vue
@@ -2,13 +2,21 @@
   <div>
     <el-form :model="searchForm" label-width="0" inline>
       <el-form-item>
-        <el-input v-model="searchForm.signId" placeholder="成交单号" />
+        <el-input v-model="searchForm.signId" placeholder="成交单号" clearable />
       </el-form-item>
       <el-form-item>
-        <el-input v-model="searchForm.name" placeholder="线索名称" />
+        <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.dealUser" placeholder="登记人" clearable filterable>
+        <el-select v-model="searchForm.state" placeholder="审核状态" clearable>
+          <el-option label="待审核" :value="1" />
+          <el-option label="已撤销" :value="2" />
+          <el-option label="已通过" :value="3" />
+          <el-option label="已驳回" :value="4" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -27,7 +35,7 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-select v-model="searchForm.createUser" placeholder="申请人" clearable filterable>
+        <el-select v-model="searchForm.applyUser" placeholder="申请人" clearable filterable>
           <el-option
             v-for="item in userOptions"
             :key="item.id"
@@ -38,7 +46,7 @@
       </el-form-item>
       <el-form-item>
         <el-date-picker
-          v-model="searchForm.createDate"
+          v-model="searchForm.applyTime"
           type="daterange"
           range-separator="-"
           start-placeholder="申请日期"
@@ -52,29 +60,42 @@
       </el-form-item>
     </el-form>
 
-    <el-table :data="tableList" border>
-      <el-table-column prop="signId" label="成交单号" width="150px" />
-      <el-table-column prop="name" label="线索名称" />
-      <el-table-column prop="phone" label="联系方式" width="150px" />
-      <el-table-column prop="signId" label="回款金额" />
-      <el-table-column prop="signId" label="是否结清" />
-      <el-table-column prop="signId" label="备注" width="200px" />
-      <el-table-column prop="signId" label="登记人" />
-      <el-table-column prop="signId" label="登记时间" width="150px" />
-      <el-table-column prop="signId" label="申请人" />
-      <el-table-column prop="signId" label="申请时间" width="150px" />
-      <el-table-column prop="signId" label="审核状态" fixed="right" />
+    <el-table v-loading="loading" :data="tableList" border>
+      <el-table-column prop="signId" label="成交单号" min-width="150px" />
+      <el-table-column prop="name" label="线索名称" min-width="200px" />
+      <el-table-column prop="phone" label="联系方式" min-width="150px" />
+      <el-table-column prop="money" label="回款金额" min-width="90" />
+      <el-table-column prop="isPayoff" label="是否结清" min-width="90" />
+      <el-table-column prop="signUserName" label="登记人" min-width="90" />
+      <el-table-column prop="dealDate" label="登记时间" min-width="150px" />
+      <el-table-column prop="applyUserName" label="申请人" min-width="90" />
+      <el-table-column prop="applyTime" label="申请时间" min-width="150px" />
+      <el-table-column prop="stateName" label="审核状态" fixed="right" min-width="90" />
       <el-table-column label="操作" width="150px" fixed="right">
         <template #default="{ row }">
-          <el-button type="primary" style="padding: 0" text @click="handleDetail(row.id)"
-            >详情</el-button
+          <el-button type="primary" style="padding: 0" text @click="handleDetail(row.id)">
+            详情
+          </el-button>
+          <el-button
+            type="primary"
+            style="padding: 0"
+            text
+            v-if="row.state == 1 && currentUserId == row.applyUser"
+            v-hasPermi="['clue:order:return']"
+            @click="handleCancel(row.id)"
           >
-          <el-button type="primary" style="padding: 0" text @click="handleCancel(row.id)"
-            >撤销</el-button
-          >
-          <el-button type="primary" style="padding: 0" text @click="handleAudit(row.id)"
-            >审核</el-button
+            撤销
+          </el-button>
+          <el-button
+            type="primary"
+            style="padding: 0"
+            text
+            v-if="row.state == 1"
+            v-hasPermi="['clue:order:return-audit']"
+            @click="handleAudit(row.id)"
           >
+            审核
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -88,13 +109,23 @@
 </template>
 
 <script setup name="Reback">
+import * as FeebackApi from '@/api/clue/payment'
+import { getSimpleUserList as getUserOption } from '@/api/system/user'
+import { useUserStore } from '@/store/modules/user'
+
+const userStore = useUserStore()
+const message = useMessage() // 消息弹窗
+
+const currentUserId = userStore.getUser.id
+
 const searchForm = ref({
   signId: undefined,
   name: undefined,
+  state: undefined,
   dealDate: [],
-  dealUser: undefined,
-  createDate: [],
-  createUser: undefined,
+  signUser: undefined,
+  applyTime: [],
+  applyUser: undefined,
   pageNo: 1,
   pageSize: 20
 })
@@ -114,16 +145,25 @@ function handleReset() {
     signId: undefined,
     name: undefined,
     dealDate: [],
-    dealUser: undefined,
-    createDate: [],
-    createUser: undefined,
+    state: undefined,
+    signUser: undefined,
+    applyTime: [],
+    applyUser: undefined,
     pageNo: 1,
     pageSize: 20
   }
 }
 
-function getList() {
-  tableList.value = [{ name: '测试' }]
+const loading = ref(false)
+async function getList() {
+  loading.value = true
+  try {
+    const data = await FeebackApi.getPaymentPage(searchForm.value)
+    tableList.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
 }
 
 function batchAudit() {
@@ -133,14 +173,31 @@ function batchAudit() {
 function handleDetail(id) {
   console.log(id)
 }
-function handleCancel(id) {
-  console.log(id)
+async function handleCancel(id) {
+  try {
+    // 删除的二次确认
+    await message.confirm('是否确认撤销申请？')
+    // 发起删除
+    await FeebackApi.cancelApplyPayment({ id })
+    message.success('撤销成功！')
+    // 刷新列表
+    await getList()
+  } catch (err) {
+    console.log(err)
+  }
 }
 function handleAudit(id) {
   console.log(id)
 }
 
+function getOptions() {
+  getUserOption().then((data) => {
+    userOptions.value = data
+  })
+}
+
 onMounted(() => {
+  getOptions()
   handleSearch()
 })
 </script>

From 2017baaf03917f6ab1daa825c4e1f6c3291953a3 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Wed, 19 Jun 2024 00:43:05 +0800
Subject: [PATCH 5/9] =?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/afterSale.js | 2 +-
 src/api/clue/payment.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/clue/afterSale.js b/src/api/clue/afterSale.js
index b9b8056..9c43e6a 100644
--- a/src/api/clue/afterSale.js
+++ b/src/api/clue/afterSale.js
@@ -22,5 +22,5 @@ export const auditAfterSale = async (data) => {
 
 // 撤销
 export const cancelApplyAfterSale = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-after-sale/revoke', data })
+  return await request.post({ url: '/admin-api/crm/sign-after-sale/revoke', params: data })
 }
diff --git a/src/api/clue/payment.js b/src/api/clue/payment.js
index 5e8f613..277f90d 100644
--- a/src/api/clue/payment.js
+++ b/src/api/clue/payment.js
@@ -22,5 +22,5 @@ export const auditPayment = async (data) => {
 
 // 撤销
 export const cancelApplyPayment = async (data) => {
-  return await request.post({ url: '/admin-api/crm/sign-pay-record/revoke', data })
+  return await request.post({ url: '/admin-api/crm/sign-pay-record/revoke', params: data })
 }

From ea7fae45e36c2afae90698a74382ae0bc6b3e064 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Wed, 19 Jun 2024 11:56:00 +0800
Subject: [PATCH 6/9] =?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/components/Form/src/Form.vue              |   4 +-
 src/components/Search/src/Search.vue          |   2 +
 src/views/Clue/Order/Comp/AfterSales.vue      |  19 ++-
 src/views/Clue/Order/Comp/DialogAfterSale.vue |   4 +-
 .../Clue/Order/Comp/DialogAfterSaleAudit.vue  | 135 ++++++++++++++++++
 .../Clue/Order/Comp/DialogFeebackAudit.vue    | 125 ++++++++++++++++
 src/views/Clue/Order/Comp/OrderList.vue       |  24 +++-
 src/views/Clue/Order/Comp/Reback.vue          |  16 ++-
 8 files changed, 312 insertions(+), 17 deletions(-)
 create mode 100644 src/views/Clue/Order/Comp/DialogAfterSaleAudit.vue
 create mode 100644 src/views/Clue/Order/Comp/DialogFeebackAudit.vue

diff --git a/src/components/Form/src/Form.vue b/src/components/Form/src/Form.vue
index 7fc5dd1..f78267d 100644
--- a/src/components/Form/src/Form.vue
+++ b/src/components/Form/src/Form.vue
@@ -51,7 +51,8 @@ export default defineComponent({
     // 表单label宽度
     labelWidth: propTypes.oneOfType([String, Number]).def('auto'),
     // 是否 loading 数据中 add by 芋艿
-    vLoading: propTypes.bool.def(false)
+    vLoading: propTypes.bool.def(false),
+    inlineBlock: propTypes.bool.def(false)
   },
   emits: ['register'],
   setup(props, { slots, expose, emit }) {
@@ -289,6 +290,7 @@ export default defineComponent({
         model={props.isCustom ? props.model : formModel}
         class={prefixCls}
         v-loading={props.vLoading}
+        style={props.inlineBlock ? 'display: inline' : ''}
       >
         {{
           // 如果需要自定义，就什么都不渲染，而是提供默认插槽
diff --git a/src/components/Search/src/Search.vue b/src/components/Search/src/Search.vue
index a9f2ebc..c60109b 100644
--- a/src/components/Search/src/Search.vue
+++ b/src/components/Search/src/Search.vue
@@ -38,6 +38,7 @@ const props = defineProps({
   // 伸缩的界限字段
   expandField: propTypes.string.def(''),
   inline: propTypes.bool.def(true),
+  inlineBlock: propTypes.bool.def(false),
   model: {
     type: Object as PropType<Recordable>,
     default: () => ({})
@@ -154,6 +155,7 @@ initSearch()
   <!-- update by 芋艿：class="-mb-15px" 用于降低和 ContentWrap 组件的底部距离，避免空隙过大 -->
   <Form
     :inline="inline"
+    :inlineBlock="inlineBlock"
     :is-col="isCol"
     :is-custom="false"
     isSearch
diff --git a/src/views/Clue/Order/Comp/AfterSales.vue b/src/views/Clue/Order/Comp/AfterSales.vue
index 1c11aaa..29785cf 100644
--- a/src/views/Clue/Order/Comp/AfterSales.vue
+++ b/src/views/Clue/Order/Comp/AfterSales.vue
@@ -29,6 +29,8 @@
         <el-date-picker
           v-model="searchForm.dealDate"
           type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           range-separator="-"
           start-placeholder="登记日期"
           end-placeholder="登记日期"
@@ -48,6 +50,8 @@
         <el-date-picker
           v-model="searchForm.applyTime"
           type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           range-separator="-"
           start-placeholder="申请日期"
           end-placeholder="申请日期"
@@ -94,7 +98,7 @@
             text
             v-if="row.state == 1"
             v-hasPermi="['clue:order:after-sale-audit']"
-            @click="handleAudit(row.id)"
+            @click="handleAudit(row)"
           >
             审核
           </el-button>
@@ -107,6 +111,7 @@
       :total="total"
       @pagination="getList"
     />
+    <DialogAfterSaleAudit ref="afterSaleAuditDialog" @success="getList" />
   </div>
 </template>
 
@@ -115,6 +120,10 @@ import * as AfterSaleApi from '@/api/clue/afterSale'
 import { getSimpleUserList as getUserOption } from '@/api/system/user'
 import { useUserStore } from '@/store/modules/user'
 
+import DialogAfterSaleAudit from './DialogAfterSaleAudit.vue'
+
+const afterSaleAuditDialog = ref()
+
 const userStore = useUserStore()
 const message = useMessage() // 消息弹窗
 
@@ -168,8 +177,8 @@ async function getList() {
   }
 }
 
-function batchAudit() {
-  console.log(123)
+function batchAudit(row) {
+  afterSaleAuditDialog.value.open(row)
 }
 
 function handleDetail(id) {
@@ -188,8 +197,8 @@ async function handleCancel(id) {
     console.log(err)
   }
 }
-function handleAudit(id) {
-  console.log(id)
+function handleAudit(row) {
+  afterSaleAuditDialog.value.open(row)
 }
 
 function getOptions() {
diff --git a/src/views/Clue/Order/Comp/DialogAfterSale.vue b/src/views/Clue/Order/Comp/DialogAfterSale.vue
index c8f1081..d943a54 100644
--- a/src/views/Clue/Order/Comp/DialogAfterSale.vue
+++ b/src/views/Clue/Order/Comp/DialogAfterSale.vue
@@ -14,8 +14,8 @@
       新增售后
     </el-button>
     <el-form v-if="!showAdd" :model="form" ref="formRef" :rules="rules" label-width="80px">
-      <el-form-item label="退款原因" prop="reason">
-        <el-input v-model="form.reason" placeholder="请输入退款原因" />
+      <el-form-item label="售后原因" prop="reason">
+        <el-input v-model="form.reason" placeholder="请输入售后原因" />
       </el-form-item>
       <el-form-item label="退款金额" prop="refundAmount">
         <el-input-number
diff --git a/src/views/Clue/Order/Comp/DialogAfterSaleAudit.vue b/src/views/Clue/Order/Comp/DialogAfterSaleAudit.vue
new file mode 100644
index 0000000..d2b7b0e
--- /dev/null
+++ b/src/views/Clue/Order/Comp/DialogAfterSaleAudit.vue
@@ -0,0 +1,135 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
+    <Descriptions :data="orderInfo" :schema="schema" :columns="2" labelWidth="130px" />
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+      <el-form-item label="状态" prop="state">
+        <el-radio-group v-model="formData.state">
+          <el-radio :label="3"> 通过 </el-radio>
+          <el-radio :label="4"> 驳回 </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <Editor v-model:modelValue="formData.remark" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script name="DialogAfterSaleAudit" setup>
+import { auditAfterSale } from '@/api/clue/afterSale'
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+
+const schema = [
+  {
+    field: 'name',
+    label: '线索名称',
+    span: 1
+  },
+  {
+    field: 'phone',
+    label: '联系方式',
+    span: 1
+  },
+  {
+    field: 'signUserName',
+    label: '登记人',
+    span: 1
+  },
+  {
+    field: 'dealDate',
+    label: '登记时间',
+    span: 1
+  },
+  {
+    field: 'reason',
+    label: '售后原因',
+    span: 1
+  },
+  {
+    field: 'solution',
+    label: '解决方案',
+    span: 1
+  },
+  {
+    field: 'refundAmount',
+    label: '退款金额',
+    span: 1
+  },
+  {
+    field: 'isReturns',
+    label: '是否退货',
+    span: 1
+  },
+  {
+    field: 'applyUserName',
+    label: '申请人',
+    span: 1
+  },
+  {
+    field: 'applyTime',
+    label: '申请时间',
+    span: 1
+  },
+  {
+    field: 'remark',
+    label: '备注',
+    span: 2,
+    isEditor: true
+  }
+]
+
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  state: 3,
+  remark: ''
+})
+const formRef = ref() // 表单 Ref
+
+const orderInfo = ref({})
+/** 打开弹窗 */
+const open = async (row) => {
+  dialogVisible.value = true
+  dialogTitle.value = '售后审核'
+  resetForm(row.id)
+  // 修改时，设置数据
+  orderInfo.value = { ...row }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    await auditAfterSale(formData.value)
+    message.success('审核完成！')
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = (signId) => {
+  formData.value = {
+    saleId: signId,
+    state: 3,
+    remark: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/Clue/Order/Comp/DialogFeebackAudit.vue b/src/views/Clue/Order/Comp/DialogFeebackAudit.vue
new file mode 100644
index 0000000..e2ec956
--- /dev/null
+++ b/src/views/Clue/Order/Comp/DialogFeebackAudit.vue
@@ -0,0 +1,125 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
+    <Descriptions :data="orderInfo" :schema="schema" :columns="2" labelWidth="130px" />
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+      <el-form-item label="状态" prop="state">
+        <el-radio-group v-model="formData.state">
+          <el-radio :label="3"> 通过 </el-radio>
+          <el-radio :label="4"> 驳回 </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <Editor v-model:modelValue="formData.remark" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script name="DialogFeebackAudit" setup>
+import { auditPayment } from '@/api/clue/payment'
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+
+const schema = [
+  {
+    field: 'name',
+    label: '线索名称',
+    span: 1
+  },
+  {
+    field: 'phone',
+    label: '联系方式',
+    span: 1
+  },
+  {
+    field: 'signUserName',
+    label: '登记人',
+    span: 1
+  },
+  {
+    field: 'dealDate',
+    label: '登记时间',
+    span: 1
+  },
+  {
+    field: 'money',
+    label: '回款金额',
+    span: 1
+  },
+  {
+    field: 'isPayoff',
+    label: '是否结清',
+    span: 1
+  },
+  {
+    field: 'applyUserName',
+    label: '申请人',
+    span: 1
+  },
+  {
+    field: 'applyTime',
+    label: '申请时间',
+    span: 1
+  },
+  {
+    field: 'remark',
+    label: '备注',
+    span: 2,
+    isEditor: true
+  }
+]
+
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  state: 3,
+  remark: ''
+})
+const formRef = ref() // 表单 Ref
+
+const orderInfo = ref({})
+/** 打开弹窗 */
+const open = async (row) => {
+  dialogVisible.value = true
+  dialogTitle.value = '回款审核'
+  resetForm(row.id)
+  // 修改时，设置数据
+  orderInfo.value = { ...row }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    await auditPayment(formData.value)
+    message.success('审核完成！')
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = (signId) => {
+  formData.value = {
+    payId: signId,
+    state: 3,
+    remark: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue
index 36c2771..64420b8 100644
--- a/src/views/Clue/Order/Comp/OrderList.vue
+++ b/src/views/Clue/Order/Comp/OrderList.vue
@@ -2,9 +2,15 @@
   <div>
     <!-- 搜索工作栏 -->
     <div>
-      <el-form :model="searchForm" ref="moreSearchRef" inline label-width="0">
+      <el-form
+        :model="searchForm"
+        ref="moreSearchRef"
+        inline
+        label-width="0"
+        style="display: inline"
+      >
         <template v-if="appStore.getAppInfo?.instanceType == 1">
-          <el-form-item>
+          <el-form-item style="margin-bottom: 10px">
             <el-select
               v-model="searchForm.signSchool"
               placeholder="选择驾校"
@@ -20,7 +26,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item>
+          <el-form-item style="margin-bottom: 10px">
             <el-select
               v-model="searchForm.signPlace"
               placeholder="选择场地"
@@ -37,7 +43,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item>
+          <el-form-item style="margin-bottom: 10px">
             <el-select
               v-model="searchForm.signClass"
               :disabled="!searchForm.signPlace"
@@ -87,7 +93,13 @@
           </el-form-item>
         </template>
       </el-form>
-      <Search v-if="!loading" ref="searchRef" :schema="allSchemas.searchSchema" labelWidth="0">
+      <Search
+        v-if="!loading"
+        ref="searchRef"
+        :schema="allSchemas.searchSchema"
+        inlineBlock
+        labelWidth="0"
+      >
         <template #actionMore>
           <el-button @click="getTableList" v-hasPermi="['clue:order:search']"> 搜索 </el-button>
           <el-button @click="resetQuery" v-hasPermi="['clue:order:reset']"> 重置 </el-button>
@@ -97,7 +109,7 @@
     <!-- 列表 -->
     <SSTable
       v-if="!loading"
-      class="mt-20px"
+      class="mt-10px"
       v-model:tableObject="tableObject"
       :tableColumns="allSchemas.tableColumns"
       @get-list="getTableList"
diff --git a/src/views/Clue/Order/Comp/Reback.vue b/src/views/Clue/Order/Comp/Reback.vue
index 427c973..724e2ec 100644
--- a/src/views/Clue/Order/Comp/Reback.vue
+++ b/src/views/Clue/Order/Comp/Reback.vue
@@ -29,6 +29,8 @@
         <el-date-picker
           v-model="searchForm.dealDate"
           type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           range-separator="-"
           start-placeholder="登记日期"
           end-placeholder="登记日期"
@@ -48,6 +50,8 @@
         <el-date-picker
           v-model="searchForm.applyTime"
           type="daterange"
+          format="YYYY-MM-DD"
+          value-format="YYYY-MM-DD"
           range-separator="-"
           start-placeholder="申请日期"
           end-placeholder="申请日期"
@@ -92,7 +96,7 @@
             text
             v-if="row.state == 1"
             v-hasPermi="['clue:order:return-audit']"
-            @click="handleAudit(row.id)"
+            @click="handleAudit(row)"
           >
             审核
           </el-button>
@@ -105,6 +109,8 @@
       :total="total"
       @pagination="getList"
     />
+
+    <DialogFeebackAudit ref="feebackDialog" @success="getList" />
   </div>
 </template>
 
@@ -113,9 +119,13 @@ import * as FeebackApi from '@/api/clue/payment'
 import { getSimpleUserList as getUserOption } from '@/api/system/user'
 import { useUserStore } from '@/store/modules/user'
 
+import DialogFeebackAudit from './DialogFeebackAudit.vue'
+
 const userStore = useUserStore()
 const message = useMessage() // 消息弹窗
 
+const feebackDialog = ref()
+
 const currentUserId = userStore.getUser.id
 
 const searchForm = ref({
@@ -186,8 +196,8 @@ async function handleCancel(id) {
     console.log(err)
   }
 }
-function handleAudit(id) {
-  console.log(id)
+function handleAudit(row) {
+  feebackDialog.value.open(row)
 }
 
 function getOptions() {

From 8df1f7d25a394277655127dc4234e0aa103b1f88 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Wed, 19 Jun 2024 15:04:20 +0800
Subject: [PATCH 7/9] =?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/afterSale.js                     |   9 ++
 src/api/clue/payment.js                       |   9 ++
 src/views/Clue/Order/Comp/AfterSales.vue      |  29 +++-
 .../Clue/Order/Comp/DialogAfterSaleDetail.vue | 137 ++++++++++++++++++
 .../Clue/Order/Comp/DialogBatchAudit.vue      |  87 +++++++++++
 .../Clue/Order/Comp/DialogFeebackDetail.vue   | 127 ++++++++++++++++
 src/views/Clue/Order/Comp/Reback.vue          |  29 +++-
 src/views/Home/Index.vue                      |   4 +-
 8 files changed, 421 insertions(+), 10 deletions(-)
 create mode 100644 src/views/Clue/Order/Comp/DialogAfterSaleDetail.vue
 create mode 100644 src/views/Clue/Order/Comp/DialogBatchAudit.vue
 create mode 100644 src/views/Clue/Order/Comp/DialogFeebackDetail.vue

diff --git a/src/api/clue/afterSale.js b/src/api/clue/afterSale.js
index 9c43e6a..685289a 100644
--- a/src/api/clue/afterSale.js
+++ b/src/api/clue/afterSale.js
@@ -20,7 +20,16 @@ export const auditAfterSale = async (data) => {
   return await request.post({ url: '/admin-api/crm/sign-after-sale/check', data })
 }
 
+export const batchAuditAfterSale = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-after-sale/batch/check', data })
+}
+
 // 撤销
 export const cancelApplyAfterSale = async (data) => {
   return await request.post({ url: '/admin-api/crm/sign-after-sale/revoke', params: data })
 }
+
+// 查询详情
+export const getAfterSaleDetail = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-after-sale/get', params })
+}
diff --git a/src/api/clue/payment.js b/src/api/clue/payment.js
index 277f90d..4a63fbf 100644
--- a/src/api/clue/payment.js
+++ b/src/api/clue/payment.js
@@ -20,7 +20,16 @@ export const auditPayment = async (data) => {
   return await request.post({ url: '/admin-api/crm/sign-pay-record/check', data })
 }
 
+export const batchAuditPayment = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-pay-record/batch/check', data })
+}
+
 // 撤销
 export const cancelApplyPayment = async (data) => {
   return await request.post({ url: '/admin-api/crm/sign-pay-record/revoke', params: data })
 }
+
+// 查询详情
+export const getPaymentDetail = async (params) => {
+  return await request.get({ url: '/admin-api/crm/sign-pay-record/get', params })
+}
diff --git a/src/views/Clue/Order/Comp/AfterSales.vue b/src/views/Clue/Order/Comp/AfterSales.vue
index 29785cf..04869c9 100644
--- a/src/views/Clue/Order/Comp/AfterSales.vue
+++ b/src/views/Clue/Order/Comp/AfterSales.vue
@@ -64,7 +64,13 @@
       </el-form-item>
     </el-form>
 
-    <el-table :data="tableList" border>
+    <el-table
+      v-loading="loading"
+      :data="tableList"
+      border
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" :selectable="(row) => row.state == 1" />
       <el-table-column prop="signId" label="成交单号" min-width="150px" />
       <el-table-column prop="name" label="线索名称" min-width="200px" />
       <el-table-column prop="phone" label="联系方式" min-width="150px" />
@@ -112,6 +118,8 @@
       @pagination="getList"
     />
     <DialogAfterSaleAudit ref="afterSaleAuditDialog" @success="getList" />
+    <DialogAfterSaleDetail ref="afterSaleDetailDialog" />
+    <DialogBatchAudit ref="batchAuditDialog" @success="getList" />
   </div>
 </template>
 
@@ -121,6 +129,8 @@ import { getSimpleUserList as getUserOption } from '@/api/system/user'
 import { useUserStore } from '@/store/modules/user'
 
 import DialogAfterSaleAudit from './DialogAfterSaleAudit.vue'
+import DialogAfterSaleDetail from './DialogAfterSaleDetail.vue'
+import DialogBatchAudit from './DialogBatchAudit.vue'
 
 const afterSaleAuditDialog = ref()
 
@@ -177,12 +187,23 @@ async function getList() {
   }
 }
 
-function batchAudit(row) {
-  afterSaleAuditDialog.value.open(row)
+const batchIds = ref([])
+function handleSelectionChange(val) {
+  batchIds.value = val
 }
 
+const batchAuditDialog = ref()
+function batchAudit() {
+  if (batchIds.value.length) {
+    batchAuditDialog.value.open('aftersale', batchIds.value)
+  } else {
+    message.info('请选择表格中需要审核的数据')
+  }
+}
+
+const afterSaleDetailDialog = ref()
 function handleDetail(id) {
-  console.log(id)
+  afterSaleDetailDialog.value.open(id)
 }
 async function handleCancel(id) {
   try {
diff --git a/src/views/Clue/Order/Comp/DialogAfterSaleDetail.vue b/src/views/Clue/Order/Comp/DialogAfterSaleDetail.vue
new file mode 100644
index 0000000..83277ad
--- /dev/null
+++ b/src/views/Clue/Order/Comp/DialogAfterSaleDetail.vue
@@ -0,0 +1,137 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="900px">
+    <Descriptions
+      title="申请详情"
+      :data="orderInfo"
+      :schema="applySchema"
+      :columns="2"
+      labelWidth="130px"
+    />
+    <Descriptions
+      title="审核详情"
+      :data="orderInfo"
+      :schema="orderInfo.state == 2 ? cancelSchema : auditSchema"
+      :columns="orderInfo.state == 2 ? 2 : 3"
+      labelWidth="100px"
+    />
+  </Dialog>
+</template>
+<script name="DialogAfterSaleDetail" setup>
+import { getAfterSaleDetail } from '@/api/clue/afterSale'
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+
+const applySchema = [
+  {
+    field: 'name',
+    label: '线索名称',
+    span: 1
+  },
+  {
+    field: 'phone',
+    label: '联系方式',
+    span: 1
+  },
+  {
+    field: 'signUserName',
+    label: '登记人',
+    span: 1
+  },
+  {
+    field: 'dealDate',
+    label: '登记时间',
+    dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    span: 1
+  },
+  {
+    field: 'reason',
+    label: '售后原因',
+    span: 1
+  },
+  {
+    field: 'refundAmount',
+    label: '退款金额',
+    span: 1
+  },
+  {
+    field: 'isReturns',
+    label: '是否退货',
+    span: 1
+  },
+  {
+    field: 'solution',
+    label: '解决方案',
+    span: 1
+  },
+  {
+    field: 'applyUserName',
+    label: '申请人',
+    span: 1
+  },
+  {
+    field: 'applyTime',
+    label: '申请时间',
+    dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    span: 1
+  },
+  {
+    field: 'remark',
+    label: '备注',
+    span: 2,
+    isEditor: true
+  }
+]
+
+const auditSchema = [
+  {
+    field: 'stateName',
+    label: '审核状态',
+    span: 1
+  },
+  {
+    field: 'checkUserName',
+    label: '审核人',
+    span: 1
+  },
+  {
+    field: 'checkTime',
+    label: '审核时间',
+    dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    span: 1
+  },
+  {
+    field: 'checkRemark',
+    label: '备注',
+    span: 3,
+    isEditor: true
+  }
+]
+
+const cancelSchema = [
+  {
+    field: 'stateName',
+    label: '审核状态',
+    span: 1
+  },
+  {
+    field: 'revokeTime',
+    label: '撤销时间',
+    dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    span: 1
+  }
+]
+
+const orderInfo = ref({})
+/** 打开弹窗 */
+const open = async (id) => {
+  dialogVisible.value = true
+  dialogTitle.value = '售后申请详情'
+  try {
+    orderInfo.value = await getAfterSaleDetail({ id })
+  } catch (error) {
+    console.log(error)
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/Clue/Order/Comp/DialogBatchAudit.vue b/src/views/Clue/Order/Comp/DialogBatchAudit.vue
new file mode 100644
index 0000000..4204057
--- /dev/null
+++ b/src/views/Clue/Order/Comp/DialogBatchAudit.vue
@@ -0,0 +1,87 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="600px">
+    <el-form ref="formRef" v-loading="formLoading" :model="formData" label-width="80px">
+      <el-form-item label="状态" prop="state">
+        <el-radio-group v-model="formData.state">
+          <el-radio :label="3"> 通过 </el-radio>
+          <el-radio :label="4"> 驳回 </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <Editor v-model:modelValue="formData.remark" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script name="DialogAfterSaleAudit" setup>
+import { batchAuditAfterSale } from '@/api/clue/afterSale'
+import { batchAuditPayment } from '@/api/clue/payment'
+
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  state: 3,
+  remark: ''
+})
+const formRef = ref() // 表单 Ref
+const formType = ref('aftersale')
+const titleMap = {
+  aftersale: '批量售后审核',
+  feeback: '批量回款审核'
+}
+
+/** 打开弹窗 */
+const open = (type, ids) => {
+  dialogVisible.value = true
+  formType.value = type
+  dialogTitle.value = titleMap[type] || '批量审核'
+  resetForm(ids)
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef.value) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    if (formType.value == 'aftersale') {
+      await batchAuditAfterSale(formData.value)
+      message.success('审核完成！')
+    } else if (formType.value == 'feeback') {
+      await batchAuditPayment(formData.value)
+      message.success('审核完成！')
+    } else {
+      return
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = (ids) => {
+  formData.value = {
+    payIds: ids,
+    saleIds: ids,
+    state: 3,
+    remark: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/Clue/Order/Comp/DialogFeebackDetail.vue b/src/views/Clue/Order/Comp/DialogFeebackDetail.vue
new file mode 100644
index 0000000..f524eb9
--- /dev/null
+++ b/src/views/Clue/Order/Comp/DialogFeebackDetail.vue
@@ -0,0 +1,127 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="900px">
+    <Descriptions
+      title="申请详情"
+      :data="orderInfo"
+      :schema="applySchema"
+      :columns="2"
+      labelWidth="130px"
+    />
+    <Descriptions
+      title="审核详情"
+      :data="orderInfo"
+      :schema="orderInfo.state == 2 ? cancelSchema : auditSchema"
+      :columns="orderInfo.state == 2 ? 2 : 3"
+      labelWidth="100px"
+    />
+  </Dialog>
+</template>
+<script name="DialogFeebackDetail" setup>
+import { getPaymentDetail } from '@/api/clue/payment'
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+
+const applySchema = [
+  {
+    field: 'name',
+    label: '线索名称',
+    span: 1
+  },
+  {
+    field: 'phone',
+    label: '联系方式',
+    span: 1
+  },
+  {
+    field: 'signUserName',
+    label: '登记人',
+    span: 1
+  },
+  {
+    field: 'dealDate',
+    label: '登记时间',
+    dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    span: 1
+  },
+  {
+    field: 'money',
+    label: '回款金额',
+    span: 1
+  },
+  {
+    field: 'isPayoff',
+    label: '是否结清',
+    span: 1
+  },
+  {
+    field: 'applyUserName',
+    label: '申请人',
+    span: 1
+  },
+  {
+    field: 'applyTime',
+    label: '申请时间',
+    dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    span: 1
+  },
+  {
+    field: 'remark',
+    label: '备注',
+    span: 2,
+    isEditor: true
+  }
+]
+
+const auditSchema = [
+  {
+    field: 'stateName',
+    label: '审核状态',
+    span: 1
+  },
+  {
+    field: 'checkUserName',
+    label: '审核人',
+    span: 1
+  },
+  {
+    field: 'checkTime',
+    label: '审核时间',
+    dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    span: 1
+  },
+  {
+    field: 'checkRemark',
+    label: '备注',
+    span: 3,
+    isEditor: true
+  }
+]
+
+const cancelSchema = [
+  {
+    field: 'stateName',
+    label: '审核状态',
+    span: 1
+  },
+  {
+    field: 'revokeTime',
+    label: '撤销时间',
+    dateFormat: 'YYYY-MM-DD HH:mm:ss',
+    span: 1
+  }
+]
+
+const orderInfo = ref({})
+/** 打开弹窗 */
+const open = async (id) => {
+  dialogVisible.value = true
+  dialogTitle.value = '回款申请详情'
+  try {
+    orderInfo.value = await getPaymentDetail({ id })
+  } catch (error) {
+    console.log(error)
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/Clue/Order/Comp/Reback.vue b/src/views/Clue/Order/Comp/Reback.vue
index 724e2ec..26be7e2 100644
--- a/src/views/Clue/Order/Comp/Reback.vue
+++ b/src/views/Clue/Order/Comp/Reback.vue
@@ -64,7 +64,13 @@
       </el-form-item>
     </el-form>
 
-    <el-table v-loading="loading" :data="tableList" border>
+    <el-table
+      v-loading="loading"
+      :data="tableList"
+      border
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" :selectable="(row) => row.state == 1" />
       <el-table-column prop="signId" label="成交单号" min-width="150px" />
       <el-table-column prop="name" label="线索名称" min-width="200px" />
       <el-table-column prop="phone" label="联系方式" min-width="150px" />
@@ -111,6 +117,8 @@
     />
 
     <DialogFeebackAudit ref="feebackDialog" @success="getList" />
+    <DialogFeebackDetail ref="feebackDetailDialog" />
+    <DialogBatchAudit ref="batchAuditDialog" @success="getList" />
   </div>
 </template>
 
@@ -120,6 +128,8 @@ import { getSimpleUserList as getUserOption } from '@/api/system/user'
 import { useUserStore } from '@/store/modules/user'
 
 import DialogFeebackAudit from './DialogFeebackAudit.vue'
+import DialogFeebackDetail from './DialogFeebackDetail.vue'
+import DialogBatchAudit from './DialogBatchAudit.vue'
 
 const userStore = useUserStore()
 const message = useMessage() // 消息弹窗
@@ -176,12 +186,23 @@ async function getList() {
   }
 }
 
-function batchAudit() {
-  console.log(123)
+const batchIds = ref([])
+function handleSelectionChange(val) {
+  batchIds.value = val
 }
 
+const batchAuditDialog = ref()
+function batchAudit() {
+  if (batchIds.value.length) {
+    batchAuditDialog.value.open('aftersale', batchIds.value)
+  } else {
+    message.info('请选择表格中需要审核的数据')
+  }
+}
+
+const feebackDetailDialog = ref()
 function handleDetail(id) {
-  console.log(id)
+  feebackDetailDialog.value.open(id)
 }
 async function handleCancel(id) {
   try {
diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue
index fb08edd..0f2b5e4 100644
--- a/src/views/Home/Index.vue
+++ b/src/views/Home/Index.vue
@@ -203,7 +203,7 @@ const getMonthlySaleRate = async () => {
   )
   set(lineOptionsData, 'series', [
     {
-      name: t('analysis.estimate'),
+      name: '个人成交率',
       smooth: true,
       type: 'line',
       data: data.map((v) => v.estimate),
@@ -211,7 +211,7 @@ const getMonthlySaleRate = async () => {
       animationEasing: 'cubicInOut'
     },
     {
-      name: t('analysis.actual'),
+      name: '平均成交率',
       smooth: true,
       type: 'line',
       itemStyle: {},

From 37818cb1e67394d175219c33e462f5313edcef73 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Wed, 19 Jun 2024 17:16:34 +0800
Subject: [PATCH 8/9] =?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>

From 013a93e668f318ddd01a4ed87d753554951e5c87 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Wed, 19 Jun 2024 17:43:16 +0800
Subject: [PATCH 9/9] =?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/views/Clue/Set/Comp/ClueSend.vue | 4 ++--
 src/views/Clue/Set/index.vue         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/Clue/Set/Comp/ClueSend.vue b/src/views/Clue/Set/Comp/ClueSend.vue
index 358973c..3315e3b 100644
--- a/src/views/Clue/Set/Comp/ClueSend.vue
+++ b/src/views/Clue/Set/Comp/ClueSend.vue
@@ -93,7 +93,7 @@ const loading = ref(false)
 const userList = ref([])
 
 function setRowClass({ row }) {
-  return row.field == currentRowId.value ? 'current-row' : ''
+  return row.id == currentRowId.value ? 'current-row' : ''
 }
 
 const currentRowId = ref('')
@@ -144,7 +144,7 @@ function resourceCheckedChange(val) {
 }
 
 function handleRowClick(row) {
-  currentRowId.value = row.ruleId
+  currentRowId.value = row.id
   form.value = { ...row }
 }
 
diff --git a/src/views/Clue/Set/index.vue b/src/views/Clue/Set/index.vue
index 3428c33..4af410f 100644
--- a/src/views/Clue/Set/index.vue
+++ b/src/views/Clue/Set/index.vue
@@ -44,8 +44,8 @@
 import FieldClue from './Comp/FieldClue.vue'
 import FieldOrder from './Comp/FieldOrder.vue'
 import ClueSource from './Comp/ClueSource.vue'
-// import ClueGet from './Comp/ClueGet.vue'
-// import ClueSend from './Comp/ClueSend.vue'
+import ClueGet from './Comp/ClueGet.vue'
+import ClueSend from './Comp/ClueSend.vue'
 // import MsgSend from './Comp/MsgSend.vue'
 import IntentionStatus from './Comp/IntentionStatus.vue'
 import ExtraFeeType from './Comp/ExtraFeeType.vue'