Merge remote-tracking branch 'origin/master'

src/projects/business/apis/Master/business_travel.js

@@ -38,7 +38,7 @@ export function businessOutApproval(params) {
 //获取审核人列表
 export function getBusinessOutApprovalPerson(params) {
 	return request({
-		url: '/mobile/businessOutApiController/getBusinessOutApprovalPerson',
+		url: '/mobile/workAttendance/approvalList',
 		data: Qs.stringify(params),
 		method: 'post',
 	})

src/projects/business/views/Master/Attendance/Apply.vue

@@ -119,7 +119,9 @@
 			//获取审核人列表
 			getPsersonList() {
 				this.isLoading = true;
-				API_Attendance.getApprovalList().then(response => {
+                //补卡1，外出2，出差3 ，请假4
+                var parameter={type:1};
+                API_Attendance.getApprovalList(parameter).then(response => {
 
 					this.personList = response.data;
 
@@ -270,7 +272,7 @@
 					this.personList.forEach(function(item, index) {
 						list.push({
 							value: item.id,
-							text: item.name
+							text: item.personName
 						});
 					})
 					return list;

src/projects/business/views/Master/Attendance/LeaveForm.vue

@@ -13,34 +13,35 @@
 							<button class="mui-btn mui-btn-block" type='button' v-text="typeName">请选择</button>
 						</div>
 					</div>
-					<div class="mui-input-row">
-						<label><span class="colorfe616c">*</span>审批人</label>
-						<div class="mui-navigate-right" @click="selectPerson">
-							<button id='' class="mui-btn mui-btn-block" type='button' v-text="approvalPersonName">请选择</button>
-						</div>
-					</div>
+                    <div class="mui-input-row">
+                        <label><span class="colorfe616c">*</span>开始日期</label>
+                        <div class="mui-navigate-right" @click="selectStartTime()">
+                            <button class="mui-btn mui-btn-block" type='button' v-text="tjForm.startTime+(tjForm.startTimeQuantum!=''?(tjForm.startTimeQuantum=='1'?'下午上班':'上午上班'):'')">请选择</button>
+                        </div>
+                    </div>
+                    <div class="mui-input-row">
+                        <label><span class="colorfe616c">*</span>结束日期</label>
+                        <div class="mui-navigate-right" @click="selectEndTime()">
+                            <button class="mui-btn mui-btn-block" type='button' v-text="tjForm.endTime+(tjForm.endTimeQuantum!=''?(tjForm.endTimeQuantum=='1'?'下午下班':'上午下班'):'')">请选择</button>
+                        </div>
+                    </div>
 				</form>
 			</div>
 			<div class="mui-content-padded vongi-qingjia-date">
 				<form class="mui-input-group">
-					<div class="mui-input-row">
-						<label><span class="colorfe616c">*</span>开始日期</label>
-						<div class="mui-navigate-right" @click="selectStartTime()">
-							<button class="mui-btn mui-btn-block" type='button' v-text="tjForm.startTime+(tjForm.startTimeQuantum!=''?(tjForm.startTimeQuantum=='1'?'下午上班':'上午上班'):'')">请选择</button>
-						</div>
-					</div>
-					<div class="mui-input-row">
-						<label><span class="colorfe616c">*</span>结束日期</label>
-						<div class="mui-navigate-right" @click="selectEndTime()">
-							<button class="mui-btn mui-btn-block" type='button' v-text="tjForm.endTime+(tjForm.endTimeQuantum!=''?(tjForm.endTimeQuantum=='1'?'下午下班':'上午下班'):'')">请选择</button>
-						</div>
-					</div>
+
 					<div class="mui-input-row">
 						<label><span class="colorfe616c"></span>请假时长</label>
 						<div  >
 							<button class="mui-btn mui-btn-block" type='button' v-text="daytime" > </button>
  						</div>
 					</div>
+                    <div class="mui-input-row">
+                        <label><span class="colorfe616c">*</span>审批人</label>
+                        <div class="mui-navigate-right" @click="selectPerson">
+                            <button id='' class="mui-btn mui-btn-block" type='button' v-text="approvalPersonName">请选择</button>
+                        </div>
+                    </div>
 				</form>
 			</div>
 			<div class="mui-content-padded">
@@ -105,9 +106,8 @@
 				daytime:'',
 				isLoading: false,
 				leaveTypeList: [],
-                approvedByTime:false,
-				approvedList: [],
-                approvedList2: [],
+ 				approvedList: [],
+
 				typeName: '请选择',
 				approvalPersonName: '请选择',
 				tjForm: {
@@ -146,31 +146,24 @@
 				})
 			},
 			//获取审核人列表
-			getPsersonList(bl) {
+			getPsersonList(days) {
 				this.isLoading = true;
-				var p={};
-				if(!bl){
-				    //1 上一层， 2，顶层
-				    p={level:2};
-				}
-				API_Leave.approvedList(p).then(response => {
+                //补卡1，外出2，出差3 ，请假4
+                var p={days:days,type:4};
 
+				API_Leave.approvedList(p).then(response => {
+                    var sz=[];
 					for (var i in response.data) {
 						var mod = response.data[i]
-						mod.text = mod.name
+						mod.text = mod.personName
 						mod.value = mod.id;
-						if(bl){
-                            this.approvedList.push(mod)
-                        }else{
-                            this.approvedList2.push(mod)
-                        }
+                        sz.push(mod)
 					}
+                    this.approvedList=sz;
 
 					this.isLoading = false;
-					if(bl){
-                        //设置默认审核人
-                        this.setDefaultExaminePerson();
-					}
+                    //设置默认审核人
+                    this.setDefaultExaminePerson();
 				}).catch(error => {
 					this.isLoading = false;
 					mui.toast(error);
@@ -209,9 +202,13 @@
 			//选择审核人
 			selectPerson() {
 				var _this = this;
+                if(this.tjForm.startTime=='请选择'||this.tjForm.endTime=='请选择'){
+                    mui.toast('请先输入请假时间');
+                    return;
+                }
 				var picker = new mui.PopPicker();
 
-				picker.setData(_this.approvedByTime?_this.approvedList2:_this.approvedList);
+				picker.setData(_this.approvedList);
 				if (this.default_examine_person) {
 					picker.pickers[0].setSelectedValue(this.default_examine_person);
 				}
@@ -322,27 +319,11 @@
               var i=  daysDistance(this.tjForm.startTime,this.tjForm.endTime);
               var day=i+(this.tjForm.endTimeQuantum-this.tjForm.startTimeQuantum)*0.5+0.5
 				this.daytime=day+'天';
-              if(day>1){
-
-                  if(!this.approvedByTime){
-                      this.tjForm.approvedId = '';
-                      this.approvalPersonName = '';
-                      if(this.approvedList2.length==0){
-                          this.getPsersonList(false);
-                      }
-                      mui.toast("请假时间大于1天，审批人发生变化，请重新选择");
-
-                  }
-					this.approvedByTime=true;
-			  }else{
-
-                  if(this.approvedByTime){
-                      this.tjForm.approvedId = '';
-                      this.approvalPersonName = '';
-                      mui.toast("请假时间少于等于1天，审批人发生变化，请重新选择");
-                  }
-                  this.approvedByTime=false;
-			  }
+
+                this.tjForm.approvedId = '';
+                this.approvalPersonName = '请选择';
+                this.getPsersonList(day);
+
 			},
 			//类型选择
 			selectType() {
@@ -414,7 +395,7 @@
 
 			this.getLeaveTypeList();
 
-			this.getPsersonList(true);
+
 		},
 		destroyed() {},
 		computed: {

src/projects/business/views/Master/Attendance/Sign.vue

@@ -156,7 +156,9 @@
 			//获取审核人列表
 			getPsersonList() {
 				this.isLoading = true;
-				API_Attendance.getApprovalList().then(response => {
+                //补卡1，外出2，出差3 ，请假4
+                var parameter={type:this.attendanceType};
+				API_Attendance.getApprovalList(parameter).then(response => {
 
 					this.personList = response.data;
 
@@ -363,7 +365,7 @@
 					this.personList.forEach(function(item, index) {
 						list.push({
 							value: item.id,
-							text: item.name
+							text: item.personName
 						});
 					})
 					return list;

src/projects/business/views/Master/BusinessTravel/Form.vue

@@ -88,6 +88,7 @@
 				},
 
 				approvalPersonList: [],
+                //补卡1，外出2，出差3 ，请假4
 				personForm: {
 					type: '3'
 				}
@@ -103,7 +104,7 @@
 				API_BusinessTravel.getBusinessOutApprovalPerson(this.personForm).then(response => {
 					this.isLoading = false;
 
-					var list = response.list;
+					var list = response.data;
 					var approvalPersonList = [];
 					for (var i = 0; i < list.length; i++) {
 						approvalPersonList.push({

src/projects/business/views/Master/BusinessTravel/Info.vue

@@ -132,7 +132,7 @@
 			//结束状态
 			outEnd() {
 				this.isLoading = true;
-				API_BusinessTravel.businessOutEnd(this.id).then(response => {
+				API_BusinessTravel.businessOutEnd({id:this.id}).then(response => {
 					this.isLoading = false;
 
 					mui.toast('处理成功');

src/projects/business/views/Master/Egress/Form.vue

@@ -88,8 +88,9 @@
 				},
 
 				approvalPersonList: [],
+                //补卡1，外出2，出差3 ，请假4
 				personForm: {
-					type: '1'
+					type: '2'
 				}
 			}
 		},
@@ -103,12 +104,12 @@
 				API_BusinessTravel.getBusinessOutApprovalPerson(this.personForm).then(response => {
 					this.isLoading = false;
 
-					var list = response.list;
+					var list = response.data;
 					var approvalPersonList = [];
 					for (var i = 0; i < list.length; i++) {
 						approvalPersonList.push({
 							value: list[i]['id'],
-							text: list[i]['personName']
+                            text: list[i]['personName']
 						})
 					}
 					if (approvalPersonList.length) {