Explorar o código

测温按钮图标更换,角色里面初始化的那些角色不让编辑操作

fanxw %!s(int64=4) %!d(string=hai) anos
pai
achega
9d1a7a8d40

+ 1 - 1
src/main/resources/static/app/intelligent/grainDetection/views/humitureDetection-list.html

@@ -15,7 +15,7 @@
15 15
                             <div id="DataTables_Table_1_wrapper" class="dataTables_wrapper form-inline no-footer">
16 16
                                 <div class="dt-toolbar">
17 17
                                     <div class="col-xs-12 col-sm-10">
18
-                                        <a has-botton="2" class="btn btn-default btn-sm" ng-click="allStoreGrainTemperatureDetection()"> <i class="fa fa-search"></i>&nbsp;粮温检测</a>
18
+                                        <a has-botton="2" class="btn btn-default btn-sm" ng-click="allStoreGrainTemperatureDetection()"> <i class="fa fa-wrench"></i>&nbsp;粮温检测</a>
19 19
                                         <label> 仓房名称:
20 20
                                             <select ng-model="search.vCfCode" class="form-control input-sm"
21 21
                                                     ng-options="store.storehouseCode as store.storehouseName for store in storelist">

+ 15 - 0
src/main/resources/static/app/system/controller/roleCtrl.js

@@ -120,9 +120,19 @@ angular.module('app.system').controller("roleCtrl",
120 120
 	// 为操作列按钮绑定事件
121 121
 	window.operateEvents = {
122 122
 		'click #add': function (e, value, row, index) {
123
+			var reg = /^系统管理员|库领导|经营部经理|仓储部经理|副主任|保管员|仓储人员$/g;
124
+	    	if (!reg.test(row.roleName)) {
125
+	    		alert("基础配置角色,不可以操作!");
126
+	    		return;
127
+	    	}
123 128
 			$scope.edit(null, row.roleId);
124 129
 		},
125 130
 		'click #edit': function (e, value, row, index) {
131
+			var reg = /^系统管理员|库领导|经营部经理|仓储部经理|副主任|保管员|仓储人员$/g;
132
+	    	if (!reg.test(row.roleName)) {
133
+	    		alert("基础配置角色,不可以操作!");
134
+	    		return;
135
+	    	}
126 136
 			if(row.remark != null && row.remark != ""){//出入库的角色id放到remark字段里了
127 137
 				$scope.edit(row.remark, row.parentId, row.roleName);
128 138
 			}else{
@@ -130,6 +140,11 @@ angular.module('app.system').controller("roleCtrl",
130 140
 			}
131 141
 		},
132 142
 		'click #delete': function (e, value, row, index) {
143
+			var reg = /^系统管理员|库领导|经营部经理|仓储部经理|副主任|保管员|仓储人员$/g;
144
+	    	if (!reg.test(row.roleName)) {
145
+	    		alert("基础配置角色,不可以操作!");
146
+	    		return;
147
+	    	}
133 148
 			if(row.remark != null && row.remark != ""){//出入库的角色id放到remark字段里了
134 149
 				$scope.delete(row.remark);
135 150
 			}else{