修改BUG

src/api/axios.js

@@ -8,7 +8,7 @@ import qs from 'qs'
 
 const service = axios.create({
 	baseURL: process.env.VUE_APP_BASE_API, // api的base_url
-	timeout: 5000,
+	timeout: 10000,
 	headers: {
 		'Content-Type': 'application/x-www-form-urlencoded'
 	},
@@ -20,8 +20,8 @@ const service = axios.create({
 service.interceptors.request.use(
 	config => {
 		// if (getToken()) {
-			// config.headers['A-Token'] = getToken()
-			config.headers['A-Token'] = ' eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5NzQ1MjI2MCwiZXhwIjoxNTk4MDUyMjYwLCJuYmYiOjE1OTc0NTIyNjAsImp0aSI6IlRoQjd5TGNXR0VSSG85MFIiLCJzdWIiOjUsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.rpIHMw-N1H_t-_UwQ_qaG4nP7TKVyNstNVAZHLMip6Q'
+		// 	config.headers['A-Token'] = getToken()
+			config.headers['A-Token'] = ' eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC90ZXN0LWRpbmcuZzEwNy5jb21cL2FwaVwvdGVzdCIsImlhdCI6MTU5ODMxOTYyMCwiZXhwIjoxNTk4OTE5NjIwLCJuYmYiOjE1OTgzMTk2MjAsImp0aSI6IndjelpldVZ6ZnlOdHRQYmgiLCJzdWIiOjIsInBydiI6ImNhNjQ4OWQ1MGYyNDA3YTY3ODMwZTgwOTBkMDE0ODgzNTY4NTk2MmIiLCJyb2xlIjoiZW1wbG95ZWUifQ.zdDyluo2f4Ilk1EDwZ2fd0Fr_tuhqwMoTXkfzRRrWWk'
 		// }
 		return config
 	},
@@ -45,11 +45,13 @@ service.interceptors.response.use(
 				message: response.data.msg,
 				type: 'error',
 			})
+			return Promise.reject('error')
 		}else{
 			Message({
 				message: response.data.msg,
 				type: 'error',
 			})
+			return Promise.reject('error')
 		}
 	
 	},

src/assets/css/reset.css

@@ -188,7 +188,6 @@ table { border-collapse:collapse; border-spacing:0; }
 .all{
 	background-color: #fff;
 	border-radius: 5px;
-	/* height: 100%; */
 	min-height:calc(100vh - 184px);
 	min-width: 800px;
 }
@@ -196,6 +195,16 @@ table { border-collapse:collapse; border-spacing:0; }
 	width: 200px;
 	box-sizing: border-box;
 	padding: 20px 10px;
+	max-height: 600px;
+	overflow: auto;
+}
+.terr-left::-webkit-scrollbar {
+	width: 3px;
+	height: 3px;
+	background-color: #fff;
+}
+.terr-left::-webkit-scrollbar-thumb {
+	background-color: #D9D9D9;
 }
 .terr-right{
 	padding: 20px;

src/components/EmployeeSelector.vue

@@ -59,7 +59,7 @@
         <el-col :xs="11" :sm="11" :md="11" :lg="11" :xl="11" class="scroller-box">
           <div class="option-box flex-box flex-v-ce">
             <div class="fontColorF flex-1" v-show="multi">已选择{{employee_selected_list.length}}个员工</div>
-            <el-button type="type" @click="clear_data">清空</el-button>
+            <el-button type="type" @click="clear_data">清空</el-button> 
           </div>
           <el-scrollbar wrap-class="column-wrapper scrollable-items-container" :native="false" style="height: 400px;">
             <div class="choose_right">
@@ -161,7 +161,8 @@
       isChecKedAll:{
         type: Boolean,
         default: true
-      }
+      },
+      "grouping_Json":Array
     },
     name: "EmployeeSelector",
     data() {
@@ -261,7 +262,7 @@
               }
             }
             // 未处理好 20200713
