瀏覽代碼

结束外出出差增加传原参数time

wgl 4 年之前
父節點
當前提交
1aad72debc

+ 4 - 4
src/projects/business/views/Master/BusinessTravel/Info.vue

@@ -40,9 +40,9 @@
 					<label>申请时间</label>
 					<span v-text="detail.createTime"></span>
 				</div>
-				<div v-if="detail.endTime" class="mui-input-row">
-					<label>结束时间</label>
-					<span v-text="detail.endTime"></span>
+				<div v-if="detail.endTime || closeFrom.time" class="mui-input-row">
+					<label>返回时间</label>
+					<span v-text="detail.endTime?detail.endTime:closeFrom.time"></span>
 				</div>
 			</form>
 			<div class="vongi-slot">
@@ -91,7 +91,7 @@
 
 				//微信模板消息过来的
 				wm: this.$route.query.wm,
-				
+
 				closeFrom: {
 					id: this.$route.query.id,
 					//来源于微信模板消息

+ 2 - 2
src/projects/business/views/Master/Egress/Info.vue

@@ -47,9 +47,9 @@
 					<label>预估时长</label>
 					<span v-text="detail.estimatedTime+'小时'"></span>
 				</div>
-				<div v-if="detail.endTime" class="mui-input-row">
+				<div v-if="detail.endTime || closeFrom.time" class="mui-input-row">
 					<label>返回时间</label>
-					<span v-text="detail.endTime"></span>
+					<span v-text="detail.endTime?detail.endTime:closeFrom.time"></span>
 				</div>
 				<div v-if="detail.remark" class="mui-input-row">
 					<label>审查意见</label>