部分问题修正

src/projects/business/router/master.js

@@ -480,6 +480,17 @@ const routesMaster = [
 							mode: true
 						}
 					},
+					//考勤补卡申请详情
+					{
+						path: 'verifyInfo',
+						name: 'MasterAttendanceVerifyInfo',
+						component: () => import('../views/Master/Attendance/VerifyInfo.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '考勤补卡申请详情',
+						}
+					},
 					//请假申请审核列表
 					{
 						path: 'verifyLeaveList',
@@ -492,6 +503,17 @@ const routesMaster = [
 							mode: true
 						}
 					},
+					//请假申请详情
+					{
+						path: 'verifyLeaveInfo',
+						name: 'MasterAttendanceVerifyLeaveInfo',
+						component: () => import('../views/Master/Attendance/VerifyLeaveInfo.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '请假申请详情',
+						}
+					},
 					//请假记录
 					{
 						path: 'leaveList',

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

@@ -2,7 +2,7 @@
 	<div>
 
 		<common @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle" :routeName="routeName"></top-header>
+		<top-header :pageTitle="pageTitle"></top-header>
 
 		<div class="mui-content vongi-wordcard">
 			<div class="mui-content-padded">
@@ -49,6 +49,7 @@
 				<div class="fyy-upphoto">
 					<div class="mui-col-xs-3 fyy-upphoto-close" v-for="(item,index) in picList">
 						<img :src="item" />
+						<a class="mui-icon mui-icon-closeempty" @click="delPic(item)"></a>
 					</div>
 					<div class="mui-col-xs-3" @click="chooseImage">
 						<a><span class="mui-icon mui-icon-plusempty"></span></a>
@@ -110,8 +111,6 @@
 
 				},
 				picList: [],
-				routeName: "Master",
-
 			}
 		},
 		created() {
@@ -249,8 +248,15 @@
 				} else {
 					return true;
 				}
