数据权限修改

src/modules/admin/components/ModifySystemRole.vue

@@ -101,12 +101,12 @@ export default {
     },
     async visibleChange() {
       let privilegeIds = [],
-        datePermissionInfo = [];
+        dataPermissionInfo = [];
       if (this.instance.id) {
         this.modalForm = this.$objAssign(initModalForm, this.instance);
         const data = await roleBoundPrivileges(this.instance.id);
         privilegeIds = data.privilegeIds || [];
-        datePermissionInfo = data.datePermissionInfo || [];
+        dataPermissionInfo = data.dataPermissionInfo || [];
         this.modalForm.privilegeIds = privilegeIds;
       } else {
         this.modalForm = { ...initModalForm };
@@ -116,7 +116,7 @@ export default {
         this.$refs.PrivilegeSet &&
           this.$refs.PrivilegeSet.buildTableData(
             privilegeIds,
-            datePermissionInfo
+            dataPermissionInfo
           );
       });
     },
@@ -132,7 +132,7 @@ export default {
 
       const {
         privilegeIds,
-        datePermissionInfo
+        dataPermissionInfo
       } = this.$refs.PrivilegeSet.getSelectedPrivileges();
       if (!privilegeIds.length) {
         this.$emit("请设置角色权限！");
@@ -143,7 +143,7 @@ export default {
       this.isSubmit = true;
       const datas = { ...this.modalForm };
       datas.privilegeIds = privilegeIds;
-      datas.datePermissionInfo = datePermissionInfo;
+      datas.dataPermissionInfo = dataPermissionInfo;
       const data = await updateRole(datas).catch(() => {});
       this.isSubmit = false;
       if (!data) return;

src/modules/admin/components/school/SchoolSetMenu.vue

@@ -35,7 +35,7 @@ export default {
     return {
       menus: [],
       privilegeIds: [],
-      datePermissionInfo: [],
+      dataPermissionInfo: [],
       loading: false
     };
   },
@@ -49,7 +49,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.PrivilegeSet.buildTableData(
           this.privilegeIds,
-          this.datePermissionInfo
+          this.dataPermissionInfo
         );
       });
     },
