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

menu-data/button-code.js

@@ -286,7 +286,8 @@ module.exports = {
   // 导购设置-导购操作权限设置
   // 保存（按钮）
   'guide-setting': {
-    saveGuideSetting: ['保存', 1, 1]
+    saveGuideSetting: ['导购操作权限设置-保存', 1, 1],
+    saveAppsVisible: ['应用可见权限设置-保存', 1, 1],
   },
   enterpriseSet: {
     // 1.同步刷新（按钮）

menu-data/button-code.json

-{"multipleAssign":"multipleAssign","assign":"assign","syncTagLog":"syncTagLog","addShowRules":"addShowRules","editShowRules":"editShowRules","delShowRules":"delShowRules","groupExpire":"groupExpire","syncGroup":"syncGroup","addGroupTemp":"addGroupTemp","editGroupTemp":"editGroupTemp","setStoreArea":"setStoreArea","delGroupTemp":"delGroupTemp","searchSetSave":"searchSetSave","saveTrafficTaskSet":"saveTrafficTaskSet","addCard":"addCard","editCard":"editCard","delCard":"delCard","sendCardLog":"sendCardLog","getCardLog":"getCardLog","saveEvaluateSet":"saveEvaluateSet","addMaterialGroup":"addMaterialGroup","editMaterialGroup":"editMaterialGroup","delMaterialGroup":"delMaterialGroup","addText":"addText","editText":"editText","delText":"delText","textAssignStore":"textAssignStore","addImage":"addImage","editImage":"editImage","delImage":"delImage","imageAssignStore":"imageAssignStore","addWeb":"addWeb","editWeb":"editWeb","delWeb":"delWeb","webAssignStore":"webAssignStore","addVideo":"addVideo","editVideo":"editVideo","delVideo":"delVideo","videoAssignStore":"videoAssignStore","addFile":"addFile","editFile":"editFile","delFile":"delFile","fileAssignStore":"fileAssignStore","addApps":"addApps","editApps":"editApps","delApps":"delApps","appsAssignStore":"appsAssignStore","saveGoodsSet":"saveGoodsSet","exportActiveUser":"exportActiveUser","exportLoginUser":"exportLoginUser","exportAreaLoginUser":"exportAreaLoginUser","multipleDelReport":"multipleDelReport","exportReport":"exportReport","reportDetail":"reportDetail","multipleDelReportDetail":"multipleDelReportDetail","delReportDetail":"delReportDetail","showReportDetail":"showReportDetail","multipleExportReport":"multipleExportReport","saveTaskSet":"saveTaskSet","settingSystemReport":"settingSystemReport","saveSystemReport":"saveSystemReport","addCustomReport":"addCustomReport","copyCustomReport":"copyCustomReport","editCustomReport":"editCustomReport","delCustomReport":"delCustomReport","monthTarget":"monthTarget","dayTarget":"dayTarget","exportMonthTask":"exportMonthTask","checkMonthTask":"checkMonthTask","multipleDelTask":"multipleDelTask","delTask":"delTask","exportStoreList":"exportStoreList","checkStoreList":"checkStoreList","exportStoreDetail":"exportStoreDetail","checkStoreDetail":"checkStoreDetail","exportStoreDetailPop":"exportStoreDetailPop","previewStoreDetail":"previewStoreDetail","exportGrTaskList":"exportGrTaskList","checkGrTaskList":"checkGrTaskList","exportTaskRecord":"exportTaskRecord","multipleDelTaskRecord":"multipleDelTaskRecord","checkTaskRecord":"checkTaskRecord","exportTaskDetail":"exportTaskDetail","multipleDelTaskDetail":"multipleDelTaskDetail","delTaskDetail":"delTaskDetail","resolveTaskDetail":"resolveTaskDetail","previewTaskDetail":"previewTaskDetail","exportTaskView":"exportTaskView","multipleDelTaskView":"multipleDelTaskView","checkTaskView":"checkTaskView","exportTaskViewDetail":"exportTaskViewDetail","multipleDelTaskViewDetail":"multipleDelTaskViewDetail","checkTaskDetail":"checkTaskDetail","addSalutatory":"addSalutatory","editSalutatory":"editSalutatory","delSalutatory":"delSalutatory","multipleResolve":"multipleResolve","singleResolve":"singleResolve","singleReject":"singleReject","saveApplySetting":"saveApplySetting","refreshStoreMember":"refreshStoreMember","exportContact":"exportContact","checkContactDetail":"checkContactDetail","checkContactMemberDetail":"checkContactMemberDetail","checkLog":"checkLog","saveGuideSetting":"saveGuideSetting","refreshStoreInfo":"refreshStoreInfo","saveMemberSecret":"saveMemberSecret","addMemberAppsSecret":"addMemberAppsSecret","editMemberAppsSecret":"editMemberAppsSecret","delMemberAppsSecret":"delMemberAppsSecret","addAppsSecret":"addAppsSecret","getAppsSecret":"getAppsSecret","editAppsSecret":"editAppsSecret","delAppsSecret":"delAppsSecret","checkAuth":"checkAuth","bindStoreList":"bindStoreList","refreshStore":"refreshStore","refreshAdminList":"refreshAdminList"}
\ No newline at end of file
+{"multipleAssign":"multipleAssign","assign":"assign","syncTagLog":"syncTagLog","addShowRules":"addShowRules","editShowRules":"editShowRules","delShowRules":"delShowRules","groupExpire":"groupExpire","syncGroup":"syncGroup","addGroupTemp":"addGroupTemp","editGroupTemp":"editGroupTemp","setStoreArea":"setStoreArea","delGroupTemp":"delGroupTemp","searchSetSave":"searchSetSave","saveTrafficTaskSet":"saveTrafficTaskSet","addCard":"addCard","editCard":"editCard","delCard":"delCard","sendCardLog":"sendCardLog","getCardLog":"getCardLog","saveEvaluateSet":"saveEvaluateSet","addMaterialGroup":"addMaterialGroup","editMaterialGroup":"editMaterialGroup","delMaterialGroup":"delMaterialGroup","addText":"addText","editText":"editText","delText":"delText","textAssignStore":"textAssignStore","addImage":"addImage","editImage":"editImage","delImage":"delImage","imageAssignStore":"imageAssignStore","addWeb":"addWeb","editWeb":"editWeb","delWeb":"delWeb","webAssignStore":"webAssignStore","addVideo":"addVideo","editVideo":"editVideo","delVideo":"delVideo","videoAssignStore":"videoAssignStore","addFile":"addFile","editFile":"editFile","delFile":"delFile","fileAssignStore":"fileAssignStore","addApps":"addApps","editApps":"editApps","delApps":"delApps","appsAssignStore":"appsAssignStore","saveGoodsSet":"saveGoodsSet","exportActiveUser":"exportActiveUser","exportLoginUser":"exportLoginUser","exportAreaLoginUser":"exportAreaLoginUser","multipleDelReport":"multipleDelReport","exportReport":"exportReport","reportDetail":"reportDetail","multipleDelReportDetail":"multipleDelReportDetail","delReportDetail":"delReportDetail","showReportDetail":"showReportDetail","multipleExportReport":"multipleExportReport","saveTaskSet":"saveTaskSet","settingSystemReport":"settingSystemReport","saveSystemReport":"saveSystemReport","addCustomReport":"addCustomReport","copyCustomReport":"copyCustomReport","editCustomReport":"editCustomReport","delCustomReport":"delCustomReport","monthTarget":"monthTarget","dayTarget":"dayTarget","exportMonthTask":"exportMonthTask","checkMonthTask":"checkMonthTask","multipleDelTask":"multipleDelTask","delTask":"delTask","exportStoreList":"exportStoreList","checkStoreList":"checkStoreList","exportStoreDetail":"exportStoreDetail","checkStoreDetail":"checkStoreDetail","exportStoreDetailPop":"exportStoreDetailPop","previewStoreDetail":"previewStoreDetail","exportGrTaskList":"exportGrTaskList","checkGrTaskList":"checkGrTaskList","exportTaskRecord":"exportTaskRecord","multipleDelTaskRecord":"multipleDelTaskRecord","checkTaskRecord":"checkTaskRecord","exportTaskDetail":"exportTaskDetail","multipleDelTaskDetail":"multipleDelTaskDetail","delTaskDetail":"delTaskDetail","resolveTaskDetail":"resolveTaskDetail","previewTaskDetail":"previewTaskDetail","exportTaskView":"exportTaskView","multipleDelTaskView":"multipleDelTaskView","checkTaskView":"checkTaskView","exportTaskViewDetail":"exportTaskViewDetail","multipleDelTaskViewDetail":"multipleDelTaskViewDetail","checkTaskDetail":"checkTaskDetail","addSalutatory":"addSalutatory","editSalutatory":"editSalutatory","delSalutatory":"delSalutatory","multipleResolve":"multipleResolve","singleResolve":"singleResolve","singleReject":"singleReject","saveApplySetting":"saveApplySetting","refreshStoreMember":"refreshStoreMember","exportContact":"exportContact","checkContactDetail":"checkContactDetail","checkContactMemberDetail":"checkContactMemberDetail","checkLog":"checkLog","saveGuideSetting":"saveGuideSetting","saveAppsVisible":"saveAppsVisible","refreshStoreInfo":"refreshStoreInfo","saveMemberSecret":"saveMemberSecret","addMemberAppsSecret":"addMemberAppsSecret","editMemberAppsSecret":"editMemberAppsSecret","delMemberAppsSecret":"delMemberAppsSecret","addAppsSecret":"addAppsSecret","getAppsSecret":"getAppsSecret","editAppsSecret":"editAppsSecret","delAppsSecret":"delAppsSecret","checkAuth":"checkAuth","bindStoreList":"bindStoreList","refreshStore":"refreshStore","refreshAdminList":"refreshAdminList"}
\ No newline at end of file

src/views/enterprise/guide-setting.vue

 <template>
-  <div class="guide-setting">
-    <dm-sub-title class="guide-setting-title">导购操作权限设置</dm-sub-title>
-    <div class="guide-auth-list">
-      <div class="guide-auth-item">
-        <span class="auth-item-label">允许编辑导购信息</span>
-        <el-switch v-model="settingData.editClerkFlag" :active-value="1" :inactive-value="0"></el-switch>
+  <el-tabs v-model="activeName">
+    <el-tab-pane label="导购操作权限设置" name="first">
+      <div class="guide-setting">
+        <div class="guide-auth-list">
+          <div class="guide-auth-item">
+            <span class="auth-item-label">允许编辑导购信息</span>
+            <el-switch v-model="settingData.editClerkFlag" :active-value="1" :inactive-value="0"></el-switch>
+          </div>
+          <div class="guide-auth-item">
+            <span class="auth-item-label">允许店长添加导购</span>
+            <el-switch v-model="settingData.addClerkFlag" :active-value="1" :inactive-value="0"></el-switch>
+          </div>
+          <div class="guide-auth-item">
+            <span class="auth-item-label">允许店长删除导购</span>
+            <el-switch v-model="settingData.delClerkFlag" :active-value="1" :inactive-value="0"></el-switch>
+          </div>
+        </div>
+        <el-button class="save-btn" v-if="$getButtonLimit($buttonCode.saveGuideSetting)" :limit-code="$buttonCode.saveGuideSetting" :loading="loading" type="primary" @click="onSave">保存</el-button>
       </div>
-      <div class="guide-auth-item">
-        <span class="auth-item-label">允许店长添加导购</span>
-        <el-switch v-model="settingData.addClerkFlag" :active-value="1" :inactive-value="0"></el-switch>
+    </el-tab-pane>
+    <el-tab-pane label="应用可见权限设置" name="second">
+      <div class="guide-setting">
+        <p class="app-auth-tip">设置导购可见应用</p>
+        <el-row>
+          <el-checkbox-group v-model="settingData.checked">
+            <el-col :span="3" v-for="el in allApps" :key="el.applicationId" style="margin-bottom: 12px">
+              <el-checkbox :label="el.applicationId">{{ el.applicationName }}</el-checkbox>
+            </el-col>
+          </el-checkbox-group>
+        </el-row>
+        <el-button class="save-btn" v-if="$getButtonLimit($buttonCode.saveAppsVisible)" :limit-code="$buttonCode.saveAppsVisible" :loading="loading" type="primary" @click="onSave">保存</el-button>
       </div>
-      <div class="guide-auth-item">
-        <span class="auth-item-label">允许店长删除导购</span>
-        <el-switch v-model="settingData.delClerkFlag" :active-value="1" :inactive-value="0"></el-switch>
-      </div>
-    </div>
-    <dm-sub-title class="guide-setting-title">应用可见权限设置</dm-sub-title>
-    <p class="app-auth-tip">设置导购可见应用</p>
-    <el-row>
-      <el-checkbox-group v-model="settingData.checked">
-        <el-col :span="3" v-for="el in allApps" :key="el.applicationId" style="margin-bottom: 12px">
-          <el-checkbox :label="el.applicationId">{{ el.applicationName }}</el-checkbox>
-        </el-col>
-      </el-checkbox-group>
-    </el-row>
-    <hb-form-bottom v-if="$getButtonLimit($buttonCode.saveGuideSetting)">
-      <el-button :limit-code="$buttonCode.saveGuideSetting" :loading="loading" type="primary" @click="onSave">保存</el-button>
-    </hb-form-bottom>
-  </div>
+    </el-tab-pane>
+  </el-tabs>
 </template>
 
 <script>
@@ -38,6 +43,7 @@ export default {
   data() {
     return {
       loading: false,
+      activeName: 'first',
       settingData: {
         editClerkFlag: 0,
         addClerkFlag: 0,
@@ -67,13 +73,21 @@ export default {
     onSave() {
       this.loading = true;
       const { editClerkFlag, addClerkFlag, delClerkFlag, checked } = this.settingData;
-      const params = { editClerkFlag, addClerkFlag, delClerkFlag, dataJson: '' };
-      params.dataJson = this.allApps.map(el => {
-        return { applicationId: el.applicationId, openFlag: checked.includes(el.applicationId) ? 1 : 0 };
-      });
-      params.dataJson = JSON.stringify(params.dataJson);
+      let params = {};
+      if (this.activeName == 'first') {
+        params = { editClerkFlag, addClerkFlag, delClerkFlag };
+      } else if (this.activeName == 'second') {
+        const dataJson = this.allApps.map(el => {
+          return { applicationId: el.applicationId, openFlag: checked.includes(el.applicationId) ? 1 : 0 };
+        });
+        params = { dataJson: JSON.stringify(dataJson) };
+      }
+      const methods = {
+        first: params => postRequest('/haoban-manage3-web/save-clerk-edit-flag', params),
+        second: params => postRequest('/haoban-manage3-web/open-or-close', params)
+      };
 
-      postRequest('/haoban-manage3-web/open-or-close', params)
+      methods[this.activeName](params)
         .then(res => {
           const { errorCode } = res.data || {};
           if (errorCode != 1) {
@@ -91,12 +105,8 @@ export default {
 
 <style lang="scss" scoped>
 .guide-setting {
-  padding: 20px;
-  .guide-setting-title {
-    margin-bottom: 22px;
-  }
+  padding: 0 20px 20px;
   .guide-auth-list {
-    margin-bottom: 44px;
     border-radius: 4px;
     border: 1px solid #dcdfe6;
     .guide-auth-item {
@@ -123,5 +133,8 @@ export default {
     color: #303133;
     line-height: 20px;
   }
+  .save-btn {
+    margin-top: 40px;
+  }
 }
 </style>