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

index.html

@@ -29,6 +29,7 @@
       document.write('<script src="//'+ host + src +'"><\/script>')
     })()
   </script>
+  <script src="//web-1251519181.file.myqcloud.com/components/pagination.1.0.10.js"></script>
 </body>
 
 </html>

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

@@ -15,14 +15,14 @@
  -->
 <template>
   <div v-show="customDialog">
-    <el-dialog class="app-dialog" title="批量删除" :visible.sync="customDialog" width="620px" :before-close="handleClose">
+    <el-dialog class="app-dialog" title="批量删除" :visible.sync="customDialog" width="630px" :before-close="handleClose">
       <div v-if="showTip" style="margin-bottom:20px;">
         <div role="alert" class="el-alert el-alert--info flex flex-align-start">
           <i class="el-alert__icon el-icon-info"></i>
           <div class="el-alert__content">
             <span class="el-alert__title">
-              1.删除任务后，会影响任务统计如已完成，完成率，待完成以及销售线索收益等，请知悉 <br />
-              2.删除后会在操作列显示“已删除”，已删除的条目不可再次操作，第二天系统将会刷新移除
+              1.删除任务后，会影响任务统计如已完成，完成率，待完成以及销售线索收益等，请知悉。 <br />
+              2.删除后会在操作列显示“已删除”，已删除的条目不可再次操作，第二天系统将会刷新移除。
             </span>
           </div>
         </div>
@@ -33,7 +33,7 @@
         <span style="color:#2f54eb;font-size:10px;padding-left:10px;" v-if="showTip">删除任务后，会影响任务统计如已完成，完成率，待完成等，请知悉</span>
       </div> -->
       <el-form ref="form" :model="formData" :rules="rules" label-width="100px" @submit.native.prevent>
-        <el-form-item v-if="showTab" label="" label-width="0">
+        <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-form-item>

src/components/app/taskView.vue

@@ -25,9 +25,10 @@
         </div>
       </div>
       <div class="table-condition flex flex-space-between m-b-20">
-        <div class="table-condition-left">
+        <div class="table-condition-left flex flex-align-center">
           <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>
-          <span class="condition-tips font-12 color-909399 p-l-10">仅包含话务任务记录</span>
+          <!-- <span class="condition-tips font-12 color-909399 p-l-10">仅包含话务任务记录</span> -->
+          <span style="font-size:14px;" class="m-l-10">创建时间：</span><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">
           <el-button type="danger" @click="multDel">批量删除</el-button><el-button :loading="loadingBtn" type="primary" @click="exportExcel"><i class="iconfont icon-icon_yunxiazai p-r-6"></i>导出</el-button>
@@ -63,7 +64,10 @@
           <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.delStatusDesc }}</template>
