钉钉PC端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'
 	},

src/components/EmployeeSelector.vue

@@ -39,7 +39,7 @@
                 </div>
               </a>
               <div class="persons_box" style="padding-top:4px;">
-                <a class="employee_cell_a" href="javascript:void(0)" v-for="(item,index) in list" :key="index" v-show="item.show">
+                <a class="employee_cell_a" href="javascript:void(0)" v-for="(item,index) in list" :key="index">
                   <div class="employee_cell flex-box flex-v-ce" v-if="can_select_employee" @click.prevent.stop="select_employee(item)" v-show="employee_not_select.indexOf(item.id) < 0">
 					          <div class="employee_checkbox">
                       <el-checkbox v-model="item.checked"></el-checkbox>
@@ -92,7 +92,7 @@
 </template>
 
 <script>
-
+  
   export default {
     props: {
       append_body: {
@@ -154,14 +154,18 @@
         type: Number,
         default: 0
       },
-      user_no_select:{
+      user_no_select:{//是否能选择创始人
         type: Boolean,
         default: false
       },
       isChecKedAll:{
         type: Boolean,
         default: true
-      }
+      },
+	  my_no_select:{//是否能选择自己
+	    type: Boolean,
+	    default: true
+	  }
     },
     name: "EmployeeSelector",
     data() {
@@ -286,9 +290,7 @@
         this.pid = this.pid_list[index]
         this.pid_list.splice(index, 100)
         this.pid_list_arr.splice(index, 100)
-        this.get_user_list(function() {
-
-        })
+        this.get_user_list(function() {})
       },
       show_child(item) {
         this.pid_list.push(this.pid)
@@ -460,6 +462,7 @@
         this.table_loading = true;
         var _this=this;
         var employee_selected_list=this.employee_selected_list;
+		var my_id=this.$getUserData().id;
         if (this.employee_list.length > 0) {
           let list = this.employee_list
 
@@ -502,23 +505,28 @@
         }).then((res) => {
           this.table_loading = false;
           var employee=res.data.data.list||[];
-          employee.map((item)=>{
-            if (this.not_user && item.is_creator == 1){
-              item['show'] = false;
-            }else{
-              item['show'] = true;
-            }
-            item['checked'] = false;
-            for(var i in employee_selected_list){//判断传进来的员工是否是员工集合里的，是就设为已点击状态
-              if(employee_selected_list[i].id==item.id){
-                item['checked'] = true;
-              }
-            }
+		  var userAll=[];
+          employee.forEach((item,i)=>{
+			  if(this.not_user && item.is_creator == 1){
+				  return null;
+			  }else if(!this.my_no_select&&item.id==my_id){
+				  return null;
+			  }else{
+				  userAll.push(item);
+			  }
           })
-          if (employee.length == employee_selected_list.length) {
+		  userAll.map((item)=>{
+			 item['checked'] = false;
+			 for(var i in employee_selected_list){//判断传进来的员工是否是员工集合里的，是就设为已点击状态
+			   if(employee_selected_list[i].id==item.id){
+			     item['checked'] = true;
+			   }
+			 } 
+		  })
+          if (userAll.length == employee_selected_list.length) {
             this.checked = true
           }
-          _this.list = employee
+          _this.list = userAll
         }).catch((e) => {
           _this.$message.error(e.data.msg);
         })

src/index.vue

@@ -45,13 +45,13 @@ export default {
 		this.routers = this.$router.options.routes[0].children;
 	},
 	mounted() {
-		var url = window.location.href;
-		var str = this.GetRequest(url).corpId || '123';
-		var corpId = str.split('#')[0];
-		if (corpId) {
-			this.login(corpId);
+		// var url = window.location.href;
+		// var str = this.GetRequest(url).corpId || '123';
+		// var corpId = str.split('#')[0];
+		// if (corpId) {
+		// 	this.login(corpId);
 			this.getTypes();
-		}
+		// }
 	},
 	methods: {
 		tz(){},
@@ -70,7 +70,7 @@ export default {
 									is=true;
 								}
 							})
-							if(!is){
+							if(is){
 								that.$setUserData(user);
 								that.userData = user;
 								that.getInfo();
@@ -79,7 +79,6 @@ export default {
 							}
 						}
 					}).finally(() => {
-						console.log("|123")
 						that.loading = false;
 					});
 				}

src/main.js

@@ -14,9 +14,9 @@ import userImage from '@/components/UserImage'
 Vue.component('userImage', userImage)
 
 Vue.use(ElementUI);
-if (process.env.NODE_ENV === 'development') {
-  new VConsole()
-}
+// if (process.env.NODE_ENV === 'development') {
+//   new VConsole()
+// }
 
 Vue.prototype.$dd=dd;
 Vue.prototype.$axios = service

src/views/framework.vue

@@ -152,11 +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.$message.success({ message: res[0].data.msg });
 					this.getInfo();
 				}
+			}).finally(()=>{
+				this.tbLoading = false;
 			});
 		},
 		//是否开通
@@ -167,19 +168,16 @@ export default {
 					this.$message.success({ message: res.data.msg });
 				}
 				this.getEmployee();
-			}).catch(err=>{
-				console.log("123")
 			});
 		},
 		//批量开通权限
 		participation() {
 			this.enable_loading=true;
 			this.$axios.post('api/employee/enable', { employee_id: this.selectIds }).then(res => {
-				this.enable_loading=false;
 				if (res) {
 					this.getEmployee();
 				}
-			}).catch(err=>{
+			}).finally(err=>{
 				this.enable_loading=false;
 			});
 		},
@@ -212,10 +210,9 @@ 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;
-			}).catch(err=>{
+			}).finally(err=>{
 				this.tableToading=false;
 			});
 		},

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"

src/views/rule.vue

@@ -78,7 +78,7 @@
 		<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;">
@@ -250,12 +250,7 @@ export default {
 				remark: [
 					{
 						required: true,
-						message: '请输入加分项名称',
-						trigger: 'blur'
-					},
-					{
-						max: 400,
-						message: '加分项名称400个字符以内',
+						message: '请输入规则名称',
 						trigger: 'blur'
 					}
 				],
@@ -263,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'
 					}
 				]
 			},
@@ -610,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;
@@ -769,11 +748,10 @@ export default {
 				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();
 								this.add_dept_close('dept_formdata');
 							} else {
@@ -788,6 +766,8 @@ 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();
@@ -801,7 +781,6 @@ export default {
 					}
 				} else {
 					this.dept_loading=false;
-					return false;
 				}
 			});