1

src/projects/business/apis-xsy/applyclass.js

@@ -27,4 +27,50 @@ export function ownerShift(params) {
 		data: Qs.stringify(params),
 		method: 'post',
 	})
-}
+}
+
+//根据id查询申请调班详情
+export function adjustShiftDetail(id) {
+	var 	params= {
+			id:id
+		}
+	return request({
+		url: '/mobile/adjustShiftApi/adjustShiftDetail',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+
+
+//根据登录人查询待审核的调班记录
+export function waitExamineShiftList(params) {
+ 
+	return request({
+		url: '/mobile/examineApi/waitExamineShiftList',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+//审核
+export function examineSubmit(params) {
+ 
+	return request({
+		url: '/mobile/examineApi/examineSubmit',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+
+
+
+//根据登录人查询已审核的调班记录
+export function alreadyExamineShiftList(params) {
+ 
+	return request({
+		url: '/mobile/examineApi/alreadyExamineShiftList',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}

src/projects/business/apis-xsy/xsy.js

@@ -1,7 +1,7 @@
 import request from '../utils/request'
 import Qs from 'qs';
 
-//上传图片
+//审批人查看
 export function examinePerson(formId) {
 	var 	params= {
 			formId:formId
@@ -9,6 +9,18 @@ export function examinePerson(formId) {
 	return request({
 		url: '/mobile/adjustShiftApi/examinePerson',
 	
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
+//根据id查询审核详情
+export function examineDetail(id) {
+	var 	params= {
+			id:id
+		}
+	return request({
+		url: '/mobile/adjustShiftApi/examineDetail',
+	
 		data: Qs.stringify(params),
 		method: 'post',
 	})

src/projects/business/views-xsy/ApplyClass/Add.vue

@@ -158,11 +158,13 @@
 					
 					API.adjustShiftSubmit(obj).then(response => {
 						this.isLoading = false;
-
+						
 						mui.toast('提交成功');
-						this.$router.push({
-						    name: "Master",
-						    query: {}
+						this.$router.replace({
+						    name: "ApplyClassInfo",
+						    query: {
+								id:response.id
+							}
 						})
 					}).catch(error => {
 						this.isLoading = false;

src/projects/business/views-xsy/ApplyClass/Info.vue

@@ -1,88 +1,265 @@
-<template>
-<div>
-			<header class="mui-bar mui-bar-nav">
-				<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-				<h1 class="mui-title">申请调班详情</h1>
-			</header>
-			<div class="mui-content vongi-qingjiadt">
-				<div class="vongi-qingjiadt-head flew-sp">
-					<div class="flew-items">
-						<div class="flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
-						<h4>郭麒麟 申请调班</h4>
-					</div>
-					<button class="mui-btn  mui-btn-primary mui-btn-outlined">审批中</button>
-					<!--<button class="mui-btn  mui-btn-danger mui-btn-outlined">已拒绝</button>
-					<button class="mui-btn  mui-btn-success mui-btn-outlined">已批准</button>-->
-				</div>
-				<form class="mui-input-group">
-					<div class="mui-input-row">
-						<label>调班日期</label>
-						<span>2021-03-01 星期一</span>
-					</div>
-					<div class="mui-input-row">
-						<label>原班次</label>
-						<span>11-保卫科白班</span>
-					</div>
-					<div class="mui-input-row">
-						<label>调整为</label>
-						<span>12-保卫科晚班<br>12-保卫科晚班</span>
-					</div>
-					<div class="mui-input-row">
-						<label>申请时间</label>
-						<span>2020-04-27 12:00:00</span>
-					</div>
-				</form>
-				<div class="mui-content-padded">
-					<h5>审核记录</h5>
-				</div>
-				<div class="vongi-slot">
-					<div class="vongi-slot-block">
-						<div class="vongi-slot-img"><img src="~$project/assets/img/02.jpg"></div>
-						<div class="vongi-slot-content">
-							<h4>审批人1<span class="mui-pull-right mui-h5 color999">2020-11-26 13:00</span></h4>
-							<p>高进权 <span class="color55f868">同意</span></p>
-						</div>
-					</div>
-					<div class="vongi-slot-block">
-						<div class="vongi-slot-img"><img src="~$project/assets/img/02.jpg"></div>
-						<div class="vongi-slot-content">
-							<h4>审批人1</h4>
-							<p>高进权 <span class="color4fc5f7">审批中</span></p>
-						</div>
-					</div>
-                    <div class="vongi-slot-block">
-						<div class="vongi-slot-img"><img src="~$project/assets/img/icon_chaosong.png"></div>
-						<div class="vongi-slot-content">
-							<h4>抄送人</h4>
-							<p>已抄送2人</p>
-							<ul class="mui-table-view mui-grid-view mui-grid-9 flex ">
-					            <li class="mui-table-view-cell mui-media">
-					            	<div class="flex">
-					            		<img src="~$project/assets/img/02.jpg"/>
-										<i class="iconfont icon-gou"></i>
-					            	</div>
-					                <div class="mui-media-body">张芳芳</div>
-					            </li>
-					           <li class="mui-table-view-cell mui-media">
-					            	<div class="flex">
-					            		<img src="~$project/assets/img/02.jpg"/>
-										<i class="iconfont icon-chacha"></i>
-					            	</div>
-					                <div class="mui-media-body">张芳芳</div>
-					            </li>
-		                   </ul>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-</template>
-
-<script>
-</script>
-
-<style src="$project/assets/css/iconfont.css"></style>
-<style scoped src="$project/assets/css/xpwyfyy.css"></style>
-<style src="$project/assets/css/xsy.css"></style>
-<style>
+<template>
+	<div>
+		<loading :visible="isLoading"></loading>
+		<header class="mui-bar mui-bar-nav">
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+			<h1 class="mui-title">申请调班详情</h1>
+		</header>
+		<div class="mui-content vongi-qingjiadt">
+			<div class="vongi-qingjiadt-head flew-sp">
+				<div class="flew-items">
+					<div class="flew"><img :src="adjustShiftDetail.faceImageUrl" width="50" /></div>
+					<h4>{{adjustShiftDetail.name}} 申请调班</h4>
+				</div>
+				<button class="mui-btn   mui-btn-outlined" :class="{'mui-btn-primary':adjustShiftDetail.status==0,
+					'mui-btn-danger':adjustShiftDetail.status==2||adjustShiftDetail.status==3,
+					'mui-btn-success':adjustShiftDetail.status==1||adjustShiftDetail.status==4}">{{adjustShiftDetail.statusName}}</button>
+
+			</div>
+			<form class="mui-input-group">
+				<div class="mui-input-row">
+					<label>调班日期</label>
+					<span>{{adjustShiftDetail.adjustDate}}</span>
+				</div>
+				<div class="mui-input-row">
+					<label>原班次</label>
+					<span>{{adjustShiftDetail.oldShift}}</span>
+				</div>
+				<div class="mui-input-row">
+					<label>调整为</label>
+					<span>{{adjustShiftDetail.newShift}}</span>
+				</div>
+				<div class="mui-input-row">
+					<label>备注</label>
+					<span>{{adjustShiftDetail.remark}}</span>
+				</div>
+				<div class="mui-input-row">
+					<label>申请时间</label>
+					<span>{{adjustShiftDetail.createTime}}</span>
+				</div>
+			</form>
+			<div class="mui-content-padded">
+				<h5>审核记录</h5>
+			</div>
+			<div class="vongi-slot">
+				<template v-for="item,i in examineDetail.examineList">
+
+					<div class="vongi-slot-block">
+						<!-- 单人展示单人 -->
+						<!-- 多人展示单人 -->
+						<!-- 多人展示多人 -->
+						<div class="vongi-slot-img"
+							v-if="item.source==1&&item.operation=='or'&&item.examinePersonDetailDTOList.length==1 ">
+							<img v-for="item1,j in item.examinePersonDetailDTOList" :src="item1.faceImageUrl">
+						</div>
+						<div class="vongi-slot-img" v-else-if="item.source==1&&item.operation=='or'&&item.action!=0 ">
+							<img v-for="item1,j in item.examinePersonDetailDTOList" :src="item1.faceImageUrl"
+								v-if="item1.action!='0'">
+						</div>
+						<div class="vongi-slot-img" v-else>
+							<img src="~$project/assets/img/team.png">
+						</div>
+
+
+						<div class="vongi-slot-content">
+							<h4>{{item.desc}}<span class="mui-pull-right mui-h5 color999">{{item.finishTime}}</span>
+							</h4>
+
+							<template
+								v-if="item.source==1&&item.operation=='or'&&item.examinePersonDetailDTOList.length==1 ">
+								<p v-for="item1,j in item.examinePersonDetailDTOList">{{item1.name}}
+									<span :class="getClass(item1,i)">{{item1.remark}}</span>
+								</p>
+							</template>
+							<template v-else-if="item.source==1&&item.operation=='or'&&item.action!=0 ">
+								<p v-for="item1,j in item.examinePersonDetailDTOList">{{item1.name}}
+									<span :class="getClass(item1,i)" v-if="item1.action!='0'">{{item1.remark}}</span>
+								</p>
+							</template>
+							<template v-else>
+								<p>{{item.operation=='or'?'或签':''}}{{item.operation=='and'?'会签':''}}{{item.examinePersonDetailDTOList.length}}人
+								</p>
+								<ul class="mui-table-view mui-grid-view mui-grid-9 flex ">
+
+
+									<li class="mui-table-view-cell mui-media"
+										v-for="item1,j in item.examinePersonDetailDTOList">
+										<div class="flex">
+											<img :src="item1.faceImageUrl" />
+											<i class="iconfont icon-gou" v-if="item1.action=='1'"></i>
+											<i class="iconfont icon-chacha" v-if="item1.action=='2'"></i>
+										</div>
+										<div class="mui-media-body">{{item1.name}}</div>
+									</li>
+								</ul>
+							</template>
+
+						</div>
+					</div>
+
+
+					<div class="vongi-slot-block" v-if="item.ccPersonDetailDTOList.length">
+						<div class="vongi-slot-img"><img src="~$project/assets/img/icon_chaosong.png"></div>
+						<div class="vongi-slot-content">
+							<h4>抄送人</h4>
+							<p>已抄送{{item.ccPersonDetailDTOList.length}}人</p>
+							<ul class="mui-table-view mui-grid-view mui-grid-9 flex ">
+								<li class="mui-table-view-cell mui-media" v-for="item1,j in item.ccPersonDetailDTOList">
+									<div class="flex">
+										<img :src="item1.faceImageUrl" />
+									</div>
+									<div class="mui-media-body">{{item1.name}}</div>
+								</li>
+
+							</ul>
+						</div>
+					</div>
+
+				</template>
+
+				<div class="vongi-slot-block" v-if="false">
+					<div class="vongi-slot-img"><img src="~$project/assets/img/02.jpg"></div>
+					<div class="vongi-slot-content">
+						<h4>审批人1</h4>
+						<p>高进权 <span class="color4fc5f7">审批中</span></p>
+					</div>
+				</div>
+				<div class="vongi-slot-block" v-if="false">
+					<div class="vongi-slot-img"><img src="~$project/assets/img/icon_chaosong.png"></div>
+					<div class="vongi-slot-content">
+						<h4>抄送人</h4>
+						<p>已抄送2人</p>
+						<ul class="mui-table-view mui-grid-view mui-grid-9 flex ">
+							<li class="mui-table-view-cell mui-media">
+								<div class="flex">
+									<img src="~$project/assets/img/02.jpg" />
+									<i class="iconfont icon-gou"></i>
+								</div>
+								<div class="mui-media-body">张芳芳</div>
+							</li>
+							<li class="mui-table-view-cell mui-media">
+								<div class="flex">
+									<img src="~$project/assets/img/02.jpg" />
+									<i class="iconfont icon-chacha"></i>
+								</div>
+								<div class="mui-media-body">张芳芳</div>
+							</li>
+						</ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+
+<script>
+	import * as API from '@/apis-xsy/applyclass'
+	import * as API_sp from '@/apis-xsy/xsy'
+
+	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: '',
+		components: {
+			Common,
+			Loading,
+			TopHeader
+		},
+		data() {
+			return {
+				pageTitle: '申请调班详情',
+
+				isLoading: false,
+				id: '',
+				adjustShiftDetail: {},
+				examineDetail: {},
+				only: "test"
+
+			}
+		},
+		created() {
+			this.id = this.$route.query.id;
+		},
+		methods: {
+			getClass(ac, i) {
+				var reclass = ""
+
+				if (ac.action == "0") {
+					if (this.only == "test") {
+
+						this.only = i;
+					}
+					if (this.only == i) {
+						return "color3385FF"
+					} else {
+						return "mui-hidden"
+					}
+
+				}
+
+				if (ac.action == "3" || ac.action == "2") {
+					return "colorfe616c"
+				}
+
+				if (ac.action == "1" || ac.action == "4") {
+					return "color389E0D"
+				}
+				return reclass
+			},
+			getExamineDetail() {
+				API_sp.examineDetail(this.id).then(response => {
+					this.examineDetail = response
+
+					this.$emit('allowExamine', response.allowExamine);
+				}).catch(error => {
+
+					mui.toast(error);
+				})
+			},
+			getAdjustShiftDetail() {
+				this.isLoading = true;
+
+				API.adjustShiftDetail(this.id).then(response => {
+					this.adjustShiftDetail = response;
+					this.isLoading = false;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			asynCallBack() {
+
+			},
+			update() {
+				this.getAdjustShiftDetail();
+				this.getExamineDetail();
+			}
+		},
+		mounted() {
+			this.getAdjustShiftDetail();
+			this.getExamineDetail();
+		},
+		destroyed() {},
+
+	}
+</script>
+
+<style src="$project/assets/css/iconfont.css"></style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/xsy.css"></style>
+<style scoped>
+	.color3385FF {
+		color: #3385FF
+	}
+
+	.color389E0D {
+		color: #389E0D
+	}
 </style>

src/projects/business/views-xsy/ApprovalClass/Info.vue

@@ -1,87 +1,123 @@
 <template>
 <div>
-    <header class="mui-bar mui-bar-nav">
-			<h1 class="mui-title">调班申请详情</h1>
-			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
-		</header>
+		<Info @allowExamine="allowExamine" ref="myinfo"></Info>
 		<div class="mui-content vongi-qingjiadt">
-			<div class="vongi-qingjiadt-head flew-sp mui-content-padded vongi-wordcard-top">
-				<div class="flew-items">
-					<div class="flew"><img src="~$project/assets/img/03.jpg" width="50" /></div>
-					<h4>郭麒麟 申请调班</h4>
-				</div>
-				<button class="mui-btn  mui-btn-primary mui-btn-outlined">待处理</button>
-				<!--<button class="mui-btn  mui-btn-danger mui-btn-outlined">已拒绝</button>
-					<button class="mui-btn  mui-btn-success mui-btn-outlined">已批准</button>-->
+			 
+			<div class="fyy-scon-botton" v-if="allowExamineBl">
+				<div class="examine-btn examine-btn1" @click="openFrom('3')">拒绝</div>
+				<div class="examine-btn examine-btn2" @click="openFrom('1')">通过</div>
 			</div>
-			<form class="mui-input-group mui-content-padded">
-				<div class="mui-input-row">
-					<label>调班日期</label>
-					<span>2021-03-01 星期一</span>
-				</div>
-				<div class="mui-input-row">
-					<label>原班次</label>
-					<span>11-保卫科白班</span>
-				</div>
-				<div class="mui-input-row">
-					<label>调整为</label>
-					<span>12-保卫科晚班<br>12-保卫科晚班</span>
-				</div>
-				<div class="mui-input-row">
-					<label>备注</label>
-					<span>无</span>
-				</div>
-				<div class="mui-input-row">
-					<label>申请时间</label>
-					<span>2020-04-27 12:00:00</span>
-				</div>
-			</form>
-			<div class="vongi-slot mui-content-padded">
-				<div class="vongi-slot-block">
-					<div class="vongi-slot-img"><img src="~$project/assets/img/02.jpg"></div>
-					<div class="vongi-slot-content">
-						<h4>审批人1<span class="mui-pull-right mui-h5 color999">2020-11-26 13:00</span></h4>
-						<p>高进权 <span class="color55f868">同意</span></p>
-					</div>
-				</div>
-				<div class="vongi-slot-block">
-					<div class="vongi-slot-img"><img src="~$project/assets/img/02.jpg"></div>
-					<div class="vongi-slot-content">
-						<h4>审批人1</h4>
-						<p>高进权 <span class="color4fc5f7">审批中</span></p>
-					</div>
-				</div>
-				<div class="vongi-slot-block">
-					<div class="vongi-slot-img"><img src="~$project/assets/img/icon_chaosong.png"></div>
-					<div class="vongi-slot-content">
-						<h4>抄送人</h4>
-						<p>已抄送2人</p>
-						<ul class="mui-table-view mui-grid-view mui-grid-9 flex ">
-							<li class="mui-table-view-cell mui-media">
-								<div class="flex">
-									<img src="~$project/assets/img/02.jpg" width="30" />
-								</div>
-								<div class="mui-media-body">张芳芳</div>
-							</li>
-							<li class="mui-table-view-cell mui-media">
-								<div class="flex">
-									<img src="~$project/assets/img/02.jpg" width="30" />
-								</div>
-								<div class="mui-media-body">张芳芳</div>
-							</li>
-						</ul>
-					</div>
+		</div>
+		<!--弹窗-->
+		<div class="mui-popup mui-popup-in vongi-mui-pop"  v-show="showApprovalBl">
+			<div class="mui-popup-inner vongi-pop-inner">
+				<div class="mui-popup-title">审核意见</div>
+				<div class="mui-popup-input">
+					<textarea id="textarea" rows="3" v-model="subForm.content" placeholder="可输入审核意见"></textarea>
 				</div>
 			</div>
-			<div class="fyy-scon-botton">
-				<div class="examine-btn examine-btn1">拒绝</div>
-				<div class="examine-btn examine-btn2">通过</div>
-			</div>
+			<div class="mui-popup-buttons">
+				<span class="mui-popup-button"  @click="showApprovalBl=false">取消</span>
+			<span class="mui-popup-button mui-popup-button-bold" @click="doAction">提交</span></div>
 		</div>
+		<div class="mui-popup-backdrop mui-active" v-show="showApprovalBl"></div>
+		<loading :visible="isLoading"></loading>
 </div>
 </template>
 
 <script>
+	import Info from '../ApplyClass/Info.vue'
+	
+	import * as API from '@/apis-xsy/applyclass'
+	import * as API_sp from '@/apis-xsy/xsy'
+
+	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: '',
+		components: {
+			Common,
+			Loading,
+			TopHeader,Info
+		},
+		data() {
+			return {
+				pageTitle: '申请调班详情',
+				showApprovalBl:false,
+				allowExamineBl:false,
+				isLoading: false,
+				subForm: {
+					procinstActUserIds: '',
+					content: '',
+					status: ''
+				},
+			}
+		},
+		created() {
+			
+	
+		},
+		methods: { 
+			allowExamine(bl){
+				 
+				this.allowExamineBl=bl;
+			},
+			//同意拒绝
+			doAction() {
+				this.subForm.procinstActUserIds =this.$route.query.procinstActUserId;
+				if (this.checkForm()) {
+					this.isLoading = true;
+					API.examineSubmit(this.subForm).then(response => {
+						this.isLoading = false;
+			
+						this.showApprovalBl = false;
+						this.$refs.myinfo.update();
+						mui.toast("操作成功");
+						 
+					}).catch(error => {
+						this.isLoading = false;
+						mui.toast(error);
+					})
+				}
+			},
+			//检测表单
+			checkForm() {
+				if (false) {
+					mui.toast('请选择要处理的信息');
+					return false;
+				} else {
+					return true;
+				}
+			},
+		    openFrom(status) {
+		    	if (false) {
+		    		mui.toast('请选择要处理的信息');
+		    	} else {
+		    		this.subForm.status = status;
+		    		this.subForm.content = status == 1 ? '同意' : '拒绝';
+		    		this.showApprovalBl = true;
+		    		//直接点击处理，不需要弹窗理由框,又需要弹窗理由框了
+		    		//this.doAction();
+		    	}
+		    },
+			asynCallBack() {
+	
+			},
+		
+		},
+		mounted() {
+		
+		},
+		destroyed() {},
+	
+	}
 </script>
 
 <style src="$project/assets/css/iconfont.css"></style>

src/projects/business/views-xsy/ApprovalClass/List.vue

@@ -1,5 +1,7 @@
 <template>
 <div>
+		<common @asynCallBack="asynCallBack"></common>
+	<loading :visible="isLoading"></loading>
     <header class="mui-bar mui-bar-nav">
 			<h1 class="mui-title">调班审核</h1>
 			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
@@ -8,85 +10,304 @@
 			<div id="slider" class="mui-slider mui-fullscreen vongi-over">
 				<div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
 					<div class="mui-scroll">
-						<a class="mui-control-item mui-active" href="#item1mobile">
-							<span class="fyy-badge">待处理<span class="mui-badge">5</span></span>
+						<a class="mui-control-item " @click="mySwitchTab(true)" :class="{'mui-active':switchTab}" >
+							<span class="fyy-badge">待处理<span class="mui-badge" v-show="mybadge">{{mybadge}}</span></span>
 						</a>
-						<a class="mui-control-item" href="#item2mobile">
+						<a class="mui-control-item"  @click="mySwitchTab(false)" :class="{'mui-active':!switchTab}"   >
 							已处理
 						</a>
 					</div>
 				</div>
 				<div class="mui-slider-group">
-					<div id="item1mobile" class="mui-slider-item mui-control-content mui-active">
-						<div id="scroll1" class="mui-scroll-wrapper">
+					
+					<div  class="mui-slider-item mui-control-content " v-show="switchTab">
+						<div  class="mui-scroll-wrapper vongi-over-hei" >
 							<div class="mui-scroll">
-								<form class="mui-input-group fyy-checkbox">
-									<div class="mui-input-row mui-checkbox mui-left">
-										<a href="" class="mui-media-body">
-											<h4 class="flew-sp margin10">邹杰的调班申请<span class="color999 mui-h5">10-17 18:00</span></h4>
-											<h5 class='mui-ellipsis color999'>调班日期：2021-03-01 星期一</h5>
-										</a>
-										<input name="checkbox" value="Item 1" type="checkbox" checked>
+								<div class="mui-input-group fyy-checkbox">
+									
+									<div class="mui-input-row mui-checkbox mui-left" v-for="item,i in recordList">
+										
+											<router-link :to="{name:'ApprovalClassInfo',query:{id:item.id,procinstActUserId:item.procinstActUserId}}" class="mui-media-body">
+											
+											<h4 class="flew-sp margin10">{{item.name}}的调班申请<span class="color999 mui-h5">{{item.createTime}}</span></h4>
+											<h5 class='mui-ellipsis color999'>调班日期：{{item.adjustDate}}</h5>
+										</router-link>
+										<input name="checkbox" v-model="ids" :value="item.procinstActUserId" type="checkbox" >
 									</div>
-									<div class="mui-input-row mui-checkbox mui-left">
-										<a href="" class="mui-media-body">
-											<h4 class="flew-sp margin10">邹杰的调班申请<span class="color999 mui-h5">10-17 18:00</span></h4>
-											<h5 class='mui-ellipsis color999'>调班日期：2021-03-01 星期一</h5>
-										</a>
-										<input name="checkbox" value="Item 1" type="checkbox">
-									</div>	
-								</form>
+									<NullList :remark="'暂无调班申请记录'" v-if="!recordList.length"></NullList>
+									 
+								</div>
 							</div>
 						</div>
 					</div>
-					<div id="item2mobile" class="mui-slider-item mui-control-content">
+					<div  class="mui-slider-item mui-control-content" v-show="!switchTab">
 						<div class="mui-scroll-wrapper">
 							<div class="mui-scroll">
 								<ul class="mui-table-view mui-table-view-chevron">
-									<li class="mui-table-view-cell mui-media">
-										<a  href="">
-											<h4 class="flew-sp margin10">邹杰的调班申请<span class="color999 mui-h5">10-17 18:00</span></h4>
-											<h5 class='mui-ellipsis color999 flew-sp flew-items'>调班日期：2021-03-01 星期一<button type="" class="mui-btn mui-btn-success mui-btn-outlined">已同意</button></h5>
-										</a>
-									</li>
-									<li class="mui-table-view-cell mui-media">
-										<a  href="">
-											<h4 class="flew-sp margin10">邹杰的调班申请<span class="color999 mui-h5">10-17 18:00</span></h4>
-											<h5 class='mui-ellipsis color999 flew-sp flew-items'>调班日期：2021-03-01 星期一<button type="" class="mui-btn mui-btn-danger mui-btn-outlined">已拒绝</button></h5>
-										</a>
+									<li class="mui-table-view-cell mui-media" v-for="item,i in recordList2">
+										<router-link :to="{name:'ApprovalClassInfo',query:{id:item.id}}" class="mui-media-body">
+										
+											<h4 class="flew-sp margin10">{{item.name}}的调班申请<span class="color999 mui-h5">{{item.createTime}}</span></h4>
+											<h5 class='mui-ellipsis color999 flew-sp flew-items'>调班日期：{{item.adjustDate}}
+											<button class="mui-btn   mui-btn-outlined" :class="{'mui-btn-primary':item.action==0,
+											'mui-btn-danger':item.action==2||item.action==3,
+											'mui-btn-success':item.action==1||item.action==4}"   >{{item.actionName}}</button>
+															
+										 
+											
+											</h5>
+										</router-link>
 									</li>
+									
 								</ul>
+								<NullList :remark="'暂无已处理记录'" v-if="!recordList2.length"></NullList>
+								
 							</div>
 						</div>
 					</div>
 				</div>
 			</div>
-			<div class="fyy-bindfyy-btn">
+			<div class="fyy-bindfyy-btn" v-show="switchTab">
 				<form class="mui-input-group">
 					<div class="mui-input-row mui-checkbox mui-left">
 						<label>全选</label>
-						<input name="checkbox" value="Item 1" type="checkbox">
+						<input v-model="allSelect" value="1" type="checkbox" @click="selectAll" :checked="recordList.length==ids.length">
+						
 					</div>
 				</form>
-				<button type="button" class="mui-btn mui-btn-danger">拒绝</button>
-				<button type="button" class="mui-btn mui-btn-success">同意</button>
+				<button type="button" class="mui-btn mui-btn-danger" @click="openFrom('3')">拒绝</button>
+				<button type="button" class="mui-btn mui-btn-success" @click="openFrom('1')">同意</button>
 			</div>
 		</div>
 		<!--弹窗-->
-		<div class="mui-popup mui-popup-in vongi-mui-pop" style="display: block;">
+		<div class="mui-popup mui-popup-in vongi-mui-pop"  v-show="showApprovalBl">
 			<div class="mui-popup-inner vongi-pop-inner">
 				<div class="mui-popup-title">审核意见</div>
 				<div class="mui-popup-input">
-					<textarea id="textarea" rows="3" placeholder="可输入审核意见"></textarea>
+					<textarea id="textarea" rows="3" v-model="subForm.content" placeholder="可输入审核意见"></textarea>
 				</div>
 			</div>
-			<div class="mui-popup-buttons"><span class="mui-popup-button">取消</span><span class="mui-popup-button mui-popup-button-bold">提交</span></div>
+			<div class="mui-popup-buttons">
+				<span class="mui-popup-button"  @click="showApprovalBl=false">取消</span>
+			<span class="mui-popup-button mui-popup-button-bold" @click="doAction">提交</span></div>
 		</div>
-		<div class="mui-popup-backdrop mui-active" style="display: block;"></div>
+		<div class="mui-popup-backdrop mui-active" v-show="showApprovalBl"></div>
 </div>
 </template>
 
-<script>
+
+<script>
+	
+	import * as API from '@/apis-xsy/applyclass'
+	import * as API_sp from '@/apis-xsy/xsy'
+
+	import  Common from '$project/components/Common.vue'
+ 	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import NullList from '$project/components/NullList.vue'
+	import isReachBottom from '$project/utils/isReachBottom'
+	
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+
+	export default {
+		name: '',
+		components: {
+			Common,
+			Loading,
+			TopHeader,NullList
+		},
+		data() {
+			return {
+				allSelect:[],
+				ids:[],
+				switchTab:true,
+				mybadge:0,
+				pageTitle: '调班审核',
+				showApprovalBl:false,
+				isLoading: false,			
+				listForm: {
+					pageIndex: 1,
+					pageSize: 10,
+					totalPage: 1,
+				},
+				recordList: [],
+				
+				listForm2: {
+					pageIndex: 1,
+					pageSize: 20,
+					totalPage: 1,
+				},
+				recordList2: [],
+				subForm: {
+					procinstActUserIds: '',
+					content: '',
+					status: ''
+				},
+			}
+		},
+		created() {
+			 
+		},
+		methods: {
+			mySwitchTab(bl){
+				this.switchTab=bl;
+				if(bl){
+					if(this.recordList.length==0){
+						this.getList()
+					}
+				}else{
+					if(this.recordList2.length==0){
+						this.getList2()
+					}
+				}
+			},
+			//检测表单
+			checkForm() {
+				if (false) {
+					mui.toast('请选择要处理的信息');
+					return false;
+				} else {
+					return true;
+				}
+			},
+			//同意拒绝
+			doAction() {
+				this.subForm.procinstActUserIds = this.ids.join(',');
+				if (this.checkForm()) {
+					this.isLoading = true;
+					API.examineSubmit(this.subForm).then(response => {
+						this.isLoading = false;
+			
+						this.showApprovalBl = false;
+						this.listForm.pageIndex = 1;
+						mui.toast("操作成功");
+						this.getList();
+					}).catch(error => {
+						this.isLoading = false;
+						mui.toast(error);
+					})
+				}
+			},
+			//显示内容表单
+			openFrom(status) {
+				if (!this.ids.length) {
+					mui.toast('请选择要处理的信息');
+				} else {
+					this.subForm.status = status;
+					this.subForm.content = status == 1 ? '同意' : '拒绝';
+					this.showApprovalBl = true;
+					//直接点击处理，不需要弹窗理由框,又需要弹窗理由框了
+					//this.doAction();
+				}
+			},
+			//选择所有
+			selectAll() {
+				if (this.allSelect.length) {
+					this.ids = [];
+				} else {
+					var selectIdList = [];
+					this.recordList.forEach(function(item, index) {
+						selectIdList.push(item.id);
+					})
+					this.ids = selectIdList;
+				}
+			},
+			//获取列表
+			getList2() {
+				this.isLoading = true;
+				API.alreadyExamineShiftList(this.listForm2).then(response => {
+					if (response) {
+						if (this.listForm2.pageIndex == 1) {
+							this.recordList2 = response.data;
+							this.listForm2.pageIndex = response.pageNumber;
+							this.listForm2.totalPage = response.totalPage;
+							
+						} else {
+							this.recordList2 = [
+								...this.recordList2,
+								...response.data
+							];
+						}
+					}
+					this.listForm2.pageIndex++;
+					this.isLoading = false;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			 //获取列表
+			 getList() {
+			 	this.isLoading = true;
+			 	API.waitExamineShiftList(this.listForm).then(response => {
+			 		if (response) {
+			 			if (this.listForm.pageIndex == 1) {
+			 				this.recordList = response.data;
+			 				this.listForm.pageIndex = response.pageNumber;
+			 				this.listForm.totalPage = response.totalPage;
+							this.mybadge=response.recordsTotal
+			 			} else {
+			 				this.recordList = [
+			 					...this.recordList,
+			 					...response.data
+			 				];
+			 			}
+			 		}
+			 		this.listForm.pageIndex++;
+			 		this.isLoading = false;
+			 	}).catch(error => {
+			 		this.isLoading = false;
+			 		mui.toast(error);
+			 	})
+			 },
+			 //下拉事件
+			 handleScrool() {
+				 
+			 	if (isReachBottom()) {
+			 		console.log('到达底部')
+					if(this.switchTab){
+						if (this.listForm.pageIndex <= this.listForm.totalPage && this.isLoading == false) {
+							this.getList();
+						} else {
+							return;
+						}
+					}else{
+						if (this.listForm2.pageIndex <= this.listForm2.totalPage && this.isLoading == false) {
+							this.getList2();
+						} else {
+							return;
+						}
+					}
+			 		
+			 	}
+			 },
+		 
+			asynCallBack() {
+
+			},
+		
+		},
+	mounted() {
+		if(this.switchTab){
+			this.getList();
+		}else{
+			this.getList2();
+		}
+		
+		//监控下拉加载事件
+		var _this = this;
+		window.addEventListener('scroll', _this.handleScrool);
+	},
+	destroyed() {
+		//销毁监听事件
+		var _this = this;
+		window.removeEventListener('scroll', _this.handleScrool);
+	},
+	
+	}
 </script>
 
 <style src="$project/assets/css/iconfont.css"></style>