Merge branch 'dev'

src/components/publics/workpoints.vue

@@ -14,7 +14,34 @@
 					</el-tooltip>
 				  </template>
 				<el-switch v-model="v.initia_input.age" :active-value="is" :inactive-value="no" @change="changeAge"></el-switch>
-		  </el-form-item>	
+		  </el-form-item>
+		  <div v-else-if="v.type=='object'" style="padding: 20px 0px;margin-left: 160px;">
+			<div style="margin-bottom: 10px;">全勤加分需同时满足以下条件</div>
+			<div style="padding-left: 23px;">1、当月无旷工</div>
+			<div style="margin: 15px 0;">
+				<div><el-checkbox v-model="v.absent_holiday.enable" :true-label="1" :false-label="0">2、当月未提交以下请假
+					<el-tooltip placement="top" content="填写的请假名称必须与钉钉考勤打卡-假期管理-假期规则对应，否则此项不生效">
+					  <span class="initia_mark" style="background-color: #666;">?</span>
+					</el-tooltip>
+				</el-checkbox></div>
+				<div class="flex-box" style="margin-top: 10px;padding-left: 20px;">
+					<el-input :disabled="v.absent_holiday.enable==1?false:true" style="width: 150px;" :key="1" type="text" v-model="val1" placeholder="假期类型"></el-input>
+					<el-input :disabled="v.absent_holiday.enable==1?false:true" style="width: 150px;margin: 0 10px;" :key="2" type="text" v-model="val2" placeholder="假期类型"></el-input>
+					<el-input :disabled="v.absent_holiday.enable==1?false:true" style="width: 150px;" type="text" :key="3" v-model="val3" placeholder="假期类型"></el-input>
+				</div>
+			</div>
+			<div>
+				<div><el-checkbox v-model="v.absent_late.enable" :true-label="1" :false-label="0">
+				3、当月迟到少于 
+				<el-input @input="[v.absent_late.count=v.absent_late.count.replace(/[^\d]/g,'')]" :disabled="v.absent_late.enable==1?false:true" style="width: 150px;" v-model="v.absent_late.count" placeholder="次数"></el-input>
+				 次</el-checkbox></div>
+<!-- 				<div class="flex-box">
+					<el-input style="width: 150px;" placeholder="假期类型"></el-input>
+					<el-input style="width: 150px;margin: 0 10px;" placeholder="假期类型"></el-input>
+					<el-input style="width: 150px;" placeholder="假期类型"></el-input>
+				</div> -->
+			</div>
+		  </div>  
           <el-form-item  style="margin: 20px 0 0 0 " v-else>
             <template slot="label">
 				<template v-if="v.message">
@@ -51,14 +78,23 @@ export default {
     return {
 		is: 1,
 		no: 0,
-		disabled:false
+		disabled:false,
+		checked1:'',
+		val1:'',
+		val2:'',
+		val3:'',
 	};
   },
   created() {
+	 if(this.initia_arr.length==9){
+		 this.val1=this.initia_arr[8].absent_holiday.list[0]
+		 this.val2=this.initia_arr[8].absent_holiday.list[1]
+		 this.val3=this.initia_arr[8].absent_holiday.list[2]
+	 }
   },
   mounted() {;
 	  if(this.initia_arr[0].type=="switch"){
-		  	 this.disabled=this.initia_arr[0].initia_input.age==1? false:true;
+		this.disabled=this.initia_arr[0].initia_input.age==1? false:true;
 	  }
   },
   methods: {
@@ -67,33 +103,21 @@ export default {
 	},
     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;
-      //   }
-      // }
-      // 无正则代码
+	  let checkAllData={};//全勤配置
       for (var i = 0; i < this.initia_arr.length; i++) {
-          arr.push({
-            sj: this.initia_arr[i].initia_input.age,
-          });
-          if (arr.length == this.initia_arr.length) {
-            this.$emit("initia", arr);
-          }
+		  if(this.initia_arr[i].type!='object'){
+			 arr.push({sj: this.initia_arr[i].initia_input.age});
+		  }else{
+			  checkAllData=this.initia_arr[i]
+			  let list=[this.val1,this.val2,this.val3];
+			  checkAllData.absent_holiday.list=list.filter(x=>{
+				  if(x){
+					  return x
+				  }
+			  })
+		  }
       }
+	  this.$emit("initia", {arr,checkAllData});
     },
   },
 };

src/views/set/check.vue

@@ -112,6 +112,20 @@ export default {
 		    age: "0",
 		  },
 		},
