Bladeren bron

Merge remote-tracking branch 'origin/master'

wgl 4 jaren geleden
bovenliggende
commit
37fea6c91d

+ 26 - 20
src/assets/css/xpwyfyy.css

@@ -1379,22 +1379,11 @@ h3 {
 	border-radius: 0 0 2px 2px;
 }
 
-.vongi-wordcard-sp .mui-slider-group .mui-slider-item {
-	background: #ffffff;
-}
-
 .vongi-wordcard-sp .mui-slider .mui-segmented-control.mui-segmented-control-inverted .mui-control-item.mui-active {
 	background: 0;
 }
 
-.vongi-wordcard-sp .mui-slider .mui-segmented-control.mui-segmented-control-inverted .mui-control-item {
-	border-bottom: 2px solid #ffffff;
-}
 
-.vongi-wordcard-sp .mui-segmented-control.mui-scroll-wrapper,
-.vongi-wordcard-sp .mui-segmented-control.mui-scroll-wrapper .mui-scroll {
-	height: 46px;
-}
 
 .vongi-wordcard-sp .mui-media-object {
 	width: 42px;
@@ -1430,9 +1419,11 @@ h3 {
 .vongi-wordcard-sp .mui-input-row a {
 	color: #333;
 	display: block;
-	background: #eee;
+	background: #ffffff;
 	padding: 10px;
-	margin: 10px 10px 10px 50px
+	margin: 10px 10px 0 50px;
+	border-top-left-radius: 5px;
+	border-bottom-left-radius: 5px;
 }
 
 .vongi-wordcard-sp .mui-input-row a .mui-media-body {
@@ -1519,7 +1510,6 @@ h3 {
 .vongi-wordcard-sp .mui-slider-item .mui-btn-danger,
 .vongi-wordcard-sp .mui-slider-item .mui-btn-success {
 	padding: 2px 10px;
-	margin-right: 35px
 }
 
 .vongi-wordcard-sp .mui-slider-item .mui-h6 {
@@ -1538,8 +1528,7 @@ h3 {
 	border-radius: 4px;
 }
 
-.vongi-wordcard-sp .mui-table-view-cell:after,
-.vongi-wordcard-sp .mui-segmented-control.mui-scroll-wrapper .mui-scroll {
+.vongi-wordcard-sp .mui-table-view-cell:after{
 	background: 0
 }
 
@@ -1556,10 +1545,6 @@ h3 {
 	background-color: rgba(0, 0, 0, .8);
 }
 
-.vongi-wordcard-sp .mui-table-view-cell>a:not(.mui-btn) {
-	padding: 11px 0
-}
-
 .vongi-work .vongi-qingjia li {
 	margin-bottom: 10px
 }
@@ -4114,3 +4099,24 @@ h3 {
 .vongi-slot{
 	background:#ffffff
 }
+.vongi-wordcard-sp .vongi-cchai .mui-slider-item .mui-h6 {
+    margin-right: 0;
+}
+.vongi-cchai .mui-input-row p{
+	padding-right:0
+}
+.vongi-cchai .mui-btn{
+	width:auto;
+	padding:2px 10px;
+	line-height: inherit;
+	font-size:12px
+}
+.vongi-cchai .mui-btn-primary{
+	border: 1px solid #3385FF;
+}
+.vongi-cchai h4{
+	margin-bottom:10px
+}
+.vongi-cchai .mui-table-view-chevron .mui-table-view-cell > a:not(.mui-btn){
+	padding:15px
+}

+ 8 - 0
src/projects/business/apis/Guest/current.js

@@ -17,4 +17,12 @@ export function add(params) {
             "Content-Type": "application/json"
         }
     });
+}
+
+export function pageList(params) {
+    return request({
+        url: '/mobile/guestInfoRecordApi/currentPageList',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
 }

+ 9 - 0
src/projects/business/apis/Guest/from.js

@@ -44,4 +44,13 @@ export function add(params) {
             "Content-Type": "application/json"
         }
     });
+}
+
+export function approval(params) {
+
+    return request({
+        url: '/mobile/guestInfoRecordApi/approval',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
 }

+ 22 - 1
src/projects/business/router/guest.js

@@ -47,7 +47,17 @@ const routesGuest = [
 							role: [],
 							title: '访客详情',
 						}
-					},
+					},//访客审批
+                    {
+                        path: 'approval',
+                        name: 'GuestFromApproval',
+                        component: () => import('../views/Guest/From/Approval.vue'),
+                        meta: {
+                            requireAuth: false,
+                            role: [],
+                            title: '访客审批',
+                        }
+                    },
 
 				]
 			},
@@ -98,6 +108,17 @@ const routesGuest = [
 							title: '访客身份信息',
 						}
 					},
+                    //访客身份信息(注册)
+                    {
+                        path: 'list',
+                        name: 'GuestCurrentList',
+                        component: () => import('../views/Guest/Current/List.vue'),
+                        meta: {
+                            requireAuth: false,
+                            role: [],
+                            title: '访客列表',
+                        }
+                    },
 				]
 			},
 		],

+ 116 - 111
src/projects/business/views/Guest/Current/Info.vue

@@ -3,10 +3,10 @@
 	<green-code ref="greenCode"   @callBack="callBack"></green-code>
 
 