-
-
+			},
+			//删除图片
+			delPic(item) {
+				let picList = this.picList;
+				let index = picList.indexOf(item);
+				if (index > -1) {
+					picList.splice(index, 1);
+				}
+				this.picList = picList;
 			},
 			//提交
 			submit() {

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

@@ -1,78 +1,74 @@
 <template>
-<div>
-	<common @asynCallBack="asynCallBack"></common>
-	<top-header :pageTitle="pageTitle"  ></top-header>
-
-	<div class="mui-content vongi-qingjiadt">
-				<div class="vongi-qingjiadt-head flew-sp">
-					<div class="flew-items">
-						<div class="flew"><img :src="detail.picUrl" width="50" /></div>
-						<h4 v-text="detail.name+' 申请请假 '+detail.leaveTypeN">郭麒麟 申请请假 事假</h4>
-					</div>
-					<button class="mui-btn   mui-btn-outlined" :class="statusColor[detail.status]" v-text="status[detail.status]">已批准</button>
-					<!-- <div class="examine-refuse">已拒绝</div> -->
+	<div>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
+		<div class="mui-content vongi-qingjiadt">
+			<div class="vongi-qingjiadt-head flew-sp">
+				<div class="flew-items">
+					<div class="flew"><img :src="detail.picUrl" width="50" /></div>
+					<h4 v-text="detail.name+' 申请请假 '+detail.leaveTypeN"></h4>
 				</div>
-				<form class="mui-input-group">
-					<div class="mui-input-row">
-						<label>身份证号</label>
-						<span v-text="detail.idCard">420400200002020101</span>
-					</div>
-					<div class="mui-input-row">
-						<label>工号</label>
-						<span v-text="detail.jobNumber">0201022121001</span>
-					</div>
-					<div class="mui-input-row">
-						<label>部门</label>
-						<span v-text="detail.department">信息工程中心</span>
-					</div>
-					<div class="mui-input-row">
-						<label>请假时间</label>
-						<span >自{{detail.startTime}}<br/>至{{detail.endTime}}</span>
-					</div>
-					<div class="mui-input-row">
-						<label>请假事由</label>
-						<span v-text="detail.reason">家中有事，需要会老家一趟家中有事，需要会老家一趟家中有事，需要会老家一趟家中有事，需要会老家一趟。</span>
-					</div>
-					<div class="mui-input-row">
-						<label>上传图片</label>
-						<span class="vongi-qingjiadt-photo">
-							<template v-for="(item,index) in picList">
-									<img :src="item" v-image-preview />
-
-							</template>
-						</span>
-					</div>
-					<div class="mui-input-row">
-						<label>申请时间</label>
-						<span v-text="detail.createTime">2020-04-27 12:00:00</span>
-					</div>
-				</form>
-				<div class="mui-content-padded">
-					<h5>审核记录</h5>
+				<button class="mui-btn   mui-btn-outlined" :class="statusColor[detail.status]" v-text="status[detail.status]">已批准</button>
+				<!-- <div class="examine-refuse">已拒绝</div> -->
+			</div>
+			<form class="mui-input-group">
+				<div class="mui-input-row">
+					<label>身份证号</label>
+					<span v-text="detail.idCard">420400200002020101</span>
 				</div>
-				<form class="mui-input-group">
-					<div class="mui-input-row">
-						<label>审批人</label>
-						<span>{{detail.approvedName}}</span>
-					</div>
-					<div class="mui-input-row">
-						<label>审核状态</label>
-						<span>{{detail.approvalOpinions}}</span>
-					</div>
-					<div class="mui-input-row">
-						<label>审核意见</label>
-						<span>{{detail.approvalExplain}}</span>
-					</div>
-					<div class="mui-input-row">
-						<label>审核时间</label>
-						<span>{{detail.approvedTime}}</span>
-					</div>
-				</form>
-
+				<div class="mui-input-row">
+					<label>工号</label>
+					<span v-text="detail.jobNumber">0201022121001</span>
+				</div>
+				<div class="mui-input-row">
+					<label>部门</label>
+					<span v-text="detail.department">信息工程中心</span>
+				</div>
+				<div class="mui-input-row">
+					<label>请假时间</label>
+					<span>自{{detail.startTime}}<br />至{{detail.endTime}}</span>
+				</div>
+				<div class="mui-input-row">
+					<label>请假事由</label>
+					<span v-text="detail.reason">家中有事，需要会老家一趟家中有事，需要会老家一趟家中有事，需要会老家一趟家中有事，需要会老家一趟。</span>
+				</div>
+				<div class="mui-input-row">
+					<label>上传图片</label>
+					<span class="vongi-qingjiadt-photo">
+						<template v-for="(item,index) in picList">
+							<img :src="item" v-image-preview />
+
+						</template>
+					</span>
+				</div>
+				<div class="mui-input-row">
+					<label>申请时间</label>
+					<span v-text="detail.createTime">2020-04-27 12:00:00</span>
+				</div>
+			</form>
+			<div class="mui-content-padded">
+				<h5>审核记录</h5>
 			</div>
-	<loading :visible="isLoading"></loading>
+			<form class="mui-input-group">
+				<div class="mui-input-row">
+					<label>审批人</label>
+					<span>{{detail.approvedName}}</span>
+				</div>
+				<div class="mui-input-row">
+					<label>审核意见</label>
+					<span>{{detail.approvalExplain}}</span>
+				</div>
+				<div class="mui-input-row">
+					<label>审核时间</label>
+					<span>{{detail.approvedTime}}</span>
+				</div>
+			</form>
 
-</div>
+		</div>
+		<loading :visible="isLoading"></loading>
+
+	</div>
 </template>
 
 <script>
@@ -97,13 +93,10 @@
 				pageTitle: '请假详情',
 
 				isLoading: false,
-				id:this.$route.query.id,
-				detail:{},
+				id: this.$route.query.id,
+				detail: {},
 				status: ['待审核', '已批准', '已拒绝'],
 				statusColor: ['', 'mui-btn-success', 'mui-btn-danger'],
-
-
-
 			}
 		},
 		created() {
@@ -114,9 +107,9 @@
 			getDetail() {
 				this.isLoading = true;
 				API_Leave.detail({
-					id:this.id
+					id: this.id
 				}).then(response => {
-					this.detail=response;
+					this.detail = response;
 					this.isLoading = false;
 				}).catch(error => {
 					this.isLoading = false;
@@ -124,8 +117,6 @@
 				})
 			},
 
-
-
 			asynCallBack() {
 
 			},
@@ -134,8 +125,7 @@
 			this.getDetail();
 
 		},
