update: dist

src/components/app/taskView.vue

@@ -64,6 +64,9 @@
         <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>
         <el-table-column prop="" label="删除状态" show-overflow-tooltip>
           <template slot-scope="scope">
             <span class="state-point state-point-error" v-if="scope.row.delStatusDesc != '-'">{{ scope.row.delStatusDesc }}</span>

src/filters/index.js

@@ -199,7 +199,15 @@ const formatTime = function(msTime) {
 
   return `${hour}:${minute}:${second}`;
 };
-
+const formatInvalidStatus = function(data) {
+  let str = '--';
+  if (data == 1) {
+    str = '未失效';
+  } else if (data == 2) {
+    str = '已失效';
+  }
+  return str;
+};
 export default {
   dateFormat,
   formatTimeStamp,
@@ -211,5 +219,6 @@ export default {
   timeStampToYmd2,
   formatName,
   timeStampSpace,
-  formatTime
+  formatTime,
+  formatInvalidStatus
 };

src/views/salesleads/groupSend/grStoreDetail.vue

@@ -74,6 +74,9 @@
                   <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

@@ -69,6 +69,9 @@
                   <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>
                   <el-table-column prop="" label="操作" width="150">
                     <template slot-scope="scope">
                       <el-button type="text" @click="showDetail(scope.row)">查看详情</el-button>

src/views/salesleads/groupSend/grTaskList.vue

@@ -71,6 +71,9 @@
                   <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>
                   <el-table-column prop="" label="操作">
                     <template slot-scope="scope">
                       <el-button type="text" @click="showDetail(scope.row)">查看详情</el-button>

src/views/salesleads/trafficTask/taskDetail.vue

@@ -142,6 +142,9 @@
         <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>
         <el-table-column label="完成情况">
           <template #header>
             <el-tooltip class="item" effect="light" placement="right">
@@ -295,6 +298,14 @@ export default {
           value: ''
         },
         {
+          label: '逾期未失效',
+          value: '2'
+        },
+        {
+          label: '逾期已失效',
+          value: '3'
+        },
+        {
           label: '已逾期',
           value: '1'
         },

src/views/salesleads/trafficTask/taskRecord.vue

@@ -68,6 +68,9 @@
         <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>
         <el-table-column prop="" label="删除状态" show-overflow-tooltip>
           <template slot-scope="scope">
             <span class="state-point state-point-error" v-if="scope.row.delStatusDesc != '-'">{{ scope.row.delStatusDesc }}</span>

src/views/salesleads/trafficTask/taskViewDetail.vue

@@ -17,6 +17,9 @@ import taskViewDetail from '@/components/app/taskViewDetail.vue';
         <div class="table-condition-left">
           <el-input placeholder="请输入门店名称" maxlength="50" v-model="conditionObj.searchInput" class="w-264" style="width: 264px;" @keyup.native="value => toInput(value, conditionObj.searchInput)"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input>
           <gic-select-group :brandId="brandId" class="m-l-10" :width="213" :selectData="conditionObj.storeGroup" @checkGroupIds="checkGroupIds"> </gic-select-group>
+          <el-select v-model="conditionObj.isOverTime" placeholder="请选择" class="w-135 m-l-10" @change="changeSelect">
+            <el-option v-for="item in overOptions" :key="item.value" :label="item.label" :value="item.value"> </el-option>
+          </el-select>
           <el-date-picker class="m-l-10" v-model="conditionObj.dateRange" @change="changeDate" :editable="false" :value-format="'yyyy-MM-dd'" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker>
         </div>
         <div class="table-condition-right">
@@ -65,6 +68,9 @@ import taskViewDetail from '@/components/app/taskViewDetail.vue';
         <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.invalidStatus | formatInvalidStatus }}</template>
+        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button type="text" @click="toDetail(scope.$index, scope.row)">查看详情</el-button>
@@ -147,11 +153,44 @@ export default {
       total: 0,
       loadingBtn: false,
       tableRefresh: false,
-      exportDialog: false
+      exportDialog: false,
+      overOptions: [
+        {
+          label: '所有逾期情况',
+          value: ''
+        },
+        {
+          label: '逾期未失效',
+          value: '2'
+        },
+        {
+          label: '逾期已失效',
+          value: '3'
+        },
+        {
+          label: '已逾期',
+          value: '1'
+        },
+        {
+          label: '未逾期',
+          value: '0'
+        }
+      ]
     };
   },
   computed: {},
   methods: {
+    changeSelect(e) {
+      const that = this;
+      if (!e) {
+        that.$store.dispatch('changeSales', []);
+      } else {
+        that.$store.dispatch('changeSales', e);
+      }
+      that.currentPage = 1;
+      that.getTableList();
+    },
+
     beforeExportExcel() {
       if (!this.multipleSelection.length) {
         showMsg.showmsg('请选择门店', 'warning');