-	<header class="mui-bar mui-bar-nav" v-if="step==1">
-		<h1 class="mui-title">访客信息登记</h1>
-	</header>
-	<div class="mui-content margin60" v-if="step==1">
+
+    <top-header :pageTitle="pageTitle" ></top-header>
+
+    <div class="mui-content margin60" v-if="step==1">
 		<div class="mui-content-padded vongi-editme vongi-qingjiadt">
 			<form class="mui-input-group">
 				<div class="mui-input-row">
@@ -15,7 +15,7 @@
 
 				</div>
 				<div class="mui-input-row">
-					<label>手机号码<i class="colorfe616c">*</i></label>
+					<label>访客手机号码<i class="colorfe616c">*</i></label>
 					<input type="text" class="mui-input-clear" v-model="detail.mobilePhone" placeholder="请填写访客手机号码">
 
 				</div>
@@ -53,82 +53,98 @@
 		</div>
 	</div>
 	<div class="fyy-footer" v-if="step==1">
-		<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary " @click="stepNext()">下一步</button></div>
+		<div class="bindfyy-btn"><button type="submit" class="mui-btn mui-btn-primary " @click="insert()">提交审核</button></div>
 	</div>
-	<header class="mui-bar mui-bar-nav" v-if="step==2">
-		<h1 class="mui-title">扫码通行</h1>
-		<a class=" mui-icon mui-icon-left-nav mui-pull-left" @click="step='1'"></a>
-	</header>
-			<div class="mui-content"  v-if="step==2">
-				<div class="fyy-scon">
-					<div class="fyy-scon-top">
-						<div class="fyy-scon-head mui-col-xs-5">
-							<img src="~$project/assets/img/default_photo.png" alt="">
-						</div>
-						<div class="fyy-scon-det mui-col-xs-7">
-							<div class="fyy-scon-det-top">
-								<div class="fyy-scon-det-top-left">
-									姓名
-									<div class="mui-h3" v-text="detail.name"></div>
-								</div>
-								<div class="fyy-scon-det-top-right">
-									健康码
-									<a  @click="showGreenCode" class="mui-h3">绿码<span class="mui-icon iconfont icon-icon-"></span><span class="mui-icon mui-icon-arrowright"></span></a>
-								</div>
-							</div>
-							<div class="fyy-scon-det-down">
-								单位
-								<div class="mui-h3" v-text="detail.unit">湖北荆盛商贸有限公司</div>
-							</div>
-							<div class="fyy-scon-det-down">
-								手机号码
-								<div class="mui-h3" v-text="showphone(detail.mobilePhone)">155****8888</div>
-							</div>
-						</div>
-					</div>
-					<div class="fyy-scon-center mui-card">
-						<p>当前健康状态</p>
-						<form class="mui-input-group">
-							<div class="mui-input-row mui-radio mui-left">
-								<label>健康</label>
-								<input name="radio1" type="radio" checked>
-							</div>
-							<div class="mui-input-row mui-radio mui-left">
-								<label>≥37.3°C</label>
-								<input name="radio1" type="radio">
-							</div>
-						</form>
-					</div>
-				</div>
-				<div class="mui-card fyy-scon-bot">
-					<div class="fyy-scon-group">
-						<label>受访人</label>
-						<span>{{detail.intervieweeName}}  {{detail.intervieweePhone}}<a class="mui-icon mui-icon-phone" v-if="detail.intervieweePhone" :href="'tel:'+detail.intervieweePhone"></a></span>
-						
-					</div>
-					<div class="fyy-scon-group">
-						<label>核验地点</label>
-						<span>{{info.name}}</span>
-					</div>
-					<div class="fyy-scon-group">
-						<label>扫码时间</label>
-						<span>{{today()}}</span>
-					</div>
-					<div class="fyy-scon-group" v-if="detail.comeInTime">
-						<label>进入时间</label>
-						<span>{{detail.comeInTime}}</span>
-					</div>
-					<div class="fyy-scon-group" v-if="detail.outTime">
-						<label>离开时间</label>
-						<span>{{detail.outTime}}</span>
-					</div>
-				</div>
-				<div class="fyy-scon-botton">
-					<div class="examine-btn examine-btn1"  :class="detail.comeInTime&&!detail.outTime?'examine-btn1':'examine-btn3'"  @click="update(detail.comeInTime&&!detail.outTime)">离开</div>
-					<div class="examine-btn examine-btn2"  :class="!detail.comeInTime?'examine-btn2':'examine-btn3'"  @click="insert(!detail.comeInTime)" >进入</div>
-					<!--<div class="examine-btn examine-btn3">灰色按钮</div>-->
-				</div>
-			</div>
+
+    <div class="mui-content margin60 "   v-if="step==2"  >
+
+        <div class="mui-content-padded vongi-qingjiadt vongi-editme">
+            <form class="mui-input-group vongi-login-form">
+                <div class="mui-input-row">
+                    <label>审核状态</label>
+                    <span :class="statusColor[detail.status]" v-text="status[detail.status]"></span>
+                    <!--<span class="colorf8b155">待确认</span>
+                                <span class="color999">已过期</span>-->
+                </div>
+
+                <div class="mui-input-row">
+                    <label>创建时间</label>
+                    <span>{{detail.createTime}}</span>
+                </div>
+                <div class="mui-input-row" v-if="detail.confirmationTime">
+                    <label>审核时间</label>
+                    <span>{{detail.confirmationTime}} </span>
+                </div>
+
+            </form>
+        </div>
+
+        <div class="mui-content-padded vongi-qingjiadt">
+            <form class="mui-input-group">
+                <div class="mui-input-row">
+                    <label>访客姓名</label>
+                    <span>{{detail.name}}</span>
+                </div>
+                <div class="mui-input-row">
+                    <label>访客手机号码</label>
+                    <span>{{detail.mobilePhone}}</span>
+                </div>
+                <div class="mui-input-row">
+                    <label>身份证号</label>
+                    <span>{{detail.idCard}}</span>
+                </div>
+
+                <div class="mui-input-row">
+                    <label>访客单位</label>
+                    <span>{{detail.unit}}</span>
+                </div>
+                <div class="mui-input-row">
+                    <label>访问事由</label>
+                    <span>{{detail.visitReasons}}</span>
+                </div>
+                <div class="mui-input-row">
+                    <label>拜访时间</label>
+                    <span>{{detail.visitDate}}</span>
+                </div>
+
+
+                <div class="mui-input-row">
+                    <label>车牌号</label>
+                    <span>{{detail.numberPlate}}</span>
+                </div>
+            </form>
+        </div>
+        <div class="mui-content-padded vongi-qingjiadt vongi-editme">
+            <form class="mui-input-group vongi-login-form">
+                <div class="mui-input-row">
+                    <label>受访人</label>
+                    <span>{{detail.intervieweeName}}</span>
+                </div>
+                <div class="mui-input-row">
+                    <label>受访手机号码</label>
+                    <span>{{detail.intervieweePhone}}</span>
+                </div>
+            </form>
+        </div>
+
+
+
+        <div class="mui-content-padded vongi-qingjiadt vongi-editme" v-if="detail.status==1">
+            <form class="mui-input-group vongi-login-form">
+
+                <div class="mui-input-row" v-if="detail.comeInTime">
+                    <label>进入时间</label>
+                    <span>{{detail.comeInTime}}</span>
+                </div>
+                <div class="mui-input-row" v-if="detail.outTime">
+                    <label>离开时间</label>
+                    <span>{{detail.outTime}} </span>
+                </div>
+
+            </form>
+        </div>
+
+    </div>
 
 	<loading :visible="isLoading"></loading>
 