-		destroyed() {
-		},
+		destroyed() {},
 		computed: {
 			computed: {
 				picList: {

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

@@ -1,19 +1,19 @@
 <template>
-<div>
+	<div>
 
-	<common @asynCallBack="asynCallBack"></common>
-	<top-header :pageTitle="pageTitle"  ></top-header>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle" :routeName="'Master'"></top-header>
 
-	<div class="mui-content">
+		<div class="mui-content">
 			<div class="mui-content-padded vongi-work">
 				<ul class="mui-table-view vongi-qingjia">
 					<li class="mui-table-view-cell" v-for="mod in recordList" @click="detail(mod.id)">
-						<h4 >
+						<h4>
 							{{mod.title}}
 							<span v-text="mod.createTime">12:00</span>
 						</h4>
 						<button type="button" class="mui-btn  mui-btn-outlined" :class="statusColor[mod.status]" v-text="status[mod.status]">
-							 </button>
+						</button>
 					</li>
 
 				</ul>
@@ -22,9 +22,9 @@
 				<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary " @click="save()">写请假条</button></div>
 			</div>
 		</div>
-	<loading :visible="isLoading"></loading>
+		<loading :visible="isLoading"></loading>
 
-</div>
+	</div>
 </template>
 
 
@@ -54,7 +54,7 @@
 				listForm: {
 					pageIndex: 1,
 					pageSize: 20,
-				//	token: '',
+					//	token: '',
 					totalPage: 1,
 					result: 0,
 				},

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

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<common @asynCallBack="asynCallBack"></common>
-		<top-header :pageTitle="pageTitle"></top-header>
+		<top-header :pageTitle="pageTitle" :rightLink="rightLink" :doRightLink="doRightLink"></top-header>
 
 		<div class="mui-content vongi-wordcard">
 			<div class="mui-content-padded vongi-wordcard-padded">
@@ -94,6 +94,13 @@
 				approvalPersonName: '',
 				personList: [],
 				picList: [],
+
+				rightLink: {
+					show: true,
+					icon: 'icon-shijian',
+					style: 'font-size:14px;color:#000;',
+					title: '考勤记录'
+				},
 			}
 		},
 		created() {
@@ -248,6 +255,12 @@
 					console.log(error)
 				})
 			},
+			//右上角点击事件
+			doRightLink() {
+				this.$router.push({
+					name: 'MasterAttendanceList'
+				})
+			},
 			asynCallBack() {
 
 			},

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

