浏览代码

请假时间

zhengkaixin 4 年之前
父节点
当前提交
4782223673

+ 5 - 2
src/projects/business/views/Master/Attendance/LeaveInfo.vue

@@ -20,8 +20,11 @@
 
 
             <div class="mui-input-row">
             <div class="mui-input-row">
                 <label>请假时间</label>
                 <label>请假时间</label>
-                <span>自{{detail.startTime}}{{(detail.startTimeQuantum!=''?(detail.startTimeQuantum=='1'?'下午上班':'上午上班'):'')}}
-                    <br />至{{detail.endTime}}{{(detail.endTimeQuantum!=''?(detail.endTimeQuantum=='1'?'下午下班':'上午下班'):'')}}</span>
+
+                <span v-if="detail.startTime==detail.endTime&&detail.startTimeQuantum=='0'&&detail.endTimeQuantum=='1'">自{{detail.startTime}}</span>
+                <span v-else-if="detail.startTime==detail.endTime">自{{detail.startTime}}{{(detail.startTimeQuantum!=''?(detail.startTimeQuantum=='1'?'下午':'上午'):'')}}</span>
+                <span  v-else >自{{detail.startTime}}{{(detail.startTimeQuantum!=''?(detail.startTimeQuantum=='1'?'下午':'上午'):'')}}
+                    <br />至{{detail.endTime}}{{(detail.endTimeQuantum!=''?(detail.endTimeQuantum=='1'?'下午':'上午'):'')}}</span>
             </div>
             </div>
             <div class="mui-input-row">
             <div class="mui-input-row">
                 <label>请假时长</label>
                 <label>请假时长</label>

+ 10 - 5
src/projects/business/views/Master/Attendance/VerifyLeaveInfo.vue

@@ -25,11 +25,16 @@
 					<label>部门</label>
 					<label>部门</label>
 					<span v-text="detail.department">信息工程中心</span>
 					<span v-text="detail.department">信息工程中心</span>
 				</div>
 				</div>
-				<div class="mui-input-row">
-					<label>请假时间</label>
-					<span>自{{detail.startTime}}{{(detail.startTimeQuantum!=''?(detail.startTimeQuantum=='1'?'下午上班':'上午上班'):'')}}
-						<br />至{{detail.endTime}}{{(detail.endTimeQuantum!=''?(detail.endTimeQuantum=='1'?'下午下班':'上午下班'):'')}}</span>
-				</div>
+
+                <div class="mui-input-row">
+                    <label>请假时间</label>
+
+                    <span v-if="detail.startTime==detail.endTime&&detail.startTimeQuantum=='0'&&detail.endTimeQuantum=='1'">自{{detail.startTime}}</span>
+                    <span v-else-if="detail.startTime==detail.endTime">自{{detail.startTime}}{{(detail.startTimeQuantum!=''?(detail.startTimeQuantum=='1'?'下午':'上午'):'')}}</span>
+                    <span  v-else >自{{detail.startTime}}{{(detail.startTimeQuantum!=''?(detail.startTimeQuantum=='1'?'下午':'上午'):'')}}
+                    <br />至{{detail.endTime}}{{(detail.endTimeQuantum!=''?(detail.endTimeQuantum=='1'?'下午':'上午'):'')}}</span>
+                </div>
+
 				<div class="mui-input-row">
 				<div class="mui-input-row">
 					<label>请假时长</label>
 					<label>请假时长</label>
 					<span v-text="daytime"></span>
 					<span v-text="daytime"></span>