调整

src/views-oa/Document/ExamineDetail.vue

@@ -1,120 +1,286 @@
 <template>
-		<div>
+	
+	
+		<div style="padding-bottom: 10px;" >
 			<loading :visible="isLoading"></loading>
 			
+			<div class="mui-loading z-loadingDiv" v-show="showPerson">
+				<div>
+					<Person ></Person>
+				</div>
+			</div >
+			
+			<div v-show="!showPerson">
+				<div class="mui-content-padded" >
+					<h5>审核记录 
+						<span v-show="view&&!edit">修改流程</span>
+						<span  v-show="view&&edit" >取消修改</span>
+					</h5>
+				</div>
+				<div class="vongi-slot" style="padding-bottom: 10px;">
+						
+					<template v-for="(item,i) in examineDetail.examineList" >
+						
+						<div class="vongi-slot-block" :key="i">
+							<!-- 单人展示单人 -->
+							<!-- 多人展示单人 -->
+							<!-- 多人展示多人 -->
+							<div class="vongi-slot-img"
+								v-if="item.source==1">
+								
+								<img v-for="(item1,j) in item.examinePersonDetailDTOList" :key="j" :src="item1.faceImageUrl+'?x-oss-process=image/resize,h_800,m_lfit'">
+								
+								
+								<img v-if="item.examinePersonDetailDTOList.length==0" src="@/assets/img/default_face.png" >
+							</div>
+							
+							<div class="vongi-slot-img" v-else>
+								<img src="@/assets/img/team.png">
+							</div>
 				
-			<div class="mui-content-padded" v-if="examineDetail.examineList">
-				<h5>审核记录</h5>
-			</div>
-			<div class="vongi-slot">
-				<template v-for="item,i in examineDetail.examineList">
-
-					<div class="vongi-slot-block">
-						<!-- 单人展示单人 -->
-						<!-- 多人展示单人 -->
-						<!-- 多人展示多人 -->
-						<div class="vongi-slot-img"
-							v-if="item.source==1&&item.operation=='or'&&item.examinePersonDetailDTOList.length==1 ">
-							<img v-for="item1,j in item.examinePersonDetailDTOList" :src="item1.faceImageUrl+'?x-oss-process=image/resize,h_800,m_lfit'">
-						</div>
-						<div class="vongi-slot-img" v-else-if="item.source!=1&&item.operation=='or'&&item.action!=0 &&item.examinePersonDetailDTOList.length==1">
-							<img v-for="item1,j in item.examinePersonDetailDTOList" :src="item1.faceImageUrl+'?x-oss-process=image/resize,h_800,m_lfit'"
-								v-if="item1.action!='0'">
-						</div>
-						<div class="vongi-slot-img" v-else>
-							<img src="~$project/assets/img/team.png">
+				
+							<div class="vongi-slot-content">
+								<h4>{{item.desc}}
+								<span class="mui-pull-right mui-h5 color999">{{item.finishTime}}</span>
+								
+								<span v-if="operationBool&&(item.action!=2)"
+								  @click="editbtn(i,item.examinePersonDetailDTOList)" 
+								 class=" mui-h5 color-bule">修改</span> 
+								
+								<span v-if="operationBool&&(item.action==0)"
+								class="mui-pull-right mui-h5 " style="color: red;"  @click="delbtn(i)" >删除</span>
+								
+								 <span class="mui-pull-right mui-h5" 
+								 v-if="operationBool&&(item.action!=2)"
+								 v-show="i!=examineDetail.examineList.length-1"
+								  @click="addExamineBtn(i)" >向下添加  </span> 
+									
+								</h4>
+								
+								<template
+									v-if="item.source==1   ">
+									
+									<p v-for="(item1,j) in item.examinePersonDetailDTOList" :key="'a'+j">{{item1.name}}
+										<span :class="getClass(item1,i)">{{item1.remark}}</span>
+									</p>
+									<ul class="mui-table-view mui-grid-view mui-grid-9 flex ">
+									</ul>
+								</template>
+								
+								<template v-else>
+									<p>{{item.operation=='or'?'或签':''}}{{item.operation=='and'?'会签':''}}{{item.examinePersonDetailDTOList.length}}人
+										<span :class="getClass(item,i)"  >{{item.actionName}} </span>
+									</p>
+									<ul class="mui-table-view mui-grid-view mui-grid-9 flex ">
+				
+				
+										<li class="mui-table-view-cell mui-media"
+											v-for="(item1,j) in item.examinePersonDetailDTOList"  :key="'c'+j">
+											<div class="flex">
+												<img :src="item1.faceImageUrl+'?x-oss-process=image/resize,h_800,m_lfit'" />
+												<i class="iconfont icon-gou" v-if="item1.action=='1'"></i>
+												<i class="iconfont icon-chacha" v-if="item1.action=='2'"></i>
+											</div>
+											<div class="mui-media-body">{{item1.name}}</div>
+										</li>
+									</ul>
+									<p v-for="(item1,j) in item.examinePersonDetailDTOList" 
+									style=" background-color: #EBEBEE;"
+									:key="'a'+j" v-if="item1.action!='0'">{{item1.name}}:
+										<span :class="getClass(item1,i)">{{item1.remark}}</span>
+									</p>
+								</template>
+				
+							</div>
+							 
 						</div>
