cloud-web-corejs-haier 1.0.4 → 1.0.6

package/src/views/user/outLink/index.vue

@@ -1,57 +1,76 @@
 <template>
   <div>
-    <div id="containt" style="margin-bottom: -4px;" v-if="type==1">
-      <iframe v-if="url" :src="url" style="width: 100%;height:calc(100vh - 40px)"></iframe>
+    <div id="containt" style="margin-bottom: -4px" v-if="type == 1">
+      <iframe
+        v-if="url"
+        :src="url"
+        style="width: 100%; height: calc(100vh - 40px)"
+      ></iframe>
     </div>
-    <component :is="content" v-if="type==2"></component>
+    <component :is="content" v-if="type == 2"></component>
   </div>
 </template>
 
 <script>
-import {getToken} from "@base/utils/auth";
+import { getToken } from "@base/utils/auth";
 
 export default {
-  name: 'outLink',
+  name: "outLink",
   data() {
     return {
       url: null,
       content: null,
-      type: 0
+      type: 0,
     };
   },
   mounted() {
     let url = this.$route.query.url;
     let route = this.$route.query.route;
     if (route) {
-      this.content = require('@/views' + route).default;
+      this.content = require("@/views" + route).default;
       this.type = 2;
     } else {
-      if (url.indexOf('dw=true') >= 0) {
+      let params = this.getCustomReqUrlAndCleanUrl(url);
+      let reqUrl = params.custom_req_url;
+      if (reqUrl) {
+        this.$http({
+          url: reqUrl,
+          method: `post`,
+          data: { thirdUrl: params.newUrl },
+          isLoading: true,
+          // modalStrictly: true,
+          success: (res) => {
+            this.url = res.objx;
+            this.type = 1;
+          },
+        });
+      } else if (url.indexOf("dw=true") >= 0) {
         this.$http({
           url: USER_PREFIX + `/dw_auth/getDwAsc`,
           method: `post`,
           data: {},
           isLoading: true,
           // modalStrictly: true,
-          success: res => {
-            this.url = url.replace('dw=true', 'dw=' + res.objx.dw) + '&param=' + res.objx.param;
+          success: (res) => {
+            this.url =
+              url.replace("dw=true", "dw=" + res.objx.dw) + "&param=" + res.objx.param;
             this.type = 1;
-          }
+          },
         });
-      }else if (url.indexOf('token=platform_token') >= 0) {
+      } else if (url.indexOf("token=platform_token") >= 0) {
         this.$http({
           url: YX_PREFIX + `/fundPlatform/getToken`,
           method: `post`,
           data: {},
           isLoading: true,
-          success: res => {
-            this.url = url.replace('token=platform_token', 'token=' + res.objx);
+          success: (res) => {
+            this.url = url.replace("token=platform_token", "token=" + res.objx);
             this.type = 1;
-          }
+          },
         });
-      } else if (url.indexOf('token=true') >= 0) {
+      } else if (url.indexOf("token=true") >= 0) {
         let token = getToken();
-        this.url = url.replace('token=true', ('token=' + token))
+        this.url = url.replace("token=true", "token=" + token);
         this.type = 1;
       } else {
         this.url = url;
@@ -59,7 +78,27 @@ export default {
       }
     }
   },
-  methods: {}
+  methods: {
+    getCustomReqUrlAndCleanUrl(url) {
+      // 直接使用正则表达式匹配
+      const match = url.match(/[?&]custom_req_url=([^&?#]+)/);
+      if (match) {
+        const customReqUrl = decodeURIComponent(match[1]);
+        // 移除匹配到的参数部分
+        const newUrl = url.replace(match[0], match[0].startsWith("?") ? "?" : "");
+
+        return {
+          custom_req_url: customReqUrl,
+          newUrl: newUrl.replace(/\?$/, "").replace(/\?&/, "?"),
+        };
+      }
+
+      return {
+        custom_req_url: "",
+        newUrl: url,
+      };
+    },
+  },
 };
 </script>
 

package/src/views/user/role/authConfig.vue

@@ -0,0 +1,89 @@
+<template>
+  <el-form
+    :model="formData"
+    status-icon
+    label-width="100px"
+    class="demo-ruleForm"
+    style="border: solid 1px #e9e9e9; padding: 5px"
+  >
+    <el-form-item :label="$t1('查询数据权限')">
+      <el-radio-group
+        v-model="formData.permissions"
+        @change="formData.menuRolePermOrgDTOs = []"
+      >
+        <el-radio :label="1">{{ $t1("创建人") }}</el-radio>
+        <el-radio :label="3">{{ $t1("所有") }}</el-radio>
+        <el-radio :label="2">{{ $t1("当前与下级所有机构权限") }}</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item :label="$t1('额外机构')" v-if="formData.permissions == 2">
+      <el-tag
+        v-for="(item, index) in formData.menuRolePermOrgDTOs"
+        :key="index"
+        type="warning"
+        :disable-transitions="false"
+        :closable="true"
+        @close="formData.menuRolePermOrgDTOs.splice(index, 1)"
+      >
+        <el-tooltip
+          :enterable="false"
+          effect="dark"
+          :content="item.saleOrgName"
+          placement="bottom"
+        >
+          <span>{{ item.saleOrgName }}</span>
+        </el-tooltip>
+      </el-tag>
+      <el-button
+        icon="el-icon-plus"
+        type="warning"
+        class="el-button-tag"
+        @click="openProjectTagDialog"
+      ></el-button>
+    </el-form-item>
+    <saleOrgsDialog
+      v-if="showSaleOrgsDialog"
+      :visiable.sync="showSaleOrgsDialog"
+      @confirm="confirmSaleOrgsDialog"
+    ></saleOrgsDialog>
+  </el-form>
+</template>
+<script>
+import saleOrgsDialog from "@base/views/user/sale_org/dialog.vue";
+export default {
+  props: {
+    formData: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  components: {
+    saleOrgsDialog,
+  },
+  data() {
+    return {
+      showSaleOrgsDialog: false,
+    };
+  },
+  methods: {
+    openProjectTagDialog() {
+      this.showSaleOrgsDialog = true;
+    },
+    confirmSaleOrgsDialog(rows) {
+      if (rows.length) {
+        let ids = this.formData.menuRolePermOrgDTOs.map((item) => item.saleOrgId);
+        let items = rows
+          .filter((item) => !ids.includes(item.id))
+          .map((item) => {
+            return {
+              menus: this.formData.id,
+              saleOrgId: item.id,
+              saleOrgName: item.name,
+            };
+          });
+        if (items.length) this.formData.menuRolePermOrgDTOs.push(...items);
+      }
+    },
+  },
+};
+</script>

package/src/views/user/role/dialog.vue

@@ -12,7 +12,7 @@
     v-el-drag-dialog
     v-el-dialog-center
   >
-    <div class="cont" style="height:65vh">
+    <div class="cont" style="height: 65vh">
       <vxe-grid
         class="is-pointer"
         ref="table-m1"
@@ -26,24 +26,41 @@
         <template #form>
           <div class="clearfix screen-btns">
             <div class="fr">
-              <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text" status="primary"
-                          plain>{{ $t1('重置') }}
+              <vxe-button
+                icon="el-icon-brush"
+                class="button-sty"
+                @click="resetEvent"
+                type="text"
+                status="primary"
+                plain
+                >{{ $t1("重置") }}
               </vxe-button>
-              <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">
-                {{ $t1('搜索') }}
+              <vxe-button
+                status="warning"
+                icon="el-icon-search"
+                class="button-sty"
+                @click="searchEvent"
+              >
+                {{ $t1("搜索") }}
               </vxe-button>
             </div>
           </div>
-          <vxe-form class="screen-box" title-width="92px" title-align="right" :data="formData" @submit="searchEvent"
-                    @reset="resetEvent">
-            <vxe-form-item :title="$t1('用户角色')+':'" field="name">
+          <vxe-form
+            class="screen-box"
+            title-width="92px"
+            title-align="right"
+            :data="formData"
+            @submit="searchEvent"
+            @reset="resetEvent"
+          >
+            <vxe-form-item :title="$t1('用户角色') + ':'" field="name">
               <template v-slot>
-                <el-input v-model="formData.name" size="small" clearable/>
+                <el-input v-model="formData.name" size="small" clearable />
               </template>
             </vxe-form-item>
-            <vxe-form-item :title="$t1('角色编码')+':'" field="code">
+            <vxe-form-item :title="$t1('角色编码') + ':'" field="code">
               <template v-slot>
-                <el-input v-model="formData.code" size="small" clearable/>
+                <el-input v-model="formData.code" size="small" clearable />
               </template>
             </vxe-form-item>
             <vxe-button type="submit" @click="searchEvent" v-show="false"></vxe-button>
@@ -58,9 +75,12 @@
       </div>
     </label>
     <div class="multipleChoice">
-      <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a
-        class="allDel icon-quanbushanchu"
-        @click="clearChecked()"></a>
+      <el-tooltip
+        :enterable="false"
+        effect="dark"
+        :content="$t1('全部删除')"
+        placement="top"
+        ><a class="allDel icon-quanbushanchu" @click="clearChecked()"></a>
       </el-tooltip>
       <div class="list">
         <div class="item" v-for="(checkRow, index) in checkRows" :key="index">
@@ -70,25 +90,27 @@
       </div>
     </div>
     <span slot="footer" class="dialog-footer">
-      <span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
+      <span class="fl tips" v-if="!selectMulti">{{
+        $t1("注：双击确认选择（单选）")
+      }}</span>
       <el-button type="primary" plain class="button-sty" @click="dialogClose">
         <i class="el-icon-close el-icon"></i>
-        {{ $t1('取 消') }}
+        {{ $t1("取 消") }}
       </el-button>
       <el-button type="primary" @click="dialogPrimary" class="button-sty">
         <i class="el-icon-check el-icon"></i>
-        {{ $t1('确 定') }}
+        {{ $t1("确 定") }}
       </el-button>
     </span>
   </el-dialog>
 </template>
 
 <script>
-import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
+import { selectDialogMixins } from "@base/mixins/selectDialog/index.js";
 
 export default {
-  name: 'roleDialog',
-  props: ['visiable', 'multi', 'rows', 'param'],
+  name: "roleDialog",
+  props: ["visiable", "multi", "rows", "param"],
   mixins: [selectDialogMixins],
   created() {
     this.initSetting();
@@ -103,64 +125,64 @@ export default {
       falseValue: false,
       selectMulti: true,
       formData: {},
-      vxeOption: {}
+      vxeOption: {},
     };
   },
   methods: {
     initTableM1() {
       let that = this;
-      let url = USER_PREFIX + '/role/listCurrentPage';
+      let url = USER_PREFIX + "/role/listCurrentPage";
       let tableOption = {
         vue: that,
-        tableRef: 'table-m1',
-        tableName: 'basic_role_dialog-m1',
+        tableRef: "table-m1",
+        tableName: "basic_role_dialog-m1",
         path: url,
         param: () => {
           return {
             ...this.formData,
-            ...this.param
+            ...this.param,
           };
         },
         columns: [
-          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
-          {title: this.$t1('用户角色'), field: 'name', width: 250, fixed: 'left'},
-          {title: this.$t1('角色编码'), field: 'code', width: 150},
-          {title: this.$t1('角色描述'), field: 'description', width: 150},
+          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
+          { title: this.$t1("用户角色"), field: "name", width: 250, fixed: "left" },
+          { title: this.$t1("角色编码"), field: "code", width: 150 },
+          { title: this.$t1("角色描述"), field: "description", width: 150 },
           {
-            title: this.$t1('是否内置'),
-            field: 'systems',
+            title: this.$t1("是否内置"),
+            field: "systems",
             width: 150,
             slots: {
-              default: ({row}) => {
+              default: ({ row }) => {
                 if (row.systems) {
-                  return this.$t1('是');
+                  return this.$t1("是");
                 } else {
-                  return this.$t1('否');
+                  return this.$t1("否");
                 }
-              }
-            }
+              },
+            },
           },
-          {title: this.$t1('所属组织'), field: 'companyName', width: 150},
-          {title: this.$t1('创建时间'), field: 'createDate', width: 150},
+          { title: this.$t1("所属组织"), field: "companyName", width: 150 },
+          { title: this.$t1("创建时间"), field: "createDate", width: 150 },
           {
             width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false
-          }
+            fixed: "right",
+            title: "",
+            sortable: false,
+          },
         ],
         config: {
           checkboxConfig: {
             checkStrictly: true,
             showHeader: this.selectMulti,
-            trigger: 'row'
-          }
-        }
+            trigger: "row",
+          },
+        },
       };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         that.vxeOption = opts;
       });
-    }
-  }
+    },
+  },
 };
 </script>

