Merge branch 'feature/4月-菜单和权限' into test

menu-data/button-code.js

@@ -175,7 +175,7 @@ module.exports = {
   },
   monthList: {
     // 1.门店月指标 （按钮，控制“门店月指标”页面内所有操作权限）；
-    monthTarget: ['门店月指标', 1, 0, 'storeMonthTask'],
+    monthTarget: ['门店月指标', 0, 0, 'storeMonthTask'],
     // 2.商户日权重 （按钮，控制“商户日权重月指标”页面内所有操作权限）；
     dayTarget: ['商户日权重', 1, 0, 'companyDaySet']
   },

menu-data/create-menu-json.js

@@ -168,7 +168,22 @@ function createXls() {
       })
     }
   })
-  // return
+  let rightErr = false;
+  menuJson.forEach(el => {
+    if (el.isRight == 0) {
+      const result = []
+      menuJson.forEach(item => {
+        if (item.parentCode == el.menuCode && item.isRight == 1) {
+          result.push(item);
+        }
+      })
+      if (result.length > 0) {
+        rightErr = true;
+        console.log(result, '不受权限控制的页面下不可以挂受权限控制的子页面')
+      }
+    }
+  })
+  if (rightErr) return;
   const jsonArray = [...menuJson, ...buttonJson].map( item => {
     return {
       '菜单名称': item.menuName,

src/components/app/app-detail.vue

@@ -501,7 +501,7 @@ export default {
               })
             }
             that.groupListData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
             return;
           }
           errMsg.errorMsg(resData);

src/components/app/card/card-get-record.vue