@@ -68,19 +68,19 @@ export default {
     async getSchoolMenuInfo() {
       const data = await schoolSetMenuInfo(this.school.id);
       this.privilegeIds = data.privilegeIdList || [];
-      this.datePermissionInfo = data.datePermissionInfo || [];
+      this.dataPermissionInfo = data.dataPermissionInfo || [];
     },
     async confirm() {
       if (this.loading) return;
       this.loading = true;
       const {
         privilegeIds,
-        datePermissionInfo
+        dataPermissionInfo
       } = this.$refs.PrivilegeSet.getSelectedPrivileges();
       const res = await schoolSetMenuUpdate({
         schoolId: this.school.id,
         privilegeIds,
-        datePermissionInfo
+        dataPermissionInfo
       }).catch(() => {});
       this.loading = false;
       if (!res) return;

src/modules/admin/views/SchoolMenuManage.vue

@@ -112,8 +112,8 @@ export default {
       this.modalForm.pdfSize = data.pdfSize || [...this.sysPdfSize];
       this.modalForm.accountSmsVerify = data.accountSmsVerify;
       const privilegeIds = data.privilegeIdList || [];
-      const datePermissionInfo = data.datePermissionInfo || [];
-      this.$refs.PrivilegeSet.buildTableData(privilegeIds, datePermissionInfo);
+      const dataPermissionInfo = data.dataPermissionInfo || [];
+      this.$refs.PrivilegeSet.buildTableData(privilegeIds, dataPermissionInfo);
     },
     async save() {
       if (!this.schoolId) {
@@ -129,12 +129,12 @@ export default {
       this.loading = true;
       const {
         privilegeIds,
-        datePermissionInfo
+        dataPermissionInfo
       } = this.$refs.PrivilegeSet.getSelectedPrivileges();
       const res = await updateSchoolMenu({
         schoolId: this.schoolId,
         privilegeIds,
-        datePermissionInfo,
+        dataPermissionInfo,
         ...this.modalForm
       }).catch(() => {});
       this.loading = false;

src/modules/base/components/ModifyRole.vue

@@ -32,12 +32,12 @@
           clearable
         ></el-input>
       </el-form-item>
-      <el-form-item prop="datePermissionType" label="数据权限：">
+      <el-form-item prop="dataPermissionType" label="数据权限：">
         <el-select
-          v-model="modalForm.datePermissionType"
+          v-model="modalForm.dataPermissionType"
           placeholder="请选择"
           style="width:282px;"
-          @change="datePermissionTypeChange"
+          @change="dataPermissionTypeChange"
         >
           <el-option
             v-for="(val, key) in DATA_PRIVILEGE_TYPE"
@@ -73,7 +73,7 @@ const initModalForm = {
   id: null,
   name: "",
   interpret: "",
-  datePermissionType: "SELF",
+  dataPermissionType: "SELF",
   privilegeIds: []
 };
 
@@ -112,7 +112,7 @@ export default {
             trigger: "change"
           }
         ],
-        // datePermissionType: [
+        // dataPermissionType: [
         //   {
         //     required: true,
         //     message: "请选择数据权限",
@@ -147,12 +147,12 @@ export default {
     },
     async visibleChange() {
       let privilegeIds = [],
-        datePermissionInfo = [];
+        dataPermissionInfo = [];
       if (this.instance.id) {
         this.modalForm = this.$objAssign(initModalForm, this.instance);
         const data = await roleBoundPrivileges(this.instance.id);
         privilegeIds = data.privilegeIds || [];
-        datePermissionInfo = data.datePermissionInfo || [];
+        dataPermissionInfo = data.dataPermissionInfo || [];
         this.modalForm.privilegeIds = privilegeIds;
       } else {
         this.modalForm = { ...initModalForm };
@@ -161,7 +161,7 @@ export default {
         this.$refs.modalFormComp.clearValidate();
         this.$refs.PrivilegeSet.buildTableData(
           privilegeIds,
-          datePermissionInfo
+          dataPermissionInfo
         );
       });
     },
@@ -171,9 +171,9 @@ export default {
     open() {
       this.modalIsShow = true;
     },
-    datePermissionTypeChange() {
-      this.$refs.PrivilegeSet.resetdatePermissionType(
-        this.modalForm.datePermissionType
+    dataPermissionTypeChange() {
+      this.$refs.PrivilegeSet.resetdataPermissionType(
+        this.modalForm.dataPermissionType
       );
     },
     async submit() {
@@ -182,7 +182,7 @@ export default {
 
       const {
         privilegeIds,
-        datePermissionInfo
+        dataPermissionInfo
       } = this.$refs.PrivilegeSet.getSelectedPrivileges();
       if (!privilegeIds.length) {
         this.$emit("请设置功能权限！");
@@ -193,7 +193,7 @@ export default {
       this.isSubmit = true;
       const datas = { ...this.modalForm };
       datas.privilegeIds = privilegeIds;
-      datas.datePermissionInfo = datePermissionInfo;
+      datas.dataPermissionInfo = dataPermissionInfo;
       const data = await updateRole(datas).catch(() => {});
       this.isSubmit = false;
       if (!data) return;

src/modules/base/components/PrivilegeSet.vue

@@ -26,7 +26,7 @@
                 row.isPage && col && col.type === 'page-data-permission'
               "
             >
-              <el-select v-model="row.datePermissionType" placeholder="请选择">
+              <el-select v-model="row.dataPermissionType" placeholder="请选择">
                 <el-option
                   v-for="(val, key) in DATA_PRIVILEGE_TYPE"
                   :key="key"
@@ -117,14 +117,14 @@ export default {
       ];
       return headers;
     },
-    buildTableData(privilegeIds = [], datePermissionInfo = []) {
+    buildTableData(privilegeIds = [], dataPermissionInfo = []) {
       let tableData = [];
       let tableColumnCount = this.maxDeep + 6;
       const pageSetTypes = ["conditions", "buttons", "lists", "links"];
 
       let datePermissionMap = {};
-      datePermissionInfo.forEach(item => {
-        datePermissionMap[item.id] = item.datePermissionType;
+      dataPermissionInfo.forEach(item => {
+        datePermissionMap[item.privilegeId] = item.dataPermissionType;
       });
       const buildData = (navs, deep) => {
         ++deep;
@@ -158,7 +158,7 @@ export default {
             id: nav.id,
             name: nav.name,
             enable: privilegeIds.includes(nav.id),
-            datePermissionType: datePermissionMap[nav.id] || "SELF",
+            dataPermissionType: datePermissionMap[nav.id] || "SELF",
             type: nav.type,
             parentId: nav.parentId,
             isPage,
@@ -173,19 +173,19 @@ export default {
 
       this.tableData = tableData;
     },
-    resetdatePermissionType(val) {
-      this.tableData.forEach(item => (item.datePermissionType = val));
+    resetdataPermissionType(val) {
+      this.tableData.forEach(item => (item.dataPermissionType = val));
     },
     getSelectedPrivileges() {
       let privilegeIds = [];
-      let datePermissionInfo = [];
+      let dataPermissionInfo = [];
       this.tableData
         .filter(row => row.enable)
         .forEach(row => {
           privilegeIds.push(row.id);
-          datePermissionInfo.push({
-            id: row.id,
-            datePermissionType: row.datePermissionType
+          dataPermissionInfo.push({
+            privilegeId: row.id,
+            dataPermissionType: row.dataPermissionType
           });
           row.columns.forEach(column => {
             if (!column.datas || !column.datas.length) return;
@@ -195,7 +195,7 @@ export default {
             });
           });
         });
-      return { privilegeIds, datePermissionInfo };
+      return { privilegeIds, dataPermissionInfo };
     },
     // set change
     pageSelectChange(row, enable) {