zhangjie пре 1 година
родитељ
комит
37d7c8b82a

+ 19 - 0
src/assets/styles/element-ui-costom.scss

@@ -25,6 +25,25 @@
     }
   }
 }
+.view-mode {
+  .el-dialog {
+    .el-dialog__body {
+      position: relative;
+
+      &::before {
+        content: "";
+        display: block;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        right: 0;
+        left: 0;
+        z-index: 8;
+        background-color: transparent;
+      }
+    }
+  }
+}
 .el-dialog__header {
   padding: 15px 20px;
   .el-dialog__title {

+ 1 - 0
src/constants/enumerate.js

@@ -74,6 +74,7 @@ export const DATA_PRIVILEGE_TYPE = {
   SELF_ORG: "本部门数据权限",
   SELF_ORG_BELOW: "本部门及下级部门数据权限",
   ALL: "全部数据权限",
+  COURSE: "课程数据权限",
 };
 
 // 通用题卡规则id

+ 16 - 3
src/modules/base/components/ModifyRole.vue

@@ -1,6 +1,11 @@
 <template>
   <el-dialog
-    class="modify-role"
+    :class="[
+      'modify-role',
+      {
+        'view-mode': viewMode,
+      },
+    ]"
     :visible.sync="modalIsShow"
     :title="title"
     :close-on-click-modal="false"
@@ -57,7 +62,11 @@
       :menus="menus"
     ></privilege-set>
     <div slot="footer">
-      <el-button type="primary" :disabled="isSubmit" @click="submit"
+      <el-button
+        v-if="!viewMode"
+        type="primary"
+        :disabled="isSubmit"
+        @click="submit"
         >确认</el-button
       >
       <el-button @click="cancel">取消</el-button>
@@ -68,7 +77,7 @@
 <script>
 import { DATA_PRIVILEGE_TYPE } from "../../../constants/enumerate";
 import { updateRole, privilegeList, roleBoundPrivileges } from "../api";
-import PrivilegeSet from "./PrivilegeSet";
+import PrivilegeSet from "./PrivilegeSet.vue";
 // import navs from "./privilege/navs.json";
 
 const initModalForm = {
@@ -90,6 +99,10 @@ export default {
         return {};
       },
     },
+    viewMode: {
+      type: Boolean,
+      default: false,
+    },
   },
   computed: {
     isEdit() {

+ 8 - 0
src/modules/base/components/course-simple/SelectSimpleCourse.vue

@@ -7,6 +7,13 @@
           placeholder="开课学院"
         ></org-select>
       </el-form-item>
+      <el-form-item>
+        <el-input
+          v-model.trim="filter.courseName"
+          placeholder="请输入课程名称"
+          clearable
+        ></el-input>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="primary" :disabled="!canSearch" @click="toPage(1)"
@@ -83,6 +90,7 @@ export default {
     return {
       filter: {
         belongOrgId: "",
+        courseName: "",
         examId: "",
       },
       dataList: [],

+ 1 - 1
src/modules/base/views/ClazzSimpleManage.vue

@@ -131,7 +131,7 @@ import {
   clazzTeachCourseQuery,
   deleteClazzSimple,
 } from "../api";
-import ModifyClazzSimple from "../components/course-simple/ModifyClazzSimple";
+import ModifyClazzSimple from "../components/course-simple/ModifyClazzSimple.vue";
 import StudentSimpleManage from "../components/course-simple/StudentSimpleManage.vue";
 
 export default {

+ 18 - 3
src/modules/base/views/RoleManage.vue

@@ -69,12 +69,19 @@
         <el-table-column class-name="action-column" label="操作" width="180px">
           <template slot-scope="scope">
             <el-button
-              v-if="checkPrivilege('link', 'edit')"
+              v-if="checkPrivilege('link', 'edit') && !scope.row.defaultRole"
               class="btn-primary"
               type="text"
               @click="toEdit(scope.row)"
               >编辑</el-button
             >
+            <el-button
+              v-if="scope.row.defaultRole"
+              class="btn-primary"
+              type="text"
+              @click="toView(scope.row)"
+              >查看</el-button
+            >
             <el-button
               v-if="checkPrivilege('link', 'Manager')"
               class="btn-primary"
@@ -118,6 +125,7 @@
       v-if="checkPrivilege('button', 'add') || checkPrivilege('link', 'edit')"
       ref="ModifyRole"
       :instance="curRole"
+      :view-mode="viewMode"
       @modified="getList"
     ></modify-role>
     <!-- ModifyRoleUser -->
@@ -128,8 +136,8 @@
 <script>
 import { ABLE_TYPE } from "@/constants/enumerate";
 import { roleListPage, ableRole, deleteRole } from "../api";
-import ModifyRole from "../components/ModifyRole";
-import ModifyRoleUser from "../components/ModifyRoleUser";
+import ModifyRole from "../components/ModifyRole.vue";
+import ModifyRoleUser from "../components/ModifyRoleUser.vue";
 
 export default {
   name: "role-manage",
@@ -150,6 +158,7 @@ export default {
       curRole: {},
       ABLE_TYPE,
       ROLE_TYPE: {},
+      viewMode: false,
     };
   },
   mounted() {
@@ -180,6 +189,12 @@ export default {
     },
     toEdit(row) {
       this.curRole = row;
+      this.viewMode = false;
+      this.$refs.ModifyRole.open();
+    },
+    toView(row) {
+      this.curRole = row;
+      this.viewMode = true;
       this.$refs.ModifyRole.open();
     },
     toEditUser(row) {