package/src/views/user/role/edit.vue

@@ -150,8 +150,16 @@
                             v-model="fourthItem.hasAuth"
                             @change="changeBtnSelect(subItem, index3, index4)"
                           ></el-checkbox>
+                          <authConfig
+                            v-if="thrItem.checkPermission"
+                            :formData="thrItem"
+                          ></authConfig>
                         </div>
                       </div>
+                      <authConfig
+                        v-if="subItem.checkPermission"
+                        :formData="subItem"
+                      ></authConfig>
                     </div>
                   </div>
                 </div>
@@ -219,10 +227,13 @@
 </template>
 
 <script>
+import authConfig from "./authConfig.vue";
 export default {
   name: "roleEdit",
   props: ["_dataId"],
-  components: {},
+  components: {
+    authConfig,
+  },
   data() {
     return {
       tabIndex: 0,
@@ -231,6 +242,8 @@ export default {
       role: {
         menus: [],
         mobileMenuIds: [],
+        menuRolePermDTOs: [],
+        menuRolePermOrgDTOs: [],
       },
       allMenus: [],
       allMobileMenus: [],
@@ -267,14 +280,51 @@ export default {
           isLoading: true,
           modalStrictly: true,
           success: (res) => {
-            this.role = res.objx || {};
-            this.initMenuData();
+            let role = res.objx || {};
+            this.getPermissionData((rows, orgRows) => {
+              role.menuRolePermDTOs = rows;
+              role.menuRolePermOrgDTOs = orgRows;
+              this.role = role;
+              this.initMenuData();
+            });
           },
         });
       } else {
         this.initMenuData();
       }
     },
+    getPermissionData(callback) {
+      this.$http({
+        url: USER_PREFIX + `/menu_role_perm/listPerms`,
+        method: `post`,
+        data: {
+          id: this.dataId,
+        },
+        isLoading: true,
+        modalStrictly: true,
+        success: (res) => {
+          let rows = res.objx || [];
+          this.getListPermOrgs((orgRows) => {
+            callback(rows, orgRows);
+          });
+        },
+      });
+    },
+    getListPermOrgs(callback) {
+      this.$http({
+        url: USER_PREFIX + `/menu_role_perm/listPermOrgs`,
+        method: `post`,
+        data: {
+          id: this.dataId,
+        },
+        isLoading: true,
+        modalStrictly: true,
+        success: (res) => {
+          let rows = res.objx || [];
+          callback(rows);
+        },
+      });
+    },
     saveData() {
       this.$refs.editForm.$baseValidate((valid) => {
         if (valid) {
@@ -284,6 +334,9 @@ export default {
             formData.menuIds = this.getMenuFormData();
             formData.mobileMenuIds = this.getMobileMenuFormData();
 
+            //处理权限数据
+            this.handleDataBeforeSubmit();
+
             this.$http({
               url: url,
               method: `post`,
@@ -394,7 +447,7 @@ export default {
       subItem.hasAuth = isCheckSubItem;
       this.$forceUpdate();
     },
-    getMenuFormData() {
+    getMenuFormData(item, menuRolePermDTOs, menuRolePermOrgDTOs) {
       let selectIds = [];
       let menus = this.allMenus;
       menus.forEach(function (item) {
@@ -425,6 +478,41 @@ export default {
       });
       return selectIds;
     },
+    handlePermission(item, menuRolePermDTOs, menuRolePermOrgDTOs) {
+      if (item.checkPermission) {
+        if (item.permissions) {
+          menuRolePermDTOs.push({
+            menus: item.id,
+            permissions: item.permissions,
+          });
+
+          if (item.permissions === 2 && item.menuRolePermOrgDTOs.length) {
+            menuRolePermOrgDTOs.push(...item.menuRolePermOrgDTOs);
+          }
+        }
+      }
+    },
+    handleDataBeforeSubmit() {
+      let menuRolePermDTOs = [];
+      let menuRolePermOrgDTOs = [];
+      let that = this;
+      let menus = this.allMenus;
+      menus.forEach(function (item) {
+        that.handlePermission(item, menuRolePermDTOs, menuRolePermOrgDTOs);
+        if (item.children) {
+          item.children.forEach(function (subItem) {
+            that.handlePermission(subItem, menuRolePermDTOs, menuRolePermOrgDTOs);
+            if (subItem.children) {
+              subItem.children.forEach(function (thrItem) {
+                that.handlePermission(thrItem, menuRolePermDTOs, menuRolePermOrgDTOs);
+              });
+            }
+          });
+        }
+      });
+      this.role.menuRolePermDTOs = menuRolePermDTOs;
+      this.role.menuRolePermOrgDTOs = menuRolePermOrgDTOs;
+    },
     getMobileMenuFormData() {
       let selectIds = [];
       let menus = this.allMobileMenus;
@@ -457,9 +545,31 @@ export default {
       return selectIds;
     },
     handleRoles(rows, menuIds) {
+      let menuRolePermDTOs = this.role.menuRolePermDTOs || [];
+      let menuRolePermOrgDTOs = this.role.menuRolePermOrgDTOs || [];
       let newRows = [];
       for (let i = 0; i < rows.length; i++) {
         let row = rows[i];
+        let permissions = null;
+        let permOrgDTOs = [];
+        if (row.checkPermission) {
+          menuRolePermDTOs.find((item) => {
+            if (item.menus == row.id) {
+              permissions = item.permissions;
+              return true;
+            }
+            return false;
+          });
+
+          menuRolePermOrgDTOs.forEach((item) => {
+            if (item.menus == row.id) {
+              permOrgDTOs.push(item);
+            }
+          });
+        }
+
+        row.permissions = permissions;
+        row.menuRolePermOrgDTOs = permOrgDTOs;
         if (menuIds.includes(row.id)) {
           row.hasAuth = true;
         } else {