From 252f23f96d1ed5606c4a8dd5516df8fa0c912f9c Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Tue, 30 Jul 2024 10:41:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Clue/Order/Comp/MallOrderList.vue |  2 +-
 src/views/Clue/Order/Comp/OrderList.vue     |  2 +-
 src/views/Clue/Order/Comp/Reback.vue        | 36 +++++++++++++++++++++
 src/views/Clue/Pool/Comp/DialogSuccess.vue  | 12 -------
 src/views/Clue/Pool/index.vue               |  2 +-
 5 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue
index c2fc013..1b30752 100644
--- a/src/views/Clue/Order/Comp/MallOrderList.vue
+++ b/src/views/Clue/Order/Comp/MallOrderList.vue
@@ -286,7 +286,7 @@ async function getCurdSchemas() {
   try {
     const data = await getSimpleFieldList()
     data.forEach((elem) => {
-      if (elem.field == 'createUser') {
+      if (['createUser', 'convertPeople', 'receiver'].includes(elem.field)) {
         elem.search.options = userOptions.value
       }
     })
diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue
index 12d26ed..cc07875 100644
--- a/src/views/Clue/Order/Comp/OrderList.vue
+++ b/src/views/Clue/Order/Comp/OrderList.vue
@@ -260,7 +260,7 @@ async function getCurdSchemas() {
   try {
     const data = await getSimpleFieldList()
     data.forEach((elem) => {
-      if (elem.field == 'createUser') {
+      if (['createUser', 'convertPeople', 'receiver'].includes(elem.field)) {
         elem.search.options = userOptions.value
       }
     })
diff --git a/src/views/Clue/Order/Comp/Reback.vue b/src/views/Clue/Order/Comp/Reback.vue
index 1ac72a8..bc0e7a6 100644
--- a/src/views/Clue/Order/Comp/Reback.vue
+++ b/src/views/Clue/Order/Comp/Reback.vue
@@ -15,6 +15,26 @@
           <el-option label="已驳回" :value="4" />
         </el-select>
       </el-form-item>
+      <el-form-item v-if="appStore.getAppInfo?.instanceType == 1">
+        <el-select v-model="searchForm.receiver" 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 v-else-if="appStore.getAppInfo?.instanceType == 2">
+        <el-select v-model="searchForm.convertPeople" 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-select v-model="searchForm.signUser" placeholder="登记人" clearable filterable>
           <el-option
@@ -76,6 +96,18 @@
       <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
+        v-if="appStore.getAppInfo?.instanceType == 1"
+        prop="receiverName"
+        label="接待人"
+        min-width="90"
+      />
+      <el-table-column
+        v-else-if="appStore.getAppInfo?.instanceType == 2"
+        prop="convertPeopleName"
+        label="转化人"
+        min-width="90"
+      />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
       <el-table-column
         prop="dealDate"
@@ -142,10 +174,12 @@ import DialogFeebackDetail from './DialogFeebackDetail.vue'
 import DialogBatchAudit from './DialogBatchAudit.vue'
 
 import { removeNullField } from '@/utils'
+import { useAppStore } from '@/store/modules/app'
 import { dateFormatter } from '@/utils/formatTime'
 
 const userStore = useUserStore()
 const message = useMessage() // 消息弹窗
+const appStore = useAppStore()
 
 const feebackDialog = ref()
 
@@ -176,6 +210,8 @@ function handleSearch() {
 function handleReset() {
   searchForm.value = {
     signId: undefined,
+    receiver: undefined,
+    convertPeople: undefined,
     name: undefined,
     dealDate: [],
     state: undefined,
diff --git a/src/views/Clue/Pool/Comp/DialogSuccess.vue b/src/views/Clue/Pool/Comp/DialogSuccess.vue
index 4dd7d87..97e364e 100644
--- a/src/views/Clue/Pool/Comp/DialogSuccess.vue
+++ b/src/views/Clue/Pool/Comp/DialogSuccess.vue
@@ -129,18 +129,6 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8" :offset="0" v-if="appStore.getAppInfo?.instanceType == 2">
-          <el-form-item label="转化人" prop="convertPeople">
-            <el-select v-model="form.convertPeople" 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-col>
         <el-col
           :span="8"
           :offset="0"
diff --git a/src/views/Clue/Pool/index.vue b/src/views/Clue/Pool/index.vue
index 578eae8..4edd667 100644
--- a/src/views/Clue/Pool/index.vue
+++ b/src/views/Clue/Pool/index.vue
@@ -214,7 +214,7 @@ async function getCurdSchemas() {
   try {
     const data = await getSimpleFieldList()
     data.forEach((elem) => {
-      if (elem.field == 'followUser') {
+      if (elem.field == 'followUser' || elem.field == 'convertPeople') {
         elem.search.options = userOptions.value
       }
     })