Merge remote-tracking branch 'origin/master'

.env.development

@@ -2,7 +2,7 @@ NODE_ENV=devlopment
 VUE_APP_NODE_NAME=devlopment
 OUT_PUT_NAME=dev
 VUE_APP_LOCAL_STORAGE_PREFIX=dev
-VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/jp-housekeeper-server/
+VUE_APP_BACKEND_URL=http://192.168.33.120:8086//jp-housekeeper-server/
 #小鹏管家微信appid
 VUE_APP_WXAPPID=wx7e70eb62a8459869
 VUE_APP_AUTH=

src/projects/business/views/Master/Attendance/LeaveInfo.vue

@@ -13,15 +13,18 @@
             <!-- <div class="examine-refuse">已拒绝</div> -->
         </div>
         <form class="mui-input-group">
-            <div class="mui-input-row">
-                <label>身份证号</label>
-                <span v-text="detail.idCard">420400200002020101</span>
-            </div>
+            <!--<div class="mui-input-row">-->
+                <!--<label>身份证号</label>-->
+                <!--<span v-text="detail.idCard">420400200002020101</span>-->
+            <!--</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>
+
+                <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">
                 <label>请假时长</label>

src/projects/business/views/Master/Attendance/VerifyLeaveInfo.vue

@@ -13,10 +13,10 @@
 				<!-- <div class="examine-refuse">已拒绝</div> -->
 			</div>
 			<form class="mui-input-group">
-				<div class="mui-input-row">
-					<label>身份证号</label>
-					<span v-text="detail.idCard">420400200002020101</span>
-				</div>
+				<!--<div class="mui-input-row">-->
+					<!--<label>身份证号</label>-->
+					<!--<span v-text="detail.idCard">420400200002020101</span>-->
+				<!--</div>-->
 				<div class="mui-input-row" v-if="detail.jobNumber">
 					<label>工号</label>
 					<span v-text="detail.jobNumber">0201022121001</span>
@@ -25,11 +25,16 @@
 					<label>部门</label>
 					<span v-text="detail.department">信息工程中心</span>
 				</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">
 					<label>请假时长</label>
 					<span v-text="daytime"></span>