Merge remote-tracking branch 'origin/master'

src/assets/css/xpwyfyy.css

@@ -1441,7 +1441,13 @@ h3 {
 
 .vongi-yidi-location {
 	position: relative;
-	width: 70%
+	padding:17px 40px 16px 15px;
+	background:#ffffff;
+	display:block;
+	white-space: normal;
+	text-align: left;
+	border:0;
+	width:100%
 }
 
 .vongi-yidi-location .mui-icon {

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

@@ -16,16 +16,19 @@
 							<button class="mui-btn mui-btn-block" type='button' v-text="approvalPersonName"></button>
 						</div>
 					</div>
-					<div class="mui-input-row">
+					<!-- <div class="mui-input-row">
 						<label><span class="colorfe616c">*</span>定位</label>
 						<div class="vongi-yidi-location mui-ellipsis" style="width: 80%;">
 							<button class="mui-btn mui-btn-block" type='button' v-text="positionName"></button>
 							<span class="mui-icon mui-icon-location"></span>
 						</div>
-
-					</div>
+					</div> -->
 				</form>
 			</div>
+			<div class="mui-content-padded">
+				<h5><span class="colorfe616c">*</span>定位</h5>
+				<button class="vongi-yidi-location">请选择<span class="mui-icon mui-icon-location"></span></button>			
+			</div>
 			<div class="mui-content-padded">
 				<h5>备注</h5>
 				<div class="mui-input-row">

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

@@ -9,7 +9,7 @@
                 <div id="sliderSegmentedControl" class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
                     <div class="mui-scroll">
                         <a class="mui-control-item " @click="reloadList(0)" :class="listForm.type=='0'?'mui-active':''">
-                            <span class="fyy-badge">待处理<span class="mui-badge">{{num}}</span></span>
+                            <span class="fyy-badge">待处理<span class="mui-badge" v-if="num" >{{num}}</span></span>
                         </a>
                         <a class="mui-control-item" @click="reloadList(1)":class="listForm.type=='1'?'mui-active':''" >
                             已处理
@@ -17,7 +17,7 @@
                     </div>
                 </div>
                 <div class="mui-slider-group">
-                    <div id="item1mobile" class="mui-slider-item mui-control-content mui-active">
+                    <div   class="mui-slider-item mui-control-content mui-active">
                         <div id="scroll1" class="mui-scroll-wrapper">
                             <div class="mui-scroll">
 
@@ -30,7 +30,7 @@
                                                 {{mod.name}}
                                                 <p class='mui-ellipsis'><span class="colorfe616c">{{mod.typeN}}</span>请假申请</p>
                                             </div>
-                                            <button type="button" class="mui-btn  mui-btn-outlined" :class="statusColor[mod.status]" v-text="status[mod.status]"></button>
+                                            <button type="button" class="mui-btn mui-btn-success mui-btn-outlined" :class="statusColor[mod.status]" v-text="status[mod.status]"></button>
                                         </router-link>
                                     </li>
                                 </ul>
@@ -124,7 +124,7 @@
                 num:0,
                 recordList: [],
                 status: ['待审核', '已批准', '已拒绝'],
-                statusColor: ['', 'mui-btn-success', 'mui-btn-danger'],
+                statusColor: ['', 'status_a', 'status_r'],
                 selectIndex:[],
                 //审批内容弹窗显示
                 openFromVisible: false,
@@ -289,5 +289,14 @@
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
 <style scoped src="$project/assets/css/iconfont.css"></style>
-<style>
-</style>
+<style scoped>
+    .status_r {
+        color: #fe616c !important;
+        border: 1px solid #fe616c !important;
+    }
+
+    .status_a {
+        color: #05c8af !important;
+        border: 1px solid #05c8af !important;
+    }
+</style>