@@ -287,7 +287,7 @@ export default {
           that.loading = false;
           if (resData.errorCode == 1) {
             that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
             return false;
           }
           errMsg.errorMsg(resData);

src/components/app/card/card-send-record.vue

@@ -347,7 +347,7 @@ export default {
           that.loading = false;
           if (resData.errorCode == 1) {
             that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
             return false;
           }
           errMsg.errorMsg(resData);

src/components/app/card/select-card.vue

@@ -167,7 +167,7 @@ export default {
           let resData = res.data;
           if (resData.errorCode == 1) {
             that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
 
             return false;
           }

src/components/app/customer/select-group.vue

@@ -166,7 +166,7 @@ export default {
           that.loading = false;
           if (resData.errorCode == 1) {
             that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
             return false;
           }
           errMsg.errorMsg(resData);

src/components/app/taskView.vue

@@ -389,7 +389,7 @@ export default {
           that.loading = false;
           if (resData.errorCode == 1) {
             that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
             if (val == 1) {
               this.$nextTick(() => {
                 this.$refs.multipleTable.toggleAllSelection();

src/components/review/salesleads-task-info.vue

@@ -222,7 +222,7 @@ export default {
           that.tableData = [];
           if (resData.errorCode == 1 && resData.result) {
             that.tableData = Array.isArray(resData.result.list) ? resData.result.list : [];
-            that.total = resData.result.pageInfo.total || 0;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
           } else {
             errMsg.errorMsg(resData);
           }

src/views/apps/badEvaluate/badEvaluateDetail.vue

@@ -384,7 +384,7 @@ export default {
           let resData = res.data;
           if (resData.errorCode == 1) {
             that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
             return;
           }
           errMsg.errorMsg(resData);

src/views/apps/badEvaluate/badEvaluateRecord.vue

@@ -439,7 +439,7 @@ export default {
           let resData = res.data;
           if (resData.errorCode == 1) {
             that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
             return false;
           }
           errMsg.errorMsg(resData);

src/views/apps/card/cardList.vue

@@ -223,7 +223,7 @@ export default {
           that.loading = false;
           if (resData.errorCode == 1) {
             that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
             return;
           }
           errMsg.errorMsg(resData);

src/views/apps/card/cardRecord.vue

@@ -256,8 +256,8 @@ export default {
         search: that.searchInput || '', // 搜索字段
         pageNum: that.currentPage, // 当前页
         pageSize: that.pageSize, // 一页显示个数
-        startDate: this.dateRange[0] || '',
-        endDate: this.dateRange[1] || '',
+        startDate: Array.isArray(this.dateRange) ? this.dateRange[0] : '',
+        endDate: Array.isArray(this.dateRange) ? this.dateRange[1] : '',
         cardStatus: this.cardStatus
       };
       postRequest('/haoban-app-customer-web/cardCoupon/find-card-log-page', para)
@@ -266,7 +266,7 @@ export default {
           that.loading = false;
           if (resData.errorCode == 1) {
             that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
             return;
           }
           errMsg.errorMsg(resData);

src/views/apps/cloudDaily/dailyRecord.vue

@@ -413,11 +413,6 @@ export default {
     }
   },
   mounted() {
-    let that = this;
-    that.activeBrand = that.brandId;
-    if (!!that.brandId) {
-      that.getTableList();
-    }
     let start = new Date();
     start = new Date(start.setMonth(start.getMonth() - 3));
     const end = new Date();
@@ -440,6 +435,11 @@ export default {
         .padStart(2, '0')
     );
     this.conditionObj.dateRange = [startDate.join('-'), endDate.join('-')];
+    let that = this;
+    that.activeBrand = that.brandId;
+    if (!!that.brandId) {
+      that.getTableList();
+    }
   },
   components: {
     multipleDel,

src/views/apps/customerApp/memberGroupList.vue

@@ -304,7 +304,7 @@ export default {
               });
             }
             that.groupListData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
             return;
           }
           errMsg.errorMsg(resData);

src/views/apps/customerApp/memberTagSet.vue

@@ -45,7 +45,7 @@
             </el-select>
           </div>
           <div class="btn-group">
-            <el-button @click="drawer = true" type="primary" :disabled="!canSync || !canUseCount" :class="['sync-btn', isShake ? 'shake' : '']">待开启同步标签（ {{ tagIds.length }} ）</el-button><span v-if="canUseCount === 0" class="no-use-count">本月同步次数已用尽</span>
+            <el-button v-if="$getButtonLimit($buttonCode.willSyncTag)" :limit-code="$buttonCode.willSyncTag" @click="drawer = true" type="primary" :disabled="!canSync || !canUseCount" :class="['sync-btn', isShake ? 'shake' : '']">待开启同步标签（ {{ tagIds.length }} ）</el-button><span v-if="canUseCount === 0" class="no-use-count">本月同步次数已用尽</span>
           </div>
         </div>
         <div class="tag-content-bottom">

src/views/apps/quota/monthTask.vue

@@ -274,7 +274,7 @@ export default {
           that.loading = false;
           if (resData.errorCode == 1) {
             that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
             return false;
           }
           errMsg.errorMsg(resData);

src/views/apps/quota/monthTaskDetail.vue

@@ -439,7 +439,7 @@ export default {
           that.loading = false;
           if (resData.errorCode == 1) {
             that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
             return;
           }
           errMsg.errorMsg(resData);

src/views/apps/quota/storeMonthTask.vue

@@ -281,7 +281,7 @@ export default {
             }
             that.tableData = resData.result.list || [];
 
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
             return;
           }
           errMsg.errorMsg(resData);

src/views/salesleads/groupSend/grStoreDetail.vue

@@ -326,7 +326,7 @@ export default {
           let resData = res.data;
           if (resData.errorCode == 1) {
             that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total || 0;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
           } else {
             errMsg.errorMsg(resData);
           }

src/views/salesleads/trafficTask/taskDetail.vue

@@ -669,7 +669,7 @@ export default {
               });
             }
             that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
             if (val == 1) {
               this.$nextTick(() => {
                 this.$refs.multipleTable.toggleAllSelection();

src/views/salesleads/trafficTask/taskRecord.vue

@@ -396,7 +396,7 @@ export default {
           that.loading = false;
           if (resData.errorCode == 1) {
             that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
             if (val == 1) {
               this.$nextTick(() => {
                 this.$refs.multipleTable.toggleAllSelection();

src/views/salesleads/trafficTask/taskViewDetail.vue

@@ -456,7 +456,7 @@ export default {
           that.loading = false;
           if (resData.errorCode == 1) {
             that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.pageInfo ? resData.result.pageInfo.total : 0;
             if (val == 1) {
               this.$nextTick(() => {
                 this.$refs.multipleTable.toggleAllSelection();