update: 视图详情

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

@@ -15,13 +15,14 @@
  -->
 <template>
   <div v-show="customDialog">
-    <el-dialog class="app-dialog" title="批量删除" :visible.sync="customDialog" width="600px" :before-close="handleClose">
+    <el-dialog class="app-dialog" title="批量删除" :visible.sync="customDialog" width="620px" :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.删除后会在操作列显示“已删除”，已删除的条目不可再次操作，第二天系统将会刷新移除
             </span>
           </div>
         </div>

src/components/app/taskView.vue

@@ -62,6 +62,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.delStatusDesc }}</template>
+        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button type="text" @click="toDetail(scope.$index, scope.row)">查看详情</el-button>

src/views/apps/card/index.vue

@@ -18,7 +18,7 @@
           <div class="apps-content-right">
             <transition name="fade" mode="out-in">
               <keep-alive v-if="$route.meta.keepAlive">
-                <router-view :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"></router-view>
+                <router-view v-if="activeBrand" :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"></router-view>
               </keep-alive>
               <router-view v-else :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"></router-view>
             </transition>

src/views/apps/cloudDaily/index.vue

@@ -17,7 +17,7 @@
           </div>
           <div class="apps-content-right border-box">
             <transition name="fade" mode="out-in">
-              <router-view :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"></router-view>
+              <router-view v-if="activeBrand" :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"></router-view>
             </transition>
           </div>
         </div>

src/views/apps/customerApp/index.vue

@@ -17,7 +17,7 @@
           </div>
           <div class="apps-content-right">
             <transition name="fade" mode="out-in">
-              <router-view :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"> </router-view>
+              <router-view v-if="activeBrand" :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"> </router-view>
             </transition>
           </div>
         </div>

src/views/apps/order-evaluate/index.vue

@@ -17,7 +17,7 @@
           </div>
           <div class="apps-content-right">
             <transition name="fade" mode="out-in">
-              <router-view :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"> </router-view>
+              <router-view v-if="activeBrand" :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"> </router-view>
             </transition>
           </div>
         </div>

src/views/apps/quota/index.vue

@@ -18,7 +18,7 @@
           <div class="apps-content-right">
             <transition name="fade" mode="out-in">
               <keep-alive v-if="$route.meta.keepAlive">
-                <router-view :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"></router-view>
+                <router-view v-if="activeBrand" :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"></router-view>
               </keep-alive>
               <router-view v-else :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"></router-view>
             </transition>

src/views/apps/shoppingCenter/index.vue

@@ -17,7 +17,7 @@
           </div>
           <div class="apps-content-right">
             <transition name="fade" mode="out-in">
-              <router-view :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"> </router-view>
+              <router-view v-if="activeBrand" :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"> </router-view>
             </transition>
           </div>
         </div>

src/views/enterprise/index.vue

@@ -20,7 +20,7 @@
                 </div>
                 <div class="apps-content-right border-box">
                   <transition name="fade" mode="out-in">
-                    <router-view :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"></router-view>
+                    <router-view v-if="activeBrand" :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab"></router-view>
                   </transition>
                 </div>
               </div>

src/views/salesleads/index.vue

@@ -21,7 +21,7 @@
                 </div>
                 <div class="apps-content-right border-box">
                   <transition name="fade" mode="out-in">
-                    <router-view :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab" @reNav="reNav"></router-view>
+                    <router-view v-if="activeBrand" :brandId="activeBrand" :activeGroupId="activeGroup" :tabType="activeTab" @showTab="showTab" @reNav="reNav"></router-view>
                   </transition>
                 </div>
               </div>

src/views/salesleads/trafficTask/taskDetail.vue

@@ -195,7 +195,7 @@
         <dm-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[20, 40, 60, 80]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="total"> </dm-pagination>
       </div>
     </div>
-    <multiple-del :showDialog="showDialog" :detailFlag="true" @hideDialog="hideDialog" :showTip="true"> </multiple-del>
+    <!-- <multiple-del :showDialog="showDialog" :detailFlag="true" @hideDialog="hideDialog" :showTip="true"> </multiple-del> -->
     <qrcode-dialog ref="qrcodePreview" v-model="dialogVisible"></qrcode-dialog>
     <detail-preview ref="detailPreview" :previewData="previewData" v-model="previewVisible" @closePreview="closePreview"></detail-preview>
     <task-detail v-if="taskDetailVisible" @close="closeTaskDetail" :taskData="taskDetail"></task-detail>
@@ -440,30 +440,23 @@ export default {
         });
         return false;
       }
-      that.showDialog = true;
-    },
-
-    /**
-     * 批量删除---弹窗关闭
-     */
-    hideDialog(obj) {
-      let that = this;
-      that.showDialog = false;
-      if (!Object.keys(obj).length) {
-        return false;
-      }
-      that.postMultDel(obj);
+       this.$confirm('<div>确定要删除吗？</div><div>删除任务后，会影响任务统计如已完成，完成率，待完成以及销售线索收益等，请知悉</div>', '', {
+        customClass: 'top-icon',
+        closeOnClickModal: false,
+        dangerouslyUseHTMLString: true,
+        showClose: false,
+        type: 'warning'
+      }).then(res => {
+          that.postMultDel();
+      })
     },
-
-    postMultDel(obj) {
+    postMultDel() {
       let that = this;
       let para = {
         storeId: that.$route.query.storeId,
         taskIds: that.selectRadio == 1 ? '' : that.multipleSelection.map(ele => ele.taskId).join(','), // 门店分组,数组
         isOverTime: that.conditionObj.overdue || '', // 逾期
         isCompleted: that.conditionObj.completed || '', // 完成
-        reason: obj.reason, // 删除备注
-        // chooseFlag: obj.chooseFlag || '', // 0仅删除逾期任务，1删除所有待完成任务
         enterpriseId: that.activeBrand, // 品牌 id
         isAll: that.selectRadio // 0：当页，1：所有
       };
@@ -516,7 +509,7 @@ export default {
      */
     handleDel(index, row) {
       const that = this;
-      this.$confirm('<div>确定要删除吗？</div><div>删除任务后，会影响任务统计如已完成，完成率，待完成等以及销售线索收益，请知悉</div>', '', {
+      this.$confirm('<div>确定要删除吗？</div><div>删除任务后，会影响任务统计如已完成，完成率，待完成以及销售线索收益等，请知悉</div>', '', {
         customClass: 'top-icon',
         closeOnClickModal: false,
         dangerouslyUseHTMLString: true,

src/views/salesleads/trafficTask/taskRecord.vue

@@ -24,6 +24,7 @@
         <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>
+          <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>
         </div>
         <div class="table-condition-right">
@@ -67,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.delStatusDesc }}</template>
+        </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
             <el-button type="text" @click="toDetail(scope.$index, scope.row)">查看详情</el-button>