zhengkaixin 4 роки тому
батько
коміт
68b71aed5f
29 змінених файлів з 265 додано та 52 видалено
  1. 1 1
      .env.development
  2. 1 0
      README.md
  3. 7 1
      src/projects/business/apis/Master/leave.js
  4. 12 0
      src/projects/business/router/master.js
  5. 1 0
      src/projects/business/views-xsy/Approval/Info.vue
  6. 1 1
      src/projects/business/views-xsy/CardReplacement/Add.vue
  7. 1 1
      src/projects/business/views-xsy/CardReplacement/Info.vue
  8. 1 1
      src/projects/business/views-xsy/Commerce/Add.vue
  9. 1 1
      src/projects/business/views-xsy/Commerce/Info2.vue
  10. 1 1
      src/projects/business/views-xsy/Scan/Info.vue
  11. 1 1
      src/projects/business/views/Master/Attendance/Apply.vue
  12. 1 1
      src/projects/business/views/Master/Attendance/LeaveForm.vue
  13. 127 12
      src/projects/business/views/Master/Attendance/LeaveInfo.vue
  14. 74 0
      src/projects/business/views/Master/Attendance/LeaveInfoCancel.vue
  15. 8 5
      src/projects/business/views/Master/Attendance/LeaveList.vue
  16. 1 1
      src/projects/business/views/Master/Attendance/Sign.vue
  17. 3 3
      src/projects/business/views/Master/BusinessTravel/Form.vue
  18. 7 7
      src/projects/business/views/Master/BusinessTravel/Info.vue
  19. 5 4
      src/projects/business/views/Master/BusinessTravel/Info2.vue
  20. 1 1
      src/projects/business/views/Master/Health/Report.vue
  21. 1 1
      src/projects/business/views/Master/Health/ReportInfo.vue
  22. 2 2
      src/projects/business/views/Master/Home.vue
  23. 1 1
      src/projects/business/views/Master/Mine/Feedback.vue
  24. 1 1
      src/projects/business/views/Master/Property/Complaint/Form.vue
  25. 1 1
      src/projects/business/views/Master/Property/Complaint/Info.vue
  26. 1 1
      src/projects/business/views/Master/Property/Complaint/VerifyInfo.vue
  27. 1 1
      src/projects/business/views/Master/Property/Repair/Info.vue
  28. 1 1
      src/projects/business/views/Master/Property/Repair/VerifyInfo.vue
  29. 1 1
      src/utils/request.js

+ 1 - 1
.env.development

@@ -2,7 +2,7 @@ NODE_ENV=devlopment
 VUE_APP_NODE_NAME=devlopment
 OUT_PUT_NAME=dev
 VUE_APP_LOCAL_STORAGE_PREFIX=dev
-VUE_APP_BACKEND_URL=http://192.168.33.120:8086/shinestar-server/
+VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/shinestar-server/
 VUE_APP_MIRROR_BACKEND_URL=https://mirror.xiaoxinda.com/xpgjapi/
 #小鹏管家微信appid
 VUE_APP_WXAPPID=wx7e70eb62a8459869

+ 1 - 0
README.md

@@ -49,6 +49,7 @@ pl-10
 []批量加班batchExtraWork
 []携物commerceWork
 []食堂接待treatWork
+[]销假leaveCancelWork
 
 
 外勤(不调整)/master/attendance/sign

+ 7 - 1
src/projects/business/apis/Master/leave.js

@@ -16,7 +16,13 @@ export function pageList(params) {
         method: 'post',
     })
 }
