fix: 时间选择器

src/router/actCodeManageRouter/staffActCodeRouter.js

@@ -7,7 +7,7 @@ const staffActCodeRouter = [
     component: _import('salesleads/actCodeManage/staffActCode', 'index'),
     meta: {
       keepAlive: true,
-      fromPath: ['/actCodeAdd', '/actCodeEdit', '/actCodeBatch', '/actCodeDetail']
+      fromPath: ['/actCodeAdd', '/actCodeEdit', '/actCodeBatch', '/actCodeDetail', '/actCodeDetails']
     }
   },
   {

src/views/salesleads/actCodeManage/staffActCode/actCodeDetail.vue

@@ -50,11 +50,11 @@
     </div>
     <el-tabs v-model="activeName" type="card">
       <!-- <el-tab-pane label="详情信息" name="first" v-if="$getButtonLimit($buttonCode.infoActCode)" :limit-code="$buttonCode.infoActCode"> -->
-      <el-tab-pane label="详情信息" name="first">
+      <el-tab-pane label="详情信息" name="first" v-if="$getButtonLimit(this.$buttonCode.infoActCode)" :limit-code="$buttonCode.infoActCode">
         <act-code-detail-info :enterprise-id="codeInfo.enterpriseId" :welcome-id="codeInfo.welcomeId" :hm-id="$route.query.hmId" @useMemberList="useMemberData"></act-code-detail-info>
       </el-tab-pane>
       <!-- <el-tab-pane label="数据统计" name="second" v-if="$getButtonLimit($buttonCode.dataActCode)" :limit-code="$buttonCode.dataActCode"> -->
-      <el-tab-pane label="数据统计" name="second">
+      <el-tab-pane label="数据统计" name="second" v-if="$getButtonLimit(this.$buttonCode.dataActCode)" :limit-code="$buttonCode.dataActCode">
         <act-code-detail-statistics :hm-id="$route.query.hmId"></act-code-detail-statistics>
       </el-tab-pane>
     </el-tabs>

src/views/salesleads/components/dataDetail.vue

@@ -8,7 +8,7 @@
 
       <div class="rightBox">
         <ul class="datebox" v-for="(lis, index) in dateLis" :key="lis.key">
-          <li :class="active == index ? 'activeClass' : 'noActive'" class="dateLisBox" @click="btnChange(index)">{{ lis.value }}</li>
+          <li :class="dateKey == index ? 'activeClass' : 'noActive'" class="dateLisBox" @click="btnChange(index)">{{ lis.value }}</li>
         </ul>
         <el-date-picker class="w256" v-model="dateDefault" type="daterange" range-separator="~" start-placeholder="创建开始日期" end-placeholder="创建结束日期" :default-time="['00:00:00', '23:59:59']" value-format="yyyy-MM-dd" :picker-options="pickerOptions()" @change="onDateChange" :clearable="false"> </el-date-picker>
       </div>
@@ -55,6 +55,7 @@
 <script>
 import { detailClerkList } from '@/api/actCode.js';
 import { _debounce } from '@/common/js/public';
+import mixin from '../actCodeManage/components/mixin';
 export default {
   name: 'DateDetail',
   props: {
@@ -71,9 +72,10 @@ export default {
       default: 'code'
     }
   },
+  mixins: [mixin],
   data() {
     return {
-      active: 0,
+      dateKey: 0,
       dateLis: [
         { key: 1, value: '近7天' },
         { key: 2, value: '近30天' },
@@ -95,34 +97,34 @@ export default {
       dateDefault: [],
       totalCount: 0,
       sortColumn: '',
-      sortType: '',
-      pickerOptions() {
-        let pickerMinDate;
-        return {
-          onPick(obj) {
-            pickerMinDate = obj.minDate;
-          },
-          disabledDate(time) {
-            let start = new Date();
-            start = new Date(`${start.getFullYear()}-${start.getMonth() + 1}-${start.getDate()}`);
-            let start2 = new Date(pickerMinDate);
-            let end = new Date();
-            end = new Date(`${end.getFullYear()}-${end.getMonth() + 1}-${end.getDate() + 1}`);
-            let end2 = new Date(pickerMinDate);
-            if (pickerMinDate) {
-              start = start.setFullYear(start.getFullYear() - 2);
-              start2 = start2.setMonth(start2.getMonth() - 6);
-              start = start > start2 ? start : start2;
-              end2 = end2.setMonth(end2.getMonth() + 6);
-              end = end.getTime() > end2 ? end2 : end.getTime();
-            } else {
-              start = start.setFullYear(start.getFullYear() - 2);
-              end = end.getTime();
-            }
-            return time.getTime() <= start || time.getTime() >= end;
-          }
-        };
-      }
+      sortType: ''
+      // pickerOptions() {
+      //   let pickerMinDate;
+      //   return {
+      //     onPick(obj) {
+      //       pickerMinDate = obj.minDate;
+      //     },
+      //     disabledDate(time) {
+      //       let start = new Date();
+      //       start = new Date(`${start.getFullYear()}-${start.getMonth() + 1}-${start.getDate()}`);
+      //       let start2 = new Date(pickerMinDate);
+      //       let end = new Date();
+      //       end = new Date(`${end.getFullYear()}-${end.getMonth() + 1}-${end.getDate() + 1}`);
+      //       let end2 = new Date(pickerMinDate);
+      //       if (pickerMinDate) {
+      //         start = start.setFullYear(start.getFullYear() - 2);
+      //         start2 = start2.setMonth(start2.getMonth() - 6);
+      //         start = start > start2 ? start : start2;
+      //         end2 = end2.setMonth(end2.getMonth() + 6);
+      //         end = end.getTime() > end2 ? end2 : end.getTime();
+      //       } else {
+      //         start = start.setFullYear(start.getFullYear() - 2);
+      //         end = end.getTime();
+      //       }
+      //       return time.getTime() <= start || time.getTime() >= end;
+      //     }
+      //   };
+      // }
     };
   },
   created() {
@@ -133,64 +135,64 @@ export default {
     toInput: _debounce(function(e, value) {
       this.getTableList();
     }, 500),
-    getDateRange(setEndDate) {
-      const start = new Date();
-      let end = new Date();
-      end = setEndDate(end);
-      function getDate(date) {
-        const result = [];
-        result.push(date.getFullYear());
-        result.push((date.getMonth() + 1).toString().padStart(2, '0'));
-        result.push(
-          date
-            .getDate()
-            .toString()
-            .padStart(2, '0')
-        );
-        return result.join('-');
-      }
-      // yyyy-MM-dd
-      return [getDate(start), getDate(end)];
-    },
-    btnChange(index) {
-      //把index值赋给active，点击改变样式
-      this.active = index;
-      this.dateDefault = [];
-      let setDate;
-      if (index == 0) {
-        // 近7天
-        setDate = endDate => {
-          endDate.setDate(endDate.getDate() - 6);
-          return new Date(endDate);
-        };
-      } else if (index == 1) {
-        // 近30天
-        setDate = endDate => {
-          endDate.setDate(endDate.getDate() - 29);
-          return new Date(endDate);
-        };
-      } else if (index == 2) {
-        // 近三个月
-        setDate = endDate => {
-          endDate.setMonth(endDate.getMonth() - 3);
-          endDate.setDate(endDate.getDate() + 1);
-          return new Date(endDate);
-        };
-      } else if (index == 3) {
-        // 近半年
-        setDate = endDate => {
-          endDate.setMonth(endDate.getMonth() - 6);
-          endDate.setDate(endDate.getDate() + 1);
-          return new Date(endDate);
-        };
-      }
-      const [start, end] = this.getDateRange(setDate);
-      this.dateDefault.push(end);
-      this.dateDefault.push(start);
-      this.getTableList();
-    },
+    // getDateRange(setEndDate) {
+    //   const start = new Date();
+    //   let end = new Date();
+    //   end = setEndDate(end);
+    //   function getDate(date) {
+    //     const result = [];
+    //     result.push(date.getFullYear());
+    //     result.push((date.getMonth() + 1).toString().padStart(2, '0'));
+    //     result.push(
+    //       date
+    //         .getDate()
+    //         .toString()
+    //         .padStart(2, '0')
+    //     );
+    //     return result.join('-');
+    //   }
+    //   // yyyy-MM-dd
+    //   return [getDate(start), getDate(end)];
+    // },
+    // btnChange(index) {
+    //   //把index值赋给active，点击改变样式
+    //   this.dateKey = index;
+    //   this.dateDefault = [];
+    //   let setDate;
+    //   if (index == 0) {
+    //     // 近7天
+    //     setDate = endDate => {
+    //       endDate.setDate(endDate.getDate() - 6);
+    //       return new Date(endDate);
+    //     };
+    //   } else if (index == 1) {
+    //     // 近30天
+    //     setDate = endDate => {
+    //       endDate.setDate(endDate.getDate() - 29);
+    //       return new Date(endDate);
+    //     };
+    //   } else if (index == 2) {
+    //     // 近三个月
+    //     setDate = endDate => {
+    //       endDate.setMonth(endDate.getMonth() - 3);
+    //       endDate.setDate(endDate.getDate() + 1);
+    //       return new Date(endDate);
+    //     };
+    //   } else if (index == 3) {
+    //     // 近半年
+    //     setDate = endDate => {
+    //       endDate.setMonth(endDate.getMonth() - 6);
+    //       endDate.setDate(endDate.getDate() + 1);
+    //       return new Date(endDate);
+    //     };
+    //   }
+    //   const [start, end] = this.getDateRange(setDate);
+    //   this.dateDefault.push(end);
+    //   this.dateDefault.push(start);
+    //   this.getTableList();
+    // },
     onDateChange() {
-      this.active = -1;
+      this.dateKey = -1;
       if (this.dateDefault.length) this.getTableList();
     },
     // 当前页变化