Skip to content

S
SuperMan
Commit 28aab68c authored by 沈良进's avatar 沈良进
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents f07c0404 04daa3d6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 575 additions and 13 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 28aab68c
......@@ -1229,8 +1229,12 @@
</div>
<div class="_upload_box">
<ul class="clearfix">
<li v-for="(img,imgIndex) in uploadImgList">
<img :src="img.src" alt="">
<li v-for="(file,imgIndex) in uploadImgList">
<img v-if="file.Type=='3'" :src="file.src" alt="">
<div v-if="file.Type=='1'" style="line-height: 82px;text-align: center;">
<span class="_wenjian_P iconfont"
:class="file.src.substring(file.src.lastIndexOf('.')+1,file.src.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"></span>
</div>
<div class="_delete_img" @click="deleteImg(imgIndex)">
<i class="iconfont icon-img_delete_small"></i>
</div>
......@@ -1288,6 +1292,7 @@
</div>
</div>
</div>
<div class="_right_content" v-else>
<div class="_more" v-for="(son,sindex) in item.AuditRecordList">
<p class="_name" v-if="son.AuditStatus==2">{{son.AuditName}}
......@@ -2552,7 +2557,8 @@ export default {
this.$message.info(this.$t('tips.shangchuanzhong'))
this.UploadSelfFileT(path, newArr, x => {
let obj = {
src: this.domainManager().ViittoFileUrl + x.data.FilePath
src: this.domainManager().ViittoFileUrl + x.data.FilePath,
Type: fileTypeNumber
}
this.uploadImgList.push(obj)
this.$message.success(this.$t('tips.scchenggong'))
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 28aab68c
......@@ -733,10 +733,16 @@
<p>{{son.Remark!=''?son.Remark:'无'}}</p>
<div class="_info_img" v-if="son.Image!=null&&son.AuditStatus==2" >
<ul class="clearfix" v-if="son.Image.length&&son.Image.length>=1">
<li v-for="(img,imgI) in son.Image">
<img v-if="!img" src="../../assets/img/Travelslider.png" alt="">
<img v-else :src="img" alt="">
<div class="_see_img" @click="showImg(img,2)">
<li v-for="(img,imgI) in son.Image" style="margin-right: 5px;">
<img v-if="!img"
src="../../assets/img/Travelslider.png" alt="">
<img v-if="img&&verificationFile(img,3)" :src="img" alt="">
<div v-if="img&&verificationFile(img,1)"
style="width: 88px; line-height: 59px;text-align: center;">
<span class="_wenjian_P iconfont"
:class="img.substring(img.lastIndexOf('.')+1,img.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"></span>
</div>
<div class="_see_img" @click="verificationFile(img,3)?showImg(img,2):showUpLoadFile2(img)">
<i class="iconfont icon-sousuo"></i>
</div>
</li>
......@@ -1040,6 +1046,13 @@ export default {
}
},
methods:{
showUpLoadFile2(i){ // 预览上传文件
if(i.substring(i.lastIndexOf('.')+1,i.length).toUpperCase()=='PDF'){
this.previewPDF(i)
}else{
window.open("https://view.officeapps.live.com/op/view.aspx?src="+i)
}
},
// 单项服务提成
ImpressionSingleCommissionDetails(path,type){
this.$router.push({
......
src/components/FinancialModule/HandDispensingFee/list.vue 0 → 100644
View file @ 28aab68c
This diff is collapsed.
src/components/scenicSpot/reservation/OrderList.vue
View file @ 28aab68c
......@@ -531,10 +531,9 @@
<span class="mr">
{{ item.SaleName }}
</span>
<span class="mr" v-if="item.CustomerName">创建人：</span>
<span class="mr" v-if="item.CustomerName">{{ item.CustomerName }} ({{ item.CustomerContact }}/{{
<span class="mr" v-if="item.CustomerName">创建人：{{ item.CustomerName }} ({{ item.CustomerContact }}<template v-if="item.CustomerTel">/{{
item.CustomerTel
}})</span>
}}</template>)</span>
<span>下单时间：</span>
<span class="mr">{{ item.CreateTime }}</span>
<div class="">
......@@ -640,7 +639,7 @@
{{ item.MailingAddress }}
</template>
<template v-else>
<template v-if="item.MailingAddress==1">
<template v-if="item.MailingState == 1">
{{ item.SelffetchAddress ? item.SelffetchAddress : '等待操作确认后，才能看到自取地址' }}
</template>
<div class="row" style="margin-right: 10px;" v-if="item.MailingState==4">
......
src/plug/index.js
View file @ 28aab68c
......@@ -119,8 +119,8 @@ export default {
let crmUrl = ""; //crm API
let locationName = window.location.hostname;
// domainUrl = "http://192.168.10.128";
// domainUrl = "http://192.168.10.9:8083" // 刘东电脑
domainUrl = "http://192.168.10.226:8015";
domainUrl = "http://192.168.10.9:8083" // 刘东电脑
// domainUrl = "http://192.168.10.226:8015";
// domainUrl = "http://reborn.oytour.com";
let crmLocalFileStreamDownLoadUrl = "";
crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
......@@ -1627,6 +1627,33 @@ export default {
});
window.open(newUrl.href, '_blank');
}
//验证文件格式
Vue.prototype.verificationFile = function (img,type) {
if(type==1){
if(img.indexOf('.DOCX')!=-1||img.indexOf('.docx')!=-1
||img.indexOf('.DOC')!=-1||img.indexOf('.doc')!=-1
||img.indexOf('.XLSX')!=-1||img.indexOf('.xlsx')!=-1
||img.indexOf('.XLS')!=-1||img.indexOf('.xls')!=-1
||img.indexOf('.PPT')!=-1||img.indexOf('.ppt')!=-1
||img.indexOf('.PPTX')!=-1||img.indexOf('.pptx')!=-1
||img.indexOf('.PDF')!=-1||img.indexOf('.pdf')!=-1){
return true
}else{
return false
}
}
if(type==3){
if(img.indexOf('.png')!=-1||img.indexOf('.PNG')!=-1
||img.indexOf('.GIF')!=-1||img.indexOf('.gif')!=-1
||img.indexOf('.JPEG')!=-1||img.indexOf('.jpeg')!=-1
||img.indexOf('.JPG')!=-1||img.indexOf('.jpg')!=-1
||img.indexOf('.BMP')!=-1||img.indexOf('.bmp')!=-1){
return true
}else{
return false
}
}
}
}
}
src/router/config.js
View file @ 28aab68c
......@@ -3884,6 +3884,14 @@ export default {
title: '外交平台查询'
},
},
{ //财务 财务单据 手配费管理
path: '/HandDispensingFeeList',
name: 'HandDispensingFeeList',
component: resolve => require(['@/components/FinancialModule/HandDispensingFee/list'], resolve),
meta: {
title: '手配费管理'
},
},
{ //财务 财务单据 费用单据
path: '/Costdocuments',
name: 'Costdocuments',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment