Explorar o código

考勤统计第四次改版/组织架构的个人资料取消上级的修改员工工作状态功能

vonin %!s(int64=4) %!d(string=hai) anos
pai
achega
2830454cde

+ 27 - 4
src/assets/css/xpwyfyy.css

@@ -1630,12 +1630,14 @@ h3 {
 	color: #999
 }
 
-.vongi-archives .mui-segmented-control.mui-scroll-wrapper .mui-control-item.mui-active {
+.vongi-archives .mui-segmented-control.mui-scroll-wrapper .mui-control-item.mui-active,
+.vongi-kqtj-tab .mui-active {
 	position: relative;
 	color: #3385FF
 }
 
-.vongi-archives .mui-segmented-control.mui-scroll-wrapper .mui-control-item.mui-active:after {
+.vongi-archives .mui-segmented-control.mui-scroll-wrapper .mui-control-item.mui-active:after,
+.vongi-kqtj-tab .mui-active:after {
 	content: "";
 	position: absolute;
 	bottom: 0;
@@ -4167,8 +4169,29 @@ h3 {
 	border-radius: initial;
 	border-bottom:1px #eee solid
 }
-
 .vongi-dw span input{
 	padding:0 10px 0 0;
 	width:80%
-}
+}
+.vongi-kqtj-tab{
+	padding:0;
+	background:#ffffff;
+	border-top:1px #eee solid
+}
+.vongi-kqtj-tab a{
+	padding:10px
+}
+.vongi-kqtj-tab .mui-active{
+	color:initial
+}
+.vongi-flxtop{
+	position:fixed;
+	width:100%;
+	z-index: 9;
+}
+.vongi-kqtj-tab{
+	margin-top:41px
+}
+.vongi-tab-top{
+	margin-top:100px
+}

+ 17 - 7
src/projects/business/views/Master/Attendance/StatisticList.vue

@@ -9,16 +9,26 @@
 		<top-header :pageTitle="pageTitle"></top-header>
 
 		<div class="mui-content vongi-admin-kqtj">
-			<div class="fyy-temper-date" style="position: fixed;width: 100%;top: 45px;z-index: 10;">
+			<div class="fyy-temper-date vongi-flxtop">
 				<a class="mui-col-xs-12" @click="selectData">{{subForm.queryDate}}<span class="mui-icon iconfont icon-xiajiantou"></span></a>
 			</div>
-			<div class="vongi-bread" style="margin-top: 45px;">
-				<template v-for="(item,index) in navList">
+			<div class="vongi-bread vongi-kqtj-tab vongi-flxtop">
+				<a href="" class="mui-active">全部(46)</a>
+				<a href="" class="">正常(46)</a>
+				<a href="" class="">迟到(46)</a>
+				<a href="" class="">早退(46)</a>
+				<a href="" class="">缺卡(46)</a>
+				<a href="" class="">出差(46)</a>
+				<a href="" class="">请假(46)</a>
+				<!-- <template v-for="(item,index) in navList">
 					<a :class="navCanClick(item,index)?'color4fc5f7':''" @click="reloadItem(item,index)" v-text="item.name"></a>
 					<span v-if="index!=navList.length-1" class="mui-icon mui-icon-forward"></span>
-				</template>
+				</template> -->
 			</div>
-			<div class="vongi-kqtj-center">
+			<div class="vongi-kqtj-center vongi-tab-top">
+				<div class="mui-content-padded">
+					<h5>荆鹏软件集团</h5>
+				</div>
 				<ul v-if="!isLast" class="mui-table-view margin10">
 					<li v-for="(item,index) in companyList" class="mui-table-view-cell">
 						<a class="mui-navigate-right" @click="reloadNext(item)">{{item.name}}({{item.number}})</a>
@@ -50,7 +60,7 @@
 					</div>
 				</div>
 
-				<div class="vongi-clasadmin vongi-kqtj-bot">
+				<!-- <div class="vongi-clasadmin vongi-kqtj-bot">
 					<div class="vongi-clasadmin-list">
 						<div @click="filter('1',workCount)" class="vongi-clasadmin-ma mui-col-xs-2">
 							<span :class="['','1'].indexOf(subForm.resultN)>-1?'color55f868':'colorAAA'" v-text="workCount"></span>
@@ -77,7 +87,7 @@
 							<div class="mui-media-body">请假</div>
 						</div>
 					</div>
-				</div>
+				</div> -->
 			</div>
 
 		</div>

+ 5 - 5
src/projects/business/views/Master/Company/OrganizationInfo.vue

@@ -15,13 +15,13 @@
 					</div>
 				</div>
 			</div>
-			<div class="vongi-archives margin10">
+			<div class="margin10">
 				<ul class="mui-table-view">
 					<li class="mui-table-view-cell">
-						<a class="mui-navigate-right" @click="selectStatus">
-							工作状态
-							<div class="mui-pull-right colorf8b155" v-text="workStatusN"></div>
-						</a>
+						<!-- <a @click="selectStatus" > -->
+						工作状态
+						<div class="mui-pull-right colorf8b155" v-text="workStatusN"></div>
+						<!-- </a> -->
 					</li>
 				</ul>
 			</div>