update: temp

src/components/app/cloudDaily/multiple-del.vue

@@ -36,6 +36,7 @@
         <el-form-item v-if="showTab" label="任务类型">
           <el-radio v-model="formData.delOptFlag" label="0">仅删除逾期任务</el-radio>
           <el-radio v-model="formData.delOptFlag" label="1">删除所有待完成任务</el-radio>
+          <el-radio v-model="formData.delOptFlag" label="2">删除所有任务</el-radio>
         </el-form-item>
         <!-- <div v-if="detailShowFlag" class="el-message-box__title">
             <div class="el-message-box__status el-icon-warning"></div>

src/views/apps/card/cardRecord.vue

@@ -19,6 +19,8 @@
       </div> -->
       <div class="m-b-20">
         <el-input placeholder="请输入卡券名称" maxlength="50" v-model="searchInput" class="w-264" style="width: 264px;" @keyup.native="value => toInput(value, searchInput)" clearable @clear="clearInput"> <i slot="prefix" class="el-input__icon el-icon-search"></i> </el-input>
+        <span style="font-size:14px;" class="m-l-10">卡券创建时间：</span>
+        <el-date-picker v-model="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>
       <el-table class="select-table" ref="multipleTable" v-loading="loading" :data="tableData" tooltip-effect="dark" style="width: calc(100% - 3px);">
         <el-table-column prop="" label="卡券名称" show-overflow-tooltip>
@@ -67,6 +69,7 @@
             {{ scope.row.sendMemberCount }}
           </template>
         </el-table-column>
+        <el-table-column width="150" prop="createTime" label="创建时间"> </el-table-column>
         <el-table-column prop="" width="200" label="操作" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" @click="showSendRecord(scope.$index, scope.row, '1')">发送记录</el-button>
@@ -103,7 +106,7 @@ export default {
   data() {
     return {
       activeId: '2',
-
+      dateRange: '',
       searchInput: '',
       tableData: [],
       loading: false,
@@ -130,6 +133,16 @@ export default {
     }
   },
   methods: {
+    /**
+     *  日期
+     */
+    changeDate(e) {
+      if (!e) {
+        this.dateRange = [];
+      }
+      this.currentPage = 1;
+      this.getTableList();
+    },
     showGetRecord(index, row) {
       const that = this;
       that.coupCardId = row.coupCardId;
@@ -202,7 +215,9 @@ export default {
         gicEnterpriseId: that.brandId,
         search: that.searchInput || '', // 搜索字段
         pageNum: that.currentPage, // 当前页
-        pageSize: that.pageSize // 一页显示个数
+        pageSize: that.pageSize, // 一页显示个数
+        startDate: this.dateRange[0] || '',
+        endDate: this.dateRange[1] || ''
       };
       postRequest('/haoban-app-customer-web/cardCoupon/find-card-log-page', para)
         .then(res => {

src/views/salesleads/trafficTask/taskRecord.vue

@@ -53,6 +53,7 @@
             <p style="color:#909399">{{ scope.row.storeCode }}</p>
           </template>
         </el-table-column>
+        <el-table-column prop="storeGroupName" label="门店分组"> </el-table-column>
         <el-table-column prop="" label="任务总数">
           <template slot-scope="scope">{{ scope.row.taskCount }}</template>
         </el-table-column>