调整

src/apis/Oa/doc.js

@@ -34,6 +34,31 @@ export function pageList(data) {
 	})
 }
 
+export function checkPageList(data) {
+	return request({
+		url: '/mobile/doc/checkPageList' ,
+		data: Qs.stringify(data),
+		method: 'post',
+	})
+}
+
+
+export function fileList(data) {
+	return request({
+		url: '/mobile/fileSharingApi/fileList' ,
+		data: Qs.stringify(data),
+		method: 'post',
+	})
+}
+
+export function checkSubmit(data) {
+	return request({
+		url: '/mobile/doc/checkSubmit' ,
+		data: Qs.stringify(data),
+		method: 'post',
+	})
+}
+
 export function edit(data) {
 	return request({
 		url: '/mobile/doc/edit/'+data ,

src/assets/css/xpwyfyy-oa.css

@@ -1541,8 +1541,11 @@ h3 {
 }
 
 .vongi-qingjiadt-head {
-	padding: 20px 15px;
+	padding: 10px 15px;
 	align-items: center;
+	background: #fff;
+    margin-bottom: 10px;
+    border-top: 1px solid #eeeeee;
 }
 
 .vongi-qingjiadt-head .flew {

src/assets/css/xpwyfyy.css

@@ -1537,8 +1537,11 @@ h3 {
 }
 
 .vongi-qingjiadt-head {
-	padding: 20px 15px;
+	padding: 10px 15px;
 	align-items: center;
+	background: #fff;
+	margin-bottom: 10px;
+	border-top: 1px solid #eeeeee;
 }
 
 .vongi-qingjiadt-head .flew {

src/commin.js

@@ -47,7 +47,11 @@
 		data() {
 			return {
 				//testOpenid:"oHjCawjpLV6Dbdit8MVkShB6G58w",
-				testOpenid:"oHjCawigqi8SEAwutwkQ-VEgdp3k",
+				//testOpenid:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//zkx
+				testOpenid:"oHjCawsxTJkxixR74OVp7aCKahj8",//ylm
+				//testOpenid:"oHjCawgwCGen5k1-hAsimdEX5lZo",//sz
+				
+				
 				isLoading: false,
 			}
 		},

src/views-oa/Document/Browse.vue

@@ -6,12 +6,7 @@
 		<div class="mui-content vongi-wordcard-sp">
 			<div class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
 				<div class="mui-scroll">
-					<a @click="reloadList('0')" :class="'mui-control-item '+(listForm.status==0?'mui-active':'')">
-						<span class="fyy-badge">待处理<span class="mui-badge" v-if="firstRecordsTotal" v-text="firstRecordsTotal"></span></span>
-					</a>
-					<a @click="reloadList('3')" :class="'mui-control-item '+(listForm.status==3?'mui-active':'')">
-						已处理
-					</a>
+					1
 				</div>
 			</div>
 
@@ -44,64 +39,20 @@
 						</div>
 					</div>
 
-					<div v-if="listForm.status==3" class="mui-slider-item mui-control-content">
-						<div class="mui-scroll-wrapper">
-							<div class="mui-scroll">
-								<ul class="mui-table-view mui-table-view-chevron">
-									<li v-for="(item,index) in recordList" :key="'s3_'+item.id" class="mui-table-view-cell mui-media">
-										<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-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'):'')"
-													 v-text="item.statusN"></button>
-												</p>
-												<p class='mui-ellipsis' v-if="item.type=='1' && item.address">打卡位置：{{item.address}}</p>
-												<p class='mui-ellipsis' v-if="item.type=='2' && item.content">申请理由：{{item.content}}</p>
-											</div>
-										</router-link>
-									</li>
-								</ul>
-							</div>
-						</div>
-					</div>
+					
 
 				</div>
 			</div>
 
-			<div v-show="recordList.length>0 && listForm.status==0" class="fyy-bindfyy-btn">
-				<form class="mui-input-group">
-					<div class="mui-input-row mui-checkbox mui-left">
-						<label>全选</label>
-						<input v-model="allSelect" value="1" type="checkbox" @click="selectAll" :checked="recordList.length==selectIdList.length">
-					</div>
-				</form>
-				<button type="button" class="mui-btn mui-btn-danger" @click="openFrom('2')">拒绝</button>
-				<button type="button" class="mui-btn mui-btn-success" @click="openFrom('1')">同意</button>
-			</div>
+			
 		</div>
 
-		<!-- 审批弹窗 -->
-		<div v-show="openFromVisible" class="mui-popup mui-popup-in vongi-mui-pop">
-			<div class="mui-popup-inner vongi-pop-inner">
-				<div class="mui-popup-title">填写意见</div>
-				<div class="mui-popup-input">
-					<textarea  v-model="subForm.content" rows="3" placeholder="请输入"></textarea>
-				</div>
-			</div>
-			<div class="mui-popup-buttons"><span class="mui-popup-button mui-popup-button-bold" @click="doAction">提交</span></div>
-		</div>
-		<div v-show="openFromVisible" @click="openFromVisible=false"  class="mui-popup-backdrop mui-active"></div>
-
 		<loading :visible="isLoading"></loading>
 	</div>
 </template>
 
 <script>
-	import * as API_Attendance from '@/apis/Master/attendance'
+	import * as API from '@/apis/Oa/doc'
 	import Common from '@/components/Common.vue'
 	import Loading from '@/components/Loading.vue'
 	import TopHeader from '@/components/TopHeader.vue'
@@ -129,7 +80,6 @@
 					pageIndex: 1,
 					pageSize: 20,
 					totalPage: 1,
-					status: this.$route.query.status ? this.$route.query.status : 0,
 				},
 				recordList: [],
 				selectIdList: [],
@@ -152,7 +102,7 @@
 			//获取列表
 			getList() {
 				this.isLoading = true;
-				API_Attendance.getVerifyList(this.listForm).then(response => {
+				API.fileList(this.listForm).then(response => {
 					if (response) {
 						if (this.listForm.pageIndex == 1) {
 							this.recordList = response.data;
@@ -192,12 +142,7 @@
 					}
 				}
 			},
-			//切换
-			reloadList(status) {
-				this.listForm.status = status;
-				this.listForm.pageIndex = 1;
-				this.getList();
-			},
+			 
 			//选择所有
 			selectAll() {
 				if (this.allSelect.length) {
@@ -270,10 +215,7 @@
 			})
 		},
 		watch: {
-			//本页面监听到路由（参数）改变
-			/* '$route': function(to, from) {
-				this.reloadList(to.query.status ? to.query.status : 0)
-			} */
+			 
 		},
 		//keepalive监控判断
 		beforeRouteLeave(to, from, next) {

src/views-oa/Document/ExamineDetail.vue

@@ -85,8 +85,8 @@
 										:key="'c'+j">
 										<div class="flex">
 											<img :src="item1.auditorImage+'?x-oss-process=image/resize,h_800,m_lfit'" />
-											<i class="iconfont icon-gou" v-if="item1.status=='2'"></i>
-											<i class="iconfont icon-chacha" v-if="item1.status=='3'"></i>
+											<i class="iconfont icon-gou" v-if="item1.status=='1'"></i>
+											<i class="iconfont icon-chacha" v-if="item1.status=='2'"></i>
 										</div>
 										<div class="mui-media-body">{{item1.auditorName}}</div>
 									</li>
@@ -312,12 +312,9 @@
 				this.$refs.PersonSelect.init(this.selectObj)
 			},getClassText(ac, i) {
 				var reclass = ""
-				if(ac.examineStatus==null){
-					ac.examineStatus=ac.status
-				}
+				 
 				if (ac.examineStatus == "0") {
 					return ""
-
 				}
 				if (ac.examineStatus == "1" ) {
 					return "审批中"
@@ -328,16 +325,22 @@
 				
 				if ( ac.examineStatus == "3") {
 					return "已拒绝"
+				}
+				if (ac.status == "0") {
+					return ""
+				}
+				if (ac.status == "1" ) {
+					return "同意"
+				}
+				if (ac.status == "2") {
+					return "拒绝"
 				}
-
 				
 				return reclass
 			},
 			getClass(ac, i) {
 				var reclass = ""
-				if(ac.examineStatus==null){
-					ac.examineStatus=ac.status
-				}
+				
 				if (ac.examineStatus == "0") {
 					return "mui-hidden"
 
@@ -352,7 +355,16 @@
 				if ( ac.examineStatus == "3") {
 					return "colorfe616c"
 				}
-
+				
+				if (ac.status == "0") {
+					return ""
+				}
+				if (ac.status == "1" ) {
+					return "color389E0D"
+				}
+				if (ac.status == "2") {
+					return "colorfe616c"
+				}
 				
 				return reclass
 			},

src/views-oa/Document/Info.vue

@@ -4,7 +4,7 @@
     <top-header :pageTitle="pageTitle"></top-header>
 
     <div class="mui-content vongi-qingjiadt margin60">
-        <div class="vongi-qingjiadt-head flew-sp">
+        <div class="vongi-qingjiadt-head flew-sp" style="" >
             <div class="flew-items">
                 <div class="flew"><img :src="detail.personImage" width="50" /></div>
                 <h4  >{{detail.personName}} 申请 <span style="color: #3385FF;">公文提报</span></h4>
@@ -44,7 +44,7 @@
            
         </div>
 		<div class="mui-content vongi-wordcard"  v-if="list" style=" background-color: #ffffff;margin-top: 10px;    padding-top: 0px;">
-			<examineDetail :edit="false" :list="list" :view="true" ></examineDetail>	
+			<examineDetail :edit="false" :list="list" :view="detail.docStatus==0" ></examineDetail>	
 		</div>
     </div>
 
@@ -85,8 +85,9 @@ export default {
             isLoading: false,
             id: this.$route.query.id,
             detail: {},
-            status: ['待审核', '已批准', '已拒绝','已撤销'],
-            statusColor: ['', 'mui-btn-success', 'mui-btn-danger',''],
+				status: ['待审核', '已通过', '未通过', '已撤销'],
+          //  status: ['待审核', '已批准', '已拒绝','已撤销'],
+            statusColor: ['mui-btn-warning', 'mui-btn-success', 'mui-btn-danger',''],
         }
     },
     created() {

src/views-oa/Document/List.vue

@@ -14,10 +14,10 @@
 								<label>公文标题：</label>
 								<span>{{item.docTitle}}<span class="mui-pull-right " :class="statusColor[item.docStatus]">{{status[item.docStatus]}}</span></span>
 							</li>
-							<li class="mui-table-view-cell" >
+						<!-- 	<li class="mui-table-view-cell" >
 								<label>公文类型：</label>
 								<span>{{item.typeName}}</span>
-							</li>
+							</li> -->
 							<li class="mui-table-view-cell"  >
 								<label>提交时间：</label>
 								<span>{{item.createTime}}</span>
@@ -80,8 +80,8 @@
 					result: 0,
 				},
 				recordList: [],
-				status: ['待审核', '已批准', '已拒绝', '已撤销'],
-				statusColor: ['', 'mui-btn-success', 'mui-btn-danger',''],
+				status: ['待审核', '已通过', '未通过', '已撤销'],
+				statusColor: ['classFF8400', 'class389E0D', 'classFF6666','classA5A5A5'],
 
 
 			}
@@ -180,5 +180,17 @@
 <style scoped src="@/assets/css/xpwyfyy-oa.css"></style>
 <style src="@/assets/css/iconfont.css"></style>
 
-<style>
+<style scoped >
+	.classFF8400 {
+		color: #FF8400 ;
+	}
+	.class389E0D  {
+		color: #389E0D  ;
+	}
+	.classFF6666  {
+		color: #FF6666  ;
+	}
+	.classA5A5A5  {
+		color: #A5A5A5  ;
+	}
 </style>

src/views-oa/Document/Person.vue

@@ -55,7 +55,7 @@
 					<h5 class="margin10">已选择人员：</h5>
 					<div class="vongi-yjbtn flew" id="spanLast" :style="'height:'+clientHeight+'px'">
 						<span style="height: 24px;" v-for="item,i in selectPerson">{{item.auditorName}}
-							<a class="iconfont icon-guanbi1" v-show="item.status==0||item.status==1"
+							<a class="iconfont icon-guanbi1" v-show="item.status==0"
 								@click="checkboxBtn(item)"></a></span>
 
 					</div>
@@ -114,25 +114,7 @@
 
 		},
 		watch: {
-			selectType(val, old) {
-				// if(this.initbl){
-				// 	var sz=[];
-				// 	var szid=[];
-				// 	for(var i in this.selectPerson){
-				// 		var obj=this.selectPerson[i];
-				// 		if(obj.status==0||obj.status==1){
-							
-				// 		}else{
-				// 			sz.push(obj);
-				// 			szid.push(obj.personId);
-				// 		}
-				// 	}
-					
-				// 	this.selectPerson = sz
-				// 	this.selectId = szid
-				// }
-				// this.initbl=true
-			}
+			 
 		},
 		methods: {
 			checkboxBtn(obj) {
@@ -151,7 +133,7 @@
 						}
 					}
 					if (i != -1) {
-						if (person.status &&!( person.status == 0|| person.status == 1)) {
+						if (person.status!=0) {
 							mui.toast("已审批人员不可调整")
 							return;
 						}
@@ -223,7 +205,7 @@
 					var k=0;
 					for(var i in this.selectPerson){
 						var obj=this.selectPerson[i];
-						if(obj.status==0||obj.status==1){
+						if(obj.status==0){
 							k++;
 						}
 					}
@@ -266,7 +248,7 @@
 							personId:obj.id,
 							auditorImage:obj.faceImageUrl,
 							auditorName:obj.name,
-							status:this.selectObj.examineStep.examineStatus,
+							status:0,
 						})
 					}
 					this.arrangeShiftPersonList = list;

src/views-oa/Document/VerifyInfo.vue

@@ -3,66 +3,57 @@
 		<common @asynCallBack="asynCallBack"></common>
 		<top-header :pageTitle="(detail.typeN?detail.typeN:'')+pageTitle"></top-header>
 
-		<div class="mui-content vongi-wordcard">
-			<div class="mui-content-padded vongi-wordcard-top">
-				<div v-show="detail.faceImageUrl" class="mui-media-object mui-pull-left">
-					<img :src="detail.faceImageUrl" v-viewer>
+		<div class="mui-content vongi-qingjiadt margin60">
+		    <div class="vongi-qingjiadt-head flew-sp">
+		        <div class="flew-items">
+		            <div class="flew"><img :src="detail.personImage" width="50" /></div>
+		            <h4  >{{detail.personName}} 申请 <span style="color: #3385FF;">公文提报</span></h4>
+		        </div>
+		        <button class="mui-btn   mui-btn-outlined" :class="statusColor[detail.docStatus]" v-text="status[detail.docStatus]">已批准</button>
+		        <!-- <div class="examine-refuse">已拒绝</div> -->
+		    </div>
+		    <form class="mui-input-group margin10">
+		        <div class="mui-input-row">
+		            <label>公文类型</label>
+		            <span v-text="detail.typeName"></span>
+		        </div>
+				<div class="mui-input-row">
+				    <label>文件标题</label>
+				    <span v-text="detail.docTitle">家中有事，需要会老家一趟家中有事，需要会老家一趟家中有事，需要会老家一趟家中有事，需要会老家一趟。</span>
 				</div>
-				<div v-show="detail.personName" class="mui-media-body">
-					<font v-text="detail.personName"></font>
-					<p class='mui-ellipsis'><span class="colorfe616c" v-text="detail.typeN"></span>申请</p>
-				</div>
-				<button type="button" :class="'mui-btn mui-btn-success mui-btn-outlined '+(detail.status>0?(detail.status==1?'status_a':'status_r'):'')">
-					{{detail.status>0?(detail.status==1?'已同意':'已拒绝'):'未审核'}}
-				</button>
+		       
+		      
+		        <div class="mui-input-row">
+		            <label>图片附件</label>
+		            <span class="vongi-qingjiadt-photo">
+		                <template v-for="(item,index) in picList">
+		                    <img :src="item" v-viewer />
+		                </template>
+		            </span>
+		        </div>
+				
+				
+		        <div class="mui-input-row">
+		            <label>申请时间</label>
+		            <span v-text="detail.createTime">2020-04-27 12:00:00</span>
+		        </div>
+		
+		
+		    </form>
+		    <div class="vongi-slot">
+		       
+		    </div>
+			<div v-if="actionSp" class="fyy-scon-botton">
+				<div class="examine-btn examine-btn1" @click="openFrom('2')">拒绝</div>
+				<div class="examine-btn examine-btn2" @click="openFrom('1')">通过</div>
 			</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 v-text="detail.typeN"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">所在部门</div>
-						<span v-text="detail.companyName"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">申请班次</div>
-						<span class="colorf6f448" v-text="detail.fillAttendanceDayAndTime"></span>
-					</li>
-					<li v-if="detail.address" class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">打卡地点</div>
-						<span v-text="detail.address"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">申请时间</div>
-						<span v-text="detail.createTime"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">申请理由</div>
-						<span class="colorf8b155" v-text="detail.content"></span>
-					</li>
-					<li class="mui-table-view-cell mui-media">
-						<div class="mui-media-body">相关照片</div>
-					</li>
-					<li class="mui-table-view-cell mui-media fyy-upphoto">
-						<div class="mui-col-xs-3" v-for="(item,index) in picList">
-							<img :src="item" v-viewer />
-						</div>
-					</li>
-				</ul>
+			<div class="mui-content vongi-wordcard"  v-if="list" style=" background-color: #ffffff;margin-top: 10px;    padding-top: 0px;">
+				<examineDetail :edit="false" :list="list"  ></examineDetail>	
 			</div>
+		
 
-           <div class="mui-content vongi-wordcard" style=" background-color: #ffffff;margin-top: 10px;    padding-top: 0px;">
-				<examineDetail :edit="false"  ></examineDetail>	
-           </div>
 
-
-            <div v-if="detail.status=='0' && detail.approvalEnable" class="fyy-scon-botton">
-				<div class="examine-btn examine-btn1" @click="openFrom('2')">拒绝</div>
-				<div class="examine-btn examine-btn2" @click="openFrom('1')">通过</div>
-			</div>
+          
 
 
 		</div>
@@ -72,7 +63,7 @@
 			<div class="mui-popup-inner vongi-pop-inner">
 				<div class="mui-popup-title">填写意见</div>
 				<div class="mui-popup-input">
-					<textarea  v-model="subForm.content" rows="3" placeholder="请输入"></textarea>
+					<textarea  v-model="subForm.opinion" rows="3" placeholder="请输入"></textarea>
 				</div>
 			</div>
 			<div class="mui-popup-buttons"><span class="mui-popup-button mui-popup-button-bold" @click="doAction">提交</span></div>
@@ -84,10 +75,12 @@
 </template>
 
 <script>
-	import * as API_Attendance from '@/apis/Master/attendance'
+import * as API from '@/apis/Oa/doc'
 	import Common from '@/components/Common.vue'
 	import Loading from '@/components/Loading.vue'
 	import TopHeader from '@/components/TopHeader.vue'
+	import examineDetail from './ExamineDetail.vue'
+	
 	import {
 		mapGetters,
 		mapMutations
@@ -97,7 +90,7 @@
 		components: {
 			Common,
 			Loading,
-			TopHeader
+			TopHeader,examineDetail
 		},
 		data() {
 			return {
@@ -107,15 +100,22 @@
 
 				id: this.$route.query.id,
 				detail: {},
-
+				list:null,
 				//审批内容弹窗显示
 				openFromVisible: false,
 				selectIdList: [],
 				subForm: {
-					ids: '',
-					content: '',
+					masterFileId: '',
+					opinion: '',
 					status: ''
 				},
+				actionSp:false,
+			
+				status: ['待审核', '已通过', '未通过', '已撤销'],
+				 //  status: ['待审核', '已批准', '已拒绝','已撤销'],
+				statusColor: ['mui-btn-warning', 'mui-btn-success', 'mui-btn-danger',''],
+					
+				
 			}
 		},
 		created() {
@@ -137,16 +137,35 @@
 			//获取详情
 			getDetail() {
 				this.isLoading = true;
-				API_Attendance.getApplyInfo({
-					id: this.id
-				}).then(response => {
-
-					this.detail = response;
-
-					this.isLoading = false;
+				this.actionSp=false;
+				this.list=null;
+				API.edit( this.id).then(response => {
+				    this.detail = response.masterFile;
+					this.list=response
+					var list= response.examineStepDTOList
+					for(var  i in  list){
+						var obj=list[i];
+						
+						if(obj.examineStep.examineStatus==1){
+							
+							var sz=obj.stepPersonList
+							for(var j in sz){
+								var obk=sz[j];
+								if(obk.status==0&&obk.personId==this.person_data.id){
+									this.actionSp=true;
+								}
+							}
+							
+							break;
+							
+						}
+						
+					}
+					
+				    this.isLoading = false;
 				}).catch(error => {
-					this.isLoading = false;
-					mui.toast(error);
+				    this.isLoading = false;
+				    mui.toast(error);
 				})
 			},
 			//显示内容表单
@@ -156,7 +175,7 @@
 					mui.toast('请选择要处理的信息');
 				} else {
 					this.subForm.status = status;
-					this.subForm.content = status == 1 ? '同意' : '拒绝';
+					this.subForm.opinion = status == 1 ? '同意' : '拒绝';
 					this.openFromVisible = true;
 					//直接点击处理，不需要弹窗理由框,又需要弹窗理由框了
 					//this.doAction();
@@ -164,19 +183,14 @@
 			},
 			//检测表单
 			checkForm() {
-				if (!this.subForm.ids) {
-					mui.toast('请选择要处理的信息');
-					return false;
-				} else {
-					return true;
-				}
+				return true;
 			},
 			//同意拒绝
 			doAction() {
-				this.subForm.ids = this.selectIdList.join(',');
+				this.subForm.masterFileId = this.id;
 				if (this.checkForm()) {
 					this.isLoading = true;
-					API_Attendance.doVerify(this.subForm).then(response => {
+					API.checkSubmit(this.subForm).then(response => {
 						this.isLoading = false;
 
 						this.openFromVisible = false;
@@ -200,8 +214,8 @@
 			picList: {
 				// getter
 				get: function() {
-					if (this.detail && this.detail.fillAttendanceFilesUrl) {
-						return this.detail.fillAttendanceFilesUrl.split(',');
+					if (this.detail && this.detail.docFiles) {
+						return this.detail.docFiles.split(',');
 					} else {
 						return [];
 					}
@@ -214,6 +228,8 @@
 			...mapGetters({
 				openId: 'wx_openid',
 				token: 'token',
+				person_data: 'person_data',
+				
 			})
 		}
 	}

src/views-oa/Document/VerifyList.vue

@@ -3,13 +3,13 @@
 		<common @asynCallBack="asynCallBack"></common>
 		<top-header :pageTitle="pageTitle" :routeName="'Master'"></top-header>
 
-		<div class="mui-content vongi-wordcard-sp">
+		<div class="mui-content ">
 			<div class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted">
 				<div class="mui-scroll">
-					<a @click="reloadList('0')" :class="'mui-control-item '+(listForm.status==0?'mui-active':'')">
-						<span class="fyy-badge">待处理<span class="mui-badge" v-if="firstRecordsTotal" v-text="firstRecordsTotal"></span></span>
+					<a @click="reloadList('0')" :class="'mui-control-item '+(listForm.type==0?'mui-active':'')">
+						<span class="fyy-badge">待处理<span class="mui-badge  mui-badge-danger" v-if="firstRecordsTotal" v-text="firstRecordsTotal"></span></span>
 					</a>
-					<a @click="reloadList('3')" :class="'mui-control-item '+(listForm.status==3?'mui-active':'')">
+					<a @click="reloadList('1')" :class="'mui-control-item '+(listForm.type==1?'mui-active':'')">
 						已处理
 					</a>
 				</div>
@@ -21,12 +21,33 @@
 
 				<div class="mui-slider-group">
 
-					<div v-if="listForm.status==0" class="mui-slider-item mui-control-content">
+					<div  class="mui-slider-item mui-control-content">
 						<div class="mui-scroll-wrapper vongi-over-hei">
 							<div class="mui-scroll">
-								<form class="mui-input-group fyy-checkbox">
-									<div v-for="(item,index) in recordList" :key="'s0_'+item.id" class="mui-input-row mui-checkbox mui-left">
-										<router-link :to="{name:'MasterAttendanceVerifyInfo',query:{id:item.id}}" class="mui-navigate-right">
+								<form class="mui-input-group ">
+									<div v-for="(item,index) in recordList" :key="'s0_'+item.id">
+										<div class="mui-content-padded" style="margin: 12px 12px !important;" >
+													
+											<ul class="mui-table-view fyy-view" @click="detail(item.id)">
+												<li class="mui-table-view-cell" >
+													<label>公文标题：</label>
+													<span>{{item.docTitle}}<span class="mui-pull-right " :class="statusColor[item.docStatus]">{{status[item.docStatus]}}</span></span>
+												</li>
+												<li class="mui-table-view-cell" >
+													<label>公文类型：</label>
+													<span>{{item.typeName}}</span>
+												</li>
+												<li class="mui-table-view-cell"  >
+													<label>提交时间：</label>
+													<span>{{item.createTime}}</span>
+												</li>
+											
+													
+											</ul>
+													
+										</div>
+									
+										<!-- <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}}
@@ -35,44 +56,22 @@
 												<p class='mui-ellipsis' v-if="item.type=='2' && item.content">申请理由：{{item.content}}</p>
 												<h5 class="vongi-bksp-time" v-text="item.createTime.substr(5)"></h5>
 											</div>
-										</router-link>
-										<input name="checkbox" v-model="selectIdList" :value="item.id" type="checkbox">
-									</div>
+										</router-link> -->
+										
+<!-- 										<input name="checkbox" v-model="selectIdList" :value="item.id" type="checkbox">
+ -->									</div>
 								</form>
 							</div>
 
 						</div>
 					</div>
 
-					<div v-if="listForm.status==3" class="mui-slider-item mui-control-content">
-						<div class="mui-scroll-wrapper">
-							<div class="mui-scroll">
-								<ul class="mui-table-view mui-table-view-chevron">
-									<li v-for="(item,index) in recordList" :key="'s3_'+item.id" class="mui-table-view-cell mui-media">
-										<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-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'):'')"
-													 v-text="item.statusN"></button>
-												</p>
-												<p class='mui-ellipsis' v-if="item.type=='1' && item.address">打卡位置：{{item.address}}</p>
-												<p class='mui-ellipsis' v-if="item.type=='2' && item.content">申请理由：{{item.content}}</p>
-											</div>
-										</router-link>
-									</li>
-								</ul>
-							</div>
-						</div>
-					</div>
+				
 
 				</div>
 			</div>
 
-			<div v-show="recordList.length>0 && listForm.status==0" class="fyy-bindfyy-btn">
+			<div v-show="false&&recordList.length>0 && listForm.type==0" class="fyy-bindfyy-btn">
 				<form class="mui-input-group">
 					<div class="mui-input-row mui-checkbox mui-left">
 						<label>全选</label>
@@ -101,7 +100,7 @@
 </template>
 
 <script>
-	import * as API_Attendance from '@/apis/Master/attendance'
+	import * as API from '@/apis/Oa/doc'
 	import Common from '@/components/Common.vue'
 	import Loading from '@/components/Loading.vue'
 	import TopHeader from '@/components/TopHeader.vue'
@@ -129,11 +128,14 @@
 					pageIndex: 1,
 					pageSize: 20,
 					totalPage: 1,
-					status: this.$route.query.status ? this.$route.query.status : 0,
+					type: this.$route.query.status ? this.$route.query.status : 0,
 				},
 				recordList: [],
 				selectIdList: [],
 				allSelect: [],
+				status: ['待审核', '已通过', '未通过', '已撤销'],
+				statusColor: ['classFF8400', 'class389E0D', 'classFF6666','classA5A5A5'],
+				
 				subForm: {
 					ids: '',
 					content: '',
@@ -149,10 +151,18 @@
 
 		},
 		methods: {
+			detail(id) {
+				this.$router.push({
+					name: 'OaDocumentVerifyInfo',
+					query: {
+						id: id
+					}
+				})
+			},
 			//获取列表
 			getList() {
 				this.isLoading = true;
-				API_Attendance.getVerifyList(this.listForm).then(response => {
+				API.checkPageList(this.listForm).then(response => {
 					if (response) {
 						if (this.listForm.pageIndex == 1) {
 							this.recordList = response.data;
@@ -165,13 +175,8 @@
 							];
 						}
 					}
-					this.recordList=[{
-						createTime:'111111',
-						address:"1111111",
-						type:"1"
-						
-					}]
-					if (this.listForm.status == 0) {
+				
+					if (this.listForm.type == 0) {
 						this.firstRecordsTotal = response.recordsTotal;
 					}
 
@@ -195,7 +200,7 @@
 			},
 			//切换
 			reloadList(status) {
-				this.listForm.status = status;
+				this.listForm.type = status;
 				this.listForm.pageIndex = 1;
 				this.getList();
 			},
@@ -289,7 +294,7 @@
 	}
 </script>
 
-<style scoped src="@/assets/css/xpwyfyy.css"></style>
+<style scoped src="@/assets/css/xpwyfyy-oa.css"></style>
 <style src="@/assets/css/iconfont.css"></style>
 <style scoped>
 	.status_r {
@@ -314,3 +319,18 @@
 		margin-top: 45px;
 	}
 </style>
+
+<style scoped >
+	.classFF8400 {
+		color: #FF8400 ;
+	}
+	.class389E0D  {
+		color: #389E0D  ;
+	}
+	.classFF6666  {
+		color: #FF6666  ;
+	}
+	.classA5A5A5  {
+		color: #A5A5A5  ;
+	}
+</style>