+          <template slot-scope="scope">
+            <span class="state-point state-point-error" v-if="scope.row.delStatusDesc != '-'">{{ scope.row.delStatusDesc }}</span>
+            <span v-else>{{ scope.row.delStatusDesc }}</span>
+          </template>
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
@@ -139,6 +143,16 @@ export default {
       that.getTableList();
     },
     /**
+     * 日期
+     */
+    changeDate(e) {
+      if (!e) {
+        this.conditionObj.dateRange = [];
+      }
+      this.currentPage = 1;
+      this.getTableList();
+    },
+    /**
      * 显示选择本页/全部
      */
     handleCommand(command) {
@@ -177,19 +191,6 @@ export default {
       that.currentPage = 1;
       that.getTableList();
     },
-
-    /**
-     * 日期
-     */
-    changeDate(e) {
-      let that = this;
-      if (!e) {
-        that.conditionObj.dateRange = [];
-      }
-      that.currentPage = 1;
-      that.getTableList();
-    },
-
     /**
      * 表格选择
      */
@@ -238,9 +239,14 @@ export default {
       if (!that.conditionObj.dateRange) {
         that.conditionObj.dateRange = [];
       }
+      if (!that.conditionObj.dateRange) {
+        that.conditionObj.dateRange = [];
+      }
       let para = {
         search: that.conditionObj.searchInput || '', // 搜索字段
         ecmIds: that.selectRadio == 1 ? '' : that.multipleSelection.map(ele => ele.ecmId).join(','), // 门店分组,数组
+        startDate: that.conditionObj.dateRange[0] || '',
+        endDate: that.conditionObj.dateRange[1] || '',
         enterpriseId: that.activeBrand, // 品牌 id
         delTaskStatus: obj.delOptFlag, // 0:仅删除逾期任务，1:删除所有待完成任务
         reason: obj.reason, // 备注
@@ -274,12 +280,17 @@ export default {
         showMsg.showmsg('请选择任务', 'warning');
         return false;
       }
+      if (!that.conditionObj.dateRange) {
+        that.conditionObj.dateRange = [];
+      }
       that.loadingBtn = true;
 
       let para = {
         search: that.conditionObj.searchInput || '', // 搜索字段
         gicEnterpriseId: that.activeBrand, // 品牌 id
-        selectType: that.selectRadio,
+        startDate: that.conditionObj.dateRange[0] || '',
+        endDate: that.conditionObj.dateRange[1] || '',
+        selectType: that.selectRadio == 2 && that.multipleSelection.length ? 0 : this.selectRadio,
         ecmIds: that.selectRadio == 1 ? '' : that.multipleSelection.map(ele => ele.ecmId).join(',')
       };
       postExcel('/haoban-app-tel-task-three-web/task/export-task-view-task-list', para)
@@ -365,6 +376,8 @@ export default {
       let that = this;
       that.loading = true;
       let para = {
+        startDate: that.conditionObj.dateRange[0] || '',
+        endDate: that.conditionObj.dateRange[1] || '',
         search: that.conditionObj.searchInput || '', // 搜索字段
         pageNum: that.currentPage, // 当前页
         pageSize: that.pageSize, // 一页显示个数

src/views/salesleads/trafficTask/taskDetail.vue

@@ -324,7 +324,7 @@ export default {
 
       let para = {
         gicEnterpriseId: that.activeBrand, // 品牌 id
-        selectType: that.selectRadio,
+        selectType: that.selectRadio == 2 && that.multipleSelection.length ? 0 : this.selectRadio,
         storeId: that.$route.query.storeId,
         ecmId: !!that.$route.query.ecmId ? that.$route.query.ecmId : '',
         isOverTime: that.conditionObj.overdue || '', // 逾期
@@ -436,6 +436,7 @@ export default {
      */
     handleSelectionChange(val) {
       this.multipleSelection = val;
+         val.length ? '' : (this.selectRadio = 2);
     },
     /**
      * 批量删除

src/views/salesleads/trafficTask/taskRecord.vue

@@ -21,11 +21,11 @@
         </div>
       </div>
       <div class="table-condition flex flex-space-between m-b-20">
-        <div class="table-condition-left">
+        <div class="table-condition-left flex flex-align-center">
           <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>
-          <span style="font-size:14px">计划创建时间:</span>
-          <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>
+          <gic-select-group :brandId="brandId" class="m-l-10" style="min-width: 213px !important;" :width="213" :selectData="conditionObj.storeGroup" @checkGroupIds="checkGroupIds"> </gic-select-group>
+          <span style="font-size:14px;" class="m-l-10">计划创建时间：</span>
+          <el-date-picker 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">
           <el-button type="danger" @click="multDel">批量删除</el-button>
@@ -69,7 +69,10 @@
           <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.delStatusDesc }}</template>
+          <template slot-scope="scope">
+            <span class="state-point state-point-error" v-if="scope.row.delStatusDesc != '-'">{{ scope.row.delStatusDesc }}</span>
+            <span v-else>{{ scope.row.delStatusDesc }}</span>
+          </template>
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
@@ -149,6 +152,7 @@ export default {
      */
     handleCommand(command) {
       this.selectRadio = command;
+      console.log(this.selectRadio);
       this.tableRefresh = !this.tableRefresh;
       if (command == 1 || command == 0) {
         this.$nextTick(() => {
@@ -194,6 +198,7 @@ export default {
      */
     handleSelectionChange(val) {
       this.multipleSelection = val;
+      val.length ? '' : (this.selectRadio = 2);
     },
     /**
      * 删除选的部门
@@ -294,7 +299,7 @@ export default {
         startDate: !!that.conditionObj.dateRange ? that.conditionObj.dateRange[0] : '',
         endDate: !!that.conditionObj.dateRange ? that.conditionObj.dateRange[1] : '',
         enterpriseId: that.activeBrand, // 品牌 id
-        selectType: that.selectRadio
+        selectType: that.selectRadio == 2 && that.multipleSelection.length ? 0 : this.selectRadio
       };
       postExcel('/haoban-app-tel-task-three-web/task/export-store-task-list', para)
         .then(res => {

src/views/salesleads/trafficTask/taskViewDetail.vue

@@ -212,6 +212,7 @@ export default {
      */
     handleSelectionChange(val) {
       this.multipleSelection = val;
+      val.length ? '' : (this.selectRadio = 2);
     },
 
     /**
@@ -318,7 +319,7 @@ export default {
         ecmId: that.$route.query.ecmId,
         storeIds: that.selectRadio == 1 ? '' : that.multipleSelection.map(ele => ele.storeId).join(','), // 门店分组,数组
         gicEnterpriseId: that.activeBrand, // 品牌 id
-        selectType: String(that.selectRadio)
+        selectType: that.selectRadio == 2 && that.multipleSelection.length ? 0 : this.selectRadio
       };
       postExcel('/haoban-app-tel-task-three-web/task/export-task-view-store-list', para)
         .then(res => {