-
-
-						<div class="vongi-slot-content">
-							<h4>{{item.desc}}<span class="mui-pull-right mui-h5 color999">{{item.finishTime}}</span>
-							</h4>
-
-							<template
-								v-if="item.source==1&&item.operation=='or'&&item.examinePersonDetailDTOList.length==1 ">
-								<p v-for="item1,j in item.examinePersonDetailDTOList">{{item1.name}}
-									<span :class="getClass(item1,i)">{{item1.remark}}</span>
-								</p>
-							</template>
-							<template v-else-if="item.source!=1&&item.operation=='or'&&item.action!=0 &&item.examinePersonDetailDTOList.length==1">
-								<p v-for="item1,j in item.examinePersonDetailDTOList">{{item1.name}}
-									<span :class="getClass(item1,i)" v-if="item1.action!='0'">{{item1.remark}}</span>
-								</p>
-							</template>
-							<template v-else>
-								<p>{{item.operation=='or'?'或签':''}}{{item.operation=='and'?'会签':''}}{{item.examinePersonDetailDTOList.length}}人
-									<span :class="getClass(item,i)"  >{{item.actionName}} </span>
-								</p>
+						
+						
+				
+						<div class="vongi-slot-block" v-if="item.action=='1'&&item.ccPersonDetailDTOList.length"  :key="'e'+i" >
+							<div class="vongi-slot-img"><img src="@/assets/img/icon_chaosong.png"></div>
+							<div class="vongi-slot-content">
+								<h4>抄送人</h4>
+								<p>已抄送{{item.ccPersonDetailDTOList.length}}人</p>
 								<ul class="mui-table-view mui-grid-view mui-grid-9 flex ">
-
-
-									<li class="mui-table-view-cell mui-media"
-										v-for="item1,j in item.examinePersonDetailDTOList">
+									<li class="mui-table-view-cell mui-media" v-for="(item1,j) in item.ccPersonDetailDTOList"  :key="'f'+j">
 										<div class="flex">
 											<img :src="item1.faceImageUrl+'?x-oss-process=image/resize,h_800,m_lfit'" />
-											<i class="iconfont icon-gou" v-if="item1.action=='1'"></i>
-											<i class="iconfont icon-chacha" v-if="item1.action=='2'"></i>
 										</div>
 										<div class="mui-media-body">{{item1.name}}</div>
 									</li>
+				
 								</ul>
