Selaa lähdekoodia

清理之前的权限

shaogen1995 4 vuotta sitten
vanhempi
commit
7204263d26

+ 8 - 0
src/apis/system1.js

@@ -7,3 +7,11 @@ export const getRZList = (data) => {
     data
   })
 }
+// 获取角色列表
+export const getJSList = (data) => {
+  return axios({
+    method: 'post',
+    url: '/sys/role/list',
+    data
+  })
+}

+ 1 - 12
src/views/collect/collect0_look.vue

@@ -332,7 +332,7 @@
           </div>
           <!-- 底部的返回按钮 -->
           <div class="btn">
-            <el-button type="primary" @click="begEdit" v-if="userLogo"
+            <el-button type="primary" @click="begEdit"
               >申请编辑</el-button
             >
             <el-button @click="$router.go(-1)">返 回</el-button>
@@ -415,7 +415,6 @@ export default {
       // 点击操作记录
       bigImg: '',
       bigImgShow: false,
-      userLogo: false,
       isShowED: false,
       isShow: false,
       // 服务器前缀地址
@@ -538,16 +537,6 @@ export default {
   created () {
     // 获取服务器前缀地址
     this.baseURL = axios.defaults.baseURL
-
-    // 获取用户角色权限标识
-    let temp = localStorage.getItem('daliCK')
-    temp = JSON.parse(temp)
-    if (temp) {
-      const temp2 = temp.role[0]
-      if (temp2 === 'sys_admin' || temp2 === 'sys_collect') {
-        this.userLogo = true
-      } // 超级管理员和征集部主任
-    }
   },
   // 生命周期 - 挂载完成(可以访问DOM元素)
   mounted () {

+ 4 - 37
src/views/collect/collect1.vue

@@ -34,7 +34,7 @@
             >
             </el-date-picker>
             <el-button style="margin-left: 20px" @click="inquire">查询</el-button>
-            <el-button type="primary" @click="enterBank" v-show="userLogo.add">申请提用</el-button>
+            <el-button type="primary" @click="enterBank">申请提用</el-button>
           </div>
           <!--表格 -->
           <div class="table">
@@ -59,9 +59,9 @@
               <el-table-column label="操作" width="200" :resizable="false">
                 <template #default='{row}'>
                   <el-button type="text" v-if="row.status==='待归还'||row.status==='已归还'||row.status==='审核不通过'" @click="myLook(row)">查看</el-button>
-                  <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)" v-show="userLogo.audit">审核</el-button>
-                  <el-button type="text" v-if="row.status==='待办理'" @click="compile(row)" v-show="userLogo.edit">编辑</el-button>
-                  <el-button type="text" v-if="row.status==='待办理'||row.status==='待审核'||row.status==='审核不通过'" @click="delData(row.id,row.status)" v-show="userLogo.del">删除</el-button>
+                  <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)" >审核</el-button>
+                  <el-button type="text" v-if="row.status==='待办理'" @click="compile(row)" >编辑</el-button>
+                  <el-button type="text" v-if="row.status==='待办理'||row.status==='待审核'||row.status==='审核不通过'" @click="delData(row.id,row.status)">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -91,12 +91,6 @@ export default {
   components: { TabList },
   data () {
     return {
-      userLogo: {
-        add: true, // 申请/归还
-        edit: true, // 编辑
-        audit: true, // 审核
-        del: true// 删除
-      },
       total: 0,
       myData: {
         endTime: '', // 结束时间
@@ -330,33 +324,6 @@ export default {
     this.stateArr[3].num = num3
     this.stateArr[4].num = num4
     this.stateArr[5].num = num5
-    // 获取用户角色权限标识
-    let temp = localStorage.getItem('daliCK')
-    temp = JSON.parse(temp)
-    if (temp) {
-      const temp2 = temp.role[0]
-      if (temp2 === 'sys_audit') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-        this.userLogo.add = false
-        this.userLogo.edit = false
-      } // 保管部主任
-      if (temp2 === 'sys_edit') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-        this.userLogo.add = false
-        this.userLogo.edit = false
-      } // 保管部成员
-      if (temp2 === 'sys_look') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-        this.userLogo.add = false
-        this.userLogo.edit = false
-      } // 其他部门人员
-      if (temp2 === 'sys_collect') {
-        this.userLogo.del = false
-      } // 征集部主任
-    }
   },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前

+ 1 - 9
src/views/collect/collect1_look.vue

@@ -40,7 +40,7 @@
         <!-- 表格 -->
         <div class="table">
           <div class="title">
-            <h3>藏品信息<el-button @click="goodsReturn" v-if="userAlso">归 还</el-button></h3>
+            <h3>藏品信息<el-button @click="goodsReturn">归 还</el-button></h3>
           </div>
           <el-table
             @selection-change="handleSelectionChange"
@@ -94,7 +94,6 @@ export default {
   data () {
     // 这里存放数据
     return {
-      userAlso: true,
       myData: {},
       // 服务器初始地址前缀
       baseURL: '',
@@ -184,13 +183,6 @@ export default {
     // 从第一层拿到传过来的数据
     this.myData = this.$route.query
     this.getDetailById()
-    // 获取用户角色权限标识
-    let temp = localStorage.getItem('daliCK')
-    temp = JSON.parse(temp)
-    if (temp) {
-      const temp2 = temp.role[0]
-      if (temp2 === 'sys_audit' || temp2 === 'sys_edit' || temp2 === 'sys_look') this.userAlso = false // 其他部门人员--征集部主任
-    }
   },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前

+ 4 - 37
src/views/collect/collect2.vue

@@ -33,7 +33,7 @@
             >
             </el-date-picker>
             <el-button style="margin-left: 20px" @click="inquire">查询</el-button>
-            <el-button type="primary" @click="cancel" v-if="userLogo.add">申请注销</el-button
+            <el-button type="primary" @click="cancel" >申请注销</el-button
             >
           </div>
           <!--表格 -->
@@ -57,9 +57,9 @@
               <el-table-column label="操作" width="200" :resizable="false">
                 <template #default='{row}'>
                   <el-button type="text" v-if="row.status==='已完成'||row.status==='审核不通过'" @click="myLook(row)">查看</el-button>
-                  <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)" v-show="userLogo.audit">审核</el-button>
-                  <el-button type="text" v-if="row.status==='待办理'" @click="compile(row)" v-show="userLogo.edit">编辑</el-button>
-                  <el-button type="text" v-if="row.status!=='已完成'" @click="delOne(row.id,row.status)" v-show="userLogo.del">删除</el-button>
+                  <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)" >审核</el-button>
+                  <el-button type="text" v-if="row.status==='待办理'" @click="compile(row)" >编辑</el-button>
+                  <el-button type="text" v-if="row.status!=='已完成'" @click="delOne(row.id,row.status)" >删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -91,12 +91,6 @@ export default {
   data () {
     // 这里存放数据
     return {
-      userLogo: {
-        add: true, // 申请/归还
-        edit: true, // 编辑
-        audit: true, // 审核
-        del: true// 删除
-      },
       total: 0,
       // 选择状态的变量
       stateInd: 0,
@@ -319,33 +313,6 @@ export default {
     this.stateArr[2].num = num2
     this.stateArr[3].num = num3
     this.stateArr[4].num = num4
-    // 获取用户角色权限标识
-    let temp = localStorage.getItem('daliCK')
-    temp = JSON.parse(temp)
-    if (temp) {
-      const temp2 = temp.role[0]
-      if (temp2 === 'sys_audit') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-        this.userLogo.add = false
-        this.userLogo.edit = false
-      } // 保管部主任
-      if (temp2 === 'sys_edit') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-        this.userLogo.add = false
-        this.userLogo.edit = false
-      } // 保管部成员
-      if (temp2 === 'sys_look') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-        this.userLogo.add = false
-        this.userLogo.edit = false
-      } // 其他部门人员
-      if (temp2 === 'sys_collect') {
-        this.userLogo.del = false
-      } // 征集部主任
-    }
   },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前

+ 2 - 17
src/views/collect/collect3.vue

@@ -61,8 +61,8 @@
               <el-table-column label="操作" width="295" :resizable="false">
                 <template #default='{row}'>
                   <el-button type="text"  @click="myLook(row)" v-if="row.status!=='待审核'">查看</el-button>
-                  <el-button type="text"  @click="audit(row)" v-if="row.status==='待审核'" v-show="userLogo.audit">审核</el-button>
-                  <el-button type="text"  @click="delData(row.id,row.status)" v-if="row.status!=='已完成'" v-show="userLogo.del">删除</el-button>
+                  <el-button type="text"  @click="audit(row)" v-if="row.status==='待审核'">审核</el-button>
+                  <el-button type="text"  @click="delData(row.id,row.status)" v-if="row.status!=='已完成'">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -92,10 +92,6 @@ export default {
   components: { TabList },
   data () {
     return {
-      userLogo: {
-        audit: false, // 审核
-        del: false// 删除
-      },
       total: 0,
       myData: {
         type: 'name',
@@ -290,17 +286,6 @@ export default {
     this.stateArr[1].num = num1
     this.stateArr[2].num = num2
     this.stateArr[3].num = num3
-    // 获取用户角色权限标识
-    let temp = localStorage.getItem('daliCK')
-    temp = JSON.parse(temp)
-    if (temp) {
-      const temp2 = temp.role[0]
-      if (temp2 === 'sys_admin') {
-        this.userLogo.audit = true
-        this.userLogo.del = true
-      } // 超管
-      if (temp2 === 'sys_collect') this.userLogo.audit = true // 征集部主任
-    }
   },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前

+ 1 - 31
src/views/holding/holding0.vue

@@ -52,7 +52,7 @@
             <el-button style="margin-left: 20px" @click="inquire"
               >查询</el-button
             >
-            <el-button type="primary" @click="addOne()" v-show="userLogo.add">新增</el-button>
+            <el-button type="primary" @click="addOne()">新增</el-button>
           </div>
           <!--表格 -->
           <div class="table">
@@ -89,21 +89,18 @@
                     >查看</el-button
                   >
                   <el-button
-                    v-show="userLogo.add"
                     type="text"
                     v-if="row.status === '待办理' || row.status === '待办理'"
                     @click="editH0(row)"
                     >编辑</el-button
                   >
                   <el-button
-                    v-show="userLogo.audit"
                     type="text"
                     v-if="row.status === '待审核'"
                     @click="auditH0(row)"
                     >审核</el-button
                   >
                   <el-button
-                    v-show="userLogo.del"
                     type="text"
                     @click="removeH0(row.id,row.status)"
                     v-if="row.status !== '已完成'"
@@ -140,12 +137,6 @@ export default {
   },
   data () {
     return {
-      userLogo: {
-        add: true,
-        edit: true,
-        audit: true,
-        del: true
-      },
       // 选择状态的变量
       stateInd: 0,
       stateArr: [
@@ -379,27 +370,6 @@ export default {
     this.stateArr[2].num = num2
     this.stateArr[3].num = num3
     this.stateArr[4].num = num4
-    // 获取用户角色权限标识
-    let temp = localStorage.getItem('daliCK')
-    temp = JSON.parse(temp)
-    if (temp) {
-      const temp2 = temp.role[0]
-      if (temp2 === 'sys_audit') this.userLogo.del = false // 保管部主任
-      if (temp2 === 'sys_edit') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-      } // 保管部成员
-      if (temp2 === 'sys_look') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-        this.userLogo.add = false
-      } // 其他部门人员
-      if (temp2 === 'sys_collect') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-        this.userLogo.add = false
-      } // 征集部主任
-    }
   },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前

+ 4 - 33
src/views/holding/holding1.vue

@@ -34,7 +34,7 @@
             >
             </el-date-picker>
             <el-button style="margin-left: 20px" @click="inquire">查询</el-button>
-            <el-button type="primary" @click="enterBank" v-show="userLogo.add">申请入库</el-button>
+            <el-button type="primary" @click="enterBank">申请入库</el-button>
           </div>
           <!--表格 -->
           <div class="table">
@@ -59,9 +59,9 @@
               <el-table-column label="操作" width="195" :resizable="false">
                 <template #default='{row}'>
                   <el-button type="text" v-if="row.status==='已完成'||row.status==='待入库'||row.status==='审核不通过'" @click="myLook(row)">查看</el-button>
-                  <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)" v-show="userLogo.audit">审核</el-button>
-                  <el-button type="text" v-if="row.status==='待办理'" @click="compile(row)" v-show="userLogo.edit">编辑</el-button>
-                  <el-button type="text" v-if="row.status!=='已完成'" @click="delData(row.id,row.status)" v-show="userLogo.del">删除</el-button>
+                  <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)">审核</el-button>
+                  <el-button type="text" v-if="row.status==='待办理'" @click="compile(row)">编辑</el-button>
+                  <el-button type="text" v-if="row.status!=='已完成'" @click="delData(row.id,row.status)">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -91,12 +91,6 @@ export default {
   components: { TabList },
   data () {
     return {
-      userLogo: {
-        add: true, // 申请
-        edit: true, // 编辑
-        audit: true, // 审核
-        del: true// 删除
-      },
       total: 0,
       myData: {
         endTime: '', // 结束时间
@@ -314,29 +308,6 @@ export default {
     this.stateArr[2].num = num2
     this.stateArr[3].num = num3
     this.stateArr[4].num = num4
-    // 获取用户角色权限标识
-    let temp = localStorage.getItem('daliCK')
-    temp = JSON.parse(temp)
-    if (temp) {
-      const temp2 = temp.role[0]
-      if (temp2 === 'sys_audit') this.userLogo.del = false // 保管部主任
-      if (temp2 === 'sys_edit') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-      } // 保管部成员
-      if (temp2 === 'sys_look') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-        this.userLogo.add = false
-        this.userLogo.edit = false
-      } // 其他部门人员
-      if (temp2 === 'sys_collect') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-        this.userLogo.add = false
-        this.userLogo.edit = false
-      } // 征集部主任
-    }
   },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前

+ 4 - 33
src/views/holding/holding2.vue

@@ -34,7 +34,7 @@
             >
             </el-date-picker>
             <el-button style="margin-left: 20px" @click="inquire">查询</el-button>
-            <el-button type="primary" @click="enterBank" v-show="userLogo.add">申请出库</el-button>
+            <el-button type="primary" @click="enterBank">申请出库</el-button>
           </div>
           <!--表格 -->
           <div class="table">
@@ -61,9 +61,9 @@
               <el-table-column label="操作" width="140" :resizable="false">
                 <template #default='{row}'>
                   <el-button type="text" v-if="row.status==='待归还'||row.status==='已归还'||row.status==='审核不通过'" @click="myLook(row)">查看</el-button>
-                  <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)" v-show="userLogo.audit">审核</el-button>
-                  <el-button type="text" v-if="row.status==='待办理'" @click="compile(row)" v-show="userLogo.edit">编辑</el-button>
-                  <el-button type="text" v-if="row.status==='待办理'||row.status==='待审核'||row.status==='审核不通过'" @click="delData(row.id,row.status)" v-show="userLogo.del">删除</el-button>
+                  <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)">审核</el-button>
+                  <el-button type="text" v-if="row.status==='待办理'" @click="compile(row)">编辑</el-button>
+                  <el-button type="text" v-if="row.status==='待办理'||row.status==='待审核'||row.status==='审核不通过'" @click="delData(row.id,row.status)">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -93,12 +93,6 @@ export default {
   components: { TabList },
   data () {
     return {
-      userLogo: {
-        add: true, // 申请/归还
-        edit: true, // 编辑
-        audit: true, // 审核
-        del: true// 删除
-      },
       total: 0,
       myData: {
         endTime: '', // 结束时间
@@ -332,29 +326,6 @@ export default {
     this.stateArr[3].num = num3
     this.stateArr[4].num = num4
     this.stateArr[5].num = num5
-    // 获取用户角色权限标识
-    let temp = localStorage.getItem('daliCK')
-    temp = JSON.parse(temp)
-    if (temp) {
-      const temp2 = temp.role[0]
-      if (temp2 === 'sys_audit') this.userLogo.del = false // 保管部主任
-      if (temp2 === 'sys_edit') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-      } // 保管部成员
-      if (temp2 === 'sys_look') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-        this.userLogo.add = false
-        this.userLogo.edit = false
-      } // 其他部门人员
-      if (temp2 === 'sys_collect') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-        this.userLogo.add = false
-        this.userLogo.edit = false
-      } // 征集部主任
-    }
   },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前

+ 1 - 11
src/views/holding/holding2_look.vue

@@ -41,7 +41,7 @@
         <div class="table">
           <div class="title">
             <h3>
-              藏品信息<el-button @click="goodsReturn" v-if="userAlso"
+              藏品信息<el-button @click="goodsReturn"
                 >归 还</el-button
               >
             </h3>
@@ -227,7 +227,6 @@ export default {
   data () {
     // 这里存放数据
     return {
-      userAlso: true,
       myData: {},
       // 服务器初始地址前缀
       baseURL: '',
@@ -341,15 +340,6 @@ export default {
     // 从第一层拿到传过来的数据
     this.myData = this.$route.query
     this.getDetailById()
-    // 获取用户角色权限标识
-    let temp = localStorage.getItem('daliCK')
-    temp = JSON.parse(temp)
-    if (temp) {
-      const temp2 = temp.role[0]
-      if (temp2 === 'sys_look' || temp2 === 'sys_collect') {
-        this.userAlso = false
-      } // 其他部门人员--征集部主任
-    }
   },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前

+ 0 - 15
src/views/holding/holding3_look.vue

@@ -159,7 +159,6 @@
             type="primary"
             size="small"
             @click="begEdit"
-            v-if="userLogo"
             >申请编辑</el-button
           >
           <el-button type="primary" size="small" @click="applyMove" v-if="myObj.storageId"
@@ -503,7 +502,6 @@ export default {
       // 点击操作记录
       bigImg: '',
       bigImgShow: false,
-      userLogo: false,
       isShowED: false,
       rukuTxt: '',
       isShow: false,
@@ -661,19 +659,6 @@ export default {
   created () {
     // 获取服务器前缀地址
     this.baseURL = axios.defaults.baseURL
-    // 获取用户角色权限标识
-    let temp = localStorage.getItem('daliCK')
-    temp = JSON.parse(temp)
-    if (temp) {
-      const temp2 = temp.role[0]
-      if (
-        temp2 === 'sys_audit' ||
-        temp2 === 'sys_admin' ||
-        temp2 === 'sys_edit'
-      ) {
-        this.userLogo = true
-      } // 超级管理员和保管部主任
-    }
   },
   // 生命周期 - 挂载完成(可以访问DOM元素)
   async mounted () {

+ 2 - 17
src/views/holding/holding4.vue

@@ -61,8 +61,8 @@
               <el-table-column label="操作" width="295" :resizable="false">
                 <template #default='{row}'>
                   <el-button type="text"  @click="myLook(row)" v-if="row.status!=='待审核'">查看</el-button>
-                  <el-button type="text"  @click="audit(row)" v-if="row.status==='待审核'" v-show="userLogo.audit">审核</el-button>
-                  <el-button type="text"  @click="delData(row.id,row.status)" v-if="row.status!=='已完成'" v-show="userLogo.del">删除</el-button>
+                  <el-button type="text"  @click="audit(row)" v-if="row.status==='待审核'">审核</el-button>
+                  <el-button type="text"  @click="delData(row.id,row.status)" v-if="row.status!=='已完成'">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -92,10 +92,6 @@ export default {
   components: { TabList },
   data () {
     return {
-      userLogo: {
-        audit: false, // 审核
-        del: false// 删除
-      },
       total: 0,
       myData: {
         type: 'name',
@@ -290,17 +286,6 @@ export default {
     this.stateArr[1].num = num1
     this.stateArr[2].num = num2
     this.stateArr[3].num = num3
-    // 获取用户角色权限标识
-    let temp = localStorage.getItem('daliCK')
-    temp = JSON.parse(temp)
-    if (temp) {
-      const temp2 = temp.role[0]
-      if (temp2 === 'sys_admin') {
-        this.userLogo.audit = true
-        this.userLogo.del = true
-      } // 超管
-      if (temp2 === 'sys_audit') this.userLogo.audit = true // 保管部主任
-    }
   },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前

+ 4 - 33
src/views/holding/holding5.vue

@@ -33,7 +33,7 @@
             >
             </el-date-picker>
             <el-button style="margin-left: 20px" @click="inquire">查询</el-button>
-            <el-button type="primary" @click="cancel" v-show="userLogo.add">申请注销</el-button
+            <el-button type="primary" @click="cancel">申请注销</el-button
             >
           </div>
           <!--表格 -->
@@ -57,9 +57,9 @@
               <el-table-column label="操作" width="200" :resizable="false">
                 <template #default='{row}'>
                   <el-button type="text" v-if="row.status==='已完成'||row.status==='审核不通过'" @click="myLook(row)">查看</el-button>
-                  <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)" v-show="userLogo.audit">审核</el-button>
-                  <el-button type="text" v-if="row.status==='待办理'" @click="compile(row)" v-show="userLogo.edit">编辑</el-button>
-                  <el-button type="text" v-if="row.status!=='已完成'" @click="delOne(row.id,row.status)" v-show="userLogo.del">删除</el-button>
+                  <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)">审核</el-button>
+                  <el-button type="text" v-if="row.status==='待办理'" @click="compile(row)">编辑</el-button>
+                  <el-button type="text" v-if="row.status!=='已完成'" @click="delOne(row.id,row.status)">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -91,12 +91,6 @@ export default {
   data () {
     // 这里存放数据
     return {
-      userLogo: {
-        add: true, // 申请/归还
-        edit: true, // 编辑
-        audit: true, // 审核
-        del: true// 删除
-      },
       total: 0,
       // 选择状态的变量
       stateInd: 0,
@@ -319,29 +313,6 @@ export default {
     this.stateArr[2].num = num2
     this.stateArr[3].num = num3
     this.stateArr[4].num = num4
-    // 获取用户角色权限标识
-    let temp = localStorage.getItem('daliCK')
-    temp = JSON.parse(temp)
-    if (temp) {
-      const temp2 = temp.role[0]
-      if (temp2 === 'sys_audit') this.userLogo.del = false // 保管部主任
-      if (temp2 === 'sys_edit') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-      } // 保管部成员
-      if (temp2 === 'sys_look') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-        this.userLogo.add = false
-        this.userLogo.edit = false
-      } // 其他部门人员
-      if (temp2 === 'sys_collect') {
-        this.userLogo.del = false
-        this.userLogo.audit = false
-        this.userLogo.add = false
-        this.userLogo.edit = false
-      } // 征集部主任
-    }
   },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前

+ 0 - 7
src/views/layout/index.vue

@@ -240,13 +240,6 @@ export default {
     // 进来显示用户信息
     const userData = localStorage.getItem('daliCK')
     this.userData = JSON.parse(userData).user
-    // 获取用户角色权限标识
-    let temp = localStorage.getItem('daliCK')
-    temp = JSON.parse(temp)
-    if (temp) {
-      const temp2 = temp.role[0]
-      if (temp2 !== 'sys_admin') this.tabList.pop() // 不是超级管理员
-    }
   },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前

+ 9 - 35
src/views/statistics/statistics0.vue

@@ -13,8 +13,8 @@
       <div class="conten">
         <div class="conten_left">
           <div class="btn">
-            <el-button type="primary" @click="addOne" v-show="userLogo.add">新建库区</el-button>
-            <el-button type="danger" @click="delOne" v-show="userLogo.del">删除</el-button>
+            <el-button type="primary" @click="addOne">新建库区</el-button>
+            <el-button type="danger" @click="delOne">删除</el-button>
           </div>
           <div class="box" v-for="(item, index) in allList" :key="item.id">
             <div class="title" :style="arrowsShow === index?'background-color: #f2f2f2;':''">
@@ -27,8 +27,8 @@
                 @click="arrowsShowClick(index)"
               ></i>
               <span @click="arrowsShowClick(index)">{{ item.name }}</span>
-              <i class="el-icon-plus tiny" @click="addTow(item.id)" v-show="userLogo.add"></i>
-              <i class="el-icon-edit tiny" @click="editOne(item)" v-show="userLogo.edit"></i>
+              <i class="el-icon-plus tiny" @click="addTow(item.id)"></i>
+              <i class="el-icon-edit tiny" @click="editOne(item)"></i>
             </div>
             <ul class="area" v-show="arrowsShow === index">
               <li
@@ -46,9 +46,9 @@
           <div class="title" v-show="towList.name">
             <b>{{ towList.name }}</b>
             <span>仓库编号:{{ towList.num }}</span>
-            <i class="el-icon-plus" @click="addThree" v-show="userLogo.add"></i>
-            <i class="el-icon-edit" @click="editTow" v-show="userLogo.edit"></i>
-            <i class="el-icon-delete" @click="delTow" v-show="userLogo.del"></i>
+            <i class="el-icon-plus" @click="addThree"></i>
+            <i class="el-icon-edit" @click="editTow"></i>
+            <i class="el-icon-delete" @click="delTow"></i>
           </div>
           <!-- 表格 -->
           <div class="table" v-if="towList.name">
@@ -77,8 +77,8 @@
               ></el-table-column>
               <el-table-column label="操作" width="150" :resizable="false">
                 <template #default='{row}'>
-                  <i class="el-icon-edit" @click="editThree(row)" v-show="userLogo.edit"></i>
-                  <i class="el-icon-delete" @click="delThree(row.id)" v-show="userLogo.del"></i>
+                  <i class="el-icon-edit" @click="editThree(row)"></i>
+                  <i class="el-icon-delete" @click="delThree(row.id)"></i>
                 </template>
               </el-table-column>
             </el-table>
@@ -138,11 +138,6 @@ export default {
   data () {
     // 这里存放数据
     return {
-      userLogo: {
-        add: true, // 新增
-        edit: true, // 编辑
-        del: true// 删除
-      },
       myId: null,
       // 第一层:箭头的显示隐藏
       arrowsShow: 0,
@@ -430,27 +425,6 @@ export default {
         this.tableData = this.towList.children
       }, 100)
     })
-    // 获取用户角色权限标识
-    let temp = localStorage.getItem('daliCK')
-    temp = JSON.parse(temp)
-    if (temp) {
-      const temp2 = temp.role[0]
-      if (temp2 === 'sys_edit') {
-        this.userLogo.del = false
-        this.userLogo.add = false
-        this.userLogo.edit = false
-      } // 保管部成员
-      if (temp2 === 'sys_look') {
-        this.userLogo.del = false
-        this.userLogo.add = false
-        this.userLogo.edit = false
-      } // 其他部门人员
-      if (temp2 === 'sys_collect') {
-        this.userLogo.del = false
-        this.userLogo.add = false
-        this.userLogo.edit = false
-      } // 征集部主任
-    }
   },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前

+ 2 - 17
src/views/statistics/statistics2.vue

@@ -61,8 +61,8 @@
               <el-table-column label="操作" width="295" :resizable="false">
                 <template #default='{row}'>
                   <el-button type="text"  @click="myLook(row)" v-if="row.status!=='待审核'">查看</el-button>
-                  <el-button type="text"  @click="audit(row)" v-if="row.status==='待审核'" v-show="userLogo.audit">审核</el-button>
-                  <el-button type="text"  @click="delData(row.id,row.status)" v-if="row.status!=='已完成'" v-show="userLogo.del">删除</el-button>
+                  <el-button type="text"  @click="audit(row)" v-if="row.status==='待审核'">审核</el-button>
+                  <el-button type="text"  @click="delData(row.id,row.status)" v-if="row.status!=='已完成'">删除</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -92,10 +92,6 @@ export default {
   components: { TabList },
   data () {
     return {
-      userLogo: {
-        audit: false, // 审核
-        del: false// 删除
-      },
       total: 0,
       myData: {
         type: 'name',
@@ -290,17 +286,6 @@ export default {
     this.stateArr[1].num = num1
     this.stateArr[2].num = num2
     this.stateArr[3].num = num3
-    // 获取用户角色权限标识
-    let temp = localStorage.getItem('daliCK')
-    temp = JSON.parse(temp)
-    if (temp) {
-      const temp2 = temp.role[0]
-      if (temp2 === 'sys_admin') {
-        this.userLogo.audit = true
-        this.userLogo.del = true
-      } // 超管
-      if (temp2 === 'sys_audit') this.userLogo.audit = true // 保管部主任
-    }
   },
   beforeCreate () {}, // 生命周期 - 创建之前
   beforeMount () {}, // 生命周期 - 挂载之前

+ 14 - 9
src/views/system/system3.vue

@@ -12,7 +12,7 @@
       <div class="conten">
         <div class="middle">
           <div class="select">
-            <span>操作事件:</span>
+            <span>角色名称:</span>
             <el-input
               v-model="myData.searchKey"
               placeholder="请输入"
@@ -20,6 +20,7 @@
             ></el-input>
 
             <el-button style="margin-left: 20px" @click="find">查询</el-button>
+            <el-button style="margin-left: 20px" type="primary" @click="isShow=true">新增角色</el-button>
           </div>
           <!--表格 -->
           <div class="table">
@@ -34,13 +35,13 @@
                    {{scope.$index+(myData.pageNum - 1) * myData.pageSize + 1}}
                 </template>
               </el-table-column>
-              <el-table-column prop="userName" label="账号" width="240" :resizable="false">
+              <el-table-column prop="roleName" label="角色名称" width="240" :resizable="false">
               </el-table-column>
-              <el-table-column prop="type" label="操作模块" width="240" :resizable="false">
+              <el-table-column prop="type" label="描述"  :resizable="false">
               </el-table-column>
-              <el-table-column prop="description" label="操作事件" :resizable="false">
+              <el-table-column prop="description" label="成员数量" width="80" :resizable="false">
               </el-table-column>
-              <el-table-column prop="createTime" label="操作时间" width="240" :resizable="false"> </el-table-column>
+              <el-table-column prop="isEnabled" label="状态" width="240" :resizable="false"> </el-table-column>
             </el-table>
           </div>
                         <!-- 分页器 -->
@@ -59,19 +60,23 @@
         </div>
       </div>
     </div>
+    <!-- 点击新增角色出现弹窗 -->
+    <System3Add :isShow.sync='isShow'/>
   </div>
 </template>
 
 <script>
-import { getRZList } from '@/apis/system1'
+import System3Add from './system3_add.vue'
+import { getJSList } from '@/apis/system1'
 import TabList from '@/components/tabLeft4.vue'
 export default {
-  name: 'system1',
+  name: 'system3',
   // import引入的组件需要注入到对象中才能使用
-  components: { TabList },
+  components: { TabList, System3Add },
   data () {
     // 这里存放数据
     return {
+      isShow: false,
       total: 0,
       myData: {
         endTime: '',
@@ -106,7 +111,7 @@ export default {
     },
     // 封装获取用户列表方法
     async getRZList (data) {
-      const res = await getRZList(data)
+      const res = await getJSList(data)
       this.total = res.data.total
       this.tableData = res.data.list
     }

+ 218 - 0
src/views/system/system3_add.vue

@@ -0,0 +1,218 @@
+<!--  -->
+<template>
+  <el-dialog title="新增角色" :visible="isShow" @close="btnCancel()">
+    <el-form
+      :model="ruleForm"
+      :rules="rules"
+      ref="ruleForm"
+      label-width="100px"
+      class="demo-ruleForm"
+    >
+      <el-form-item label="角色名称:" prop="roleName">
+        <el-input v-model="ruleForm.roleName" placeholder="请输入"></el-input>
+      </el-form-item>
+      <el-form-item label="描述:" prop="roleDesc">
+        <el-input
+          v-model="ruleForm.roleDesc"
+          type="textarea"
+          :rows="2"
+          placeholder="请输入"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+    <div class="row">
+      <span>是否启用:</span>
+      <el-switch v-model="value"> </el-switch>
+    </div>
+    <div class="rowTow">
+      <span>权限设置:</span>
+      <ul class="conten">
+        <li v-for="(item,index) in checkedList" :key="index">
+          <span>{{item.name}}</span>
+          <el-checkbox v-model="item.checked">启用</el-checkbox>
+          <el-checkbox v-for="(val,ind) in item.op" :key="ind" v-model="val.checked" :disabled='!item.checked'>{{val.name}}</el-checkbox>
+        </li>
+      </ul>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button @click="btnCancel">取 消</el-button>
+      <el-button type="primary" @click="btnOk">确 定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+// 这里可以导入其他文件(比如:组件,工具js,第三方插件js,json文件,图片文件等等)
+// 例如:import 《组件名称》 from '《组件路径》';
+
+export default {
+  // import引入的组件需要注入到对象中才能使用
+  name: 'system3_add',
+  components: {},
+  props: {
+    isShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    // 这里存放数据
+    return {
+      checked: false,
+      checkedList: [
+        {
+          name: '藏品登记',
+          checked: false,
+          op: [
+            { name: '编辑', checked: false },
+            { name: '审核', checked: false },
+            { name: '删除', checked: false }
+          ]
+        },
+        {
+          name: '藏品总账',
+          checked: false,
+          op: [
+            { name: '编辑', checked: false },
+            { name: '移库', checked: false }
+          ]
+        },
+        {
+          name: '入库管理',
+          checked: false,
+          op: [
+            { name: '编辑', checked: false },
+            { name: '审核', checked: false },
+            { name: '删除', checked: false }
+          ]
+        },
+        {
+          name: '出库管理',
+          checked: false,
+          op: [
+            { name: '编辑', checked: false },
+            { name: '审核', checked: false },
+            { name: '归还', checked: false },
+            { name: '删除', checked: false }
+          ]
+        },
+        {
+          name: '藏品修改',
+          checked: false,
+          op: [
+            { name: '审核', checked: false },
+            { name: '删除', checked: false }
+          ]
+        },
+        {
+          name: '藏品注销',
+          checked: false,
+          op: [
+            { name: '编辑', checked: false },
+            { name: '审核', checked: false },
+            { name: '删除', checked: false }
+          ]
+        },
+        {
+          name: '库房设置',
+          checked: false,
+          op: [
+            { name: '编辑', checked: false },
+            { name: '删除', checked: false }
+          ]
+        },
+        {
+          name: '藏品移库',
+          checked: false,
+          op: [
+            { name: '审核', checked: false },
+            { name: '删除', checked: false }
+          ]
+        },
+        {
+          name: '用户管理',
+          checked: false,
+          op: [
+            { name: '编辑', checked: false },
+            { name: '注销', checked: false },
+            { name: '密码', checked: false }
+          ]
+        },
+        {
+          name: '角色管理',
+          checked: false,
+          op: [
+            { name: '编辑', checked: false },
+            { name: '删除', checked: false }
+          ]
+        }
+      ],
+      value: false,
+      // 滑块
+      ruleForm: {
+        roleName: '',
+        roleDesc: ''
+      },
+      rules: {
+        roleName: [{ required: true, message: '不能为空', trigger: 'blur' }],
+        roleDesc: [{ required: true, message: '不能为空', trigger: 'blur' }]
+      }
+    }
+  },
+  // 监听属性 类似于data概念
+  computed: {},
+  // 监控data中的数据变化
+  watch: {},
+  // 方法集合
+  methods: {
+    // 点击取消
+    btnCancel () {
+      this.$emit('update:isShow', false)
+    },
+    // 点击确定
+    btnOk () {
+      console.log(999, this.checkedList)
+    }
+  },
+  // 生命周期 - 创建完成(可以访问当前this实例)
+  created () {},
+  // 生命周期 - 挂载完成(可以访问DOM元素)
+  mounted () {},
+  beforeCreate () {}, // 生命周期 - 创建之前
+  beforeMount () {}, // 生命周期 - 挂载之前
+  beforeUpdate () {}, // 生命周期 - 更新之前
+  updated () {}, // 生命周期 - 更新之后
+  beforeDestroy () {}, // 生命周期 - 销毁之前
+  destroyed () {}, // 生命周期 - 销毁完成
+  activated () {} // 如果页面有keep-alive缓存功能,这个函数会触发
+}
+</script>
+<style lang='less' scoped>
+/deep/.el-dialog{
+  margin-top: 30px !important;
+}
+.row {
+  margin-left: 20px;
+}
+.rowTow {
+  display: flex;
+  margin-top: 20px;
+  margin-left: 20px;
+  ul {
+    width: 80%;
+    border: 1px solid #ccc;
+    border-radius: 10px;
+    padding: 0 20px;
+    li {
+      height: 45px;
+      line-height: 45px;
+      border-bottom: 1px solid #ccc;
+      span {
+        font-size: 16px;
+        font-weight: 700;
+        margin-right: 20px;
+      }
+    }
+  }
+}
+</style>