Merge branch 'master' of http://47.92.161.104:10080/wgl/jp-xpgj

src/assets/css/xpwyfyy.css

@@ -3881,3 +3881,7 @@ h3 {
 	line-height: 44px;
 	color:#101010
 }
+.vongi-sqhd-list .mui-card-content-inner{
+	height:128px;
+	overflow: hidden;
+}

src/projects/business/router/master.js

@@ -684,7 +684,7 @@ const routesMaster = [
 				path: 'attendance',
 				component: () => import('../views/Layout.vue'),
 				children: [
-					//异地打卡
+					//外勤打卡
 					{
 						path: 'sign',
 						name: 'MasterAttendanceSign',
@@ -692,7 +692,7 @@ const routesMaster = [
 						meta: {
 							requireAuth: true,
 							role: [],
-							title: '异地打卡',
+							title: '外勤打卡',
 							mode: true
 						}
 					},
@@ -708,7 +708,7 @@ const routesMaster = [
 							mode: true
 						}
 					},
-					//考勤补卡申请/异地打卡详情
+					//考勤补卡申请/外勤打卡详情
 					{
 						path: 'info',
 						name: 'MasterAttendanceInfo',

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

@@ -10,7 +10,7 @@
 					<li v-for="(item,index) in recordList" class="mui-table-view-cell">
 						{{item.recordTime}}
 						<div class="mui-media-body">
-							<button type="button" class="mui-btn mui-btn-primary" v-if="item.result=='1' && item.status=='1'" @click="goToInfo(item.fillAttendanceId)">{{item.type=='1'?'已异地打卡':'已补卡'}}</button>
+							<button type="button" class="mui-btn mui-btn-primary" v-if="item.result=='1' && item.status=='1'" @click="goToInfo(item.fillAttendanceId)">{{item.type=='1'?'已外勤打卡':'已补卡'}}</button>
 							<button type="button" class="mui-btn mui-btn-primary" v-if="item.result=='0' && item.status=='2'" @click="goToInfo(item.fillAttendanceId)">已拒绝</button>
 							<button type="button" class="mui-btn mui-btn-primary" v-if="item.result=='0' && item.status=='0'" @click="goToInfo(item.fillAttendanceId)">审核中</button>
 							<button type="button" class="mui-btn mui-btn-primary" v-if="item.result=='0' && item.status===null" @click="applybk(item.id)">申请补卡</button>

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

@@ -71,7 +71,7 @@
 		},
 		data() {
 			return {
-				pageTitle: '异地打卡',
+				pageTitle: '外勤打卡',
 
 				isLoading: false,
 
@@ -83,7 +83,7 @@
 					workAttendanceDate: '',
 					workAttendanceTime: '',
 					type: '1', //外勤打卡/补卡（1/2）
-					content: '异地打卡申请',
+					content: '外勤打卡申请',
 					approvalPersonId: '',
 					workAttendanceId: '',
 					photoFile: '',

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

@@ -154,7 +154,7 @@
 							}
 						})
 					} else if (iten.type == '1' && iten.fillAttendanceId) {
-						//异地打卡
+						//外勤打卡
 						this.$router.push({
 							name: 'MasterAttendanceInfo',
 							query: {