-							</template>
-
-						</div>
-					</div>
-
-
-					<div class="vongi-slot-block" v-if="item.action=='1'&&item.ccPersonDetailDTOList.length">
-						<div class="vongi-slot-img"><img src="~$project/assets/img/icon_chaosong.png"></div>
-						<div class="vongi-slot-content">
-							<h4>抄送人</h4>
-							<p>已抄送{{item.ccPersonDetailDTOList.length}}人</p>
-							<ul class="mui-table-view mui-grid-view mui-grid-9 flex ">
-								<li class="mui-table-view-cell mui-media" v-for="item1,j in item.ccPersonDetailDTOList">
-									<div class="flex">
-										<img :src="item1.faceImageUrl+'?x-oss-process=image/resize,h_800,m_lfit'" />
-									</div>
-									<div class="mui-media-body">{{item1.name}}</div>
-								</li>
-
-							</ul>
+							</div>
 						</div>
+				
+					</template>
+				
+					</div> 
+					
+					<div  class="addbtn" style="text-align: center;" v-if="operationBool" >
+						<button class="btn1 mui-btn mui-btn-primary" @click="addExamineBtn(-1)">添加流程</button>
+						
+						<button class="btn1 mui-btn mui-btn-primary" v-show="view&&edit" >保存</button>
+						
 					</div>
-
-				</template>
-				</div> 
-			
+			</div>
+				
 		</div>
 </template>
 
 <script>
-		import * as API_sp from '@/apis-xsy/xsy'
-	import Loading from '$project/components/Loading.vue'
+		//import * as API_sp from '@/apis-xsy/xsy'
+	import Loading from '@/components/Loading.vue'
+	import Person from './Person.vue'
 
 	export default {
 	
 		name: 'examineDetail',
 		data() {
 			return {
+				showPerson:true,
 				isLoading:false,
-				examineDetail: {},
+				examineDetail: {
+					"examineList2": [],
+					"examineList": [
+						{
+							"finishTime": null,
+							"action": "2",
+							"actionName": "已审核",
+							"remark": "已审核1",
+							"operation": "or",
+							"source": "1",
+							"desc": "审核人",
+							"examinePersonDetailDTOList": [
+								
+								{
+									"personId": 49605,
+									"faceImageUrl": "http://oss.xiaoxinda.com/smart/person/2021/5/24/75e73e10-0590-45d4-95cb-0731596ead09/1.jpg",
+									"name": "付龙龙",
+									"type": "1",
+									"action": "1",
+									"remark": "已审核2"
+								}
+							],
+							"ccPersonDetailDTOList": []
+						},
+						{
+							"finishTime": null,
+							"action": "1",
+							"actionName": "待审核",
+							"remark": "待审核",
+							"operation": "or",
+							"source": "0",
+							"desc": "审核人",
+							"examinePersonDetailDTOList": [
+								{
+									"personId": 49881,
+									"faceImageUrl": "http://oss.xiaoxinda.com/smart/person/2021/5/31/f29e6b9d-80a4-451a-a0e7-294c3f5a4b4b/1.jpg",
+									"name": "郑开鑫",
+									"type": "1",
+									"action": "1",
+									"remark": "待审核"
+								},
+								{
+									"personId": 49605,
+									"faceImageUrl": "http://oss.xiaoxinda.com/smart/person/2021/5/24/75e73e10-0590-45d4-95cb-0731596ead09/1.jpg",
+									"name": "付龙龙",
+									"type": "1",
+									"action": "2",
+									"remark": "待审核"
+								}
+							],
+							"ccPersonDetailDTOList": []
+						},
+						{
+							"finishTime": null,
+							"action": "0",
+							"actionName": "待审核",
+							"remark": "待审核",
+							"operation": "or",
+							"source": "0",
+							"desc": "审核人",
+							"examinePersonDetailDTOList": [
+								{
+									"personId": 49881,
+									"faceImageUrl": "http://oss.xiaoxinda.com/smart/person/2021/5/31/f29e6b9d-80a4-451a-a0e7-294c3f5a4b4b/1.jpg",
+									"name": "郑开鑫",
+									"type": "1",
+									"action": "0",
+									"remark": "待审核"
+								},
+								{
+									"personId": 49605,
+									"faceImageUrl": "http://oss.xiaoxinda.com/smart/person/2021/5/24/75e73e10-0590-45d4-95cb-0731596ead09/1.jpg",
+									"name": "付龙龙",
+									"type": "1",
+									"action": "0",
+									"remark": "待审核"
+								}
+							],
+							"ccPersonDetailDTOList": []
+						}
+					],
+					"allowExamine": true,
+					"procinstActUserId": "726dead5-1d0d-4d27-afef-94166bb2d119",
+					"ownerSubmit": true
+				},
 				only: "test"
 
 			}
 		},
 		components: {
 		
-			Loading,
+			Loading,Person
 		
 		},
 		props: {
 			id: {
-				require: true,
+				require: false,
 				default: '',
 			},
+			//编辑状态
+			edit: {
+				require: false,
+				default: true,
+			},
+			//是否只能查看
+			view: {
+				require: false,
+				default: false,
+			},
+		},
+		computed:{
+			operationBool(){
+				return this.edit
+			}
 		},
 		methods: {
-			
+			editbtn(i,list){
+				
+			},
+			delbtn(i){
+				
+			},
+			addExamineBtn(i){
+				// var obj={
+				// 	source:1,
+				// 	desc:"审批人",
+				// 	operation:"or",
+				// 	examinePersonDetailDTOList:[],
+				// 	ccPersonDetailDTOList:[],
+				// }
+				// if(type){
+				// 	obj.source=0
+				// 	obj.operation=type
+				// }
+				// if(i==-1){
+				// 	this.examineDetail.examineList.push(obj)
+				// }else{
+					
+				// }
+			},
 			getClass(ac, i) {
 				var reclass = ""
 				
@@ -154,13 +320,13 @@
 			},
 		},
 		mounted() {
-				this.getExamineDetail();
+			//	this.getExamineDetail();
 		}
 	}
 </script>
 
 <style src="@/assets/css/iconfont.css"></style>
