zhengkaixin 2 yıl önce
ebeveyn
işleme
4bc77f306f

+ 2 - 2
src/commin.js

@@ -46,8 +46,8 @@
 		},
 		data() {
 			return {
-				testOpenid:"oHjCawmHqG44pqUW54iBlenaHYB8",//ys
-				//testOpenid:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//zkx
+				//testOpenid:"oHjCawmHqG44pqUW54iBlenaHYB8",//ys
+				testOpenid:"oHjCawigqi8SEAwutwkQ-VEgdp3k",//zkx
 				//testOpenid:"oHjCawsxTJkxixR74OVp7aCKahj8",//ylm
 				//testOpenid:"oHjCawgwCGen5k1-hAsimdEX5lZo",//sz
 				

+ 12 - 9
src/views-oa/Document/ExamineDetail.vue

@@ -39,8 +39,8 @@
 						<div class="vongi-slot-img" v-if="item.examineStep.examineType=='single'">
 
 							<img v-for="(item1,j) in item.stepPersonList" :key="j"
-								:src="item1.auditorImage+'?x-oss-process=image/resize,h_800,m_lfit'">
-
+								:src="item1.auditorImage?item1.auditorImage:defaultFace+'?x-oss-process=image/resize,h_800,m_lfit'">
+									
 
 							<img v-if="item.stepPersonList.length==0" src="@/assets/img/default_face.png">
 						</div>
@@ -89,7 +89,7 @@
 									<li class="mui-table-view-cell mui-media" v-for="(item1,j) in item.stepPersonList"
 										:key="'c'+j">
 										<div class="flex">
-											<img :src="item1.auditorImage+'?x-oss-process=image/resize,h_800,m_lfit'" />
+											<img :src="item1.auditorImage?item1.auditorImage:defaultFace+'?x-oss-process=image/resize,h_800,m_lfit'" />
 											<i class="iconfont icon-gou" v-if="item1.status=='1'"></i>
 											<i class="iconfont icon-chacha" v-if="item1.status=='2'"></i>
 										</div>
@@ -118,7 +118,7 @@
 						<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 ccPersonList" :key="'f'+j">
 								<div class="flex">
-									<img :src="item1.auditorImage+'?x-oss-process=image/resize,h_800,m_lfit'" />
+									<img :src="item1.auditorImage?item1.auditorImage:defaultFace+'?x-oss-process=image/resize,h_800,m_lfit'" />
 								</div>
 								<div class="mui-media-body">{{item1.auditorName}}</div>
 							</li>
@@ -143,13 +143,16 @@
 <script>
 	import * as API from '@/apis/Oa/doc'
 	import Loading from '@/components/Loading.vue'
-	import Person from './Person.vue'
-
+	import Person from './Person.vue'
+	//var defaultFace = require('@/assets/img/default_face.png')
+	
+	
 	export default {
 
 		name: 'examineDetail',
 		data() {
-			return {
+			return {
+				defaultFace:require('@/assets/img/default_face.png'),
 				showPerson: false,
 				selectIndex: 0,
 				selectIndexBl: true, // 添加 、 修改
@@ -226,7 +229,7 @@
 						this.init()
 					}).catch(error => {
 						this.isLoading = false;
-						mui.toast(error);
+						mui.toast("未获取到上一次审批记录,请手动添加");
 					})
 				}else{
 					mui.toast("请选择文件类型");
@@ -434,7 +437,7 @@
 						// 		var obj2 = obj.stepPersonList[j];
 						// 		obj2.id = obj2.personId;
 						// 		obj2.spStatus=obj2.status
-						// 		obj2.faceImageUrl=obj2.auditorImage
+						// 		obj2.faceImageUrl=obj2.audito2rImage
 						// 		obj2.name=obj2.auditorName
 						// }
 						if(obj.examineStep.stepType==2){

+ 7 - 4
src/views-oa/Document/Info.vue

@@ -25,10 +25,12 @@
           
             <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 class="vongi-qingjiadt-photo"
+				 style="border-radius: 0; margin: 3px 3px;float: left;"
+				 v-for="(item,index) in picList"  >
+                   
+                   <img :src="item" v-viewer />
+					
                 </span>
             </div>
 			
@@ -134,6 +136,7 @@ export default {
             // getter
             get: function () {
                 if (this.detail && this.detail.docFiles) {
+					console.log(this.detail.docFiles.split(','))
                     return this.detail.docFiles.split(',');
                 } else {
                     return [];

+ 4 - 2
src/views-oa/Document/VerifyInfo.vue

@@ -25,8 +25,10 @@
 		      
 		        <div class="mui-input-row">
 		            <label>图片附件</label>
-		            <span class="vongi-qingjiadt-photo">
-		                <template v-for="(item,index) in picList">
+		            <span class="vongi-qingjiadt-photo" 
+					 style="border-radius: 0; margin: 3px 3px;float: left;"
+					v-for="(item,index) in picList" >
+		                <template >
 		                    <img :src="item" v-viewer />
 		                </template>
 		            </span>

+ 4 - 2
src/views/Master/Attendance/LeaveInfo.vue

@@ -36,8 +36,10 @@
             </div>
             <div class="mui-input-row">
                 <label>上传图片</label>
-                <span class="vongi-qingjiadt-photo">
-                    <template v-for="(item,index) in picList">
+                <span class="vongi-qingjiadt-photo"
+				  style="border-radius: 0; margin: 3px 3px;float: left;"
+				 v-for="(item,index) in picList">
+                    <template >
                         <img :src="item" v-viewer />
                     </template>
                 </span>

+ 4 - 2
src/views/Master/Attendance/VerifyLeaveInfo.vue

@@ -45,8 +45,10 @@
 				</div>
 				<div class="mui-input-row">
 					<label>上传图片</label>
-					<span class="vongi-qingjiadt-photo">
-						<template v-for="(item,index) in picList">
+					<span class="vongi-qingjiadt-photo" 
+					 style="border-radius: 0; margin: 3px 3px;float: left;"
+					v-for="(item,index) in picList">
+						<template >
 							<img :src="item" v-viewer />
 
 						</template>