Przeglądaj źródła

修改去掉外勤打卡选审批人

wgl 4 lat temu
rodzic
commit
e01b20f2eb

+ 2 - 1
src/projects/business/router/index.js

@@ -39,7 +39,8 @@ const router = new VueRouter({
 				y: 0
 			}
 		}
-	}
+	},
+	
 })
 
 export default router

+ 2 - 1
src/projects/business/router/master.js

@@ -740,7 +740,8 @@ const routesMaster = [
 							requireAuth: true,
 							role: [],
 							title: '考勤补卡申请审核列表',
-							mode: true
+							mode: true,
+							//keepAlive: true
 						}
 					},
 					//考勤补卡申请详情

+ 1 - 1
src/projects/business/views/Layout.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<keep-alive>
-		   <router-view v-if='$route.meta.keepAlive'></router-view>
+			<router-view v-if='$route.meta.keepAlive'></router-view>
 		</keep-alive>
 		<router-view v-if='!$route.meta.keepAlive'></router-view>
 	</div>

+ 7 - 5
src/projects/business/views/Master/Attendance/Sign.vue

@@ -18,7 +18,7 @@
 				<h5>当前打卡班次</h5>
 				<h3>{{tjForm.workAttendanceDate}}<span v-text="tjForm.workAttendanceTime"></span></h3>
 			</div>
-			<div class="mui-content-padded">
+			<!-- <div class="mui-content-padded">
 				<form class="mui-input-group">
 					<div class="mui-input-row" @click="selectPerson">
 						<label><span class="colorfe616c">*</span>审批人</label>
@@ -27,7 +27,7 @@
 						</div>
 					</div>
 				</form>
-			</div>
+			</div> -->
 			<div class="mui-content-padded">
 				<h5><span class="colorfe616c">*</span>定位</h5>
 				<button class="vongi-yidi-location" @click="getPoint">{{tjForm.address}}<span class="mui-icon mui-icon-location"></span></button>
@@ -224,10 +224,12 @@
 				} else if (!this.tjForm.type) {
 					mui.toast('请选择打卡类型');
 					return false;
-				} else if (!this.tjForm.approvalPersonId) {
+				}
+				/* else if (!this.tjForm.approvalPersonId) {
 					mui.toast('请选择审批人');
 					return false;
-				} else if (!this.tjForm.content) {
+				} */
+				else if (!this.tjForm.content) {
 					mui.toast('请输入申请内容');
 					return false;
 				} else if (!this.tjForm.address) {
@@ -337,7 +339,7 @@
 			//获取经纬度
 			this.getPoint();
 			this.getTime();
-			this.getPsersonList();
+			//this.getPsersonList();
 		},
 		destroyed() {},
 		computed: {

+ 2 - 1
src/projects/business/views/Master/Attendance/VerifyList.vue

@@ -52,7 +52,8 @@
 										<router-link :to="{name:'MasterAttendanceVerifyInfo',query:{id:item.id}}" class="mui-navigate-right">
 											<div class="mui-media-object mui-pull-left vongi-buka"><img :src="item.faceImageUrl"></div>
 											<div class="mui-media-body">
-												{{item.personName}}<span class="mui-pull-right mui-h6" v-text="item.approvalTime.substr(5)"></span>
+												{{item.personName}}
+												<span class="mui-pull-right mui-h6" v-if="item.approvalTime" v-text="item.approvalTime.substr(5)"></span>
 												<p class='mui-ellipsis'>
 													<span class="colorfe616c" v-text="item.typeN"></span>申请
 													<button type="button" :class="'mui-btn mui-btn-success mui-btn-outlined mui-pull-right '+(item.status>0?(item.status==1?'status_a':'status_r'):'')"