@@ -161,21 +177,23 @@
 		},
 		data() {
 			return {
-				pageTitle: '扫码通行',
+				pageTitle: '访客信息登记',
 				detail: {
 
 				},
-				info:{},
 
+                currentId:this.$route.query.currentId,
 				id:this.$route.query.id,
 				step:'1',
 				isLoading: false,
 				lineColor: '#e5aa37',
-				statusColor: '#e5aa37',
-				statusTitleColor: '#d39d33',
+ 				statusTitleColor: '#d39d33',
 				statusName: '异常',
+                status: ['待确认', '已通过', '待审核','已过期','未通过'],
+                statusColor: ['colorf8b155', 'color55f868','colorf8b155','color999', 'colorfe616c'],
+
 
-			}
+            }
 		},
 		created() {
 
@@ -184,17 +202,15 @@
 			showGreenCode(){
  				this.$refs.greenCode.showGreenCode();
 			},
-			insert(bl){
-				if(bl){
-					this.detail.openId=this.openId;
-					this.detail.comeInTime=parseUnixTime(currentTimeStamp());
-					this.detail.visitDate=parseUnixTime(currentTimeStamp());
-					this.detail.createTime=parseUnixTime(currentTimeStamp());
+			insert(){
+                this.detail.openId=this.openId;
+                //this.detail.comeInTime=parseUnixTime(currentTimeStamp());
+                this.detail.visitDate=parseUnixTime(currentTimeStamp());
+                this.detail.createTime=parseUnixTime(currentTimeStamp());
 
-					this.detail.status=0;
-					this.detail.temperature=36;
-					this.save();
-				}
+                this.detail.status=2;
+               // this.detail.temperature=36;
+                this.save();
 			},
 			update(bl){
 				if(bl){
@@ -211,8 +227,8 @@
 				API_Current.add(this.detail).then(response => {
 					this.isLoading = false;
 					this.detail=response;
-					mui.toast("操作成功,请将此页面展示给工作人员");
-
+					mui.toast("提交成功,请等待受访者审批");
+                    this.$router.go(-1);
 				}).catch(error => {
 					this.isLoading = false;
 					mui.toast(error);
@@ -269,11 +285,10 @@
 			getDetail() {
 				this.isLoading = true;
 
-				API_Current.info({qrcode:this.id,openId:this.openId }).then(response => {
+				API_Current.info({qrcode:this.id,openId:this.openId,id:this.currentId }).then(response => {
 					this.isLoading = false;
 
-					this.detail = response.data;
-					this.info = response.info;
+					this.detail = response;
 
 					if(this.detail.id){
 						this.step='2';
@@ -286,15 +301,7 @@
 			},asynCallBack(){},
 		},
 		mounted() {
-
-			if(!this.openId){
-				mui.toast("请先关注【小鹏管家】")
-			}else if(!this.id){
-				mui.toast("请通过扫描二维码访问本页面")
-
-			}else  if(this.id&&this.openId){
-				this.getDetail();
-			}
+            this.getDetail();
 		},
 		destroyed() {
 
@@ -303,8 +310,6 @@
 			...mapGetters({
 				openId: 'wx_openid',
 				token: 'token',
-				person_data: 'person_data',
-				person_popedom: 'person_popedom',
 			})
 		}
 	}

+ 178 - 0
src/projects/business/views/Guest/Current/List.vue

@@ -0,0 +1,178 @@
+<template>
+<div>
+    <header class="mui-bar mui-bar-nav" >
+        <h1 class="mui-title">拜访申请记录</h1>
+    </header>
+		<div class="mui-content margin60">
+			<template v-for="item in recordList">
+				<div class="mui-content-padded" >
+
+					<ul class="mui-table-view fyy-view" @click="detail(item)">
+                        <li class="mui-table-view-cell"  >
+                            <div>{{item.unit}}</div>
+                        </li>
+                        <li class="mui-table-view-cell" >
+							<label>受  访 人:</label>
+							<span>{{item.name}}<span class="mui-pull-right " :class="statusColor[item.status]">{{status[item.status]}}</span></span>
+						</li>
+                        <li class="mui-table-view-cell"  >
+                            <label>拜访时间:</label>
+                            <span>{{item.visitDate}}</span>
+                        </li>
+						<li class="mui-table-view-cell"  >
+							<label>拜访事由:</label>
+							<span>{{item.visitReasons}}</span>
+						</li>
+
+
+					</ul>
+
+				</div>
+
+			</template>
+
+
+		</div>
+	<NullList :remark="'暂无拜访记录'" v-if="!recordList.length"></NullList>
+
+	<div class="fyy-footer" v-if="id">
+			<div class="bindfyy-btn">
+				<button type="button" class="mui-btn mui-btn-primary " @click="save">
+                    我要拜访
+				</button>
+			</div>
+	</div>
+	<loading :visible="isLoading"></loading>
+
+</div>
+</template>
+
+
+<script>
+    import * as API_Current from '@/apis/Guest/current'
+	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 NullList from '$project/components/NullList.vue'
+
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	export default {
+		name: 'GuestFromList',
+		components: {
+			Common,
+			Loading,
+			TopHeader,NullList
+		},
+		data() {
+			return {
+				pageTitle: '申请记录',
+
+				isLoading: false,
+                id:this.$route.query.id,
+				listForm: {
+					pageIndex: 1,
+					pageSize: 20,
+					//	token: '',
+					totalPage: 1,
+					result: 0,
+				},
+				recordList: [],
+                status: ['待确认', '已通过', '待审核','已过期','未通过'],
+                statusColor: ['colorf8b155', 'color55f868','colorf8b155','color999', 'colorfe616c'],routeName: "Master",
+			}
+		},
+		created() {
+
+		},
+		methods: {
+			//info
+
+			detail(mod) {
+ 				 this.$router.push({
+					name: "GuestCurrentInfo",
+					query: {
+                        currentId: mod.id,
+					}
+				})
+			},
+			save() {
+			    if(this.id){
+                    this.$router.push({
+                        name: 'GuestCurrentInfo',
+                        query: {
+                            id:this.id
+                        }
+                    })
+                }else{
+                    mui.toast("请通过扫描园区二维码,进行访客登记");
+                }
+
+			},
+			//获取列表
+			getList() {
+				this.isLoading = true;
+                this.listForm.openId=this.openId;
+                API_Current.pageList(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;
+						} 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.listForm.pageIndex <= this.listForm.totalPage && this.isLoading == false) {
+						this.getList();
+					} else {
+						return;
+					}
+				}
+			},
+
+			asynCallBack() {
+
+			},
+		},
+		mounted() {
+			this.getList();
+			//监控下拉加载事件
+			var _this = this;
+			window.addEventListener('scroll', _this.handleScrool);
+		},
+		destroyed() {
+			//销毁监听事件
+			var _this = this;
+			window.removeEventListener('scroll', _this.handleScrool);
+		},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+			})
+		},
+
+	}
+</script>
+
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style>
+</style>

+ 192 - 0
src/projects/business/views/Guest/From/Approval.vue

@@ -0,0 +1,192 @@
+<template>
+    <div>
+
+
+        <common @asynCallBack="asynCallBack"></common>
+        <header class="mui-bar mui-bar-nav" >
+            <h1 class="mui-title">访客申请</h1>
+        </header>
+        <div class="mui-content margin60 "    >
+            <div class="mui-content-padded vongi-qingjiadt">
+
+                <form class="mui-input-group">
+                    <div class="mui-input-row">
+                        <label>访客单位</label>
+                        <span>{{detail.unit}}</span>
+                    </div>
+                    <div class="mui-input-row">
+                        <label>访客名称</label>
+                        <span>{{detail.name}}</span>
+                    </div>
+                    <div class="mui-input-row">
+                        <label>访客手机号码</label>
+                        <span>{{detail.mobilePhone}}</span>
+                    </div>
+                    <div class="mui-input-row">
+                        <label>身份证号</label>
+                        <span>{{detail.idCard}}</span>
+                    </div>
+
+
+                    <div class="mui-input-row">
+                        <label>来访事由</label>
+                        <span>{{detail.visitReasons}}</span>
+                    </div>
+                    <div class="mui-input-row">
+                        <label>来访时间</label>
+                        <span>{{detail.visitDate}}</span>
+                    </div>
+
+
+                    <div class="mui-input-row">
+                        <label>车牌号</label>
+                        <span>{{detail.numberPlate}}</span>
+                    </div>
+                </form>
+            </div>
+            <div class="mui-content-padded vongi-qingjiadt vongi-editme">
+                <form class="mui-input-group vongi-login-form">
+                    <div class="mui-input-row">
+                        <label>审核状态</label>
+                        <span :class="statusColor[detail.status]" v-text="status[detail.status]"></span>
+
+                    </div>
+
+                    <div class="mui-input-row" v-if="detail.confirmationTime">
+                        <label>审核时间</label>
+                        <span>{{detail.confirmationTime}} </span>
+                    </div>
+                </form>
+            </div>
+
+
+
+
+        </div>
+
+
+        <div v-if="detail.status=='2'" class="fyy-scon-botton">
+            <div class="examine-btn examine-btn1" @click="openFrom('4')">拒绝</div>
+            <div class="examine-btn examine-btn2" @click="openFrom('1')">通过</div>
+        </div>
+        <loading :visible="isLoading"></loading>
+
+    </div>
+</template>
+
+
+<script>
+
+    import * as API_From from '@/apis/Guest/from'
+    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'
+    import {
+        currentTimeStamp,
+        parseUnixTime
+    } from '$project/utils'
+    export default {
+        name: 'GuestFromInfo',
+        components: {
+            Common,
+            Loading,
+            TopHeader
+        },
+        data() {
+            return {
+                pageTitle: '访客申请',
+                step:'1',
+                id: '',
+                detail: {
+                    id:'',
+                    name:'',
+                    mobilePhone:'',
+                    unit:'',
+                    visitReasons:'',
+
+                    visitDate: '请选择',
+                    expirationTime: '请选择',
+                    issueDevice: '',
+                    isUpPhoto:1,
+                },
+                list:[],
+                isLoading: false,
+
+                status: ['待确认', '已通过', '待审核','已过期','已拒绝'],
+                statusColor: ['colorf8b155', 'color55f868','colorf8b155','color999', 'colorfe616c'],
+            }
+        },
+        created() {
+            this.id = this.$route.query.id;
+        },
+        methods:  {
+            openFrom(status){
+
+               var  _this=this;
+                var btnArray = ['取消', '确认'];
+                mui.confirm(status=='1'?'是否确认通过本次访客申请':'是否确认拒绝本次访客申请', '确认', btnArray, function(e) {
+                        if (e.index == 1) {
+                            _this.isLoading = true;
+
+                            API_From.approval({id:_this.id,status:status}).then(response => {
+                                _this.isLoading = false;
+
+                                _this.detail=response ;
+
+                            }).catch(error => {
+                                _this.isLoading = false;
+                                mui.toast(error);
+                            })
+                        }
+                })
+
+            },
+
+
+
+            //获取详情
+            getDetail() {
+                this.isLoading = true;
+
+                API_From.getDetail(this.id ).then(response => {
+                    this.isLoading = false;
+                    this.detail = response.info;
+                    this.list=response.list;
+                }).catch(error => {
+                    this.isLoading = false;
+                    mui.toast(error);
+                })
+            },asynCallBack(){},
+        },
+        mounted() {
+            if(this.id){
+                this.detail.id=this.id;
+                this.getDetail();
+            }
+
+
+        },
+
+
+        destroyed() {
+
+        },
+        computed: {
+            ...mapGetters({
+                openId: 'wx_openid',
+                token: 'token',
+                person_data: 'person_data',
+                person_popedom: 'person_popedom',
+            })
+        }
+    }
+</script>
+
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
+<style>
+</style>

+ 3 - 4
src/projects/business/views/Guest/From/Info.vue

@@ -39,7 +39,7 @@
             <label>邀访时间</label>
             <span>{{detail.visitDate}}</span>
           </div>
-          <div class="mui-input-row">
+          <div class="mui-input-row" v-if="detail.expirationTime">
             <label>结束时间</label>
             <span>{{detail.expirationTime}}</span>
           </div>
@@ -178,9 +178,8 @@
         list:[],
         isLoading: false,
 
-        status: ['待确认', '已确认', '已拒绝','已过期'],
-        statusColor: ['colorf8b155', 'color55f868', 'colorfe616c','color999'],
-
+          status: ['待确认', '已确认', '待确认','已过期','已拒绝'],
+          statusColor: ['colorf8b155', 'color55f868','colorf8b155','color999', 'colorfe616c'],
       }
     },
     created() {

+ 2 - 3
src/projects/business/views/Guest/From/List.vue

@@ -80,9 +80,8 @@
 					result: 0,
 				},
 				recordList: [],
-				status: ['待确认', '已确认', '已拒绝','已过期'],
-				statusColor: ['colorf8b155', 'color55f868', 'colorfe616c','color999'],
-				routeName: "Master",
+                status: ['待确认', '已确认', '待确认','已过期','已拒绝'],
+                statusColor: ['colorf8b155', 'color55f868','colorf8b155','color999', 'colorfe616c'],		routeName: "Master",
 			}
 		},
 		created() {

+ 74 - 1
src/projects/business/views/Master/BusinessTravel/VerifyInfo.vue

@@ -1,6 +1,79 @@
 <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>
+		<div class="mui-content vongi-wordcard">
+			<div class="mui-content-padded vongi-wordcard-top">
+				<div class="mui-media-object mui-pull-left">
+					<img src="~$project/assets/img/zhaop1.jpg">
+				</div>
+				<div class="mui-media-body">
+					冯银银
+					<p class='mui-ellipsis'><span class="color4fc5f7">出差</span>申请</p>
+				</div>
+				<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined">
+					待处理
+				</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>出差</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">所在部门</div>
+						<span>信息工程中心</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">出差地点</div>
+						<span>湖南长沙</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">出差时间</div>
+						<span>2020-04-19</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">预估天数</div>
+						<span>2天</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">出差事由</div>
+						<span>去长沙沟通设备调试问题</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">申请单编号</div>
+						<span>00000000</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">申请时间</div>
+						<span>2020-11-26 09:00</span>
+					</li>
+				</ul>
+			</div>
+			<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</h4>
+						<p>高进权 <span class="color4fc5f7">待处理</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>
+			<div class="fyy-scon-botton">
+				<div class="examine-btn examine-btn1">拒绝</div>
+				<div class="examine-btn examine-btn2">通过</div>
+			</div>
+		</div>
 </div>
 </template>
 

+ 99 - 1
src/projects/business/views/Master/BusinessTravel/VerifyList.vue

@@ -1,6 +1,104 @@
 <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>
+		<div class="mui-content vongi-wordcard-sp">
+			<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>
+						<a class="mui-control-item" href="#item2mobile">
+							已处理
+						</a>
+					</div>
+				</div>
+				<div class="mui-slider-group vongi-cchai">
+					<div id="item1mobile" class="mui-slider-item mui-control-content mui-active">
+						<div id="scroll1" 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="">
+											<h4>赵刚的出差申请<span class="mui-h6 mui-pull-right">10-17</span></h4>
+											<p class='mui-ellipsis'>出差事由:去长沙沟通设备调试问题</p>
+											<p class='mui-ellipsis flew-items flew-sp'>
+												预估天数:2天
+												<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined">审批中</button>
+											</p>
+										</a>
+										<input name="checkbox" value="Item 1" type="checkbox" checked>
+									</div>
+									<div class="mui-input-row mui-checkbox mui-left">
+										<a href="">
+											<h4>赵刚的出差申请<span class="mui-h6 mui-pull-right">10-17</span></h4>
+											<p class='mui-ellipsis'>出差事由:去长沙沟通设备调试问题</p>
+											<p class='mui-ellipsis flew-items flew-sp'>
+												预估天数:2天
+												<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined">审批中</button>
+											</p>
+										</a>
+										<input name="checkbox" value="Item 1" type="checkbox">
+									</div>
+									<div class="mui-input-row mui-checkbox mui-left">
+										<a href="">
+											<h4>赵刚的出差申请<span class="mui-h6 mui-pull-right">10-17</span></h4>
+											<p class='mui-ellipsis'>出差事由:去长沙沟通设备调试问题</p>
+											<p class='mui-ellipsis flew-items flew-sp'>
+												预估天数:2天
+												<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined">审批中</button>
+											</p>
+										</a>
+										<input name="checkbox" value="Item 1" type="checkbox">
+									</div>
+								</form>
+							</div>
+						</div>
+					</div>
+					<div id="item2mobile" class="mui-slider-item mui-control-content">
+						<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>赵刚的出差申请<span class="mui-h6 mui-pull-right">10-17</span></h4>
+											<p class='mui-ellipsis'>出差事由:去长沙沟通设备调试问题</p>
+											<p class='mui-ellipsis flew-items flew-sp'>
+												预估天数:2天
+												<button type="button" class="mui-btn mui-btn-success mui-btn-outlined">已通过</button>
+											</p>
+										</a>
+									</li>
+									<li class="mui-table-view-cell mui-media">
+										<a href="">
+											<h4>赵刚的出差申请<span class="mui-h6 mui-pull-right">10-17</span></h4>
+											<p class='mui-ellipsis'>出差事由:去长沙沟通设备调试问题去长沙沟通设备调试问题去长沙沟通设备调试问题</p>
+											<p class='mui-ellipsis flew-items flew-sp'>
+												预估天数:2天
+												<button type="button" class="mui-btn mui-btn-danger mui-btn-outlined">已拒绝</button>
+											</p>
+										</a>
+									</li>
+								</ul>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="fyy-bindfyy-btn">
+				<form class="mui-input-group">
+					<div class="mui-input-row mui-checkbox mui-left">
+						<label>全选</label>
+						<input name="checkbox" value="Item 1" type="checkbox">
+					</div>
+				</form>
+				<button type="button" class="mui-btn mui-btn-danger">拒绝</button>
+				<button type="button" class="mui-btn mui-btn-success">同意</button>
+			</div>
+		</div>
 </div>
 </template>
 

+ 74 - 1
src/projects/business/views/Master/Egress/VerifyInfo.vue

@@ -1,6 +1,79 @@
 <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>
+		<div class="mui-content vongi-wordcard">
+			<div class="mui-content-padded vongi-wordcard-top">
+				<div class="mui-media-object mui-pull-left">
+					<img src="~$project/assets/img/zhaop1.jpg">
+				</div>
+				<div class="mui-media-body">
+					冯银银
+					<p class='mui-ellipsis'><span class="color4fc5f7">外出</span>申请</p>
+				</div>
+				<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined">
+					待处理
+				</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>外出</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">所在部门</div>
+						<span>信息工程中心</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">外出地点</div>
+						<span>湖南长沙</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">外出日期</div>
+						<span>2020-04-19</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">预估时长</div>
+						<span>2天</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">外出事由</div>
+						<span>去长沙沟通设备调试问题</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">申请单编号</div>
+						<span>00000000</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">申请时间</div>
+						<span>2020-11-26 09:00</span>
+					</li>
+				</ul>
+			</div>
+			<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</h4>
+						<p>高进权 <span class="color4fc5f7">待处理</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>
+			<div class="fyy-scon-botton">
+				<div class="examine-btn examine-btn1">拒绝</div>
+				<div class="examine-btn examine-btn2">通过</div>
+			</div>
+		</div>
 </div>
 </template>
 

+ 99 - 1
src/projects/business/views/Master/Egress/VerifyList.vue

@@ -1,6 +1,104 @@
 <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>
+		<div class="mui-content vongi-wordcard-sp">
+			<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>
+						<a class="mui-control-item" href="#item2mobile">
+							已处理
+						</a>
+					</div>
+				</div>
+				<div class="mui-slider-group vongi-cchai">
+					<div id="item1mobile" class="mui-slider-item mui-control-content mui-active">
+						<div id="scroll1" 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="">
+											<h4>赵刚的外出申请<span class="mui-h6 mui-pull-right">10-17</span></h4>
+											<p class='mui-ellipsis'>外出事由:去长沙沟通设备调试问题</p>
+											<p class='mui-ellipsis flew-items flew-sp'>
+												预估时长:2天
+												<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined">审批中</button>
+											</p>
+										</a>
+										<input name="checkbox" value="Item 1" type="checkbox" checked>
+									</div>
+									<div class="mui-input-row mui-checkbox mui-left">
+										<a href="">
+											<h4>赵刚的外出申请<span class="mui-h6 mui-pull-right">10-17</span></h4>
+											<p class='mui-ellipsis'>外出事由:去长沙沟通设备调试问题</p>
+											<p class='mui-ellipsis flew-items flew-sp'>
+												预估时长:2天
+												<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined">审批中</button>
+											</p>
+										</a>
+										<input name="checkbox" value="Item 1" type="checkbox">
+									</div>
+									<div class="mui-input-row mui-checkbox mui-left">
+										<a href="">
+											<h4>赵刚的外出申请<span class="mui-h6 mui-pull-right">10-17</span></h4>
+											<p class='mui-ellipsis'>外出事由:去长沙沟通设备调试问题</p>
+											<p class='mui-ellipsis flew-items flew-sp'>
+												预估时长:2天
+												<button type="button" class="mui-btn mui-btn-primary mui-btn-outlined">审批中</button>
+											</p>
+										</a>
+										<input name="checkbox" value="Item 1" type="checkbox">
+									</div>
+								</form>
+							</div>
+						</div>
+					</div>
+					<div id="item2mobile" class="mui-slider-item mui-control-content">
+						<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>赵刚的外出申请<span class="mui-h6 mui-pull-right">10-17</span></h4>
+											<p class='mui-ellipsis'>外出事由:去长沙沟通设备调试问题</p>
+											<p class='mui-ellipsis flew-items flew-sp'>
+												预估时长:2天
+												<button type="button" class="mui-btn mui-btn-success mui-btn-outlined">已通过</button>
+											</p>
+										</a>
+									</li>
+									<li class="mui-table-view-cell mui-media">
+										<a href="">
+											<h4>赵刚的外出申请<span class="mui-h6 mui-pull-right">10-17</span></h4>
+											<p class='mui-ellipsis'>外出事由:去长沙沟通设备调试问题去长沙沟通设备调试问题去长沙沟通设备调试问题</p>
+											<p class='mui-ellipsis flew-items flew-sp'>
+												预估时长:2天
+												<button type="button" class="mui-btn mui-btn-danger mui-btn-outlined">已拒绝</button>
+											</p>
+										</a>
+									</li>
+								</ul>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="fyy-bindfyy-btn">
+				<form class="mui-input-group">
+					<div class="mui-input-row mui-checkbox mui-left">
+						<label>全选</label>
+						<input name="checkbox" value="Item 1" type="checkbox">
+					</div>
+				</form>
+				<button type="button" class="mui-btn mui-btn-danger">拒绝</button>
+				<button type="button" class="mui-btn mui-btn-success">同意</button>
+			</div>
+		</div>
 </div>
 </template>
 

+ 5 - 1
src/projects/business/views/Master/Guest/List.vue

@@ -39,7 +39,9 @@
 
 
 <script>
-	import * as API_Guest from '@/apis/Master/guest'
+    require('$project/assets/js/mui.picker.min.js');
+
+    import * as API_Guest from '@/apis/Master/guest'
 	import Common from '$project/components/Common.vue'
 	import Loading from '$project/components/Loading.vue'
 	import TopHeader from '$project/components/TopHeader.vue'
@@ -187,5 +189,7 @@
 </script>
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/mui.picker.min.css"></style>
+
 <style>
 </style>

+ 56 - 0
src/projects/home/apis/from.js

@@ -0,0 +1,56 @@
+import request from '@/utils/request'
+import Qs from 'qs';
+
+//
+export function pageList(params) {
+    return request({
+        url: '/mobile/guestInfoRecordApi/pageList',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
+}
+
+//获取设备列表
+export function getDeviceList() {
+    return request({
+        url: '/mobile/guestInfoRecordApi/deviceList',
+        data: Qs.stringify({}),
+        method: 'post',
+    })
+}
+
+//访客离开操作
+export function out(params) {
+    return request.post( '/mobile/guestInfoRecordApi/out', params,{
+        headers: {
+            "Content-Type": "application/json"
+        }
+    });
+}
+
+
+//访客记录详情
+export function getDetail(id) {
+    return request({
+        url: '/mobile/guestInfoRecordApi/get/'+id,
+        //data: Qs.stringify({id:id}),
+        method: 'get',
+    })
+}
+//添加访客记录
+export function add(params) {
+    return request.post('/mobile/guestInfoRecordApi/add', params,{
+        headers: {
+            "Content-Type": "application/json"
+        }
+    });
+}
+
+export function approval(params) {
+
+    return request({
+        url: '/mobile/guestInfoRecordApi/approval',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
+}

+ 18 - 0
src/projects/home/router/index.js

@@ -58,7 +58,25 @@ const routes = [
 			},
 		]
 	},
+//邀请者
+    {
+        path: '/guest',
+        component: () => import('../views/Layout.vue'),
+        children: [
+           //访客审批
+            {
+                path: 'approval',
+                name: 'GuestApproval',
+                component: () => import('../views/Guest/Approval.vue'),
+                meta: {
+                    requireAuth: false,
+                    role: [],
+                    title: '访客审批',
+                }
+            },
 
+        ]
+    },
 
 	//微信页面
 	{

+ 192 - 0
src/projects/home/views/Guest/Approval.vue

@@ -0,0 +1,192 @@
+<template>
+    <div>
+
+
+        <common @asynCallBack="asynCallBack" :projectCheck="false"></common>
+        <header class="mui-bar mui-bar-nav" >
+            <h1 class="mui-title">访客申请</h1>
+        </header>
+        <div class="mui-content margin60 "    >
+            <div class="mui-content-padded vongi-qingjiadt">
+
+                <form class="mui-input-group">
+                    <div class="mui-input-row">
+                        <label>访客单位</label>
+                        <span>{{detail.unit}}</span>
+                    </div>
+                    <div class="mui-input-row">
+                        <label>访客名称</label>
+                        <span>{{detail.name}}</span>
+                    </div>
+                    <div class="mui-input-row">
+                        <label>访客手机号码</label>
+                        <span>{{detail.mobilePhone}}</span>
+                    </div>
+                    <div class="mui-input-row">
+                        <label>身份证号</label>
+                        <span>{{detail.idCard}}</span>
+                    </div>
+
+
+                    <div class="mui-input-row">
+                        <label>来访事由</label>
+                        <span>{{detail.visitReasons}}</span>
+                    </div>
+                    <div class="mui-input-row">
+                        <label>来访时间</label>
+                        <span>{{detail.visitDate}}</span>
+                    </div>
+
+
+                    <div class="mui-input-row">
+                        <label>车牌号</label>
+                        <span>{{detail.numberPlate}}</span>
+                    </div>
+                </form>
+            </div>
+            <div class="mui-content-padded vongi-qingjiadt vongi-editme">
+                <form class="mui-input-group vongi-login-form">
+                    <div class="mui-input-row">
+                        <label>审核状态</label>
+                        <span :class="statusColor[detail.status]" v-text="status[detail.status]"></span>
+
+                    </div>
+
+                    <div class="mui-input-row" v-if="detail.confirmationTime">
+                        <label>审核时间</label>
+                        <span>{{detail.confirmationTime}} </span>
+                    </div>
+                </form>
+            </div>
+
+
+
+
+        </div>
+
+
+        <div v-if="detail.status=='2'" class="fyy-scon-botton">
+            <div class="examine-btn examine-btn1" @click="openFrom('4')">拒绝</div>
+            <div class="examine-btn examine-btn2" @click="openFrom('1')">通过</div>
+        </div>
+        <loading :visible="isLoading"></loading>
+
+    </div>
+</template>
+
+
+<script>
+
+    import * as API_From from '@/apis/from'
+    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'
+    import {
+        currentTimeStamp,
+        parseUnixTime
+    } from '$project/utils'
+    export default {
+        name: 'GuestFromInfo',
+        components: {
+            Common,
+            Loading,
+            TopHeader
+        },
+        data() {
+            return {
+                pageTitle: '访客申请',
+                step:'1',
+                id: '',
+                detail: {
+                    id:'',
+                    name:'',
+                    mobilePhone:'',
+                    unit:'',
+                    visitReasons:'',
+
+                    visitDate: '请选择',
+                    expirationTime: '请选择',
+                    issueDevice: '',
+                    isUpPhoto:1,
+                },
+                list:[],
+                isLoading: false,
+
+                status: ['待确认', '已通过', '待审核','已过期','已拒绝'],
+                statusColor: ['colorf8b155', 'color55f868','colorf8b155','color999', 'colorfe616c'],
+            }
+        },
+        created() {
+            this.id = this.$route.query.id;
+        },
+        methods:  {
+            openFrom(status){
+
+               var  _this=this;
+                var btnArray = ['取消', '确认'];
+                mui.confirm(status=='1'?'是否确认通过本次访客申请':'是否确认拒绝本次访客申请', '确认', btnArray, function(e) {
+                        if (e.index == 1) {
+                            _this.isLoading = true;
+
+                            API_From.approval({id:_this.id,status:status}).then(response => {
+                                _this.isLoading = false;
+
+                                _this.detail=response ;
+
+                            }).catch(error => {
+                                _this.isLoading = false;
+                                mui.toast(error);
+                            })
+                        }
+                })
+
+            },
+
+
+
+            //获取详情
+            getDetail() {
+                this.isLoading = true;
+
+                API_From.getDetail(this.id ).then(response => {
+                    this.isLoading = false;
+                    this.detail = response.info;
+                    this.list=response.list;
+                }).catch(error => {
+                    this.isLoading = false;
+                    mui.toast(error);
+                })
+            },asynCallBack(){},
+        },
+        mounted() {
+            if(this.id){
+                this.detail.id=this.id;
+                this.getDetail();
+            }
+
+
+        },
+
+
+        destroyed() {
+
+        },
+        computed: {
+            ...mapGetters({
+                openId: 'wx_openid',
+                token: 'token',
+                person_data: 'person_data',
+                person_popedom: 'person_popedom',
+            })
+        }
+    }
+</script>
+
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
+<style>
+</style>