-<style scoped src="@/assets/css/xpwyfyy.css"></style>
+<style scoped src="@/assets/css/xpwyfyy-oa.css"></style>
 <style src="@/assets/css/xsy.css"></style>
 <style scoped>
 	.color3385FF {
@@ -170,4 +336,33 @@
 	.color389E0D {
 		color: #389E0D
 	}
+	.mui-content-padded{
+		margin:0 !important;
+		border-top: 1px solid #f4f4f6 ;
+	}
+	.addbtn{
+		text-align: center;
+	}
+	.mui-pull-right{
+		padding-left: 5px;
+	}
+	.btn1,.btn2,.btn3{
+		padding: 3px 8px;
+		margin-right: 2px;
+	}
+	.z-loadingDiv {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background: rgb(255, 255, 255);
+		z-index: 999;
+	}
+	
+	.z-loadingDiv div {
+		/* top: 40%;
+		position: absolute;
+		left: 40% */
+	}
 </style>

src/views-oa/Document/Form.vue

@@ -50,86 +50,7 @@
 			</div>
 		</div>
 		<div class="mui-content vongi-wordcard" style=" background-color: #ffffff;margin-top: 10px;    padding-top: 0px;">
-			<div class="mui-content-padded" >
-				<h5>审核记录</h5>
-			</div>
-			<div class="vongi-slot">
-				<template v-for="item,i in examineDetail.examineList">
-			
-					<div class="vongi-slot-block">
-						<!-- 单人展示单人 -->
-						<!-- 多人展示单人 -->
-						<!-- 多人展示多人 -->
-						<div class="vongi-slot-img"
-							v-if="item.source==1&&item.operation=='or'&&item.examinePersonDetailDTOList.length==1 ">
-							<img v-for="item1,j in item.examinePersonDetailDTOList" :src="item1.faceImageUrl+'?x-oss-process=image/resize,h_800,m_lfit'">
-						</div>
-						<div class="vongi-slot-img" v-else-if="item.source!=1&&item.operation=='or'&&item.action!=0 &&item.examinePersonDetailDTOList.length==1">
-							<img v-for="item1,j in item.examinePersonDetailDTOList" :src="item1.faceImageUrl+'?x-oss-process=image/resize,h_800,m_lfit'"
-								v-if="item1.action!='0'">
-						</div>
-						<div class="vongi-slot-img" v-else>
-							<img src="@/assets/img/team.png">
-						</div>
-			
-			
-						<div class="vongi-slot-content">
-							<h4>{{item.desc}}<span class="mui-pull-right mui-h5 color999">{{item.finishTime}}</span>
-							</h4>
-			
-							<template
-								v-if="item.source==1&&item.operation=='or'&&item.examinePersonDetailDTOList.length==1 ">
-								<p v-for="item1,j in item.examinePersonDetailDTOList">{{item1.name}}
-									<span :class="getClass(item1,i)">{{item1.remark}}</span>
-								</p>
-							</template>
-							<template v-else-if="item.source!=1&&item.operation=='or'&&item.action!=0 &&item.examinePersonDetailDTOList.length==1">
-								<p v-for="item1,j in item.examinePersonDetailDTOList">{{item1.name}}
-									<span :class="getClass(item1,i)" v-if="item1.action!='0'">{{item1.remark}}</span>
-								</p>
-							</template>
-							<template v-else>
-								<p>{{item.operation=='or'?'或签':''}}{{item.operation=='and'?'会签':''}}{{item.examinePersonDetailDTOList.length}}人
-									<span :class="getClass(item,i)"  >{{item.actionName}} </span>
-								</p>
-								<ul class="mui-table-view mui-grid-view mui-grid-9 flex ">
-			
-			
-									<li class="mui-table-view-cell mui-media"
-										v-for="item1,j in item.examinePersonDetailDTOList">
-										<div class="flex">
-											<img :src="item1.faceImageUrl+'?x-oss-process=image/resize,h_800,m_lfit'" />
-											<i class="iconfont icon-gou" v-if="item1.action=='1'"></i>
-											<i class="iconfont icon-chacha" v-if="item1.action=='2'"></i>
-										</div>
-										<div class="mui-media-body">{{item1.name}}</div>
-									</li>
-								</ul>
-							</template>
-			
-						</div>
-					</div>
-			
-			
-					<div class="vongi-slot-block" v-if="item.action=='1'&&item.ccPersonDetailDTOList.length">
-						<div class="vongi-slot-img"><img src="@/assets/img/icon_chaosong.png"></div>
-						<div class="vongi-slot-content">
-							<h4>抄送人</h4>
-							<p>已抄送{{item.ccPersonDetailDTOList.length}}人</p>
-							<ul class="mui-table-view mui-grid-view mui-grid-9 flex ">
-								<li class="mui-table-view-cell mui-media" v-for="item1,j in item.ccPersonDetailDTOList">
-									<div class="flex">
-										<img :src="item1.faceImageUrl+'?x-oss-process=image/resize,h_800,m_lfit'" />
-									</div>
-									<div class="mui-media-body">{{item1.name}}</div>
-								</li>
-			
-							</ul>
-						</div>
-					</div>
-			
-				</template>
-				</div> 
+			<examineDetail :edit="true"   ></examineDetail>	
 		</div>
 
 			
@@ -149,6 +70,8 @@
 	require('@/assets/js/mui.picker.min.js');
 	import * as API_Leave from '@/apis/Master/leave'
 	import Common from '@/components/Common.vue'
+	import examineDetail from './ExamineDetail.vue'
+	
 	import Loading from '@/components/Loading.vue'
 	import TopHeader from '@/components/TopHeader.vue'
 	import {
@@ -166,45 +89,11 @@
 		components: {
 			Common,
 			Loading,
-			TopHeader
+			TopHeader,examineDetail
 		},
 		data() {
 			return {
-				examineDetail: {
-    "examineList": [
-        {
-            "finishTime": null,
-            "action": "0",
-            "actionName": "待审核",
-            "remark": "待审核",
-            "operation": "or",
-            "source": "1",
-            "desc": "审核人",
-            "examinePersonDetailDTOList": [
-                {
-                    "personId": 49881,
-                    "faceImageUrl": "http://oss.xiaoxinda.com/smart/person/2021/5/31/f29e6b9d-80a4-451a-a0e7-294c3f5a4b4b/1.jpg",
-                    "name": "郑开鑫",
-                    "type": "1",
-                    "action": "0",
-                    "remark": "待审核"
-                },
-                {
-                    "personId": 49605,
-                    "faceImageUrl": "http://oss.xiaoxinda.com/smart/person/2021/5/24/75e73e10-0590-45d4-95cb-0731596ead09/1.jpg",
-                    "name": "付龙龙",
-                    "type": "1",
-                    "action": "0",
-                    "remark": "待审核"
-                }
-            ],
-            "ccPersonDetailDTOList": []
-        }
-    ],
-    "allowExamine": true,
-    "procinstActUserId": "726dead5-1d0d-4d27-afef-94166bb2d119",
-    "ownerSubmit": true
-},
+				
 				only: "test",
 				pageTitle: '请假',
 				daytime:'',

src/views-oa/Document/Info.vue

@@ -60,6 +60,9 @@
         </div>
     </div>
 
+	<div class="mui-content vongi-wordcard" style=" background-color: #ffffff;margin-top: 10px;    padding-top: 0px;">
+		<examineDetail :edit="true" :view="true" ></examineDetail>	
+	</div>
 
     <loading :visible="isLoading"></loading>
 

src/views-oa/Document/Person.vue

@@ -28,7 +28,7 @@
 				<div class="mui-content-padded" v-show="arrangeShiftPersonList"  >
 					<h5><i class="iconfont icon-ze-friends blue"></i>人员列表</h5>
 				</div>
-				<form class="mui-input-group">
+				<form class="mui-input-group" style="background-color: #fff; ">
 					
 					<div class="mui-input-row "  v-for="(item,index) in arrangeShiftCompanyList" @click="checkboxBtn(item),selectId.push(item.id)"   v-if="item.type==2">
 						<label>{{item.name}}</label>
@@ -52,7 +52,7 @@
 
 <script>
  
-	import * as API from '@/apis/applyclass'
+	//import * as API from '@/apis/applyclass'
  
 	import Loading from '@/components/Loading.vue'
 	 
@@ -69,7 +69,182 @@
 				clientHeight:37,
 				companyId:'',
 				  isLoading: false,
-				  arrangeShiftCompanyList:[],
+				  arrangeShiftCompanyList2:[
+					  {
+					      "id": "49827",
+					      "name": "徐州轶",
+					      "desc": "100101",
+					      "type": "2",
+					      "list": null
+					  },
+				  ],
+				  arrangeShiftCompanyList:[
+					 {
+					     "id": "49827",
+					     "name": "徐州轶",
+					     "desc": "100101",
+					     "type": "2",
+					     "list": null
+					 },
+					 {
+					     "id": "49881",
+					     "name": "郑开鑫",
+					     "desc": "22922",
+					     "type": "2",
+					     "list": null
+					 }, {
+					      "id": "49827",
+					      "name": "徐州轶",
+					      "desc": "100101",
+					      "type": "2",
+					      "list": null
+					  },
+					  {
+					      "id": "49881",
+					      "name": "郑开鑫",
+					      "desc": "22922",
+					      "type": "2",
+					      "list": null
+					  }, {
+					      "id": "49827",
+					      "name": "徐州轶",
+					      "desc": "100101",
+					      "type": "2",
+					      "list": null
+					  },
+					  {
+					      "id": "49881",
+					      "name": "郑开鑫",
+					      "desc": "22922",
+					      "type": "2",
+					      "list": null
+					  }, {
+					      "id": "49827",
+					      "name": "徐州轶",
+					      "desc": "100101",
+					      "type": "2",
+					      "list": null
+					  },
+					  {
+					      "id": "49881",
+					      "name": "郑开鑫",
+					      "desc": "22922",
+					      "type": "2",
+					      "list": null
+					  }, {
+					      "id": "49827",
+					      "name": "徐州轶",
+					      "desc": "100101",
+					      "type": "2",
+					      "list": null
+					  },
+					  {
+					      "id": "49881",
+					      "name": "郑开鑫",
+					      "desc": "22922",
+					      "type": "2",
+					      "list": null
+					  }, {
+					      "id": "49827",
+					      "name": "徐州轶",
+					      "desc": "100101",
+					      "type": "2",
+					      "list": null
+					  },
+					  {
+					      "id": "49881",
+					      "name": "郑开鑫",
+					      "desc": "22922",
+					      "type": "2",
+					      "list": null
+					  }, {
+					      "id": "49827",
+					      "name": "徐州轶",
+					      "desc": "100101",
+					      "type": "2",
+					      "list": null
+					  },
+					  {
+					      "id": "49881",
+					      "name": "郑开鑫",
+					      "desc": "22922",
+					      "type": "2",
+					      "list": null
+					  }, {
+					      "id": "49827",
+					      "name": "徐州轶",
+					      "desc": "100101",
+					      "type": "2",
+					      "list": null
+					  },
+					  {
+					      "id": "49881",
+					      "name": "郑开鑫",
+					      "desc": "22922",
+					      "type": "2",
+					      "list": null
+					  },
+					  {
+					      "id": "49881",
+					      "name": "郑开鑫",
+					      "desc": "22922",
+					      "type": "2",
+					      "list": null
+					  }, {
+					      "id": "49827",
+					      "name": "徐州轶",
+					      "desc": "100101",
+					      "type": "2",
+					      "list": null
+					  },
+					  {
+					      "id": "49881",
+					      "name": "郑开鑫",
+					      "desc": "22922",
+					      "type": "2",
+					      "list": null
+					  },
+					  {
+					      "id": "49881",
+					      "name": "郑开鑫",
+					      "desc": "22922",
+					      "type": "2",
+					      "list": null
+					  }, {
+					      "id": "49827",
+					      "name": "徐州轶",
+					      "desc": "100101",
+					      "type": "2",
+					      "list": null
+					  },
+					  {
+					      "id": "49881",
+					      "name": "郑开鑫",
+					      "desc": "22922",
+					      "type": "2",
+					      "list": null
+					  },
+					  {
+					      "id": "49881",
+					      "name": "郑开鑫",
+					      "desc": "22922",
+					      "type": "2",
+					      "list": null
+					  }, {
+					      "id": "49827",
+					      "name": "徐州轶",
+					      "desc": "100101",
+					      "type": "2",
+					      "list": null
+					  },
+					  {
+					      "id": "49881",
+					      "name": "郑开鑫",
+					      "desc": "22922",
+					      "type": "2",
+					      "list": null
+					  },
+				  ],
 				  arrangeShiftPersonList:false,
 				  nowLevel: 0,
 				  navList: [{
@@ -246,7 +421,8 @@
 					}
 				});
 			}
-			this.getArrangeShiftCompanyList();
+			//this.getArrangeShiftCompanyList();
+			
 			//console.log("mounted")
 			//var _this = this;
 			//	window.addEventListener('scroll', _this.handleScrool);

src/views-oa/Document/VerifyInfo.vue

@@ -54,16 +54,9 @@
 				</ul>
 			</div>
 
-            <div class="vongi-slot mui-content-padded vongi-wordcard-center">
-                <div v-for="(item,index) in detail.list" class="vongi-slot-block">
-                    <div class="vongi-slot-img"><img :src="item.faceImageUrl"></div>
-                    <div class="vongi-slot-content">
-                        <h4>审批人{{index+1}}<span class="mui-pull-right mui-h5 color999" v-text="item.time"></span></h4>
-                        <p>{{item.name}} <span class="color55f868" :style="getColor(item.status)" v-text="item.statusN"></span></p>
-						<p v-if="item.approvalContent" v-text="item.approvalContent"></p>
-					</div>
-                </div>
-            </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">