外出返回填写外出办理结果说明

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

@@ -63,12 +63,10 @@ export function verifyList(params) {
 }
 
 //出差结束
-export function businessOutEnd(id) {
+export function businessOutEnd(params) {
 	return request({
 		url: '/mobile/businessOutApiController/businessOutEnd',
-		data: Qs.stringify({
-			id: id
-		}),
+		data: Qs.stringify(params),
 		method: 'post',
 	})
 }
@@ -80,4 +78,4 @@ export function addRemark(params) {
 		data: Qs.stringify(params),
 		method: 'post',
 	})
-}
+}

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

@@ -70,9 +70,22 @@
 			</form>
 		</div>
 		<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 class="bindfyy-btn"><button type="button" @click="openCloseFromVisible=true" class="mui-btn mui-btn-danger">结束外出</button></div>
 		</div>
 
+		<!-- 审批弹窗 -->
+		<div v-show="openCloseFromVisible" class="mui-popup mui-popup-in vongi-mui-pop">
+			<div class="mui-popup-inner vongi-pop-inner">
+				<div class="mui-popup-title">填写外出事项办理情况</div>
+				<div class="mui-popup-input">
+					<textarea v-model="closeFrom.workReport" rows="3" placeholder="请输入"></textarea>
+				</div>
+			</div>
+			<div class="mui-popup-buttons"><span class="mui-popup-button mui-popup-button-bold" @click="closeActoin">提交</span></div>
+		</div>
+		<div v-show="openCloseFromVisible" @click="openCloseFromVisible=false" class="mui-popup-backdrop mui-active"></div>
+
+
 		<div v-if="can_remark" class="fyy-scon-botton" style="position: fixed;width: 100%;bottom: 0;">
 			<div style="background-color: #3385FF;" class="examine-btn examine-btn1-blue" @click="openFromVisible=true">填写意见</div>
 		</div>
@@ -82,12 +95,12 @@
 			<div class="mui-popup-inner vongi-pop-inner">
 				<div class="mui-popup-title">填写意见</div>
 				<div class="mui-popup-input">
-					<textarea  v-model="remarkForm.remark" rows="3" placeholder="请输入"></textarea>
+					<textarea v-model="remarkForm.remark" rows="3" placeholder="请输入"></textarea>
 				</div>
 			</div>
 			<div class="mui-popup-buttons"><span class="mui-popup-button mui-popup-button-bold" @click="addRemark">提交</span></div>
 		</div>
-		<div v-show="openFromVisible" @click="openFromVisible=false"  class="mui-popup-backdrop mui-active"></div>
+		<div v-show="openFromVisible" @click="openFromVisible=false" class="mui-popup-backdrop mui-active"></div>
 
 		<loading :visible="isLoading"></loading>
 	</div>
@@ -128,7 +141,13 @@
 					id: this.$route.query.id,
 					remark: ''
 				},
-				openFromVisible: false
+				openFromVisible: false,
+
+				openCloseFromVisible: false,
+				closeFrom: {
+					id: this.$route.query.id,
+					workReport: '',
+				}
 			}
 		},
 		created() {},
@@ -170,7 +189,7 @@
 			//结束状态
 			outEnd() {
 				this.isLoading = true;
-				API_BusinessTravel.businessOutEnd(this.id).then(response => {
+				API_BusinessTravel.businessOutEnd(this.closeFrom).then(response => {
 					this.isLoading = false;
 
 					mui.toast('处理成功');