@@ -0,0 +1,232 @@
+<template>
+	<div>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
+		<div class="mui-content vongi-wordcard">
+			<div class="mui-content-padded vongi-wordcard-top">
+				<div class="mui-media-object mui-pull-left">
+					<img :src="detail.faceImageUrl" v-image-preview>
+				</div>
+				<div class="mui-media-body">
+					{{detail.personName}}
+					<p class='mui-ellipsis'><span class="colorfe616c">{{detail.typeN}}</span>申请</p>
+				</div>
+				<button type="button" :class="'mui-btn mui-btn-success mui-btn-outlined '+(detail.status>0?(detail.status==1?'status_a':'status_r'):'')">
+					{{detail.status>0?(detail.status==1?'已同意':'已拒绝'):'未审核'}}
+				</button>
+			</div>
+
+			<div class="mui-content-padded vongi-wordcard-center">
+				<ul class="mui-table-view">
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">申请类型</div>
+						<span v-text="detail.typeN"></span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">所在部门</div>
+						<span v-text="detail.companyName"></span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">申请班次</div>
+						<span class="colorf6f448" v-text="detail.fillAttendanceDayAndTime"></span>
+					</li>
+					<li v-if="detail.address" class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">打卡地点</div>
+						<span v-text="detail.address"></span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">申请时间</div>
+						<span v-text="detail.createTime"></span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">申请理由</div>
+						<span class="colorf8b155" v-text="detail.content"></span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">相关照片</div>
+					</li>
+					<li class="mui-table-view-cell mui-media fyy-upphoto">
+						<div class="mui-col-xs-3" v-for="(item,index) in picList">
+							<img :src="item" v-image-preview />
+						</div>
+					</li>
+				</ul>
+			</div>
+
+			<div v-if="detail.status=='0'" class="fyy-scon-botton">
+				<div class="examine-btn examine-btn1" @click="openFrom('2')">拒绝</div>
+				<div class="examine-btn examine-btn2" @click="openFrom('1')">通过</div>
+			</div>
+
+			<div v-if="detail.status>0" class="mui-content-padded vongi-wordcard-center">
+				<h5>审批意见</h5>
+				<ul class="mui-table-view">
+					<li class="mui-table-view-cell mui-media">
+						审批人:
+						<span v-text="detail.approvalPersonName"></span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						审批编号：
+						<span v-text="detail.approvalNo"></span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<span class="colorf8b155" v-text="detail.approvalContent"></span>
+					</li>
+				</ul>
+			</div>
+		</div>
+
+		<!-- 审批弹窗 -->
+		<div v-show="openFromVisible" @click="openFromVisible=false" class="mui-backdrop mui-active"></div>
+		<div v-show="openFromVisible" class="mui-card fyy-popup">
+			<div class="mui-card-header mui-h3">审批意见</div>
+			<div class="mui-card-content">
+				<div class="mui-input-row">
+					<textarea v-model="subForm.content" rows="5" placeholder="请输入"></textarea>
+				</div>
+			</div>
+			<div class="vongi-btn">
+				<button class="mui-btn mui-btn-primary" @click="doAction">提交</button>
+			</div>
+		</div>
+
+		<loading :visible="isLoading"></loading>
+	</div>
+</template>
+
+<script>
+	import * as API_Attendance from '@/apis/Master/attendance'
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	export default {
+		name: 'MasterAttendanceVerifyInfo',
+		components: {
+			Common,
+			Loading,
+			TopHeader
+		},
+		data() {
+			return {
+				pageTitle: '打卡申请详情',
+
+				isLoading: false,
+
+				id: this.$route.query.id,
+				detail: {},
+
+				//审批内容弹窗显示
+				openFromVisible: false,
+				selectIdList: [],
+				subForm: {
+					ids: '',
+					content: '',
+					status: ''
+				},
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			//获取详情
+			getDetail() {
+				this.isLoading = true;
+				API_Attendance.getApplyInfo({
+					id: this.id
+				}).then(response => {
+
+					this.detail = response;
+
+					this.isLoading = false;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			//显示内容表单
+			openFrom(status) {
+				this.selectIdList = [this.id];
+				if (!this.selectIdList.length) {
+					mui.toast('请选择要处理的信息');
+				} else {
+					this.subForm.status = status;
+					this.subForm.content = status == 1 ? '同意' : '拒绝';
+					this.openFromVisible = true;
+				}
+			},
+			//检测表单
+			checkForm() {
+				if (!this.subForm.ids) {
+					mui.toast('请选择要处理的信息');
+					return false;
+				} else {
+					return true;
+				}
+			},
+			//同意拒绝
+			doAction() {
+				this.subForm.ids = this.selectIdList.join(',');
+				if (this.checkForm()) {
+					this.isLoading = true;
+					API_Attendance.doVerify(this.subForm).then(response => {
+						this.isLoading = false;
+
+						this.openFromVisible = false;
+						this.getDetail();
+					}).catch(error => {
+						this.isLoading = false;
+						mui.toast(error);
+					})
+				}
+			},
+			asynCallBack() {
+
+			},
+		},
+		mounted() {
+			//获取详情
+			this.getDetail();
+		},
+		destroyed() {},
+		computed: {
+			picList: {
+				// getter
+				get: function() {
+					if (this.detail && this.detail.fillAttendanceFilesUrl) {
+						return this.detail.fillAttendanceFilesUrl.split(',');
+					} else {
+						return [];
+					}
+				},
+				// setter
+				set: function(newValue) {
+					console.log(newValue)
+				}
+			},
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+			})
+		}
+	}
+</script>
+
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
+<style scoped>
+	.status_r {
+		color: #fe616c !important;
+		border: 1px solid #fe616c !important;
+	}
+
+	.status_a {
+		color: #05c8af !important;
+		border: 1px solid #05c8af !important;
+	}
+</style>

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

@@ -0,0 +1,225 @@
+<template>
+	<div>
+		<common @asynCallBack="asynCallBack"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
+		<div class="mui-content vongi-qingjiadt">
+			<div class="vongi-qingjiadt-head flew-sp">
+				<div class="flew-items">
+					<div class="flew"><img :src="detail.picUrl" width="50" /></div>
+					<h4 v-text="detail.name+' 申请请假 '+detail.leaveTypeN"></h4>
+				</div>
+				<button class="mui-btn   mui-btn-outlined" :class="statusColor[detail.status]" v-text="status[detail.status]">已批准</button>
+				<!-- <div class="examine-refuse">已拒绝</div> -->
+			</div>
+			<form class="mui-input-group">
+				<div class="mui-input-row">
+					<label>身份证号</label>
+					<span v-text="detail.idCard">420400200002020101</span>
+				</div>
+				<div class="mui-input-row">
+					<label>工号</label>
+					<span v-text="detail.jobNumber">0201022121001</span>
+				</div>
+				<div class="mui-input-row">
+					<label>部门</label>
+					<span v-text="detail.department">信息工程中心</span>
+				</div>
+				<div class="mui-input-row">
+					<label>请假时间</label>
+					<span>自{{detail.startTime}}<br />至{{detail.endTime}}</span>
+				</div>
+				<div class="mui-input-row">
+					<label>请假事由</label>
+					<span v-text="detail.reason">家中有事，需要会老家一趟家中有事，需要会老家一趟家中有事，需要会老家一趟家中有事，需要会老家一趟。</span>
+				</div>
+				<div class="mui-input-row">
+					<label>上传图片</label>
+					<span class="vongi-qingjiadt-photo">
+						<template v-for="(item,index) in picList">
+							<img :src="item" v-image-preview />
+
+						</template>
+					</span>
+				</div>
+				<div class="mui-input-row">
+					<label>申请时间</label>
+					<span v-text="detail.createTime">2020-04-27 12:00:00</span>
+				</div>
+			</form>
+
+			<div v-if="detail.status==0" class="fyy-scon-botton">
+				<div class="examine-btn examine-btn1" @click="openFrom('2','拒绝')">拒绝</div>
+				<div class="examine-btn examine-btn2" @click="openFrom('1','同意')">通过</div>
+			</div>
+
+			<div v-if="detail.status>0">
+				<div class="mui-content-padded">
+					<h5>审核记录</h5>
+				</div>
+				<form class="mui-input-group">
+					<div class="mui-input-row">
+						<label>审批人</label>
+						<span>{{detail.approvedName}}</span>
+					</div>
+					<div class="mui-input-row">
+						<label>审核意见</label>
+						<span>{{detail.approvalExplain}}</span>
+					</div>
+					<div class="mui-input-row">
+						<label>审核时间</label>
+						<span>{{detail.approvedTime}}</span>
+					</div>
+				</form>
+			</div>
+		</div>
+
+		<!-- 审批弹窗 -->
+		<div v-show="openFromVisible" @click="openFromVisible=false" class="mui-backdrop mui-active"></div>
+		<div v-show="openFromVisible" class="mui-card fyy-popup">
+			<div class="mui-card-header mui-h3">审批意见</div>
+			<div class="mui-card-content">
+				<div class="mui-input-row">
+					<textarea v-model="subForm.approvalExplain" rows="5" placeholder="请输入"></textarea>
+				</div>
+			</div>
+			<div class="vongi-btn">
+				<button class="mui-btn mui-btn-primary" @click="doAction">提交</button>
+			</div>
+		</div>
+
+		<loading :visible="isLoading"></loading>
+	</div>
+</template>
+
+<script>
+	import * as API_Leave from '@/apis/Master/leave'
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import isReachBottom from '$project/utils/isReachBottom'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	export default {
+		name: 'MasterAttendanceLeaveInfo',
+		components: {
+			Common,
+			Loading,
+			TopHeader
+		},
+		data() {
+			return {
+				pageTitle: '请假详情',
+
+				isLoading: false,
+				id: this.$route.query.id,
+				detail: {},
+				status: ['待审核', '已批准', '已拒绝'],
+				statusColor: ['', 'mui-btn-success', 'mui-btn-danger'],
+
+				selectIndex: [],
+				//审批内容弹窗显示
+				openFromVisible: false,
+				subForm: {
+					id: 0,
+					status: 0,
+					approvalExplain: '', //说明
+				},
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			//info
+			getDetail() {
+				this.isLoading = true;
+				API_Leave.detail({
+					id: this.id
+				}).then(response => {
+					this.detail = response;
+					this.isLoading = false;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+
+			//显示内容表单
+			openFrom(status, val) {
+				this.selectIndex = [this.id];
+				if (!this.selectIndex.length) {
+					mui.toast('请选择要处理的信息');
+				} else {
+					this.subForm.status = status;
+					this.subForm.approvalExplain = val;
+					this.openFromVisible = true;
+				}
+			},
+			//同意拒绝
+			doAction() {
+				console.log(this.selectIndex)
+				if (this.checkForm()) {
+					this.isLoading = true;
+					this.subForm.id = this.selectIndex.toString();
+					API_Leave.approved(this.subForm).then(response => {
+						this.isLoading = false;
+
+						this.openFromVisible = false;
+						this.getDetail();
+					}).catch(error => {
+						this.isLoading = false;
+						mui.toast(error);
+					})
+				}
+			},
+			//检测表单
+			checkForm() {
+				if (!this.subForm.approvalExplain) {
+					mui.toast('请填写审核意见');
+					return false;
+				} else {
+					return true;
+				}
+			},
+
+			asynCallBack() {
+
+			},
+		},
+		mounted() {
+			this.getDetail();
+
+		},
+		destroyed() {},
+		computed: {
+			computed: {
+				picList: {
+					// getter
+					get: function() {
+						if (this.detail && this.detail.imageUrl) {
+							return this.detail.imageUrl.split(',');
+						} else {
+							return [];
+						}
+					},
+					// setter
+					set: function(newValue) {
+						console.log(newValue)
+					}
+				},
+				...mapGetters({
+					openId: 'wx_openid',
+					token: 'token',
+				})
+			}
+		},
+
+	}
+</script>
+
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style>
+</style>

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

@@ -22,7 +22,7 @@
 							<div class="mui-scroll">
 								<ul class="mui-table-view mui-table-view-chevron" v-if="listForm.type==1">
 									<li class="mui-table-view-cell mui-media" v-for="mod in recordList">
-										<router-link class="mui-navigate-right" :to="{name: 'MasterAttendanceLeaveInfo', query: {id:mod.id}}">
+										<router-link class="mui-navigate-right" :to="{name: 'MasterAttendanceVerifyLeaveInfo', query: {id:mod.id}}">
 											<div class="mui-media-object mui-pull-left">
 												<img :src="mod.picUrl"></div>
 											<div class="mui-media-body">
@@ -37,9 +37,7 @@
 								<form class="mui-input-group fyy-checkbox" v-if="listForm.type==0">
 									<div class="mui-input-row mui-checkbox mui-left" v-for="mod in recordList">
 
-										<router-link class="mui-navigate-right" :to="{name: 'MasterAttendanceLeaveInfo', query: {id:mod.id}}">
-
-
+										<router-link class="mui-navigate-right" :to="{name: 'MasterAttendanceVerifyLeaveInfo', query: {id:mod.id}}">
 											<div class="mui-media-object mui-pull-left">
 												<img :src="mod.picUrl"></div>
 											<div class="mui-media-body">
@@ -131,7 +129,6 @@
 				subForm: {
 					id: 0,
 					status: 0,
-					approvalOpinions: '', //意见
 					approvalExplain: '', //说明
 				},
 				allclick: false
@@ -144,30 +141,20 @@
 		methods: {
 			//同意拒绝
 			doAction() {
-
 				console.log(this.selectIndex)
 				if (this.checkForm()) {
-					var btnArray = ['否', '是'];
-					var _this = this;
-					mui.confirm('确认当操作？', '提示', btnArray, function(e) {
-						if (e.index == 1) {
-							_this.isLoading = true;
-
+					this.isLoading = true;
+					this.subForm.id = this.selectIndex.toString();
+					API_Leave.approved(this.subForm).then(response => {
+						this.isLoading = false;
 
-							_this.subForm.id = _this.selectIndex.toString();
-
-							API_Leave.approved(_this.subForm).then(response => {
-								_this.isLoading = false;
-
-								_this.openFromVisible = false;
-								_this.listForm.pageIndex = 1;
-								_this.getList();
-							}).catch(error => {
-								_this.isLoading = false;
-								mui.toast(error);
-							})
-						}
-					});
+						this.openFromVisible = false;
+						this.listForm.pageIndex = 1;
+						this.getList();
+					}).catch(error => {
+						this.isLoading = false;
+						mui.toast(error);
+					})
 				}
 			},
 			//检测表单
@@ -203,7 +190,7 @@
 					mui.toast('请选择要处理的信息');
 				} else {
 					this.subForm.status = status;
-					this.subForm.approvalOpinions = val;
+					this.subForm.approvalExplain = val;
 					this.openFromVisible = true;
 				}
 			},

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

@@ -22,7 +22,7 @@
 							<div class="mui-scroll">
 								<form class="mui-input-group fyy-checkbox">
 									<div v-for="(item,index) in recordList" :key="item.id" class="mui-input-row mui-checkbox mui-left">
-										<router-link :to="{name:'MasterAttendanceInfo',query:{id:item.id}}" class="mui-navigate-right">
+										<router-link :to="{name:'MasterAttendanceVerifyInfo',query:{id:item.id}}" class="mui-navigate-right">
 											<div class="mui-media-object mui-pull-left"><img :src="item.faceImageUrl"></div>
 											<div class="mui-media-body">
 												{{item.personName}}
@@ -51,7 +51,7 @@
 							<div class="mui-scroll">
 								<ul class="mui-table-view mui-table-view-chevron">
 									<li v-for="(item,index) in recordList" :key="item.id" class="mui-table-view-cell mui-media">
-										<router-link :to="{name:'MasterAttendanceInfo',query:{id:item.id}}" class="mui-navigate-right">
+										<router-link :to="{name:'MasterAttendanceVerifyInfo',query:{id:item.id}}" class="mui-navigate-right">
 											<div class="mui-media-object mui-pull-left"><img :src="item.faceImageUrl"></div>
 											<div class="mui-media-body">
 												{{item.personName}}
@@ -215,23 +215,17 @@
 			doAction() {
 				this.subForm.ids = this.selectIdList.join(',');
 				if (this.checkForm()) {
-					var btnArray = ['否', '是'];
-					var _this = this;
-					mui.confirm('确认当操作？', '提示', btnArray, function(e) {
-						if (e.index == 1) {
-							_this.isLoading = true;
-							API_Attendance.doVerify(_this.subForm).then(response => {
-								_this.isLoading = false;
+					this.isLoading = true;
+					API_Attendance.doVerify(this.subForm).then(response => {
+						this.isLoading = false;
 
-								_this.openFromVisible = false;
-								_this.listForm.pageIndex = 1;
-								_this.getList();
-							}).catch(error => {
-								_this.isLoading = false;
-								mui.toast(error);
-							})
-						}
-					});
+						this.openFromVisible = false;
+						this.listForm.pageIndex = 1;
+						this.getList();
+					}).catch(error => {
+						this.isLoading = false;
+						mui.toast(error);
+					})
 				}
 			},
 			asynCallBack() {

src/projects/business/views/Master/Company/AddPerson.vue

@@ -65,7 +65,7 @@
 		},
 		data() {
 			return {
-				pageTitle: '用户注册',
+				pageTitle: '添加人员',
 
 				isLoading: false,