Merge branch 'feature_20241220_客资、客诉去掉-转交其他组织操作，优化列表筛选条件'

# Conflicts:
#	src/views/clew/clewent.vue
#	src/views/clew/index.vue

src/api/clew.js

@@ -1,52 +1,60 @@
-import request from '@/utils/request'
+import request from '@/utils/request';
 
 // 不想写
 export function infolist(query) {
-    return request({
-        url: 'mobile/customerClueInfo/infolist',
-        method: 'get',
-        params: query
-    })
+  return request({
+    url: 'mobile/customerClueInfo/infolist',
+    method: 'get',
+    params: query,
+  });
 }
 export function getCustomerClueInfoById(query) {
-    return request({
-        url: 'mobile/customerClueInfo/getCustomerClueInfoById',
-        method: 'get',
-        params: query
-    })
+  return request({
+    url: 'mobile/customerClueInfo/getCustomerClueInfoById',
+    method: 'get',
+    params: query,
+  });
 }
 export function insertCustomerClueAnswer(data) {
-    return request({
-        url: 'mobile/customerClueInfo/insertCustomerClueAnswer',
-        method: 'post',
-        data
-    })
+  return request({
+    url: 'mobile/customerClueInfo/insertCustomerClueAnswer',
+    method: 'post',
+    data,
+  });
 }
 export function addPhotoK(data) {
-    return request({
-        url: 'mobile/customerClueInfo/addPhoto',
-        method: 'post',
-        data
-    })
+  return request({
+    url: 'mobile/customerClueInfo/addPhoto',
+    method: 'post',
+    data,
+  });
 }
 export function getCustomerClueAnswerById(query) {
-    return request({
-        url: 'mobile/customerClueInfo/getCustomerClueAnswerById',
-        method: 'get',
-        params: query
-    })
+  return request({
+    url: 'mobile/customerClueInfo/getCustomerClueAnswerById',
+    method: 'get',
+    params: query,
+  });
 }
 export function getDeptInfo(query) {
-    return request({
-        url: 'mobile/customerClueInfo/getDeptInfo',
-        method: 'get',
-        params: query
-    })
+  return request({
+    url: 'mobile/customerClueInfo/getDeptInfo',
+    method: 'get',
+    params: query,
+  });
 }
 export function updateCustomerClueDept(query) {
-    return request({
-        url: 'mobile/customerClueInfo/updateCustomerClueDept',
-        method: 'get',
-        params: query
-    })
-}
+  return request({
+    url: 'mobile/customerClueInfo/updateCustomerClueDept',
+    method: 'get',
+    params: query,
+  });
+}
+//查询客资列表分组
+export function getCustomerClueType(query) {
+  return request({
+    url: 'mobile/customerClueInfo/getCustomerClueType',
+    method: 'get',
+    params: query,
+  });
+}

src/views/clew/complaintDetail/index.vue

@@ -8,9 +8,9 @@
     <div class="lineGrey"></div>
     <div class="lineGrey"></div>
     <div class="lineGrey"></div>
-    <!-- 客诉详情 -->
+    <!-- 投诉详情 -->
     <infoDetail v-if="infoData" :infoData="infoData" :customerClassify="customerClassifyOption">
-      <van-button
+      <!-- <van-button
         type="info"
         v-if="infoData.customerClueStatus == 0"
         style="
@@ -26,16 +26,16 @@
         class="centerBtn"
         @click="onstopVisit"
         >转交其他组织</van-button
-      >
+      > -->
     </infoDetail>
-    <!-- 客诉记录 -->
+    <!-- 投诉记录 -->
     <complaintLog
       v-if="infoData && infoData.customerClueInfoComplaintList.length"
       :customerClueInfoComplaintList="infoData.customerClueInfoComplaintList"></complaintLog>
     <!-- 跟进记录 userCustomerClueList -->
     <!-- 历史跟进记录 -->
     <p style="margin: 0 16px 8px; color: #888" v-if="infoData && infoData.userCustomerClueList">
-      该客诉历史跟进记录
+      该投诉历史跟进记录
     </p>
     <van-cell-group inset class="cardclewContentCell" v-if="infoData">
       <div style="border-radius: 6px; overflow: hidden">
@@ -124,10 +124,10 @@
         </van-col>
       </van-row>
     </van-dialog>
-    <!-- 客诉跟进历史 -->
+    <!-- 渠道投诉跟进历史 -->
     <van-dialog
       v-model="showView"
-      title="客诉历史"
+      title="投诉历史"
       show-cancel-button
       cancel-button-text="关闭"
       :show-confirm-button="false"
@@ -289,7 +289,7 @@ export default {
             this.$dialog
               .confirm({
                 title: '提示',
-                message: '该客诉已经被转移给其他人',
+                message: '该渠道投诉已经被转移给其他人',
                 showCancelButton: false,
               })
               .then(() => {

src/views/clew/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="bgcolor clew">
     <div class="navBarTOP">
-      <van-nav-bar class="navBar" title="客资任务" left-arrow @click-left="onClickLeft">
+      <van-nav-bar class="navBar" title="客资&投诉任务" left-arrow @click-left="onClickLeft">
         <template #right>
           <van-dropdown-menu>
             <van-dropdown-item
@@ -61,10 +61,10 @@
 </template>
 
 <script>
-import { infolist } from '@/api/clew';
 import { getDictOption } from '@/api';
 import { mapState } from 'vuex';
 import store from '@/store';
+import { infolist, getCustomerClueType } from '@/api/clew';
 export default {
   name: 'clew',
   computed: {
@@ -85,7 +85,6 @@ export default {
   },
   created() {
     this.getCustomerClue();
-    this.approveList();
   },
   activated() {},
   watch: {
@@ -117,7 +116,7 @@ export default {
   },
   methods: {
     async getCustomerClue() {
-      let option = await getDictOption({}, 'customer_clue');
+      let option = await getCustomerClueType();
       let arr = [{ text: '全部', value: -1 }];
       option.data.forEach((val) => {
         arr.push({
@@ -126,7 +125,7 @@ export default {
         });
       });
       this.customerClueOption = arr;
-      console.log(this.customerClueOption);
+      this.approveList();
     },
     submit() {
       var taskIds = [];
@@ -161,7 +160,7 @@ export default {
     },
     approveFn(row) {
       if (row.cid == 9) {
-        // 渠道客诉
+        // 渠道投诉
         this.$router.push({
           path: '/complaintDetail',
           query: { id: row.customerClueInfoId },