Merge branch 'feature/3月迭代' into dev

src/components/app/taskView.vue

@@ -61,11 +61,8 @@
         <el-table-column prop="" label="待完成" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.toComplete }}</template>
         </el-table-column>
-        <el-table-column prop="" label="逾期中" show-overflow-tooltip>
-          <template slot-scope="scope">{{ scope.row.overTimeNum }}</template>
-        </el-table-column>
-        <el-table-column prop="" label="逾期失效" show-overflow-tooltip>
-          <template slot-scope="scope">{{ scope.row.invalidCount }}</template>
+        <el-table-column prop="" label="逾期中/逾期失效" show-overflow-tooltip>
+          <template slot-scope="scope">{{ scope.row.overTimeNum }}/{{ scope.row.invalidCount }}</template>
         </el-table-column>
         <el-table-column prop="" label="删除状态" show-overflow-tooltip>
           <template slot-scope="scope">

src/views/salesleads/groupSend/grStoreDetail.vue

@@ -68,15 +68,12 @@
                       <div class="color-606266 line-20">{{ scope.row.overdueTime | timeStampToHms }}</div>
                     </template>
                   </el-table-column>
-                  <el-table-column label="逾期情况" min-width="90">
-                    <template slot-scope="scope"><span class="point" :style="'background:' + overdueStyle[scope.row.overdueStatus] + ';'"></span>{{ scope.row.overdueStatus === 1 ? '已逾期' : scope.row.overdueStatus === 2 ? '未逾期' : '' }}</template>
+                  <el-table-column label="逾期情况/逾期失效" min-width="140">
+                    <template slot-scope="scope"><span class="point" :style="'background:' + overdueStyle[scope.row.overdueStatus] + ';'"></span>{{ scope.row.overdueStatus === 1 ? '已逾期' : scope.row.overdueStatus === 2 ? '未逾期' : '' }}/{{ scope.row.invalidStatus | formatInvalidStatus }}</template>
                   </el-table-column>
                   <el-table-column label="完成情况" min-width="90">
                     <template slot-scope="scope"><span v-if="scope.row.taskStatus" class="point" :style="'background:' + taskStyle[scope.row.taskStatus] + ';'"></span>{{ scope.row.taskStatus === 1 ? '未完成' : scope.row.taskStatus === 2 ? '已完成' : '' }}</template>
                   </el-table-column>
-                  <el-table-column label="逾期失效" min-width="90">
-                    <template slot-scope="scope">{{ scope.row.invalidStatus | formatInvalidStatus }}</template>
-                  </el-table-column>
                   <el-table-column label="完成详情" min-width="280">
                     <template slot-scope="scope"> 待发送：{{ scope.row.waitSendCount }}，已发送：{{ scope.row.successCount }}，发送失败：{{ scope.row.failCount }} </template>
                   </el-table-column>

src/views/salesleads/groupSend/grStoreList.vue

@@ -66,11 +66,8 @@
                   <el-table-column prop="" label="待完成">
                     <template slot-scope="scope">{{ scope.row.waitFinishCount || '--' }}</template>
                   </el-table-column>
-                  <el-table-column prop="" label="逾期中">
-                    <template slot-scope="scope">{{ scope.row.ovincplTaskCnt || '--' }}</template>
-                  </el-table-column>
-                  <el-table-column prop="" label="逾期失效" show-overflow-tooltip>
-                    <template slot-scope="scope">{{ scope.row.invalidCount }}</template>
+                  <el-table-column prop="" label="逾期中/逾期失效">
+                    <template slot-scope="scope">{{ scope.row.ovincplTaskCnt || '--' }}/{{ scope.row.invalidCount || '--' }}</template>
                   </el-table-column>
                   <el-table-column prop="" label="操作" width="150">
                     <template slot-scope="scope">

src/views/salesleads/groupSend/grTaskList.vue

@@ -68,11 +68,8 @@
                   <el-table-column prop="" label="待完成">
                     <template slot-scope="scope">{{ scope.row.waitFinishCount || '--' }}</template>
                   </el-table-column>
-                  <el-table-column prop="" label="逾期中">
-                    <template slot-scope="scope">{{ scope.row.ovincplTaskCnt || '--' }}</template>
-                  </el-table-column>
-                  <el-table-column prop="" label="逾期失效" show-overflow-tooltip>
-                    <template slot-scope="scope">{{ scope.row.invalidCount }}</template>
+                  <el-table-column prop="" label="逾期中/逾期失效">
+                    <template slot-scope="scope">{{ scope.row.ovincplTaskCnt || '--' }}/{{ scope.row.invalidCount || '--' }}</template>
                   </el-table-column>
                   <el-table-column prop="" label="操作">
                     <template slot-scope="scope">

src/views/salesleads/trafficTask/taskDetail.vue

@@ -139,11 +139,8 @@
             <div class="line-18">{{ scope.row.lastTime | formatTimeHMS }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="逾期情况">
-          <template slot-scope="scope"> <span class="point" :style="'background:' + overdueStyle[scope.row.isOverTime] + ';'"></span>{{ scope.row.isOverTime }}</template>
-        </el-table-column>
-        <el-table-column label="逾期失效">
-          <template slot-scope="scope">{{ scope.row.invalidStatus | formatInvalidStatus }}</template>
+        <el-table-column label="逾期情况/逾期失效" width="140">
+          <template slot-scope="scope"> <span class="point" :style="'background:' + overdueStyle[scope.row.isOverTime] + ';'"></span>{{ scope.row.isOverTime }}/{{ scope.row.invalidStatus | formatInvalidStatus }}</template>
         </el-table-column>
         <el-table-column label="完成情况">
           <template #header>

src/views/salesleads/trafficTask/taskRecord.vue

@@ -65,11 +65,8 @@
         <el-table-column prop="" label="待完成" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.noCompletedCount }}</template>
         </el-table-column>
-        <el-table-column prop="" label="逾期中" show-overflow-tooltip>
-          <template slot-scope="scope">{{ scope.row.overdueCount }}</template>
-        </el-table-column>
-        <el-table-column prop="" label="逾期失效" show-overflow-tooltip>
-          <template slot-scope="scope">{{ scope.row.invalidCount }}</template>
+        <el-table-column prop="" label="逾期中/逾期失效" show-overflow-tooltip>
+          <template slot-scope="scope">{{ `${scope.row.overdueCount} / ${scope.row.invalidCount}` }}</template>
         </el-table-column>
         <el-table-column prop="" label="删除状态" show-overflow-tooltip>
           <template slot-scope="scope">

src/views/salesleads/trafficTask/taskViewDetail.vue

@@ -62,11 +62,8 @@ import taskViewDetail from '@/components/app/taskViewDetail.vue';
         <el-table-column prop="" label="待完成" show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.noCompletedCount }}</template>
         </el-table-column>
-        <el-table-column prop="" label="逾期中" show-overflow-tooltip>
-          <template slot-scope="scope">{{ scope.row.overdueCount }}</template>
-        </el-table-column>
-        <el-table-column label="逾期失效">
-          <template slot-scope="scope">{{ scope.row.invalidCount }}</template>
+        <el-table-column prop="" label="逾期中/逾期失效" show-overflow-tooltip>
+          <template slot-scope="scope">{{ scope.row.overdueCount || '--' }}/{{ scope.row.invalidCount || '--' }}</template>
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">