Merge remote-tracking branch 'origin/master'

src/assets/css/sczpfyy.css

@@ -511,7 +511,7 @@
 .fyy-back .mui-control-content {
 	display: block;
 	height: 100%;
-	padding:15px 0;
+	padding:10px 0;
 	background:#ffffff
 }
 
@@ -535,7 +535,8 @@
 }
 
 .fyy-undetect .mui-grid-view.mui-grid-9 .mui-media {
-	color: #333
+	color: #333;
+	padding:5px 15px
 }
 
 .fyy-bar {

src/assets/css/xpwyfyy.css

@@ -30,7 +30,7 @@ body {
 }
 
 .color55f868 {
-	color: #47bf37/*绿*/
+	color: #389E0D/*绿*/
 }
 
 .color-yellow {
@@ -1559,4 +1559,21 @@ h3 {
 
 .vongi-clasadmin-ma span {
 	font-size: 24px;
-}
+}
+.vongi-yddk-dat-photo{
+	margin-left:-5px
+}
+.vongi-yddk-dat-photo .mui-col-xs-3{
+	padding:0 5px;
+	display: flex;
+	height:46px;
+	border-radius: 4px;
+	
+	 
+}
+.vongi-yddk-dat-photo .mui-col-xs-3 img{
+	width:100%;
+	object-fit: cover;
+	background:#999;
+	min-height: 45px;
+}

src/projects/business/views/HouseKeeper/Admin/Attendance/OutsideInfo.vue

@@ -1,8 +1,98 @@
 <template>
+<div>
+    <header class="mui-bar mui-bar-nav">
+			<h1 class="mui-title">异地打卡详情</h1>
+			<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
+		</header>
+		<div class="mui-content vongi-wordcard">
+			<div class="mui-content-padded vongi-wordcard-top">
+				<div class="mui-media-object mui-pull-left">
+					<img src="~$project/assets/img/zhaop1.jpg">
+				</div>
+				<div class="mui-media-body">
+					冯银银
+					<p class='mui-ellipsis'><span class="colorfe616c">异地打卡</span>申请</p>
+				</div>
+				<button type="button" class="mui-btn mui-btn-danger mui-btn-outlined">
+					异地打卡
+				</button>
+			</div>
+
+			<div class="mui-content-padded vongi-wordcard-center">
+				<ul class="mui-table-view">
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">申请类型</div>
+						<span>异地打卡</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">所在部门</div>
+						<span>信息工程中心</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">申请班次</div>
+						<span class="colorf6f448">2020-04-19 07:30-09:00</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">申请时间</div>
+						<span>2020-04-19 07:30:56</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">打卡位置</div>
+						<span>湖北省荆州市沙市区北京东路133号沙市花园</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">相关照片</div>
+						<span class="vongi-yddk-dat-photo flew">
+							<div class="mui-col-xs-3">
+								<img src="~$project/assets/img/zhaop1.jpg" width="100%"/>
+							</div>
+							<div class="mui-col-xs-3">
+								<img src="~$project/assets/img/zhaop1.jpg" width="100%"/>
+							</div>
+							<div class="mui-col-xs-3">
+								<img src="~$project/assets/img/zhaop1.jpg" width="100%"/>
+							</div>
+							<div class="mui-col-xs-3">
+								<img src="~$project/assets/img/zhaop1.jpg" width="100%"/>
+							</div>
+						</span>
+					</li>
+				</ul>
+			</div>
+			<div class="mui-content-padded vongi-wordcard-center">
+				<h5>审批意见</h5>
+				<ul class="mui-table-view">
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">审批人</div>
+						<span>郑强</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">审批状态</div>
+						<span class="color55f868">同意</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">审批意见</div>
+						<span class="colorf6f448">无</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">审批时间</div>
+						<span>2020-04-19 07:30:56</span>
+					</li>
+					<li class="mui-table-view-cell mui-media">
+						<div class="mui-media-body">审批编号</div>
+						<span>20200419115613532321135</span>
+					</li>
+				</ul>
+			</div>
+		</div>
+</div>
 </template>
 
 <script>
 </script>
 
+<style scoped src="$project/assets/css/sczpfyy.css"></style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>