+		{//全勤配置
+		  type:'object',
+		  absent_holiday:{
+			enable:0,
+			list:[],
+			val1:'',
+			val2:'',
+			val3:'',
+		  },
+		  absent_late:{
+			enable:0,
+			count:1
+		  },
+		},
       ],
 	  obj: {
 		  // ding_enable:'',
@@ -132,7 +146,8 @@ export default {
     this.cheak_ax();
   },
   methods: {
-    initia(ok) {
+    initia(obj) {
+	  let ok=obj.arr;
       var objs = {};
 	  objs.enable = ok[0].sj; 
       objs.normal = ok[1].sj; //>=0
@@ -141,10 +156,18 @@ export default {
 	  objs.on_duty_late = ok[4].sj>0? ok[4].sj:ok[4].sj; //<=0
 	  objs.off_duty_early = ok[5].sj>0? ok[5].sj:ok[5].sj; //<=0
 	  objs.ot_per_day =ok[6].sj; //>=0
-	  
-   //    objs.ot_per_hour = ok[7].sj; //>=0
-   //    objs.leave_per_hour = ok[8].sj>0? -ok[8].sj:ok[8].sj; //<=0
 	  objs.month_full_ad = ok[7].sj
+	  
+	  let {absent_late,absent_holiday}=obj.checkAllData;
+	  objs.absent_late=absent_late;
+	  objs.absent_holiday=absent_holiday;
+	  // if(absent_holiday.list.length==0){
+		 //  objs.absent_holiday.list="";
+	  // }
+	  if(absent_late.enable&&(absent_late.count==='0'||absent_late.count===0)){
+		  this.$message.error("迟到次数不能为0")
+		  return
+	  }
       this.$axios('post',"/api/ad/update",objs).then((res) => {
           if (res.data.code == 1) {
             this.$message({
@@ -164,12 +187,6 @@ export default {
 		if(!this.ding_enable){
 			return false;
 		}
-		// config.no_sign=config.no_sign-(config.no_sign+config.no_sign);
-		// config.absent=config.absent-(config.absent+config.absent);
-		// config.on_duty_late=config.on_duty_late-(config.on_duty_late+config.on_duty_late);
-		// config.off_duty_early=config.off_duty_early-(config.off_duty_early+config.off_duty_early);
-		// config.leave_per_hour=config.leave_per_hour-(config.leave_per_hour+config.leave_per_hour);
-		
 		this.initia_arr[0].initia_input.age =config.enable
 		this.initia_arr[1].initia_input.age =config.normal? config.normal:0   //正常打卡加分
 		this.initia_arr[2].initia_input.age =config.no_sign? config.no_sign:0 //缺卡扣分
@@ -181,6 +198,12 @@ export default {
 		// this.initia_arr[8].initia_input.age =config.leave_per_hour? config.leave_per_hour:0 //每小时请假扣分
 		this.initia_arr[7].initia_input.age =config.month_full_ad? config.month_full_ad:0  //月度全勤加分
 		
+		// 全勤配置
+		this.initia_arr[8].absent_holiday =config.absent_holiday
+		// this.initia_arr[8].absent_holiday.val1 =config.absent_holiday.list[0]
+		// this.initia_arr[8].absent_holiday.val2 =config.absent_holiday.list[1]
+		// this.initia_arr[8].absent_holiday.val3 =config.absent_holiday.list[2]
+		this.initia_arr[8].absent_late = config.absent_late 
       }).finally(err=>{
 			this.loading = false;
 	  });

src/views/set/initialPoint.vue

@@ -49,7 +49,8 @@ export default {
 		this.cheak_ax();
 	},
 	methods: {
-		initia(ok) {
+		initia(obj) {
+			let ok=obj.arr;
 			this.loading = true;
 			this.obj.base_point = +ok[0].sj;
 			this.obj.service_point = +ok[1].sj;

src/views/workbench/alreadySp.vue

@@ -15,6 +15,7 @@
 				<el-select v-model="formData.target_id" filterable clearable placeholder="请输入或选择人员">
 				  <el-option v-for="item in employee_map" :key="item.id" :label="item.name" :value="item.id"></el-option>
 				</el-select>
+				<el-form-item style="margin-left: 10px;"><el-input v-model="formData.keyword" placeholder="请输入审批内容" clearable></el-input></el-form-item>
 			</el-form>
 			<div>
 				<el-table :data="list" style="cursor: pointer;" v-loading="loading" class="listTable" @row-click="openDetail">
@@ -83,7 +84,7 @@
 
 <script>
 import examinePopup from '@/components/examinePopup.vue';
-
+import { _debounce, getToken } from '@/api/auth';
 export default {
 	data() {
 		return {
@@ -93,7 +94,8 @@ export default {
 				target_id:null,
 				pt_id: 0,
 				page_size: 10,
-				page: 1
+				page: 1,
+				keyword:'',
 			},
 			total: null,
 			list: null,
@@ -106,6 +108,13 @@ export default {
 		};
 	},
 	watch: {
+		'formData.keyword': {
+			deep: true,
+			handler: _debounce(function(val) {
+				this.formData.page = 1;
+				this.getSpList();
+			}, 1000)
+		},
 		'formData.pt_id'() {
 			this.formData.page = 1;
 			this.getSpList();

src/views/workbench/approval_list.vue

@@ -16,6 +16,7 @@
 				<el-select v-model="formData.target_id" filterable clearable placeholder="请输入或选择人员">
 				  <el-option v-for="item in employee_map" :key="item.id" :label="item.name" :value="item.id"></el-option>
 				</el-select>
+				<el-form-item style="margin-left: 10px;"><el-input v-model="formData.keyword" placeholder="请输入审批内容" clearable></el-input></el-form-item>
 			</el-form>
 
 			<div>
@@ -72,7 +73,7 @@
 
 <script>
 import examinePopup from '@/components/examinePopup.vue';
-
+import { _debounce, getToken } from '@/api/auth';
 export default {
 	data() {
 		return {
@@ -82,7 +83,8 @@ export default {
 				target_id:null,
 				pt_id: 0,
 				page_size: 10,
-				page: 1
+				page: 1,
+				keyword:'',
 			},
 			total: null,
 			list: null,
@@ -95,6 +97,13 @@ export default {
 		};
 	},
 	watch: {
+		'formData.keyword': {
+			deep: true,
+			handler: _debounce(function(val) {
+				this.formData.page = 1;
+				this.getSpList();
+			}, 1000)
+		},
 		'formData.pt_id'() {
 			this.formData.page = 1;
 			this.getSpList();