外出登记修改

src/projects/business/apis/Master/business_travel.js

@@ -72,3 +72,12 @@ export function businessOutEnd(id) {
 		method: 'post',
 	})
 }
+
+//添加备注
+export function addRemark(params) {
+	return request({
+		url: '/mobile/businessOutApiController/addRemarkForBusinessOut',
+		data: Qs.stringify(params),
+		method: 'post',
+	})
+}

src/projects/business/views/Master/Egress/Form.vue

@@ -35,7 +35,7 @@
 			<div class="mui-content-padded vongi-qingjiadt vongi-editme">
 				<form class="mui-input-group">
 					<div class="mui-input-row">
-						<label><i class="colorfe616c">*</i> 审批人</label>
+						<label><i class="colorfe616c">*</i> 通知人</label>
 						<button @click="selectPerson" class="mui-btn mui-btn-block mui-navigate-right mui-ellipsis" type='button' style="width:65%">
 							{{approvalPersonName}}
 						</button>

src/projects/business/views/Master/Egress/Info.vue

@@ -9,7 +9,7 @@
 					<div class="flew"><img :src="detail.faceImageUrl" width="50" v-viewer /></div>
 					<h4>{{detail.personName}} 申请 <span class="color4fc5f7" v-text="detail.typeN"></span></h4>
 				</div>
-				<button class="mui-btn  mui-btn-primary mui-btn-outlined" :style="getColor(detail.status)" v-text="detail.statusN"></button>
+				<button class="mui-btn  mui-btn-primary mui-btn-outlined" :style="getColor(detail.status)" v-text="detail.remark?'已批示':'未批示'"></button>
 			</div>
 			<form class="mui-input-group margin10">
 				<div class="mui-input-row">
@@ -44,6 +44,10 @@
 					<label>结束时间</label>
 					<span v-text="detail.endTime"></span>
 				</div>
+				<div v-if="detail.remark" class="mui-input-row">
+					<label>批示意见</label>
+					<span v-text="detail.remark"></span>
+				</div>
 			</form>
 			<div class="mui-content-padded">
 				<h5>审核记录</h5>
@@ -54,7 +58,7 @@
 						<label>审批人</label>
 						<span v-text="item.name"></span>
 					</div>
-					<div class="mui-input-row">
+					<div v-if="item.approvalContent" class="mui-input-row">
 						<label>审核意见</label>
 						<span v-text="item.approvalContent"></span>
 					</div>
@@ -68,6 +72,25 @@
 		<div v-if="wm && !detail.endTime" class="fyy-footer">
 			<div class="bindfyy-btn"><button type="button" @click="closeActoin" class="mui-btn mui-btn-danger">结束外出</button></div>
 		</div>
+
+		<div v-if="can_remark" class="fyy-scon-botton">
+			<div style="background-color: #3385FF;" class="examine-btn examine-btn1-blue" @click="openFromVisible=true">填写意见</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="remarkForm.remark" rows="5" placeholder="请输入"></textarea>
+				</div>
+			</div>
+			<div class="vongi-btn">
+				<button class="mui-btn mui-btn-primary" @click="addRemark">提交</button>
+			</div>
+		</div>
+
 		<loading :visible="isLoading"></loading>
 	</div>
 </template>
@@ -90,7 +113,7 @@
 		},
 		data() {
 			return {
-				pageTitle: '外出申请详情',
+				pageTitle: '外出登记详情',
 
 				isLoading: false,
 
@@ -101,6 +124,13 @@
 
 				//微信模板消息过来的
 				wm: this.$route.query.wm,
+
+				can_remark: this.$route.query.remark,
+				remarkForm: {
+					id: this.$route.query.id,
+					remark: ''
+				},
+				openFromVisible: false
 			}
 		},
 		created() {},
@@ -152,6 +182,24 @@
 					mui.toast(error);
 				})
 			},
+			//领导添加备注
+			addRemark() {
+				if (!this.remarkForm.remark) {
+					mui.toast('请填写意见');
+				} else {
+					this.isLoading = true;
+					API_BusinessTravel.addRemark(this.remarkForm).then(response => {
+						this.isLoading = false;
+
+						this.openFromVisible = false;
+						mui.toast('提交成功');
+						this.getInfo();
+					}).catch(error => {
+						this.isLoading = false;
+						mui.toast(error);
+					})
+				}
+			},
 			asynCallBack() {
 				//获取详情
 				this.getInfo();
@@ -172,5 +220,14 @@
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style src="$project/assets/css/iconfont.css"></style>
-<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/Egress/List.vue

@@ -26,7 +26,7 @@
 		<NullList :remark="'暂无申请记录'" v-if="!recordList.length"></NullList>
 		
 		<div class="fyy-footer">
-			<div class="bindfyy-btn"><button @click="goToForm" type="submit" class="mui-btn mui-btn-primary ">填写外出申请单</button></div>
+			<div class="bindfyy-btn"><button @click="goToForm" type="submit" class="mui-btn mui-btn-primary ">填写外出登记单</button></div>
 		</div>
 
 		<loading :visible="isLoading"></loading>
@@ -54,7 +54,7 @@
 		},
 		data() {
 			return {
-				pageTitle: '外出申请记录',
+				pageTitle: '外出登记记录',
 
 				isLoading: false,
 

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

@@ -27,7 +27,7 @@
 								<form class="mui-input-group fyy-checkbox">
 									<div v-for="(item,index) in recordList" class="mui-input-row mui-checkbox mui-left">
 										<router-link :to="{name:'MasterEgressVerifyInfo',query:{id:item.id}}">
-											<h4>{{item.personName}}的外出申请<span class="mui-h6 mui-pull-right" v-text="item.startTime.substr(5)"></span></h4>
+											<h4>{{item.personName}}的外出登记<span class="mui-h6 mui-pull-right" v-text="item.startTime.substr(5)"></span></h4>
 											<p class='mui-ellipsis'>外出事由:{{item.content}}</p>
 											<p class='mui-ellipsis flew-items flew-sp'>
 												预估时长:{{item.estimatedTime}}小时
@@ -47,7 +47,7 @@
 								<ul class="mui-table-view mui-table-view-chevron">
 									<li v-for="(item,index) in recordList" class="mui-table-view-cell mui-media">
 										<router-link :to="{name:'MasterEgressVerifyInfo',query:{id:item.id}}">
-											<h4>{{item.personName}}的外出申请<span class="mui-h6 mui-pull-right" v-text="item.startTime.substr(5)"></span></h4>
+											<h4>{{item.personName}}的外出登记<span class="mui-h6 mui-pull-right" v-text="item.startTime.substr(5)"></span></h4>
 											<p class='mui-ellipsis'>外出事由:{{item.content}}</p>
 											<p class='mui-ellipsis flew-items flew-sp'>
 												预估时长:{{item.estimatedTime}}小时