fix: "子商家分配权限后也能看到订单数据"

src/assets/language/en.json

@@ -62,7 +62,7 @@
     "submit": "Submit",
     "modifyAccount": "Modify account",
     "delete": "delete",
-    "addAccount": "Add account",
+    "addAccount": "Add submerchant account",
     "whole": "whole",
     "successfullyModifiedTheAccount": "Successfully modified the account",
     "failedToModifyTheAccount": "Failed to modify the account",
@@ -74,7 +74,7 @@
     "total": "",
     "permissions": " permissions in total",
     "rolePermissions": "Role Permissions",
-    "add": "add to",
+    "add": "submerchant",
     "screen": "screen",
     "fullName": "full name",
     "role": "role",
@@ -899,7 +899,7 @@
     "rolePermissionSettings": "Role permission settings",
     "total": "total",
     "inTotal": "individual",
-    "addTo": "add",
+    "addTo": "addRole",
     "edit": "edit",
     "delete": "delete",
     "operationConfirmation": "Operation confirmation",

src/assets/language/zh.json

@@ -62,7 +62,7 @@
     "submit": "提交",
     "modifyAccount": "修改账号",
     "delete": "删除",
-    "addAccount": "添加账号",
+    "addAccount": "添加子商家账号",
     "whole": "全部",
     "successfullyModifiedTheAccount": "修改账号成功",
     "failedToModifyTheAccount": "修改账号失败",
@@ -74,7 +74,7 @@
     "total": "共",
     "permissions": "条权限",
     "rolePermissions": "角色权限",
-    "add": "添加",
+    "add": "子商家",
     "screen": "筛选",
     "fullName": "姓名",
     "role": "角色",
@@ -903,7 +903,7 @@
     "rolePermissionSettings": "角色权限设置",
     "total": "共",
     "inTotal": "个",
-    "addTo": "添加",
+    "addTo": "添加权限组",
     "edit": "编辑",
     "delete": "删除",
     "operationConfirmation": "操作确认",

src/common/js/utils.js

