Merge branch 'feature_20260304_客资客诉超时处理' into uat(dev)

src/views/clew/clewentDetails.vue

@@ -38,9 +38,11 @@
       最后一次跟进时间：{{ infoData.latestClueTime }}
     </div>
     <div class="info">
-      跟进状态：<span v-if="infoData.isClose == 1">跟进完成</span
-      ><span v-if="infoData.isClose == 0">跟进中</span
-      ><span v-if="infoData.isClose == -1">未跟进</span>
+      跟进状态：
+      <span v-if="infoData.isClose == 1">跟进完成</span>
+      <span v-if="infoData.isClose == 0">跟进中</span>
+      <span v-if="infoData.isClose == -1">未跟进</span>
+      <span v-if="infoData.isClose == 2">已过期</span>
     </div>
     <div class="info" v-if="infoData.followUpResult" style="word-break: break-all">
       跟进结果：{{ infoData.followUpResult }}

src/views/clew/complaintDetail/index.vue

@@ -59,7 +59,12 @@
     </van-cell-group>
     <p v-if="infoData && infoData.isClose == 1" style="padding: 10px 0"></p>
     <!-- 跟进任务填写 -->
-    <div class="assign" v-if="infoData && (infoData.isClose != 1 || this.infoData.allowFollowUp)">
+    <div
+      class="assign"
+      v-if="
+        infoData &&
+        ((infoData.isClose != 1 && infoData.isClose != 2) || this.infoData.allowFollowUp)
+      ">
       <!-- <div class="assign"> -->
       <div style="padding: 10px 16px 0 16px; color: red; font-size: 14px">
         400客服已对来电进行分类，若分类有误，可重新分类
@@ -260,7 +265,7 @@ export default {
       this.customerClassifyOption = option.data || [];
       // 来电分类一
       let item = this.customerClassifyOption.find(
-        (val) => val.dictValue == this.infoData.customerClassify
+        (val) => val.dictValue == this.infoData.customerClassify,
       );
       this.customerClassifyValue = item ? item.remark : '';
       this.customerClassify = item ? item.dictValue : '';
@@ -271,7 +276,7 @@ export default {
       this.customerSubClassifyOption = option.data || [];
       // 来电分类二
       let item = this.customerSubClassifyOption.find(
-        (val) => val.dictValue == this.infoData.customerSubClassify
+        (val) => val.dictValue == this.infoData.customerSubClassify,
       );
       item = item || this.customerSubClassifyOption[0];
       this.customerSubClassifyValue = item.dictLabel || '';
@@ -285,7 +290,10 @@ export default {
         if (response.code == 200) {
           this.infoData = response.data;
           this.title = response.data.name;
-          if (this.infoData.isClose != 1 || this.infoData.allowFollowUp) {
+          if (
+            (this.infoData.isClose != 1 && this.infoData.isClose != 2) ||
+            this.infoData.allowFollowUp
+          ) {
             // response.data.customerClue.customerClueItemList[0].customerClueInfoId = this.id;
             this.taskGather = response.data.customerClue.customerClueItemList;
           }
@@ -374,7 +382,7 @@ export default {
                 let customerClueItemList =
                   params.customerClueItemList[val].customerClueOptionList[i].customerClueItemList;
                 customerClueItemList.push(
-                  ...this.deepClone(customerClueOptionList[i].customerClueItemList, 0)
+                  ...this.deepClone(customerClueOptionList[i].customerClueItemList, 0),
                 );
                 if (customerClueOptionList[i].customerClueItemList[0]) {
                   this.filterOption(customerClueOptionList[i].customerClueItemList, params);

src/views/week/assignAwait/JZfollowUp.vue

@@ -15,11 +15,17 @@
         <span v-if="infoData.isClose == 1">跟进完成</span>
         <span v-if="infoData.isClose == 0">跟进中</span>
         <span v-if="infoData.isClose == -1">未跟进</span>
+        <span v-if="infoData.isClose == 2">已过期</span>
       </div>
       <!-- 转交 -->
       <!--  -->
       <van-button
-        v-if="infoData.isClose != 1 && postName && postName == '区域家装销售负责人'"
+        v-if="
+          infoData.isClose != 1 &&
+          infoData.isClose != 2 &&
+          postName &&
+          postName == '区域家装销售负责人'
+        "
         type="info"
         size="small"
         plain
@@ -53,7 +59,7 @@
       </div>
     </van-cell-group>
     <!-- 跟进任务填写 -->
-    <div class="assign" v-if="infoData && infoData.isClose != 1">
+    <div class="assign" v-if="infoData && infoData.isClose != 1 && infoData.isClose != 2">
       <div class="followUp required">跟进结果</div>
       <div class="taskGather" v-if="taskGather && taskGather">
         <radioGroup :clueOptionList="taskGather"></radioGroup>
@@ -157,12 +163,13 @@ export default {
           //  获取转交下属数据 未跟进状态下
           if (
             this.infoData.isClose != 1 &&
+            this.infoData.isClose != 2 &&
             this.postName &&
             this.postName == '区域家装销售负责人'
           ) {
             this.getSelectSubUserList();
           }
-          if (this.infoData.isClose != 1) {
+          if (this.infoData.isClose != 1 && this.infoData.isClose != 1) {
             this.getSelectCustomerClueInfoById();
           }
           // 当前客资归属人不是当前登录人
@@ -275,7 +282,7 @@ export default {
             // 必填校验
             this.isRequiredFlag(optionList[i].customerClueItemList);
             params.customerClueItemList.push(
-              ...this.deepClone(optionList[i].customerClueItemList, 0)
+              ...this.deepClone(optionList[i].customerClueItemList, 0),
             );
             if (
               optionList[i].customerClueItemList[0] &&
@@ -283,7 +290,7 @@ export default {
             ) {
               this.filterOption(
                 optionList[i].customerClueItemList[0].customerClueOptionList,
-                params
+                params,
               );
             }
           }