-
+export function cancelLeaveSubmit(params) {
+    return request({
+        url: '/mobile/requestForLeave/cancelLeaveSubmit',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
+}
 //请假类型列表
 export function leaveTypeList(params) {
     return request({

+ 12 - 0
src/projects/business/router/master.js

@@ -800,6 +800,18 @@ const routesMaster = [
 							title: '请假详情',
 						}
 					},
+					//请假详情
+					{
+						path: 'leaveInfoCancel',
+						name: 'MasterAttendanceLeaveInfoCancel',
+						component: () => import('../views/Master/Attendance/LeaveInfoCancel.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '销假详情',
+						}
+					},
+					
 					//请假提交
 					{
 						path: 'leaveForm',

+ 1 - 0
src/projects/business/views-xsy/Approval/Info.vue

@@ -25,6 +25,7 @@
 			 <Info7 v-if="sp&&formId=='extraWork'" @getInfo="getInfo"></Info7>
 			 <Info8 v-if="sp&&formId=='commerceWork'" @getInfo="getInfo"></Info8>
 			 <Info9 v-if="sp&&formId=='treatWork'" @getInfo="getInfo"></Info9>
+			 <Info2 v-if="sp&&formId=='leaveCancelWork'" @getInfo="getInfo"></Info2>
 			 
 			 
 			<examineDetail @allowExamine="allowExamine" :id="id" v-if="info.sp&&info.status!=4"></examineDetail>

+ 1 - 1
src/projects/business/views-xsy/CardReplacement/Add.vue

@@ -32,7 +32,7 @@
 				<h5>上传照片</h5>
 				<div class="fyy-upphoto">
 					<div class="mui-col-xs-3 fyy-upphoto-close" v-for="(item,index) in picList">
-						<img :src="item" />
+						<img :src="item" v-viewer />
 						<a class="mui-icon mui-icon-closeempty"  @click="delPic(item)"></a>
 					</div>
 					

+ 1 - 1
src/projects/business/views-xsy/CardReplacement/Info.vue

@@ -28,7 +28,7 @@
 							<div class="fyy-upphoto flew" >
 								<template  v-if="adjustShiftDetail.imageUrl">
 									<div class="mui-col-xs-3"  v-for="(item,index) in adjustShiftDetail.imageUrl.split(',')">
-										<img :src="item" />
+										<img :src="item" v-viewer />
 									</div>
 								</template>
 								

+ 1 - 1
src/projects/business/views-xsy/Commerce/Add.vue

@@ -27,7 +27,7 @@
                         <h5>图片附件</h5>
                         <div class="fyy-upphoto">
                             <div class="mui-col-xs-3 fyy-upphoto-close" v-for="(item,index) in picList">
-                                <img :src="item" />
+                                <img :src="item" v-viewer />
                                 <a class="mui-icon mui-icon-closeempty" @click="delPic(item)" ></a>
                             </div>
                             

+ 1 - 1
src/projects/business/views-xsy/Commerce/Info2.vue

@@ -28,7 +28,7 @@
 						<span class="vongi-span vongi-wordcard vongi-meform-pho">
 							<div class="fyy-upphoto flew"  v-if="adjustShiftDetail.images" >
 								<div class="mui-col-xs-3" v-for="(item,index) in adjustShiftDetail.images.split(',')">
-									<img :src="item" />
+									<img :src="item" v-viewer />
 								</div>
 							 
 							</div>

+ 1 - 1
src/projects/business/views-xsy/Scan/Info.vue

@@ -37,7 +37,7 @@
 							<span class="vongi-span vongi-wordcard vongi-meform-pho">
 							<div class="fyy-upphoto flew"  v-if="info.images" >
 								<div class="mui-col-xs-3"  v-for="(item,index) in info.images.split(',')">
-									<img :src="item" />
+									<img :src="item" v-viewer />
 								</div>
 								 
 							</div>

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

@@ -34,7 +34,7 @@
 				<h5>上传照片</h5>
 				<div class="fyy-upphoto">
 					<div class="mui-col-xs-3 fyy-upphoto-close" v-for="(item,index) in picList">
-						<img :src="item" />
+						<img :src="item" v-viewer />
 						<a class="mui-icon mui-icon-closeempty" @click="delPic(item)"></a>
 					</div>
 					<div class="mui-col-xs-3" @click="chooseImage">

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

@@ -58,7 +58,7 @@
 				<h5>上传照片</h5>
 				<div class="fyy-upphoto">
 					<div class="mui-col-xs-3 fyy-upphoto-close" v-for="(item,index) in picList">
-						<img :src="item" />
+						<img :src="item" v-viewer />
 						<a class="mui-icon mui-icon-closeempty" @click="delPic(item)"></a>
 					</div>
 					<div class="mui-col-xs-3" @click="chooseImage">

+ 127 - 12
src/projects/business/views/Master/Attendance/LeaveInfo.vue

@@ -28,20 +28,67 @@
            <label>请假事由</label>
            <span v-text="detail.reason">家中有事,需要会老家一趟家中有事,需要会老家一趟家中有事,需要会老家一趟家中有事,需要会老家一趟。</span>
        </div>
-       <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  vongi-wordcard">
+	   		   <div class="mui-content-padded" >
+	   		   		  <h5>上传图片</h5>
+	   		   
+	   		   		  <div class="fyy-upphoto">
+	   		   		  	<div class="mui-col-xs-3 fyy-upphoto-close" v-for="(item,index) in picList">
+	   		   		  		<img :src="item" v-viewer />
+	   		   		  	
+	   		   		  	</div>
+	   		   		  
+	   		   		  </div>
+	   		   </div>
+	   </div>
+	   
+	   
        <div class="mui-input-row">
            <label>申请时间</label>
            <span v-text="detail.createTime">2020-04-27 12:00:00</span>
        </div>
-   
-   
+	   <div class="mui-input-row  vongi-wordcard">
+		   <div class="mui-content-padded" v-if="detail.enableCancel&&opAction" >
+		   		  <h5>销假凭证</h5>
+		   
+		   		  <div class="fyy-upphoto">
+		   		  	<div class="mui-col-xs-3 fyy-upphoto-close" v-for="(item,index) in picList2">
+		   		  		<img :src="item" v-viewer />
+		   		  		<a class="mui-icon mui-icon-closeempty" @click="delPic(item)"></a>
+		   		  	</div>
+		   		  	<div class="mui-col-xs-3" @click="chooseImage">
+		   		  		<a><span class="mui-icon mui-icon-plusempty" 
+						style=" padding: 20px 18px 11px 0;"></span></a>
+		   		  	</div>
+		   		  </div>
+		   </div>
+	   </div>
+	
+	  
+	  <div class="mui-input-row  vongi-wordcard" v-if="detail.cancelImages">
+	  		   <div class="mui-content-padded" >
+	  		   		  <h5>销假凭证</h5>
+	  		   
+	  		   		  <div class="fyy-upphoto">
+	  		   		  	<div class="mui-col-xs-3 fyy-upphoto-close" v-for="(item,index) in detail.cancelImages.split(',')">
+	  		   		  		<img :src="item" v-viewer />
+	  		   		  	
+	  		   		  	</div>
+	  		   		  
+	  		   		  </div>
+	  		   </div>
+	  </div>
+	  <div class="mui-input-row"v-if="detail.cancelTime">
+	      <label>销假时间</label>
+	      <span v-text="detail.cancelTime">2020-04-27 12:00:00</span>
+	  </div>
+	   <div class="vongi-btn"  v-if="detail.enableCancel&&opAction">
+	   	<button class="mui-btn  mui-btn-primary "  type="button" @click="submit()">
+	   		申请销假
+	   	</button>
+	   </div>
+	
    </form>
 
 
@@ -51,6 +98,8 @@
 </template>
 
 <script>
+	import * as WxJsApi from '$project/utils/wxJsApi'
+	
 import * as API_Leave from '@/apis/Master/leave'
 import Common from '$project/components/Common.vue'
 import Loading from '$project/components/Loading.vue'
@@ -73,6 +122,7 @@ export default {
     },
     data() {
         return {
+			opAction:false,
             pageTitle: '请假详情',
             daytime:'',
             isLoading: false,
@@ -80,12 +130,43 @@ export default {
             detail: {},
             status: ['待审核', '已批准', '已拒绝'],
             statusColor: ['', 'mui-btn-success', 'mui-btn-danger'],
+			picList2:[],
         }
     },
     created() {
-
+		this.opAction=this.$route.query.opAction
     },
     methods: {
+		//微信选择图片
+		chooseImage() {
+			WxJsApi.chooseImage().then(res => {
+				var localData = res.localData;
+		
+				if (localData.indexOf('data:image') != 0) {
+					//判断是否有这样的头部
+					localData = 'data:image/jpeg;base64,' + localData
+				}
+				localData = localData.replace(/\r|\n/g, '').replace('data:image/jgp', 'data:image/jpeg')
+				this.imgBase64 = localData;
+				//显示裁剪图片
+				//_this.showCropper(field);
+				this.uploadpic();
+			}).catch(error => {
+				mui.toast(error);
+			})
+		},
+		//上传图片
+		uploadpic() {
+			this.isLoading = true;
+			WxJsApi.uploadPic(this.imgBase64).then(response => {
+				this.isLoading = false;
+		
+				this.picList2.push(response);
+			}).catch(error => {
+				this.isLoading = false;
+				mui.toast(error);
+			})
+		},
 		allowExamine(op){
 			this.$emit('allowExamine',op);	
 		},
@@ -116,6 +197,9 @@ export default {
                 this.daytime=day+'天';
 				this.detail.sp=true
 				this.detail.text=this.detail.typeName+"申请"
+				if(this.detail.cancelStatus!=5){
+					this.detail.statusName=this.detail.mergeStatusN;
+				}
 				this.$emit('getInfo',this.detail);
 				
                 this.isLoading = false;
@@ -124,7 +208,33 @@ export default {
                 mui.toast(error);
             })
         },
-
+		//提交
+		submit() {
+			if(this.picList2.length==0){
+				mui.toast("请上传销假凭证");
+				return
+			}
+ 			if (true) {
+				var obj={
+					imageUrl:this.picList2.join(','),
+					id:this.id,
+					formId:'leaveCancelWork'
+				}
+ 				this.isLoading = true;
+			 
+				API_Leave.cancelLeaveSubmit(obj).then(response => {
+					this.isLoading = false;
+					mui.toast("提交成功");
+						this.getDetail();				 
+					
+				}).catch(error => {
+				
+					
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			}
+		},
         asynCallBack() {
 
         },
@@ -135,6 +245,10 @@ export default {
 		}
     },
     mounted() {
+		if(this.opAction){
+			//获取微信配置
+			WxJsApi.getWxConfig();
+		}
         this.getDetail();
 
     },
@@ -164,5 +278,6 @@ export default {
 </script>
 
 <style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
 <style>
 </style>

+ 74 - 0
src/projects/business/views/Master/Attendance/LeaveInfoCancel.vue

@@ -0,0 +1,74 @@
+<template>
+<div>
+		<Info   ref="myinfo"></Info>
+		<div class="vongi-btn">
+			<button class="mui-btn  mui-btn-primary "  type="submit" @click="submit()">
+				提交
+			</button>
+		</div>
+ 		<loading :visible="isLoading"></loading>
+</div>
+</template>
+
+<script>
+	import Info from '@/views-xsy/Approval/Info.vue'
+	
+	import * as API from '@/apis-xsy/applyclass'
+	import * as API_sp from '@/apis-xsy/xsy'
+
+	import  Common from '$project/components/Common.vue'
+	 
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	
+	export default {
+		name: '',
+		components: {
+			Common,
+			Loading,
+			TopHeader,Info
+		},
+		data() {
+			return {
+				pageTitle: '申请调班详情',
+				showApprovalBl:false,
+				allowExamineBl:false,
+				isLoading: false,
+				subForm: {
+					procinstActUserIds: '',
+					content: '',
+					status: ''
+				},
+			}
+		},
+		created() {
+			
+	
+		},
+		methods: { 
+			submit(){},
+			 
+			 
+			 
+			asynCallBack() {
+	
+			},
+		
+		},
+		mounted() {
+		
+		},
+		destroyed() {},
+	
+	}
+</script>
+
+<style src="$project/assets/css/iconfont.css"></style>
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style src="$project/assets/css/xsy.css"></style>
+<style>
+</style>

+ 8 - 5
src/projects/business/views/Master/Attendance/LeaveList.vue

@@ -7,7 +7,7 @@
 		<div class="mui-content">
 			<div class="mui-content-padded vongi-work">
 				<ul class="mui-table-view vongi-qingjia">
-					<li class="mui-table-view-cell" v-for="mod in recordList" @click="detail(mod.id)">
+					<li class="mui-table-view-cell" v-for="mod in recordList" @click="detail(mod.id,mod.enableCancel)">
 						<h4>
 							{{mod.title}}
 							<span v-text="mod.createTime">12:00</span>
@@ -15,7 +15,7 @@
 						 
 						<button class="mui-btn   mui-btn-outlined" :class="{'mui-btn-primary':mod.status==0,
 						'mui-btn-danger':mod.status==2||mod.status==3,
-						'mui-btn-success':mod.status==1||mod.status==4}"  v-text="status[mod.status]"  ></button>
+						'mui-btn-success':mod.status==1||mod.status==4}"  v-text="mod.enableCancel||mod.cancelStatus!=5?mod.mergeStatusN:status[mod.status]"  ></button>
 							
 					</li>
 
@@ -77,12 +77,15 @@
 		},
 		methods: {
 			//info
-			detail(id) {
+			detail(id,bl) {
+				var routeName="XsyApprovalInfo";
+				
 				this.$router.push({
-					name: 'XsyApprovalInfo',
+					name: routeName,
 					query: {
 						id: id,
-						formId:'leaveWork'
+						formId:'leaveWork',
+						opAction:bl
 					}
 				})
 			},

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

@@ -43,7 +43,7 @@
 				<h5>上传照片</h5>
 				<div class="fyy-upphoto">
 					<div class="mui-col-xs-3 fyy-upphoto-close" v-for="(item,index) in picList">
-						<img :src="item" />
+						<img :src="item" v-viewer />
 						<a class="mui-icon mui-icon-closeempty" @click="delPic(item)"></a>
 					</div>
 					<div class="mui-col-xs-3" @click="chooseImage">

+ 3 - 3
src/projects/business/views/Master/BusinessTravel/Form.vue

@@ -17,7 +17,7 @@
 					<div class="mui-input-row">
 						<label><i class="colorfe616c">*</i> 出差日期</label>
 						<button @click="selectStartTime" class="mui-btn mui-btn-block mui-navigate-right mui-ellipsis" type='button' style="width:65%">
-							{{subForm.startTimeShow}}{{subForm.startTimeQuantum=='0'?'上午':''}}{{subForm.startTimeQuantum=='1'?'下午':''}}
+							{{subForm.startTimeShow}}{{subForm.startTimeQuantum=='0'?' 00:00':''}}{{subForm.startTimeQuantum=='1'?' 12:00':''}}
 						</button>
 					</div>
 					<div class="mui-input-row vongi-dw">
@@ -127,7 +127,7 @@
 					"beginDate": new Date(),
 			        "value": startTime,
 			
-			        "customData":{"h":[{"text":"上午","value":"0"},{"text":"下午","value":"1"}]}
+			        "customData":{"h":[{"text":"00:00","value":"0"},{"text":"12:00","value":"1"}]}
 			
 			
 			    });
@@ -191,7 +191,7 @@
 				}
 				if (this.checkForm()) {
 					this.subForm.startTime=this.subForm.startTimeShow+
-					(this.subForm.startTimeQuantum=='0'?' 06:00':' 12:00')
+					(this.subForm.startTimeQuantum=='0'?' 00:00':' 12:00')
 					
 					this.isLoading = true;
 					API_BusinessTravel.submitBusiness(this.subForm).then(response => {

+ 7 - 7
src/projects/business/views/Master/BusinessTravel/Info.vue

@@ -31,6 +31,10 @@
 					<label>预估天数</label>
 					<span v-text="detail.estimatedTime+'天'"></span>
 				</div>
+				<div v-if="detail.endTime " class="mui-input-row">
+					<label>结束时间</label>
+					<span v-text="detail.endTime"></span>
+				</div>
 				<div class="mui-input-row">
 					<label>出差事由</label>
 					<span v-text="detail.content"></span>
@@ -40,17 +44,13 @@
 					<label>申请时间</label>
 					<span v-text="detail.createTime"></span>
 				</div>
-				<div v-if="detail.endTime || closeFrom.time" class="mui-input-row">
-					<label>返回时间</label>
-					<span v-text="detail.endTime?detail.endTime:closeFrom.time"></span>
-				</div>
+				 
 			</form>
 			 <examineDetail :id="id" @allowExamine="allowExamine" v-if="detail.sp&&detail.status!=4"></examineDetail>
 			 
 		</div>
-		<div v-if="wm && !detail.endTime" class="fyy-footer">
-			<div class="bindfyy-btn"><button type="button" @click="closeActoin" class="mui-btn mui-btn-danger">结束出差</button></div>
-	
+		<div v-if="false&&wm && !detail.endTime" class="fyy-footer">
+			<div class="bindfyy-btn"><button type="button" @click="closeActoin" class="mui-btn mui-btn-danger">结束出差</button></div>	
 		</div>
 			
 		<loading :visible="isLoading"></loading>

+ 5 - 4
src/projects/business/views/Master/BusinessTravel/Info2.vue

@@ -18,6 +18,10 @@
 					<label>预估天数</label>
 					<span v-text="detail.estimatedTime+'天'"></span>
 				</div>
+				<div v-if="detail.endTime " class="mui-input-row">
+					<label>结束时间</label>
+					<span v-text="detail.endTime"></span>
+				</div>
 				<div class="mui-input-row">
 					<label>出差事由</label>
 					<span v-text="detail.content"></span>
@@ -27,10 +31,7 @@
 					<label>申请时间</label>
 					<span v-text="detail.createTime"></span>
 				</div>
-				<div v-if="detail.endTime || closeFrom.time" class="mui-input-row">
-					<label>返回时间</label>
-					<span v-text="detail.endTime?detail.endTime:closeFrom.time"></span>
-				</div>
+				
 			</form>
  			 
 		

+ 1 - 1
src/projects/business/views/Master/Health/Report.vue

@@ -14,7 +14,7 @@
 				<h5>上传照片</h5>
 				<div class="fyy-upphoto">
 					<div class="mui-col-xs-3 fyy-upphoto-close" v-for="(item,index) in picList">
-						<img :src="item" />
+						<img :src="item" v-viewer />
 						<a class="mui-icon mui-icon-closeempty" @click="delPic(item)"></a>
 					</div>
 					<div class="mui-col-xs-3" @click="chooseImage">

+ 1 - 1
src/projects/business/views/Master/Health/ReportInfo.vue

@@ -24,7 +24,7 @@
 						<span v-if="detail.img" class="vongi-span vongi-wordcard vongi-meform-pho">
 							<div class="fyy-upphoto flew">
 								<div v-for="(item,index) in detail.img.split(',')" class="mui-col-xs-3">
-									<img :src="item" />
+									<img :src="item" v-viewer />
 								</div>
 							</div>
 						</span>

+ 2 - 2
src/projects/business/views/Master/Home.vue

@@ -150,8 +150,8 @@
 		created() {},
 		methods: {
 			getDown(){
-				var url='http://rccs.oss-cn-hangzhou.aliyuncs.com/jp_housekeeper/xsy/file/%E5%BE%AE%E4%BF%A1%E6%93%8D%E4%BD%9C.docx';
-				 window.location=url;
+				var url='http://xpgj.xiaoxinda.com/xpgj/xsy-file/%E5%BE%AE%E4%BF%A1%E6%93%8D%E4%BD%9C.html';
+				 window.open(url);
 			},
             goto(url){
                 window.location=url;

+ 1 - 1
src/projects/business/views/Master/Mine/Feedback.vue

@@ -14,7 +14,7 @@
 				<h5>上传图片<span class="mui-h6">(选填,提供问题截图)</span></h5>
 				<div class="fyy-upphoto">
 					<div v-for="(item,index) in listPic" class="mui-col-xs-3">
-						<img :src="item" />
+						<img :src="item" v-viewer />
 					</div>
 					<div class="mui-col-xs-3" @click="chooseImage">
 						<a><span class="mui-icon mui-icon-camera"></span></a>

+ 1 - 1
src/projects/business/views/Master/Property/Complaint/Form.vue

@@ -25,7 +25,7 @@
 				<h5>上传图片<span class="color999">(选填,提供问题截图)</span></h5>
 				<div class="fyy-upphoto">
 					<div v-for="(item,index) in picList" class="mui-col-xs-3 fyy-upphoto-close">
-						<img :src="item" />
+						<img :src="item" v-viewer />
 						<a class="mui-icon mui-icon-closeempty" @click="delPic(item)"></a>
 					</div>
 					<div class="mui-col-xs-3" @click="chooseImage">

+ 1 - 1
src/projects/business/views/Master/Property/Complaint/Info.vue

@@ -24,7 +24,7 @@
 						<span class="vongi-span vongi-wordcard vongi-meform-pho">
 							<div v-if="detail.img" class="fyy-upphoto flew">
 								<div v-for="(item,index) in detail.img.split(',')" class="mui-col-xs-3">
-									<img :src="item" />
+									<img :src="item" v-viewer />
 								</div>
 							</div>
 						</span>

+ 1 - 1
src/projects/business/views/Master/Property/Complaint/VerifyInfo.vue

@@ -32,7 +32,7 @@
 						<span class="vongi-span vongi-wordcard vongi-meform-pho">
 							<div v-if="detail.img" class="fyy-upphoto flew">
 								<div v-for="(item,index) in detail.img.split(',')" class="mui-col-xs-3">
-									<img :src="item" />
+									<img :src="item" v-viewer />
 								</div>
 							</div>
 						</span>

+ 1 - 1
src/projects/business/views/Master/Property/Repair/Info.vue

@@ -24,7 +24,7 @@
 						<span class="vongi-span vongi-wordcard vongi-meform-pho">
 							<div v-if="detail.img" class="fyy-upphoto flew">
 								<div v-for="(item,index) in detail.img.split(',')" class="mui-col-xs-3">
-									<img :src="item" />
+									<img :src="item" v-viewer />
 								</div>
 							</div>
 						</span>

+ 1 - 1
src/projects/business/views/Master/Property/Repair/VerifyInfo.vue

@@ -32,7 +32,7 @@
 						<span class="vongi-span vongi-wordcard vongi-meform-pho">
 							<div v-if="detail.img" class="fyy-upphoto flew">
 								<div v-for="(item,index) in detail.img.split(',')" class="mui-col-xs-3">
-									<img :src="item" />
+									<img :src="item" v-viewer />
 								</div>
 							</div>
 						</span>

+ 1 - 1
src/utils/request.js

@@ -16,7 +16,7 @@ axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'
 var BACKEND_URL = process.env.VUE_APP_BACKEND_URL;
 
 if (process.env.VUE_APP_NODE_NAME == 'devlopment') {
-		BACKEND_URL=BACKEND_URL;
+		BACKEND_URL='http://192.168.33.120:8086/shinestar-server';
 }
 //var BACKEND_URL="https://ykt-test.xiaoxinda.com/shinestar-server/"
 //var BACKEND_URL = 'http://192.168.33.120:8086/shinestar-server'