-            this.lsit.length == total?this.indeterminate = true:this.indeterminate = false
+            // this.lsit.length == total?this.indeterminate = true:this.indeterminate = false
           })
         }else{
           this.clear_data()
@@ -428,6 +429,8 @@
         if (this.employee_list.length > 0) {
           return
         }
+        //  this.dept_selected_list=this.grouping_Json
+        //  console.log(this.$parent)
 
         this.$axios.get('/api/department/index', {
           params: {
@@ -435,7 +438,6 @@
             keyword: this.keyword
           }
         }).then((res) => {
-          console.log(res)
           for (let i in res.data.data.list) {
             res.data.data.list[i]['checked'] = false
             if (this.dept_selected.indexOf(res.data.data.list[i].id) >= 0) {
@@ -502,7 +504,6 @@
             page_size: 2000
           }
         }).then((res) => {
-          console.log(res)
           this.table_loading = false;
           var employee=res.data.data.list||[];
           employee.map((item)=>{

src/components/publics/workpoints.vue

@@ -3,24 +3,6 @@
     <div class="initialPoint">
       <div class="initia_title">{{initia_head.initial_suername}}</div>
       <div class="initia_title_1">{{initia_head.initial_suertext}}</div>
-
-      <!-- <el-form :label-width="initia_head.initial_width">
-        <el-form-item prop="base_point" style="margin: 20px 0 0 0 "  v-for="(v,i) in initia_arr" :key="i">
-            <template slot="label">
-              <span :style="'width:'+initia_head.initial_left">{{v.initialName}}</span>
-              <el-tooltip placement="top">
-                <div slot="content" class="initia_mark_none_text" v-html="v.initial_text"></div>
-                <span class="initia_mark" v-show="v.initia_mark">?</span>
-              </el-tooltip>
-            </template>
-            <el-input
-              class="nitia_list_input"
-              v-model="v.initia_input"
-              placeholder="请输入分值"
-              oninput="if(this.value=='0'){this.value='';}else{this.value=this.value.replace(/[^0-9]/g,'')}"
-            ></el-input>
-        </el-form-item>
-      </el-form>-->
       <div v-for="(v,i) in initia_arr" :key="i">
         <el-form
           :model="v.initia_input"
@@ -28,12 +10,18 @@
           :label-width="initia_head.initial_width"
           class="demo-ruleForm"
         >
-          <el-form-item
+
+        <!-- 正则代码 -->
+          <!-- <el-form-item
             style="margin: 20px 0 0 0 "
             prop="age"
             :rules="[
               { required: true, message: '分值不能为空'},
             ]"
+          > -->
+
+          <el-form-item
+            style="margin: 20px 0 0 0 "
           >
             <template slot="label">
               <span :style="'width:'+initia_head.initial_left">{{v.initialName}}</span>
@@ -48,7 +36,7 @@
               autocomplete="off"
               class="nitia_list_input"
               placeholder="请输入分值"
-              oninput="if(this.value=='0'){this.value='';}else{this.value=this.value.replace(/[^0-9]/g,'')}"
+              oninput="if(this.value=='00'){this.value='0';}else{this.value=this.value.replace(/[^0-9]/g,'')}"
             ></el-input>
           </el-form-item>
         </el-form>
@@ -77,8 +65,28 @@ export default {
   methods: {
     save() {
       let arr = [];
+
+      // 正则判断代码
+      // for (var i = 0; i < this.initia_arr.length; i++) {
+      //   if (this.initia_arr[i].initia_input.age !== "") {
+      //     arr.push({
+      //       sj: this.initia_arr[i].initia_input.age,
+      //     });
+      //     if (arr.length == this.initia_arr.length) {
+      //       this.$emit("initia", arr);
+      //       this.disableds = false;
+      //     }
+      //   } else {
+      //     this.$message({
+      //       message: "请输入分值",
+      //       type: "warning",
+      //     });
+      //     return;
+      //   }
+      // }
+
+      // 无正则代码
       for (var i = 0; i < this.initia_arr.length; i++) {
-        if (this.initia_arr[i].initia_input.age !== "") {
           arr.push({
             sj: this.initia_arr[i].initia_input.age,
           });
@@ -86,13 +94,6 @@ export default {
             this.$emit("initia", arr);
             this.disableds = false;
           }
-        } else {
-          this.$message({
-            message: "请输入分值",
-            type: "warning",
-          });
-          return;
-        }
       }
     },
   },

src/index.vue

@@ -10,7 +10,7 @@
 					<div class="name flex-1">{{ info.name }}</div>
 					<div class="flex-box flex-v-ce">
 						<div>您当前的版本：15~20人（剩余231天）</div>
-						<el-button size="small" class="upgrade" type="primary" icon="el-icon-upload">续费升级</el-button>
+						<el-button size="small" @click="tz" class="upgrade" type="primary" icon="el-icon-upload">续费升级</el-button>
 						<span class="wn">?</span>
 						<userImage :user_name="userData.name" :img_url="userData.img_url" width="44px" height="44px"></userImage>
 					</div>
@@ -50,24 +50,36 @@ export default {
 		// var corpId = str.split('#')[0];
 		// if (corpId) {
 		// 	this.login(corpId);
-		this.getTypes();
+			this.getTypes();
 		// }
 	},
 	methods: {
+		tz(){},
 		login(corpId) {
 			var that = this;
+			this.loading=true;
 			this.$dd.runtime.permission.requestAuthCode({
 				corpId: corpId, // 企业id
 				onSuccess: function(info) {
 					that.$axios.post('api/ding/login', { authCode: info.code, corpId: corpId }).then(res => {
-						console.log(res.data.code);
+						var is=false;
 						if (res.data.code == 1) {
 							var { token, user } = res.data.data;
-							that.$setToken(token);
-							that.$setUserData(user);
-							that.userData = user;
-							that.getInfo();
+							user.employee_detail.role_list.forEach(item=>{
+								if(item.name=='admin'||item.name=='creator'||item.name=='point_manager'){
+									is=true;
+								}
+							})
+							if(is){
+								that.$setUserData(user);
+								that.userData = user;
+								that.getInfo();
+							}else{
+								that.$router.replace({path:'/noAccess'})
+							}
 						}
+					}).finally(() => {
+						that.loading = false;
 					});
 				}
 			});
@@ -76,7 +88,6 @@ export default {
 			var that = this;
 			this.$axios.get('api/site/info').then(res => {
 				that.info = res.data.data;
-				that.loading = false;
 			});
 		},
 		getTypes() {
@@ -147,6 +158,15 @@ export default {
 	background-color: #ccc;
 	height: calc(100vh - 60px);
 	overflow-y: scroll;
+	padding: 10px;
+}
+.el-main::-webkit-scrollbar{
+	width: 3px;
+	height: 10px;
+	background-color: #fff;
+}
+.el-main::-webkit-scrollbar-thumb {
+	background-color: #D9D9D9;
 }
 .logo-box {
 	width: 200px;

src/noAccess.vue

@@ -0,0 +1,13 @@
+<template>
+	<div class="noData">您不是相关管理人员,请联系管理员给与对应管理权限</div>
+</template>
+
+<script>
+</script>
+
+<style scoped="scoped">
+	.noData{
+		text-align: center;
+		margin-top: 25%;
+	}
+</style>

src/router/index.js

@@ -48,6 +48,11 @@ Vue.use(VueRouter)
 		}
 	]
   },
+  {
+  path: '/noAccess',
+  name: '无权限',
+  component: () => import('@/noAccess'),
+  }
 ]
 
 const router = new VueRouter({

src/views/check.vue

@@ -39,7 +39,7 @@ export default {
           },
         },
         {
-          initialName: "矿工缺席，每次扣分",
+          initialName: "旷工缺席，每次扣分",
           initia_mark: false,
           initia_input: {
             age: "",
@@ -120,6 +120,7 @@ export default {
           }
         })
         .catch((err) => {
+          this.loading = false;
           console.log(err);
         });
     },
@@ -132,6 +133,7 @@ export default {
           arr.push(res.data.data.config[i]);
         }
 
+        // 循环赋值，后端返回顺序不对不能用
         // for (let i = 0; i < this.initia_arr.length; i++) {
         //   this.initia_arr[i].initia_input.age = Math.abs(arr[i]);
         // }

src/views/framework.vue

@@ -46,7 +46,7 @@
 				</div>
 				<div class="terr-right border-right flex-1">
 					<div class="margin-bottom">
-						<el-button @click="participation()" size="medium" type="primary" style="margin-right: 10px;" v-show="selectIds.length > 0">参与积分管理</el-button>
+						<el-button @click="participation()" :loading="enable_loading" size="medium" type="primary" style="margin-right: 10px;" v-show="selectIds.length > 0">参与积分管理</el-button>
 						<el-input placeholder="输入同事姓名" size="medium" style="width: 230px;" v-model="keywords">
 							<el-button slot="append" icon="el-icon-search" @click="getEmployee()"></el-button>
 						</el-input>
@@ -118,7 +118,9 @@ export default {
 
 			tableToading: false,
 			tbLoading: false,
-			selectIds: []
+			selectIds: [],
+			enable_loading:false
+			
 		};
 	},
 	components: {
@@ -150,12 +152,12 @@ export default {
 			var http1 = this.$axios.post('api/ding/department_sync');
 			var http2 = this.$axios.post('api/ding/employee_sync');
 			Promise.all([http1, http2]).then(res => {
-				this.tbLoading = false;
 				if (res[0]) {
-					this.tbLoading = false;
 					this.$message.success({ message: res[0].data.msg });
 					this.getInfo();
 				}
+			}).finally(()=>{
+				this.tbLoading = false;
 			});
 		},
 		//是否开通
@@ -170,10 +172,13 @@ export default {
 		},
 		//批量开通权限
 		participation() {
+			this.enable_loading=true;
 			this.$axios.post('api/employee/enable', { employee_id: this.selectIds }).then(res => {
 				if (res) {
 					this.getEmployee();
 				}
+			}).finally(err=>{
+				this.enable_loading=false;
 			});
 		},
 		//获取公司信息
@@ -205,9 +210,10 @@ export default {
 		getEmployee() {
 			this.tableToading = true;
 			this.$axios.get('api/employee/index', { params: { dept_id: this.dept_id, keywords: this.keywords, page: this.page, page_size: this.perPage } }).then(res => {
-				this.tableToading = false;
 				this.total = res.data.data.pageInfo.count;
 				this.userList = res.data.data.list;
+			}).finally(err=>{
+				this.tableToading=false;
 			});
 		},
 		//关闭提示

src/views/initialPoint.vue

@@ -54,8 +54,8 @@ export default {
     initia(ok) {
       this.loading = true;
 
-      this.obj.base_point = ok[0].sj;
-      this.obj.service_point = ok[1].sj;
+      this.obj.base_point = +ok[0].sj;
+      this.obj.service_point = +ok[1].sj;
       this.$axios
         .post("api/integral/site/config", this.obj)
         .then((res) => {

src/views/jurisdiction.vue

@@ -244,6 +244,7 @@
 				v-if="add_employee_form"
 				ref="Employee"
 				:user_no_select="true"
+				:my_no_select="false"
 				:can_select_dept="false"
 				:multi="false"
 				:visible.sync="add_employee_show"
@@ -270,7 +271,7 @@
 		    </el-form-item>
 		    <el-form-item style="text-align: right; margin-bottom: 0">
 		      <el-button @click="integral_limit_show = false">取消</el-button>
-		      <el-button type="primary" @click="sub_employee_limit">确定</el-button>
+		      <el-button type="primary" :loading="integral_loading" @click="sub_employee_limit">确定</el-button>
 		    </el-form-item>
 		  </el-form>
 		</el-dialog>
@@ -283,7 +284,7 @@
 		  <EmployeeSelector v-if="management_scope_show" ref="Employee" :employee_not_select="employee_not_select" :max='add_employee_max' :selected="management_scope_arr" :can_select_dept="false"  @confirm="management_scope_confirm"></EmployeeSelector>
 		  <span slot="footer">
 		    <el-button @click="publicClose()">取消</el-button>
-		    <el-button type="primary" @click="sub_management_scope">完成</el-button>
+		    <el-button type="primary" :loading="scope_loading" @click="sub_management_scope">完成</el-button>
 		  </span>
 		</el-dialog>
 		<el-dialog
@@ -364,7 +365,7 @@
 		    </el-form-item>
 		    <el-form-item style=" text-align: right; margin-bottom: 0;">
 		      <el-button @click="bonus_deducted_colse('integral_limit_form')">取消</el-button>
-		      <el-button type="primary" @click="sub_bonus_deducted('integral_limit_form')">确定</el-button>
+		      <el-button type="primary" :loading="bonus_loading" @click="sub_bonus_deducted('integral_limit_form')">确定</el-button>
 		    </el-form-item>
 		  </el-form>
 		</el-dialog>
@@ -407,10 +408,14 @@ export default {
 			employee_not_select:[],
 			add_employee_max: 0,
 			management_scope_arr: {employee: [], dept: []},
+			scope_loading:false,
+			integral_loading:false,
+			
 			
 			// 设置奖扣任务相关
 			bonus_deducted_show:false,
 			bonus_deducted_loading:false,
+			bonus_loading:false,
 			integral_limit_rules:{
 			  exec_count:[
 			    { required: true, validator: minimum, trigger: 'blur' },
@@ -445,6 +450,7 @@ export default {
 		  this.get_employee_limit(item.id)
 		},
 		sub_bonus_deducted(fromName){
+		  this.bonus_loading=true;	
 		  this.integral_limit_form.employee_id = this.set_mployee_limit_id
 		  this.$refs[fromName].validate((valid) => {
 		    if (valid) {
@@ -462,7 +468,7 @@ export default {
 		        }else{
 		          this.$message.error(res.data.msg)
 		        }
-		      })
+		      }).finally(() => { this.bonus_loading=false;})
 		    }
 		  });
 		},
@@ -472,6 +478,7 @@ export default {
 		},
 		//设置管理范围
 		sub_management_scope(){
+		  this.scope_loading=true;
 		  this.$refs.Employee.confirm();//调用组件的confirm（）；
 		  this.$axios({
 		    url: '/api/employee/scope',
@@ -489,7 +496,7 @@ export default {
 		    } else{
 		      this.$message.error(res.data.msg)
 		    }
-		  }).catch((e) => {this.$message.error(e.data.msg)})
+		  }).catch((e) => {this.$message.error(e.data.msg)}).finally(() => { this.scope_loading=false;})
 		},
 		//添加编辑管理范围
 		management_scope_confirm(val){
@@ -514,6 +521,7 @@ export default {
 		  })
 		},
 		sub_employee_limit(){
+		  this.integral_loading=true;
 		  this.integral_limit_form.employee_id = this.set_mployee_limit_id
 		  this.$axios.post('/api/integral/employee/limit',this.integral_limit_form).then((res) => {
 		    if (res.data.code == 1) {
@@ -523,7 +531,9 @@ export default {
 		    }else{
 		      this.$message.error(res.data.msg)
 		    }
-		  }).catch((e) => {this.$message.error(e.data.msg)})
+		  }).catch((e) => {this.$message.error(e.data.msg)}).finally(() => {
+					this.integral_loading = false;
+			});
 		},
 		open_integral_limit(item){
 		  this.integral_limit_show = true
@@ -555,7 +565,6 @@ export default {
 		sub_add_employee(form) {
 			  var that=this;
 			   this.$refs.Employee.confirm();//调用组件的confirm（）；
-			   			console.log(this.employee_arr)
 			   this.employee_arr.forEach(element => {
 					 this.$axios.put('/api/role/user',{role_id: this.item_info.id,employee_id: element}).then((res) => {
 					   if (res.data.code == 1) {
@@ -580,7 +589,8 @@ export default {
 	
 		//关闭弹窗
 		publicClose() {
-			this.add_employee_show = false;
+			this.$refs.Employee.close()
+			// this.add_employee_show = false;
 			this.management_scope_show = false;
 		},
 		handleSelectionChange() {},
@@ -651,7 +661,6 @@ export default {
 							}
 						});
 						this.table_list = list||[];
-						console.log(this.table_list)
 					} else {
 						this.$message.error(res.data.msg);
 					}

src/views/rule.vue

@@ -69,16 +69,16 @@
 				<el-form-item style="text-align: right; margin-bottom:0;">
 					<el-button type="danger" @click="del_dept" v-show="class_type == 'edit'">删除分类</el-button>
 					<el-button @click="add_dept_close('dept_formdata')">取消</el-button>
-					<el-button type="primary" @click="submit_add_dept('dept_formdata')">确定</el-button>
+					<el-button type="primary" @click="submit_add_dept('dept_formdata')" :loading="dept_loading">确定</el-button>
 				</el-form-item>
 			</el-form>
 		</el-dialog>
 
 		<!-- 添加编辑规则 -->
-		<el-dialog :title="rule_type == 'add' ? '添加规则' : '编辑规则'" :visible.sync="rule_show" :close-on-click-modal="false" width="700px">
+		<el-dialog :title="rule_type == 'add' ? '添加规则' : '编辑规则'" :visible.sync="rule_show" :close-on-click-modal="false" width="550px">
 			<el-form :model="rules_detail_form" ref="rules_detail_form" :rules="rules" label-width="80px">
 				<el-form-item label="规则内容" prop="remark">
-					<el-input v-model="rules_detail_form.remark" placeholder="请输入规则内容" type="textarea" :rows="3"></el-input>
+					<el-input v-model="rules_detail_form.remark" placeholder="请输入规则内容" type="textarea" :rows="3" maxlength="100" show-word-limit></el-input>
 				</el-form-item>
 				<el-form-item label="所属分类" prop="rule_id">
 					<div style="position: relative;">
@@ -138,10 +138,10 @@
 					</el-row>
 				</el-form-item>
 				<el-form-item style="text-align: right; margin-bottom:0;">
-					<el-button type="danger" @click="del_rule" v-show="rule_type == 'edit'">删除规则</el-button>
+					<el-button type="danger" @click="del_rule" :loading="delRule_loading" v-show="rule_type == 'edit'">删除规则</el-button>
 					<el-button @click="rule_close('rules_detail_form')">取消</el-button>
-					<el-button type="primary" v-show="rule_type == 'add'" @click="add_submit_rule('rules_detail_form')">确定</el-button>
-					<el-button type="primary" v-show="rule_type == 'edit'" @click="edit_submit_rule('rules_detail_form')">确定</el-button>
+					<el-button type="primary" v-show="rule_type == 'add'" :loading="rule_loading2" @click="add_submit_rule('rules_detail_form')">确定</el-button>
+					<el-button type="primary" v-show="rule_type == 'edit'" :loading="rule_loading2" @click="edit_submit_rule('rules_detail_form')">确定</el-button>
 				</el-form-item>
 			</el-form>
 		</el-dialog>
@@ -206,6 +206,7 @@ export default {
 			selectItem: { name: '积分分类' }, //选择的分类
 			//添加分类
 			class_show: false,
+			delRule_loading:false,
 			dept_formdata_rules: {
 				name: [
 					{
@@ -227,9 +228,11 @@ export default {
 				cycle_type: '1'
 			},
 			class_type: 'add',
+			dept_loading:false,
 
 			// 规则相关
 			del_item_id: [], //选择规则ID集合
+			rule_loading2: false,
 			rule_type: 'add',
 			rule_show: false,
 			rules_detail_form: {
@@ -247,12 +250,7 @@ export default {
 				remark: [
 					{
 						required: true,
-						message: '请输入加分项名称',
-						trigger: 'blur'
-					},
-					{
-						max: 400,
-						message: '加分项名称400个字符以内',
+						message: '请输入规则名称',
 						trigger: 'blur'
 					}
 				],
@@ -260,21 +258,7 @@ export default {
 					{
 						required: true,
 						message: '请选择分类',
-						trigger: 'blur'
-					}
-				],
-				pt_id: [
-					{
-						required: true,
-						message: '请输入加分项名称',
-						trigger: 'blur'
-					}
-				],
-				range_type: [
-					{
-						required: true,
-						message: '请输入加分项名称',
-						trigger: 'blur'
+						trigger: 'change'
 					}
 				]
 			},
@@ -329,6 +313,7 @@ export default {
 		// 导入相关
 		close_import() {
 			this.import_rules_show = false;
+			this.import_btn_show = false;
 			this.$refs.upload.clearFiles();
 		},
 		submitUpload() {
@@ -336,18 +321,15 @@ export default {
 			let params = {
 				file: this.file
 			};
-			this.$axios
-				.post('/api/rule/import', params)
-				.then(res => {
+			this.$axios.post('/api/rule/import', params).then(res => {
 					if (res.data.code == 1) {
-						this.import_rules_show = false;
+						this.close_import();
 						this.$message.success({ message: res.data.msg });
 						this.getData();
 					} else {
 						this.$message({ type: 'error', message: res.data.msg });
 					}
-				})
-				.finally(() => {
+				}).finally(() => {
 					this.save_loading = false;
 				});
 		},
@@ -386,6 +368,7 @@ export default {
 		},
 
 		edit_submit_rule(form) {
+			this.rule_loading2=true;
 			let self = this;
 			self.$refs[form].validate(valid => {
 				if (valid) {
@@ -424,11 +407,13 @@ export default {
 								data.item_id = self.rules_detail_form.id;
 								if (self.rules_detail_form.min_point == 0 && self.rules_detail_form.range_type == 1) {
 									self.$message.error('积分不能为零');
+									this.rule_loading2=false;
 									return false;
 								}
 								this.$axios
 									.post('/api/integral/rule/items/edit', data)
 									.then(res => {
+										this.rule_loading2=false;
 										if (res.data.code == 1) {
 											self.$message.success(res.data.msg);
 											self.getData();
@@ -448,11 +433,13 @@ export default {
 						data.item_id = self.rules_detail_form.id;
 						if (self.rules_detail_form.min_point == 0 && self.rules_detail_form.range_type == 1) {
 							self.$message.error('积分不能为零');
+							this.rule_loading2=false;
 							return false;
 						}
 						this.$axios
 							.post('/api/integral/rule/items/edit', data)
 							.then(res => {
+								this.rule_loading2=false;
 								if (res.data.code == 1) {
 									self.$message.success(res.data.msg);
 									self.getData();
@@ -460,18 +447,21 @@ export default {
 								} else {
 									self.$message.error(res.data.msg);
 								}
-							})
-							.catch(e => {
+							}).catch(e => {
 								self.$message.error(e.data.msg);
+							}).finally(() => {
+								this.rule_loading2 = false;
 							});
 					}
 				} else {
+					this.rule_loading2=false;
 					return false;
 				}
 			});
 		},
 		//添加规则
 		add_submit_rule(form) {
+			this.rule_loading2=true;
 			let self = this;
 			self.$refs[form].validate(valid => {
 				if (valid) {
@@ -507,6 +497,7 @@ export default {
 							self.rules_detail_form.max_point = min_point;
 							if (self.rules_detail_form.min_point == 0 && self.rules_detail_form.range_type == 1) {
 								self.$message.error('积分不能为零');
+								this.rule_loading2=false;
 								return false;
 							}
 							let data = {
@@ -522,15 +513,17 @@ export default {
 									} else {
 										self.$message.error(res.data.msg);
 									}
-								})
-								.catch(e => {
+								}).catch(e => {
 									self.$message.error(e.data.msg);
+								}).finally(() => {
+									this.rule_loading2 = false;
 								});
 						});
 					} else {
 						self.rules_detail_form.item_id = self.rules_detail_form.id;
 						if (self.rules_detail_form.min_point == 0 && self.rules_detail_form.range_type == 1) {
 							self.$message.error('积分不能为零');
+							this.rule_loading2=false;
 							return false;
 						}
 						let data = {
@@ -539,6 +532,7 @@ export default {
 						this.$axios
 							.post('/api/integral/rule/items', data)
 							.then(res => {
+								this.rule_loading2=false;
 								if (res.data.code == 1) {
 									self.$message.success(res.data.msg);
 									self.getData();
@@ -546,12 +540,14 @@ export default {
 								} else {
 									self.$message.error(res.data.msg);
 								}
-							})
-							.catch(e => {
+							}).catch(e => {
 								self.$message.error(e.data.msg);
+							}).finally(() => {
+								this.rule_loading2 = false;
 							});
 					}
 				} else {
+					this.rule_loading2=false;
 					return false;
 				}
 			});
@@ -562,11 +558,9 @@ export default {
 			let data = {
 				item_id: [this.rules_detail_form.id]
 			};
-			self.$confirm('此操作将永久删除该选项, 是否继续?', '提示')
-				.then(() => {
-					this.$axios
-						.post('/api/integral/rule/items/destroy', data)
-						.then(res => {
+			this.delRule_loading=true;
+			self.$confirm('此操作将永久删除该选项, 是否继续?', '提示').then(() => {
+					this.$axios.post('/api/integral/rule/items/destroy', data).then(res => {
 							if (res.data.code == 1) {
 								self.$message.success(res.data.msg);
 								self.rule_show = false;
@@ -577,9 +571,10 @@ export default {
 						})
 						.catch(e => {
 							self.$message.error(e.data.msg);
+						}).finally(() => {
+							this.delRule_loading = false;
 						});
-				})
-				.catch(() => {});
+			});
 		},
 		//关闭规则弹窗
 		rule_close(form) {
@@ -596,12 +591,10 @@ export default {
 				confirmButtonText: '确定',
 				cancelButtonText: '取消',
 				type: 'warning'
-			})
-				.then(() => {
+			}).then(() => {
 					this.rule_show = false;
 					this.class_show = true;
-				})
-				.catch(() => {});
+			}).catch(() => {});
 		},
 		add_rule() {
 			this.rule_show = true;
@@ -732,12 +725,13 @@ export default {
 				that.rule_tree = res.data.data.rule_tree || [];
 				that.item_list = list;
 				that.all_item_list = list;
-				that.rule_loading = false;
 				if (is) {
 					that.handleNodeClick(that.selectItem);
 				} else {
 					this.selectItem = { name: '积分分类' }; //选择的分类
 				}
+			}).finally(() => {
+				this.rule_loading = false;
 			});
 		},
 		//编辑分组
@@ -748,21 +742,23 @@ export default {
 		},
 		//添加分组
 		submit_add_dept(form) {
+			this.dept_loading=true;
 			let that = this;
 			that.$refs[form].validate(valid => {
 				if (valid) {
 					if (that.class_type == 'edit') {
 						delete that.dept_formdata.child;
-						that.dept_formdata.pid = that.dept_formdata.pid[that.dept_formdata.pid.length - 1] || 0;
 						that.dept_formdata.rule_id = that.dept_formdata.id;
 						this.$axios.post('/api/integral/rule/edit', that.dept_formdata).then(res => {
 							if (res.data.code == 1) {
-								that.$message.success('修改积分规则成功');
+								that.$message.success('修改积分分类成功');
 								this.getData();
-								that.add_dept_close();
+								this.add_dept_close('dept_formdata');
 							} else {
 								that.$message.error(res.data.msg);
 							}
+						}).finally(() => {
+							this.dept_loading = false;
 						});
 					} else {
 						if (that.dept_formdata.pid !== null && that.dept_formdata.pid.length == 0) {
@@ -770,20 +766,24 @@ export default {
 						} else {
 							that.dept_formdata.pid = that.dept_formdata.pid[that.dept_formdata.pid.length - 1];
 						}
+						console.log(that.dept_formdata);
+						return;
 						this.$axios.post('/api/integral/rule', that.dept_formdata).then(res => {
 							if (res.data.code == 1) {
 								this.getData();
-								that.add_dept_close();
+								this.add_dept_close('dept_formdata');
 							} else {
 								that.$message.error(res.data.msg);
 							}
+						}).finally(() => {
+							this.dept_loading = false;
 						});
 					}
-					that.class_show = false;
 				} else {
-					return false;
+					this.dept_loading=false;
 				}
 			});
+			
 		},
 		//删除分组
 		del_dept() {
@@ -796,7 +796,7 @@ export default {
 					if (res.data.code == 1) {
 						this.$message.success(res.data.msg);
 						this.getData();
-						this.add_dept_close();
+						this.add_dept_close('dept_formdata');
 					} else {
 						this.$message.error(res.data.msg);
 					}

src/views/voluntarilyPoint.vue

@@ -22,12 +22,14 @@
           </div>
 
           <!-- 循环分组 -->
-          <el-col :span="24" class="grouping" v-loading="rule_trees_load">
+          <el-col :span="24" style="padding-right: 0;" v-loading="rule_trees_load">
             <el-menu class="rule_name" :unique-opened="true">
               <el-submenu :index="index.toString()" v-for="(item,index) in rule_list" :key="index">
                 <template slot="title">
-                  <i class="el-icon-edit-outline title_top" @click.stop="edit_grouping(item)"></i>
-                  <span class="title_top">{{item.name}}</span>
+                  <div style="width:80%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap">
+                    <i class="el-icon-edit-outline title_top" @click.stop="edit_grouping(item)"></i>
+                    <span class="title_top">{{item.name}}</span>
+                  </div>
                 </template>
                 <span
                   :index="i.toString()"
@@ -41,7 +43,9 @@
                     :key="i1"
                     @click="open_right(data)"
                   >
-                    <span slot="title">{{data.remark}}</span>
+                    <div style="width:95%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap">
+                      <span slot="title">{{data.remark}}</span>
+                    </div>
                   </el-menu-item>
                 </span>
                 <!-- <el-menu-item :index="i.toString()" v-for="(data,i) in item.data" :key="i" @click="open_right(data)" >{{data.name}}</el-menu-item> -->
@@ -51,89 +55,85 @@
         </div>
 
         <div class="terr-right border-right flex-1" v-loading="table_loading">
-          <el-col
-            :span="24"
-            v-show="(rule_list.length == 0||item_list.length == 0)"
-            style="text-align: center;margin: 0 auto;position: relative;top: 30%;"
-          >
-            <p>
-              <img src="@/assets/image/nodata_default.png" width="200px" alt />
-            </p>
-            <p style="color: #909399;">还没有分类和规则</p>
-            <p style="color: #909399;">
-              先
-              <span style="color: #26A2FF;" @click="add_grouping()">【添加分类】</span>，再
-              <span style="color: #26A2FF;" @click="add_rules_detail">添加规则</span>
-            </p>
+          <el-col :span="24" v-show="(rule_list.length == 0||item_list.length == 0)" style="text-align: center;margin: 0 auto;position: relative;top: 30%;">
+            <p><img src="@/assets/image/nodata_default.png" width="200px" alt=""></p>
+            <p style="color: #909399;">还没有<span v-if="rule_list.length==0">加分组和</span>加分项</p>
+            <p style="color: #909399;"><span v-if="rule_list.length==0">先</span><span style="color: #26A2FF;cursor:pointer;" v-if="rule_list.length==0" @click="add_grouping()">【添加加分组】</span>，<span v-if="rule_list.length==0">再</span><span v-if="rule_list.length!==0">请</span><span style="color: #26A2FF;cursor:pointer" @click="add_rules_detail">【添加加分项】</span></p>
           </el-col>
           <el-col v-if="item_list.length != 0">
-            <el-row>
+          <el-row>
+            <!-- 移除隐藏 -->
+            <!-- <el-col :span="24" style="font-size:20px;color:#303133;line-height:36px;display:flex;flex-wrap: wrap;">
+              <div style="width:5%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap">
+                <span>{{right_rules_detail.remark}}</span>
+              </div> -->
               <el-col :span="24" style="font-size:20px;color:#303133;line-height:36px;">
-                {{right_rules_detail.remark}}
-                <span
-                  style="padding-left: 10px;"
-                >{{right_rules_detail.min_point}}B分</span>
-                <el-button
-                  plain
-                  style="padding:10px 12px; margin-left: 10px;"
-                  @click="edit_rules(item_info)"
-                >编辑</el-button>
-              </el-col>
-            </el-row>
-            <div class="flex-box btns flex-v-ce">
-              <el-button size="medium" @click="del_item" type="danger" plain>批量移除</el-button>
-              <el-button type="primary" @click="add_employee_show= true">添加人员</el-button>
-            </div>
-            <el-table
-              ref="multipleTable"
-              :data="table_list"
-              v-loading="table_loading"
-              tooltip-effect="dark"
-              style="width: 100%;margin-top:20px;"
-              @selection-change="handleSelectionChange"
-            >
-              <el-table-column type="selection" width="45"></el-table-column>
-              <el-table-column label="姓名">
-                <template slot-scope="scope">
-                  <div style="display:flex">
-                    <span class="fl">
-                      <userImage
-                        :id="scope.row.employee_id"
-                        width="50px"
-                        height="50px"
-                        :user_name="scope.row.employee.name"
-                        :img_url="scope.row.employee.img_url"
-                        v-if="scope.row.employee"
-                      ></userImage>
-                    </span>
-                    <span
-                      style="margin-left: 10px; line-height: 50px; display: inline-block"
+              {{right_rules_detail.remark}}
+              <span style="padding-left: 10px;">{{right_rules_detail.min_point}}B分</span>
+              <el-button
+                plain
+                style="padding:10px 12px; margin-left: 10px;"
+                @click="edit_rules(item_info)"
+              >编辑</el-button>
+            </el-col>
+          </el-row>
+          <div class="flex-box btns flex-v-ce">
+            <el-button size="small" @click="del_item" type="danger" plain>批量移除</el-button>
+            <el-button size="small" type="primary" @click="add_employee_show_TJ">添加人员</el-button>
+          </div>
+          <el-table
+            ref="multipleTable"
+            :data="table_list"
+            v-loading="table_loading"
+            tooltip-effect="dark"
+            style="width: 100%;margin-top:20px;"
+            @selection-change="handleSelectionChange"
+          >
+            <el-table-column type="selection" width="45"></el-table-column>
+            <el-table-column label="姓名">
+              <template slot-scope="scope">
+                <div style="display:flex">
+                  <span class="fl">
+                    <userImage
+                    
+                      :id="scope.row.employee_id"
+                      width="50px"
+                      height="50px"
+                      :user_name="scope.row.employee.name"
+                      :img_url="scope.row.employee.img_url"
                       v-if="scope.row.employee"
-                    >{{scope.row.employee.name}}</span>
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column prop="cycle_remark" label="加分周期"></el-table-column>
-              <template slot="empty">
-                <noData></noData>
+                    ></userImage>
+                  </span>
+                  <span
+                    style="margin-left: 10px; line-height: 50px; display: inline-block"
+                    v-if="scope.row.employee"
+                  >{{scope.row.employee.name}}</span>
+                </div>
               </template>
-            </el-table>
+            </el-table-column>
+            <el-table-column prop="cycle_remark" label="加分周期"></el-table-column>
+			<template slot="empty">
+				<noData></noData>
+			</template>
+          </el-table>
 
-            <!-- 分页 -->
-            <div style=" text-align: center; padding: 20px;">
-              <el-pagination
-                background
-                layout="total, prev, pager, next"
-                :current-page="page"
-                @current-change="handleCurrentChange"
-                :page-size.sync="pagesize"
-                :hide-on-single-page="true"
-                :total="total"
-              ></el-pagination>
-            </div>
+          <!-- 分页 -->
+          <div style=" text-align: center; padding: 20px;">
+            <el-pagination
+              background
+              layout="total, prev, pager, next"
+              :current-page="page"
+              @current-change="handleCurrentChange"
+              :page-size.sync="pagesize"
+              :hide-on-single-page="true"
+              :total="total"
+            ></el-pagination>
+          </div>
+          
           </el-col>
         </div>
       </div>
+
       <!-- 可写公共组建： -->
       <!-- 新增加分组弹出框 -->
       <el-dialog
@@ -158,8 +158,6 @@
             <el-input
               type="age"
               v-model="numberValidateForm.name"
-              
-            @keydown.enter.native="submitForm('numberValidateForm')"
               autocomplete="off"
               placeholder="请输入分组名称"
             ></el-input>
@@ -241,7 +239,7 @@
               style="float:left"
               :disabled="disabled"
             >删除</el-button>
-
+            
             <el-button
               v-if="rules_detail_title"
               class="fr"
@@ -287,7 +285,8 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <div v-loading="staff_loading">
+          <div 
+       v-loading="staff_loading">
             <EmployeeSelector1
               :max="add_employee_max"
               :can_select_dept="false"
@@ -312,11 +311,12 @@
 
 <script>
 import EmployeeSelector1 from "@/components/EmployeeSelector";
-import noData from "@/components/noData";
+import noData from '@/components/noData';
 export default {
   data() {
     return {
-      jieguoId: "",
+      // grouping_Json:[],
+      jieguoId:"",
       table_list: [],
       tips_show: false,
       item_info: {},
@@ -336,9 +336,10 @@ export default {
       del_arr: {
         ids: [],
       },
-      page: 1, //默认页数  为1
-      total: 0, //返回的总数据
-      pagesize: 10, //每页显示的数据
+      val_page:'',//存入某一页文本框选中的数量
+      page: 1,//默认页数  为1
+      total: 0,//返回的总数据
+      pagesize: 10,//每页显示的数据
       table_loading: false,
       staff_loading: false,
 
@@ -425,11 +426,11 @@ export default {
   },
   components: {
     EmployeeSelector1,
-    noData,
+	noData
   },
   created() {},
   mounted() {
-    if (localStorage.getItem("framework")) {
+    if (localStorage.getItem("voluntarilyPoint")) {
       this.tips_show = false;
     } else {
       this.tips_show = true;
@@ -453,9 +454,29 @@ export default {
 
     // 添加成员点击取消
     add_employee_close() {
-      this.task_cycle_name = "";
       this.add_employee_show = false;
     },
+    // 点击添加人员
+    add_employee_show_TJ(){
+      this.add_employee_show= true;//弹出添加人员框
+      var params = {
+        params: {
+          item_id: this.add_employee_id || "",
+          employee_id: this.employee_id || "",
+        },
+      };
+      this.$axios
+        .get("/api/integral/auto/list", params)
+        .then((res) => {
+          //   let grup_list = [];
+          // for(let i=0;i<res.data.data.list.length;i++){
+          //   grup_list.push(res.data.data.list[i])
+          // }
+          // this.grouping = grup_list//拿到当前细则的人员
+          
+          // this.grouping_Json =  this.res.data.data.list//拿到当前细则的人员
+        })
+    },
     // 添加成员点击完成
     sub_add_employee(form) {
       let self = this;
@@ -480,7 +501,7 @@ export default {
             self.$message.error("请先选择细则");
           } else {
             this.disabled = true;
-            self.staff_loading = true;
+             self.staff_loading = true;
             self
               .$axios({
                 url: "/api/integral/auto/add",
@@ -490,8 +511,10 @@ export default {
               .then((res) => {
                 this.disabled = false;
                 self.table_loading = false;
-                self.staff_loading = false;
+                 self.staff_loading = false;
                 if (res.data.code == 1) {
+                  // 不需要了
+                  // sessionStorage.setItem('task_cycle_name', (self.task_cycle_name))//存入用户上次请求成功的加分周期。
                   self.add_employee_show = false;
                   self.$message.success(
                     "此次操作成功" +
@@ -503,10 +526,11 @@ export default {
                       "条"
                   );
                   // self.err_open_right();
-
+                  
                   // self.open_right();
-
-                  self.get_role_lists();
+                  
+          
+          self.get_role_lists()
                 } else {
                   self.$message.error(res.data.msg);
                 }
@@ -523,6 +547,7 @@ export default {
         }
       });
     },
+    
 
     editDetails() {},
     handleSelectionChange(val) {
@@ -530,6 +555,9 @@ export default {
       val.forEach((element) => {
         this.del_arr.ids.push(element.id);
       });
+      this.val_page = val
+
+      
     },
     add_item() {},
     // 批量删除
@@ -552,13 +580,19 @@ export default {
               .then((res) => {
                 if (res.data.code == 1) {
                   self.$message.success(res.data.msg);
+                  // 判断当页的总数与选中的数量是否相等，如果相等，此页就无数据，就请求上一页的数据
+                if(this.table_list.length == this.val_page.length){
+                  if(this.page !== 1){//判断不在第一页的时候执行
+                    this.page=this.page-1
+                  }
+                }
                   self.open_right();
                 } else {
                   self.$message.error(res.data.msg);
                 }
               })
               .catch((e) => {
-                // self.$message.error(e.data.msg);
+                // self.$message.error(e.data.msg); 
               })
               .finally(() => {
                 self.loading = false;
@@ -569,11 +603,9 @@ export default {
         self.$message.error("请选择要移除的人员");
       }
     },
-    //导入规则
-    import_rules_show() {},
     // 关闭提示语
     tips_close() {
-      localStorage.setItem("framework", "true");
+      localStorage.setItem("voluntarilyPoint", "true");
       this.tips_show = false;
     },
     //新增规则
@@ -582,6 +614,7 @@ export default {
       this.rules_detail_title = false;
     },
 
+
     editRule(form) {
       let self = this;
       let data = null;
@@ -622,18 +655,22 @@ export default {
                 self.jieguoId = res.data.data.item_id;
                 // self.add_employee_id = res.data.data.item_id;
                 self.add_rulse_id = self.rules_detail_form.rule_id;
-                self.get_role_lists();
+                self.get_role_lists()
                 if (this.rules_detail_title == false) {
                   setTimeout(() => {
                     self.add_employee_show = true;
                   }, 600);
                 }
               } else {
+                this.disabled = false;
+                this.dialogFormVisible = false;
                 self.$message.error(res.data.msg);
               }
             })
             .catch((e) => {
-              self.$message.error(e.data.msg);
+              this.disabled = false;
+              this.dialogFormVisible = false;
+              // self.$message.error(e.data.msg);
             })
             .finally(() => {
               self.loading = false;
@@ -690,10 +727,14 @@ export default {
                   }, 600);
                 }
               } else {
+              this.disabled = false;
+              this.dialogFormVisible = false;
                 self.$message.error(res.data.msg);
               }
             })
             .catch((e) => {
+              this.disabled = false;
+              this.dialogFormVisible = false;
               self.$message.error(e.data.msg);
             })
             .finally(() => {
@@ -710,67 +751,20 @@ export default {
       this.rules_detail_show = false;
       this.$refs[form].resetFields();
     },
-    //第一次添加
-    // err_open_right() {
-    //   let self = this;
-    //   self.table_loading = true;
-    //   self.item_id = self.jieguoId
-    //   self.add_rulse_id = data.rule_id;
-    //   self.right_rules_detail = data;
-    //   // if (data || self.add_employee_id!="") {
-    //   //   self.add_employee_id = data.id;
-    //   //   self.add_rulse_id = data.rule_id;
-    //   //   self.right_rules_detail = data;
-    //   // }
-    //   // else{
-    //   //   self.add_employee_id = self.jieguoId
-    //   // }
-    //   var params = {
-    //     params: {
-    //       item_id: self.item_id,
-    //       employee_id: self.employee_id || "",
-    //       page: self.page,
-    //       page_size:Number(this.pagesize)
-    //     },
-    //   };
-    //   self.$axios
-    //     .get("/api/integral/auto/list", params)
-    //     .then((res) => {
-    //       self.table_loading = false;
-    //       if (res.data.code == 1) {
-    //         self.table_list = res.data.data.list || [];
-    //         self.total = res.data.data.total;
-    //       } else {
-    //         self.$message.error(res.data.msg);
-    //       }
-    //     })
-    //     .finally(() => {
-    //       self.table_loading = false;
-    //     });
-    // },
     open_right(data) {
       let self = this;
       self.table_loading = true;
-
       if (data) {
         self.add_employee_id = data.id;
         self.add_rulse_id = data.rule_id;
         self.right_rules_detail = data;
       }
-      // if (data || self.add_employee_id!="") {
-      //   self.add_employee_id = data.id;
-      //   self.add_rulse_id = data.rule_id;
-      //   self.right_rules_detail = data;
-      // }
-      // else{
-      //   self.add_employee_id = self.jieguoId
-      // }
       var params = {
         params: {
           item_id: self.add_employee_id || "",
           employee_id: self.employee_id || "",
           page: self.page,
-          page_size: Number(this.pagesize),
+          page_size:Number(this.pagesize)
         },
       };
       self.$axios
@@ -824,10 +818,16 @@ export default {
               this.rules_detail_show = false;
               this.get_rule_trees();
             } else {
+              
+              this.dialogFormVisible = false;
+              this.disabled = false;
               this.$message.error(res.data.msg);
             }
           })
-          .catch((err) => {})
+          .catch((err) => {
+            this.dialogFormVisible = false;
+            this.disabled = false;
+          })
           .finally(() => {
             this.loading = false;
           });
@@ -865,14 +865,20 @@ export default {
             .then((res) => {
               this.dialogVisible = false;
               this.disabled = false;
-              if (res.data.code == "1") {
+              if (res.data.code == '1') {
                 this.get_role_lists();
                 this.$message.success(
                   this.grouping_type ? "修改积分规则" : res.data.msg
                 );
+              }else{
+                this.dialogVisible = false;
+                this.disabled = false;
               }
             })
-            .catch((err) => {});
+            .catch((err) => {
+              this.dialogVisible = false;
+              this.disabled = false;
+            });
         } else {
           console.log("error submit!!");
           return false;
@@ -909,7 +915,10 @@ export default {
                 this.$message.success("删除成功");
               }
             })
-            .catch((err) => {});
+            .catch((err) => {
+              this.dialogVisible = false;
+              this.disabled = false;
+            });
         })
         .catch(() => {
           setTimeout(() => {
@@ -919,7 +928,7 @@ export default {
     },
     // 获取分组
     get_role_lists() {
-      this.table_loading = true;
+      this.table_loading = true
       this.rule_trees_load = true;
       this.$axios
         .get("/api/integral/rule/trees", {
@@ -944,7 +953,7 @@ export default {
             }
           }
           this.table_loading = false;
-        });
+        })
     },
   },
 };
@@ -1016,37 +1025,4 @@ export default {
   display: block;
   margin-bottom: 10px;
 }
-
-
-
-.grouping{
-  height:815.4px;
-  overflow-y: hidden; 
-  padding-right: 4.2px;
-}
-.grouping:hover{ 
-  overflow-x: hidden; 
-  overflow-y: auto;
-  padding-right: 0px;
-}
-//修改滚动条样式
-.grouping::-webkit-scrollbar{
-  width:4px;
-  height:10px;
-  /**/
-}
-.grouping::-webkit-scrollbar-track{
-  background: rgb(239, 239, 239);
-  border-radius:2px;
-}
-.grouping::-webkit-scrollbar-thumb{
-  background: #bfbfbf;
-  border-radius:10px;
-}
-.grouping::-webkit-scrollbar-thumb:hover{
-  background: #333;
-}
-.grouping::-webkit-scrollbar-corner{
-  background: #179a16;
-}
 </style>