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

src/store/store.js

@@ -22,7 +22,7 @@ export default new Vuex.Store({
     addDepartment: [], // 添加
     editDepartment: [], // 编辑配置
     delDepartment: [], // 删除配置
-    wxEnterpriseType: 0,
+    wxEnterpriseType: 0, // 0：总部 1：代理，有些按钮对代理商禁用，新权限管理系统上线后废弃此逻辑
     salesDate: initDataRange()
   },
   mutations: {

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)

src/views/apps/customerApp/add-member-show-rules.vue

@@ -61,7 +61,7 @@ export default {
   data() {
     const valiStoreType = (rules, value, callback) => {
       const data = value.filter(el => !this.selectedTypes.includes(el));
-      if (this.myCustomData.storeType.includes('-1')) {
+      if (this.myCustomData.storeType.includes('-999')) {
         return callback();
       }
       if (this.storeTypes.every(el => this.selectedTypes.includes(el.value))) {
@@ -74,7 +74,7 @@ export default {
     };
     return {
       // 门店类型（0:自营,1:联营,2:代理(加盟),3:代销,4:托管）
-      // -1:全部，也就是通用策略、默认策略
+      // -999:全部，也就是通用策略、默认策略
       storeTypes: [
         { label: '自营', value: '0' },
         { label: '联营', value: '1' },
@@ -87,7 +87,7 @@ export default {
       myCustomData: {
         memberManageSettingId: '', // 会员设置id，更新时必传
         strategyName: '',
-        storeType: [], //门店类型	-1:全部；1:自营；2:联营；3:代理；4:代销；5:托管
+        storeType: [], //门店类型	-999:全部；1:自营；2:联营；3:代理；4:代销；5:托管
         mainStoreFlag: 0, // 服务门店显示，1显示0不现实
         minorStoreFlag: 0, // 协管门店显示，1显示0不显示
         openCardStoreFlag: 0, // 开卡门店显示，1显示0不显示
@@ -119,7 +119,7 @@ export default {
         }
         // storeType = -1时为通用策略
         // 通用策略不能修改门店类型
-        if (this.myCustomData.storeType.includes('-1')) return;
+        if (this.myCustomData.storeType.includes('-999')) return;
         if (Array.isArray(result)) {
           this.selectedTypes = result.reduce((types, el) => {
             if (typeof el.storeType == 'string' && el.memberManageSettingId != this.myCustomData.memberManageSettingId) {
@@ -180,10 +180,10 @@ export default {
         });
         // storeType = -1时为通用策略
         // 通用策略不能修改门店类型
-        if (storeType == -'1') {
+        if (storeType == '-999') {
           this.selectedTypes = this.storeTypes.map(el => el.value);
           this.myCustomData.storeType = this.storeTypes.map(el => el.value);
-          this.myCustomData.storeType.push('-1');
+          this.myCustomData.storeType.push('-999');
         }
         this.$nextTick(() => {
           this.rules.options.trigger = 'change';

src/views/apps/customerApp/memberGroupSetList.vue

@@ -17,7 +17,7 @@
       <div></div>
       <div>
         <span class="font-12 color-909399">最多新建20个模板</span>
-        <el-button v-if="$getButtonLimit($buttonCode.addGroupTemp)" :limit-code="$buttonCode.addGroupTemp" :disabled="$store.state.wxEnterpriseType || templateList.length >= 20" class="m-l-20" type="primary" @click="addTemplate">新建模版</el-button>
+        <el-button v-if="$getButtonLimit($buttonCode.addGroupTemp)" :limit-code="$buttonCode.addGroupTemp" :disabled="$store.state.wxEnterpriseType || canAddTemp" class="m-l-20" type="primary" @click="addTemplate">新建模版</el-button>
       </div>
     </div>
     <div class="m-t-20">
@@ -58,7 +58,7 @@
 <script>
 import showMsg from '@/common/js/showmsg';
 import errMsg from '@/common/js/error';
-import { postRequest } from '@/api/api';
+import { getRequest, postRequest } from '@/api/api';
 export default {
   name: 'app-detail',
   props: {
@@ -72,10 +72,21 @@ export default {
       wxEnterpriseRelatedId: sessionStorage.getItem('userInfos') ? JSON.parse(sessionStorage.getItem('userInfos')).wxEnterpriseId : '',
       loading: false,
       // 模板
-      templateList: []
+      templateList: [],
+      canAddTemp: false
     };
   },
   methods: {
+    getTemplateCount() {
+      getRequest('/haoban-app-customer-web/get-template-count', {}).then(res => {
+        const { errorCode, result } = res.data || {};
+        if (errorCode != 1) {
+          errMsg.errorMsg(res.data);
+          return;
+        }
+        this.canAddTemp = result >= 20;
+      });
+    },
     /**
      * 删除
      */
@@ -167,6 +178,7 @@ export default {
   mounted() {
     const that = this;
     that.getTableList();
+    this.getTemplateCount();
   }
 };
 </script>

src/views/apps/customerApp/memberTagSet.vue

@@ -74,12 +74,12 @@
                 <span :class="['state-point', syncStatusClass[row.syncFlag]]">{{ syncStatusOpt[row.syncFlag] }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="操作">
+            <el-table-column label="操作" v-if="$getButtonLimit($buttonCode.breakSyncTag)">
               <template slot-scope="{ row }">
-                <p v-if="row.syncFlag == 2 && canSync">
-                  <el-button type="text" @click="changeSync(row)">关闭同步</el-button>
+                <p v-if="row.syncFlag == 2 && canSync && $getButtonLimit($buttonCode.breakSyncTag)">
+                  <el-button :limit-code="$buttonCode.breakSyncTag" type="text" @click="changeSync(row)">关闭同步</el-button>
                 </p>
-                <p v-else></p>
+                <p v-else>--</p>
               </template>
             </el-table-column>
             <el-table-column type="expand" width="1">