Browse Source

系统设置增加一些权限按钮

cxmo 1 year ago
parent
commit
823577697e

+ 4 - 0
src/utils/buttonConfig.js

@@ -479,6 +479,8 @@ export const sysDepartPermission = {
     sysDepart_del:'sysDepart:del',//用户删除
     sysDepart_del:'sysDepart:del',//用户删除
     sysDepart_saveUser_researchGroup:'sysDepart:saveUser:researchGroup',//添加/编辑用户表单中,研究方向的按钮
     sysDepart_saveUser_researchGroup:'sysDepart:saveUser:researchGroup',//添加/编辑用户表单中,研究方向的按钮
     sysDepart_saveUser_LabelVal:'sysDepart:saveUser:LabelVal',//姓名角色的标签
     sysDepart_saveUser_LabelVal:'sysDepart:saveUser:LabelVal',//姓名角色的标签
+    sysDepart_classifyOpt_edit:'sysDepart:classifyOpt:edit',//添加/编辑部门
+    sysDepart_classifyOpt_delete:'sysDepart:classifyOpt:delete',//删除部门
     /*-----------角色管理-------- */
     /*-----------角色管理-------- */
     sysRole_del:'sysRole:del',//删除角色
     sysRole_del:'sysRole:del',//删除角色
     sysRole_settingAuth:'sysRole:settingAuth',//设置/查看权限
     sysRole_settingAuth:'sysRole:settingAuth',//设置/查看权限
@@ -506,6 +508,8 @@ export const operateAuthPermission = {
     /*---------手工数据指标-------- */
     /*---------手工数据指标-------- */
     operateAuth_manual:'operateAuth:manual',
     operateAuth_manual:'operateAuth:manual',
     operateAuth_manual_edit:'operateAuth:manual:edit',
     operateAuth_manual_edit:'operateAuth:manual:edit',
+    /*---------手工数据权限-------- */
+    sysdataAuth_classify:'sysdataAuth:classify',//手工指标分类
 }
 }
 /*-----------基本配置-------- */
 /*-----------基本配置-------- */
 export const baseConfigPermission = {
 export const baseConfigPermission = {

+ 1 - 1
src/views/system_manage/dataAuthManage.vue

@@ -56,7 +56,7 @@
 		</div>
 		</div>
 		<div class="dataAuth-bot">
 		<div class="dataAuth-bot">
 			<div>
 			<div>
-				<span class="add-btn" @click="addClassifyHandle">
+				<span class="add-btn" @click="addClassifyHandle" v-if="permissionBtn.isShowBtn('operateAuthPermission','sysdataAuth_classify')">
 					<i
 					<i
 						class="el-icon-circle-plus-outline"
 						class="el-icon-circle-plus-outline"
 						style="color: #5882ef; font-size: 16px"
 						style="color: #5882ef; font-size: 16px"

+ 6 - 5
src/views/system_manage/departManage.vue

@@ -23,10 +23,11 @@
 					<span style="display:flex;alignItems:center;" v-show="act_node===data.unicodeKey">
 					<span style="display:flex;alignItems:center;" v-show="act_node===data.unicodeKey">
                         <img src="~@/assets/img/data_m/move_ico.png" alt="" style="width:12px;height:12px;marginRight:10px;" @click.stop>
                         <img src="~@/assets/img/data_m/move_ico.png" alt="" style="width:12px;height:12px;marginRight:10px;" @click.stop>
 						<img src="~@/assets/img/set_m/add.png" alt="" style="width:12px;height:12px;marginRight:10px;" @click.stop="addNode(data)" 
 						<img src="~@/assets/img/set_m/add.png" alt="" style="width:12px;height:12px;marginRight:10px;" @click.stop="addNode(data)" 
-						v-if="data.IsDepartment && (!isTrail || (isTrail && data.canEdit))">
-						<img src="~@/assets/img/set_m/add.png" alt="" style="width:12px;height:12px;marginRight:10px;" @click.stop="addNode(data)" v-if="data.IsGroup">
+						v-if="data.IsDepartment && (!isTrail || (isTrail && data.canEdit))&&permissionBtn.isShowBtn('sysDepartPermission','sysDepart_classifyOpt_edit')">
+						<img src="~@/assets/img/set_m/add.png" alt="" style="width:12px;height:12px;marginRight:10px;" @click.stop="addNode(data)" 
+						v-if="data.IsGroup&&permissionBtn.isShowBtn('sysDepartPermission','sysDepart_classifyOpt_edit')">
 						<img src="~@/assets/img/set_m/edit.png" alt="" style="width:12px;height:12px;marginRight:10px;" @click.stop="editNode(data)"
 						<img src="~@/assets/img/set_m/edit.png" alt="" style="width:12px;height:12px;marginRight:10px;" @click.stop="editNode(data)"
-						v-if="(!isTrail) || (data.canEdit||data.IsGroup)">
+						v-if="((!isTrail) || (data.canEdit||data.IsGroup))&&permissionBtn.isShowBtn('sysDepartPermission','sysDepart_classifyOpt_edit')">
 						<el-popconfirm
 						<el-popconfirm
 						@onConfirm="removeNode(node,data)"
 						@onConfirm="removeNode(node,data)"
 						confirmButtonText='删除'
 						confirmButtonText='删除'
@@ -35,7 +36,7 @@
 						icon="el-icon-info"
 						icon="el-icon-info"
 						iconColor="red"
 						iconColor="red"
 						title="确定删除吗"
 						title="确定删除吗"
-						v-if="data.DepartmentId!=shareCustomDepartmentId && (!isTrail || (isTrail && (data.canEdit || data.IsGroup)))"
+						v-if="data.DepartmentId!=shareCustomDepartmentId && (!isTrail || (isTrail && (data.canEdit || data.IsGroup)))&&permissionBtn.isShowBtn('sysDepartPermission','sysDepart_classifyOpt_delete')"
 						>
 						>
 						<!-- 共享客户组不允许删除 -->
 						<!-- 共享客户组不允许删除 -->
 							<img slot="reference" src="~@/assets/img/set_m/del.png" alt="" style="width:12px;height:12px;marginTop:4px">
 							<img slot="reference" src="~@/assets/img/set_m/del.png" alt="" style="width:12px;height:12px;marginTop:4px">
@@ -43,7 +44,7 @@
 					</span>
 					</span>
 				</span>
 				</span>
 			</el-tree>
 			</el-tree>
-			<div class="noDepart" @click="addDepart">
+			<div class="noDepart" @click="addDepart" v-if="permissionBtn.isShowBtn('sysDepartPermission','sysDepart_classifyOpt_edit')">
 				<img src="~@/assets/img/set_m/add_ico.png" alt="" style="width:16px;height:16px;marginRight:10px;">
 				<img src="~@/assets/img/set_m/add_ico.png" alt="" style="width:16px;height:16px;marginRight:10px;">
 				<span>新建部门</span>
 				<span>新建部门</span>
 			</div>
 			</div>

+ 1 - 1
src/vuex/modules/permissionButton.js

@@ -20,7 +20,7 @@ const permissionButtons = {
                     buttons.push({ButtonCode:'etaTable:customize:mix:download'}) 
                     buttons.push({ButtonCode:'etaTable:customize:mix:download'}) 
                     buttons.push({ButtonCode:'docPage:delete'})
                     buttons.push({ButtonCode:'docPage:delete'})
                     */
                     */
-                    //buttons.push({ButtonCode:'fittingEq:classifyOpt:edit'})
+                    //buttons.push({ButtonCode:'sysDepart:classifyOpt:edit'})
                     commit('SET_PERMISSION_BUTTONS',buttons)
                     commit('SET_PERMISSION_BUTTONS',buttons)
                     
                     
                     let trialUserPermisson = !!buttons.find(item => item.ButtonCode =="trialUserAction")
                     let trialUserPermisson = !!buttons.find(item => item.ButtonCode =="trialUserAction")