@@ -17,7 +17,6 @@ export const $M_Menus = {
   "M3":t("role.accountOperation"),//账户操作
   // "M4":t("role.orderData"),//报警历史
   "M4":t("role.orderData"),//订单数据
-
   "M5":t("role.advertisingManagement"),//广告管理
   "M6":t("role.taskMessage"),//任务消息
   "M7":t("role.discountCode"),//优惠码

src/views/home/index.vue

@@ -389,7 +389,7 @@ export default {
             (
               item !== "M1" &&
               item !== "M2" && // M2本身就无logo
-              item !== "M4" && 
+              item !== "M4" &&
               item !== "M6" &&
               item !== "M14" &&
               item !== "M16" &&
@@ -432,7 +432,7 @@ export default {
       const isDataOverview = user.menuCodeList.some((item) => {
         return item === "M14";
       })
-      
+
       // 如果没有apk管理
       if (!isApkMan) {
         // 如果是公司人，要把apk添加上去
@@ -455,13 +455,16 @@ export default {
         }
       }
 
-      // 如果有数据概览权限 和 订单数据权限
-      if (isDataOverview && isOrderData.value) {
-        if (user.type < 3) {
+      // 子商家以上级别，默认可以看到订单详情
+      if (user.type < 3) {
+        showDataDiv.value = true;
+      } else {
+        // 如果有数据概览权限 和 订单数据权限
+        if (isDataOverview && isOrderData.value) {
           showDataDiv.value = true;
         }
       }
-      
+
     };
 
     // 常用操作跳转页面
@@ -491,12 +494,7 @@ export default {
           router.push({ path: "/accountPer" });
           break;
         case "M9":
-          // 同时具备 订单数据M4 权限的人才能使用订单导出功能
-          if (isOrderData.value) {
-            router.push({ path: "/orderExport" });
-          } else {
-            console.log("权限不足，无法跳转");
-          }
+          router.push({ path: "/orderExport" });
           break;
         case "M10":
           router.push({ path: "/subLedgerManage" });

src/views/robotRanking.vue

@@ -88,8 +88,9 @@
               </div>
             </template>
           </van-field>
-          <van-field v-if="isAdmin()" @click-input="companyTypeInpClk" readonly clearable v-model="searchForm.companyTypeName"
-            :placeholder="$t('robotRanking.companyTypePlaceholder')" :label="$t('robotRanking.companyTypeLabel')">
+          <van-field v-if="isAdmin()" @click-input="companyTypeInpClk" readonly clearable
+            v-model="searchForm.companyTypeName" :placeholder="$t('robotRanking.companyTypePlaceholder')"
+            :label="$t('robotRanking.companyTypeLabel')">
             <template #right-icon>
               <div class="l-flex-RC">
                 <van-icon v-if="searchForm.companyTypeName" @click="
@@ -239,7 +240,7 @@ export default {
     // 年的日期选择弹窗
     // 点击确定
     const yearPopConfirm = (e) => {
-      console.log("e11", e);
+      // console.log("e的值是11", e);
       const year = e.id;
       const startDate =
         moment().year(year).startOf("year").format("YYYY-MM-DD") + " 00:00:00";
@@ -527,7 +528,6 @@ export default {
         chartType,
         startDate,
         endDate,
-
       };
       getRankingList(param).then(async (res) => {
         const { data } = res;
@@ -698,7 +698,17 @@ export default {
       searchForm.changeTypeName = t("robotRanking.salesStatistics");
       searchForm.changeType = 0;
       searchForm.companyTypeName = t("robotRanking.whole");
-      init();
+
+      // 查询是否有订单数据权限
+      const isOrderData = user.menuCodeList.some((item) => {
+        return item === "M4";
+      })
+
+      // 如果是type<3或者是有订单数据权限M4的子商家才可以查看
+      if ( user.type < 3 || isOrderData ) {
+        init();
+      }
+
       window.addEventListener("resize", () => {
         chartObj.day && chartObj.day.resize();
         chartObj.week && chartObj.week.resize();
@@ -757,11 +767,11 @@ export default {
     // 筛选弹窗
     // 点击商家输入框
     const busiInpClk = () => {
-      console.log(111111111);
+      // console.log(111111111);
       busiPopShow.value = true;
     };
     const busiPopConfirm = (e) => {
-      console.log("e", e);
+      // console.log("e的值是", e);
       busiPopShow.value = false;
       searchForm.businessName = e.name;
     };
@@ -800,7 +810,6 @@ export default {
       yearPopList,
       yearPopConfirm,
       yearPopFieldName,
-
       changeTypeShow,
       changeTypePopList,
       changeTypePopConfirm,
@@ -811,7 +820,6 @@ export default {
       companyTypeShow,
       totalNoData,
       chgTypeDefaIdx,
-
       isAdmin,
     };
   },

src/views/role/add.vue

@@ -128,13 +128,19 @@ export default {
     });
     // 设置菜单权限
     const menuSet = ()=>{
-      // 如果不是管理员权限type=0，要删除 广告管理M5，杉德分账M10，系统脱机M17，apk管理M19
+      // 如果不是admin管理员权限type=0，要删除 广告管理M5，杉德分账M10，系统脱机M17，apk管理M19
       if(user.type !== 0){
         delete $M_Menus['M5'];
         delete $M_Menus['M10'];
         delete $M_Menus['M17'];
         delete $M_Menus['M19'];
       }
+      // 如果是商家，进一步删除 账户操作M3，订单导出M9，
+      if (user.type === 2) {
+        delete $M_Menus['M3'];
+        delete $M_Menus['M9'];
+      }
+
       for(const key in $M_Menus){
         menuCodeList.value.push({
           label:$M_Menus[key],