Merge remote-tracking branch 'origin/master'

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

@@ -63,8 +63,9 @@
                     <div class="vongi-slot-img"><img :src="item.faceImageUrl"></div>
                     <div class="vongi-slot-content">
                         <h4>审批人{{index+1}}<span class="mui-pull-right mui-h5 color999" v-text="item.time"></span></h4>
-                        <p>{{item.name}} <span class="color55f868" :style="getColor(item.status)" v-text="item.statusN"></span></p>
-                    </div>
+                        <p>{{item.name}} <span class="color55f868" :style="getColor(item.status)" v-text="item.statusN"></span><span v-if="item.status!=0&&item.approvalContent!='同意'&&item.approvalContent!='拒绝'" class="color55f868" :style="getColor(item.status)" v-text="'（'+item.approvalContent+'）'"></span></p>
+
+					</div>
                 </div>
             </div>
 
@@ -176,9 +177,16 @@
 				} else {
 					this.subForm.status = status;
 					this.subForm.approvalExplain = val;
-					//this.openFromVisible = true;
+                    this.openFromVisible = true;
+
+                    // if('2'==status){
+                    //     this.openFromVisible = true;
+                    // }
+                    // if('1'==status){
+                    //     this.doAction();
+                    // }
 					//直接点击处理，不需要弹窗理由框
-					this.doAction();
+					//
 				}
 			},
 			//同意拒绝
@@ -186,11 +194,12 @@
 				console.log(this.selectIndex)
 				if (this.checkForm()) {
 					this.isLoading = true;
-					this.subForm.id = this.selectIndex.toString();
-					API_Leave.approved(this.subForm).then(response => {
+					this.subForm.id = this.selectIndex.toString()
+                    this.openFromVisible = false;
+
+                    API_Leave.approved(this.subForm).then(response => {
 						this.isLoading = false;
 
-						this.openFromVisible = false;
 						this.getDetail();
 					}).catch(error => {
 						this.isLoading = false;

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

@@ -153,10 +153,9 @@
 				if (this.checkForm()) {
 					this.isLoading = true;
 					this.subForm.id = this.selectIndex.toString();
+                    this.openFromVisible = false;
 					API_Leave.approved(this.subForm).then(response => {
 						this.isLoading = false;
-
-						this.openFromVisible = false;
 						this.listForm.pageIndex = 1;
 						this.getList();
 					}).catch(error => {
@@ -199,9 +198,9 @@
 				} else {
 					this.subForm.status = status;
 					this.subForm.approvalExplain = val;
-					//this.openFromVisible = true;
+					this.openFromVisible = true;
 					//直接点击处理，不需要弹窗理由框
-					this.doAction();
+					//this.doAction();
 				}
 			},
 			//info

src/projects/business/views/Master/Health/WorkerReport.vue

@@ -10,24 +10,24 @@
 			<form class="mui-input-group">
 				<div class="mui-input-row">
 					<label>姓名</label>
-					<span>{{person_data.name}}</span>
+					<span>{{student&&student.name}}</span>
 				</div>
 				<div class="mui-input-row">
 					<label>手机号</label>
-					<span>{{showTel(person_data.phone)}}</span>
+					<span>{{showTel(student&&student.phone)}}</span>
 				</div>
 
 				<div class="mui-input-row">
 					<label>所属单位</label>
-					<span>{{person_popedom.companyName}}</span>
+					<span v-text="student.position1"></span>
 				</div>
-				<div class="mui-input-row" v-if="person_popedom.deptName">
+				<div class="mui-input-row" v-if="student.position2" >
 					<label>所属部门</label>
-					<span>{{person_popedom.deptName}}</span>
+					<span v-text="student.position2"></span>
 				</div>
-				<div class="mui-input-row" v-if="person_popedom.job">
+				<div class="mui-input-row" v-if="student.position3">
 					<label>岗位</label>
-					<span>{{person_popedom.job}}</span>
+					<span v-text="student.position3"></span>
 				</div>
 			</form>
 			<div class="mui-content-padded">