Merge remote-tracking branch 'origin/master'

src/projects/business/apis/Master/Property/car.js

@@ -1,6 +1,15 @@
 import request from '@/utils/request'
 import Qs from 'qs';
 
+
+//申请
+export function ParkingApplicationDetail(params) {
+	return request({
+		url: '/mobile/personInfoApi/ParkingApplicationDetail',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}
 //申请
 export function submitParkingApply(params) {
 	return request({

src/projects/business/views/Master/Property/Car/Apply.vue

@@ -1,8 +1,44 @@
 <template>
 <div>
- 	<top-header :pageTitle="pageTitle"   v-if="step==1"  ></top-header>
-
+	<common ref="common" @asynCallBack="asynCallBack"></common>
+
+	<top-header :pageTitle="pageTitle"   v-if="step==3"  ></top-header>
+	<div class="mui-content" v-if="step==3" >
+		<div class="mui-content-padded vongi-editme vongi-qingjiadt">
+			<form class="mui-input-group">
+				<div class="mui-input-row">
+					<label>业主姓名</label>
+					<span>{{info.applicationName}}</span>
+				</div>
+				<div class="mui-input-row">
+					<label>手机号码</label>
+					<span class="color4fc5f7">{{info.telephone}}</span>
+				</div>
 
+				<div class="mui-input-row">
+					<label>车牌号</label>
+					<span>{{info.carNum}}</span>
+				</div>
+			</form>
+		</div>
+		<div class="mui-content-padded vongi-editme vongi-qingjiadt">
+			<form class="mui-input-group">
+				<div class="mui-input-row">
+					<label>申请车位</label>
+					<span>{{info.parkingName}}</span>
+				</div>
+				<div class="mui-input-row">
+					<label style="width:40%">租用起止时间</label>
+					<span style="width:60%">{{info.rentTime}}</span>
+				</div>
+				<div class="mui-input-row">
+					<label>租用时长</label>
+					<span>{{info.contractDuration}}</span>
+				</div>
+			</form>
+		</div>
+	</div>
+	<top-header :pageTitle="pageTitle"   v-if="step==1"  ></top-header>
 		<div class="mui-content"  v-if="step==1" >
 			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
 				<form class="mui-input-group">
@@ -125,7 +161,7 @@
 			return {
 				pageTitle: '车位申请',
 				step:'1',
-
+				info:{},
 				detail: {
 					carNum:'',
 					parkingId:'',
@@ -143,7 +179,7 @@
 				listcenindex:0,
 				selectName:'',
 				parkingId:'',
-				car:null,
+
 
 			}
 		},
@@ -154,11 +190,11 @@
 			okCar(){
 				this.detail.parkingId=this.parkingId;
 				this.carName=this.selectName
-				this.detail.parkingName=this.car.parkingName;
+				this.detail.parkingName=this.selectName
 				this.step='1';
 			},
 			ckbtn(m,i,cen){
-				this.car=m;
+
 				this.listcen.splice(i+1,this.listcen.length-i+1);
  				this.getSelect(m.id);
 				m.show=true;
@@ -220,6 +256,9 @@
 
 					API.submitParkingApply(this.detail ).then(response => {
 						this.isLoading = false;
+						this.$router.push({
+							name: 'Master',
+						})
 						mui.toast("操作成功");
 					}).catch(error => {
 						this.isLoading = false;
@@ -325,6 +364,16 @@
 					this.isLoading = false;
 					if(response.id){
 						this.issubmit=false;
+						this.isLoading = true;
+
+						API.ParkingApplicationDetail({id:response.id}).then(info => {
+							this.isLoading = false;
+							this.step=3;
+							this.info=info;
+						}).catch(error => {
+							this.isLoading = false;
+							mui.toast(error);
+						})
 						mui.toast("您已有一条待处理的车位申请记录");
 					}
 				}).catch(error => {