Browse Source

外出登记原型调整

wgl 4 years ago
parent
commit
03f4d0e85b

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

@@ -7,9 +7,9 @@
 			<div class="vongi-qingjiadt-head flew-sp">
 				<div class="flew-items">
 					<div class="flew"><img :src="detail.faceImageUrl" width="50" v-viewer /></div>
-					<h4>{{detail.personName}} 申请 <span class="color4fc5f7" v-text="detail.typeN"></span></h4>
+					<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.remark?'已审核':'未审核'"></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">
@@ -21,31 +21,38 @@
 					<span v-text="detail.destination"></span>
 				</div>
 				<div class="mui-input-row">
-					<label>外出日期</label>
-					<span v-text="detail.startTime"></span>
+					<label>外出事由</label>
+					<span v-text="detail.content"></span>
 				</div>
 				<div class="mui-input-row">
-					<label>预估时长</label>
-					<span v-text="detail.estimatedTime+'小时'"></span>
+					<label>报备</label>
+					<span v-text="detail.list.length>0?detail.list[0]['name']:''"></span>
 				</div>
 				<div class="mui-input-row">
-					<label>外出事由</label>
-					<span v-text="detail.content"></span>
+					<label>提交时间</label>
+					<span v-text="detail.createTime"></span>
 				</div>
 				<div class="mui-input-row">
 					<label>申请单编号</label>
 					<span v-text="detail.approvalNo"></span>
 				</div>
+			</form>
+
+			<form class="mui-input-group margin10">
+				<div class="mui-input-row">
+					<label>预计外出日期</label>
+					<span v-text="detail.startTime"></span>
+				</div>
 				<div class="mui-input-row">
-					<label>申请时间</label>
-					<span v-text="detail.createTime"></span>
+					<label>预估时长</label>
+					<span v-text="detail.estimatedTime+'小时'"></span>
 				</div>
 				<div v-if="detail.endTime" class="mui-input-row">
 					<label>结束时间</label>
 					<span v-text="detail.endTime"></span>
 				</div>
 				<div v-if="detail.remark" class="mui-input-row">
-					<label>审意见</label>
+					<label>审意见</label>
 					<span v-text="detail.remark"></span>
 				</div>
 				<div v-if="detail.workReport" class="mui-input-row">
@@ -53,7 +60,7 @@
 					<span v-text="detail.workReport"></span>
 				</div>
 			</form>
-			<div class="mui-content-padded">
+			<!-- <div class="mui-content-padded">
 				<h5>审核记录</h5>
 			</div>
 			<form class="mui-input-group margin10">
@@ -71,7 +78,7 @@
 						<span v-text="item.time"></span>
 					</div>
 				</template>
-			</form>
+			</form> -->
 		</div>
 		<div v-if="wm && !detail.endTime" class="fyy-footer">
 			<div class="bindfyy-btn"><button type="button" @click="openCloseFromVisible=true" class="mui-btn mui-btn-danger">结束外出</button></div>

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

@@ -15,7 +15,7 @@
 							<p class='mui-ellipsis'>外出事由:{{item.content}}</p>
 							<p class='flew-sp flew-items'>
 								预估时长:{{item.estimatedTime}}小时
-								<button type="button" :style="getColor(item.status)" class="mui-btn mui-btn-primary mui-btn-outlined" v-text="item.remark?'已审核':'未审核'"></button>
+								<button type="button" :style="getColor(item.status)" class="mui-btn mui-btn-primary mui-btn-outlined" v-text="item.remark?'已审查':'未审查'"></button>
 							</p>
 						</router-link>
 					</li>