Просмотр исходного кода

通知弹窗样式,通知发布、记录删除权限控制

cfort 2 лет назад
Родитель
Сommit
18e59fcddc

+ 4 - 3
src/views/platform/bpmn/bpmInstHis/list.vue

@@ -289,9 +289,10 @@ export default {
     created () {
     created () {
         this.loadData()
         this.loadData()
         this.getConfig()
         this.getConfig()
-        const roleList = this.$store.getters.userInfo.role
-        // 系统管理角色添加删除按钮
-        const hasRole = roleList.some(item => item.name === '系统管理角色')
+        const { role = [] } = this.$store.getters.userInfo || {}
+        const roleList = ['xtgljs', 'xxglxzfzr', 'syszr']
+        // 系统管理角色、信息管理负责人、检验科主任添加删除按钮
+        const hasRole = role.some(item => roleList.includes(item.alias))
         this.listConfig.toolbars.push({
         this.listConfig.toolbars.push({
             key: 'detail',
             key: 'detail',
             label: '详情',
             label: '详情',

+ 12 - 2
src/views/platform/system/news/edit.vue

@@ -11,7 +11,7 @@
         @open="getform"
         @open="getform"
         @close="closeDialog"
         @close="closeDialog"
     >
     >
-        <el-row style="padding: 10px; max-height: 600px;">
+        <el-row class="notice-container">
             <!-- <div style="padding-left:65px;">
             <!-- <div style="padding-left:65px;">
                 <span class="photo-area" @click="dialogPictureVisible = !readonly">
                 <span class="photo-area" @click="dialogPictureVisible = !readonly">
                     <img v-if="form.picture" :src="image" class="avatar">
                     <img v-if="form.picture" :src="image" class="avatar">
@@ -35,7 +35,13 @@
                 @action-event="uploaderPictureAction"
                 @action-event="uploaderPictureAction"
                 @close="visible => dialogPictureVisible = visible"
                 @close="visible => dialogPictureVisible = visible"
             /> -->
             /> -->
-            <el-form ref="form" :rules="rules" :model="form" label-width="100px" @submit.native.prevent>
+            <el-form
+                ref="form"
+                :rules="rules"
+                :model="form"
+                label-width="100px"
+                @submit.native.prevent
+            >
                 <!-- <el-form-item label="发布选项:" prop="publicItem">
                 <!-- <el-form-item label="发布选项:" prop="publicItem">
                     <el-radio-group v-model="form.publicItem">
                     <el-radio-group v-model="form.publicItem">
                         <el-radio label="notices">发布公告</el-radio>
                         <el-radio label="notices">发布公告</el-radio>
@@ -434,6 +440,10 @@ export default {
 }
 }
 </script>
 </script>
 <style lang="scss">
 <style lang="scss">
+.notice-container {
+    padding: 10px;
+    max-height: calc(80vh - 120px);
+}
 .photo-area {
 .photo-area {
     display: block;
     display: block;
     position: relative;
     position: relative;

+ 11 - 2
src/views/platform/system/news/list.vue

@@ -53,6 +53,9 @@ export default {
     },
     },
     mixins: [FixHeight],
     mixins: [FixHeight],
     data () {
     data () {
+        const { role = [] } = this.$store.getters.userInfo || {}
+        const roleList = ['xtgljs', 'jykfzr', 'jsfzr', 'zlfzr', 'syszr']
+        const hasRole = role.some(item => roleList.includes(item.alias))
         return {
         return {
             dialogFormVisible: false, // 弹窗
             dialogFormVisible: false, // 弹窗
             dialogdetailVisible: false,
             dialogdetailVisible: false,
@@ -72,10 +75,16 @@ export default {
                         key: 'search'
                         key: 'search'
                     },
                     },
                     {
                     {
-                        key: 'add'
+                        key: 'add',
+                        hidden: () => {
+                            return !hasRole
+                        }
                     },
                     },
                     {
                     {
-                        key: 'remove'
+                        key: 'remove',
+                        hidden: () => {
+                            return !hasRole
+                        }
                     }
                     }
                 ],
                 ],
                 searchForm: {
                 searchForm: {