Skip to content

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

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

parents 4b86a75a 081b494e
Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 19 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 08960432
<style>
._addUpload_box_btm{
padding-top: 20px;
max-height: 230px;
overflow: auto;
}
._addUpload_box_btm img{
width: 100%;
}
._addUpload_box_btm>div{
float: left;
width:135px;
height:80px;
border:1px dashed rgba(210,210,210,1);
border-radius:2px;
cursor: pointer;
margin-bottom: 10px;
padding: 5px;
margin-right: 10px;
position: relative;
}
._addUpload_box_btm>div:hover{
background-color: #f5f5f5;
}
._addFile_name{
padding-left: 15px;
max-width: 450px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
._addUpload_box_btm .icon-guanbi1 {
font-size: 12px;
color: white;
display: inline-block;
margin-left: 15px;
position: absolute;
right: -6px;
top: -9px;
background-color: #f56c6c;
border-radius: 50%;
height: 20px;
width: 20px;
text-align: center;
line-height: 20px;
}
._addUpload_box_btm .icon-guanbi1:hover {
font-size: 12px;
color: #c94052;
}
._addUpload_box_btm .icon-excel{
text-align: center;
font-size: 38px;
color: green;
line-height: 75px;
}
._show_img_box{position: fixed; background: rgba(0,0,0,.6); left: 0; top:0; width: 100%; height: 100%; z-index: 999; text-align: center;}
._addUpload_tips{
font-size: 12px;
color: #999999;
}
.page_fdd .avatar-uploader-icon{
width: 100%;
line-height: 0;
height: 10px;
}
.page_fdd .shangchuanfujian{
text-align: right;
}
.page_bdm .page_bdm{padding: 20px 0;}
.page_bdm ._tit{padding-left: 10px;border-left: 3px solid #E95252;font-size: 14px}
.page_bdm ._conten,._process{margin-top: 20px;width: 890px;}
......@@ -499,7 +568,7 @@
<div class="_addUpload_box" v-if="fujianShow">
<div style="width:100%;" v-if="FuImgList.length>0">
<el-carousel trigger="click" height="293px" width="440px" :interval="5000">
<el-carousel-item style="height: 293px;" v-for="item in FuImgList" :key="item">
<el-carousel-item style="height: 293px;" v-for="(item,index) in FuImgList" :key="index">
<img @click="showImg(item)" :src="item" alt="" style="width: 100%;">
</el-carousel-item>
</el-carousel>
......@@ -511,6 +580,41 @@
</div>
</template>
</div>
<div v-if="saveMsg.length>0">
<div class="_addUpload_box _addUpload_box_btm clearfix" >
<template v-for="(file,fIndex) in saveMsg">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Url?file.Url:file.Content" @click="showImg(file.Url?file.Url:file.Content)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type==1">
<div class="iconfont _wenjian_P" :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFileT(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
</template>
</div>
</div>
<div v-if='picIsShow' class="_show_img_box" @click="picIsShow=false,picObj=''">
<img :src="picObj" style="margin-top: 80px;"/>
</div>
<div style="margin-top: 80px;" class="page_fdd" v-if="isShowAttachment&&GetDetail.IsUploadPic===1">
<div class="_pic_upload">
<el-upload
drag
:http-request="uploadFileBtn2"
:multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">点击/拖拽上传</div>
</el-upload>
</div>
<div class="shangchuanfujian">
<button class="hollowFixedBtn" @click="upLoadFuJian">上传附件</button>
</div>
</div>
</div>
</div>
<div class="w890px">
......@@ -1374,7 +1478,7 @@
<img :src="picObj" style="margin-top: 80px"/>
</div>
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
<img v-for="(src,index) in images" :src="src" :key="index">
</viewer>
<a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a>
</div>
......@@ -1400,6 +1504,11 @@ import czBillModule from "./FinancialSubmodule/czBillModule.vue";
export default {
data(){
return{
picIsShow:false,
picObj:'',
imgList:[],
isShowAttachment:false,//是出纳可上传附件
saveMsg:[],
StandCurrBranchId:'',
TeamShouZhi:false,
F_Disbursement_Schedule:false,
......@@ -1575,6 +1684,77 @@ export default {
},
methods:{
showUpLoadFileT(i){ // 预览上传文件
if(i.Type==3){
this.picObj.push(i.Url);
this.imgList.push(i.Url);
this.picIsShow= true;
}else{
if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){
this.previewPDF(i.Url)
}else{
let dom = document.querySelector("#groupTourOrder_DownLoad");
dom.href = i.Url;
dom.click();
// window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Url)
}
}
},
uploadFileBtn2(file) { //上传
if(file.file.size > 1024 * 1024 * 10) {
this.$message.warning('文件大小不能超过10M！')
return
}
// 1 文档 2 数据 3 图片
let typeArr=[
{stringArr:'GIF|JPG|JPEG|PNG|BMP',type:3},
{stringArr:'DOCX|DOC|XLSX|XLS|PPT|PPTX|PDF',type:1},
]
let ft=file.file.name.substring(file.file.name.lastIndexOf('.')+1,file.file.name.length).toUpperCase();
let fileTypeNumber = 2;
let typeOk = false;
typeArr.forEach(x=>{
if(x.stringArr.indexOf(ft)!='-1')
{
fileTypeNumber=x.type;
typeOk = true;
}
});
if (!typeOk) return this.$message.error('请上传图片、word、excel类型的文件！');
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info('上传中...')
this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.saveMsg.push({
Type:fileTypeNumber,
Content: x.data.FilePath,
Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
});
this.$message.success('上传成功');
});
},
deleteUploadFile(i){ // 删除上传文件
this.saveMsg.splice(i,1);
},
upLoadFuJian() {
if (this.saveMsg.length===0) return this.$message.error('请上传文件！');
let msg = {
FrID: this.ID,
vorcherInos: this.saveMsg
};
this.apipost('Financial_post_SetVoucher', msg, res=>{
if (res.data.resultCode===1) {
this.saveMsg = []
this.Financial_post_GetDetail(this.ID)
} else {
this.$message.error(res.data.message);
}
}, null)
},
// 单项服务提成
ImpressionSingleCommissionDetails(path,type){
this.$router.push({
......@@ -2659,6 +2839,11 @@ export default {
}
this.chongJudge(data)
this.GetDetail = data;
this.GetDetail.AuditSteps.forEach(x=>{
if(x.NextStep==1&&(x.SpecialNode==1||x.SpecialNode==2)){
this.isShowAttachment = true
}
})
this.StandCurrBranchId = this.GetDetail.RB_Branch_Id
if(this.GetDetail.DetailList){
this.GetDetail.DetailList.forEach(item=>{
......
src/components/FinancialModule/FinancialDocumentsDetailSPF.vue
View file @ 08960432
......@@ -987,6 +987,7 @@ export default {
imageUrl:'',
uploadImgList:[],
FuImgList:[],
imgList:[],
picIsShow:false,
picObj:'',
initialIndex:0,
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 08960432
......@@ -454,6 +454,25 @@
<p class="travelnowrap" v-if="item.WordPath!=''">
<a style="corsor:pointer;"
:href="domainManager().ViittoFileUrl+item.WordPath">{{$t('visa.v_salecompany')}}下载WORD行程</a>
</p>
<p class="travelnowrap flex" v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0">
<span>报价单</span>
<span class="go_date">
<template v-for="(subItem,subIndex) in item.OfferUrlExtArray">
<a :key="subIndex" style="margin-left:20px;color:blue;cursor:pointer;" :href="subItem.Url"
v-if="subItem.Url" target="_blank" :download="subItem.Name">{{subItem.Name}}</a>
<template v-if="item.OfferUrlExtArray.length>1 && subIndex<item.OfferUrlExtArray.length">
<br :key="subIndex+1000" />
</template>
</template>
</span>
</p>
<p class="travelnowrap flex" v-else-if="item.PriceOfferUrl&&item.PriceOfferUrl!=''">
<span>报价单</span>
<span class="go_date">
<a style="margin-left:20px;color:blue;cursor:pointer;" :href="item.PriceOfferUrl"
v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
</span>
</p>
</div>
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 08960432
<style>
@import "../../../assets/css/newTravelManager.css";
.choosed span {
background-color: #1bc594 !important;
}
......@@ -468,8 +469,8 @@
:false-label="UnCheckedLessPrice" label="公司车辆">
</el-checkbox>
</div>
<template v-if="priceData.IsUseCompanyBus==1">
<el-select v-model="priceData.BusPriceId">
<template v-if="priceData.IsUseCompanyBus==1">
<el-select v-model="priceData.BusPriceId">
<el-option v-for="item in busPriceList" :key="item.Id" :label="item.BusNumber" :value="item.Id">
<span style="float: left">{{ item.AreaTypeName }} ({{item.BusTypeStr}})</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.BusNumber }}</span>
......@@ -654,8 +655,8 @@
<el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
</el-option>
</el-select>
<span class="TC_neibu" style="float: inherit;margin-left: 5px;margin-right: 5px;" v-if="standardCurrencyName"
:class="{'TCneibu':standardCurrencyName=='人民币','TCb2b':standardCurrencyName=='日元',
<span class="TC_neibu" style="float: inherit;margin-left: 5px;margin-right: 5px;"
v-if="standardCurrencyName" :class="{'TCneibu':standardCurrencyName=='人民币','TCb2b':standardCurrencyName=='日元',
'TCb2c':standardCurrencyName=='新台币','AppPlat':standardCurrencyName=='',
'otherPlat':standardCurrencyName=='',}">{{standardCurrencyName}}结算</span>
</el-form-item>
......@@ -861,8 +862,11 @@
<el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">团队类型</span>
<el-select class="w180" v-model="priceData.PriceTeamType">
<el-option v-for="item in TeamListArr" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
<template v-for="item in TeamListArr">
<!--去掉小包团2023-04-19-->
<el-option v-if="item.Id!=4" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</template>
</el-select>
</el-form-item>
<el-form-item style="margin-top:1px;">
......@@ -1120,9 +1124,14 @@
SaleBranchIdArray: [],
OutGroupType: 0
},
OutGroupTypeList: [
{Name: '常规', Id: 0},
{Name: '落地团', Id: 1},
OutGroupTypeList: [{
Name: '常规',
Id: 0
},
{
Name: '落地团',
Id: 1
},
],
returnPriceList: this.priceList,
//酒店列表
......@@ -1673,15 +1682,15 @@
});
return isExit;
},
getstandardCurrencyName(){
getstandardCurrencyName() {
let isShow = true
this.companyList.forEach(x=>{
if(x.id==this.priceData.OutBranchId&&x.standardCurrencyId>0){
this.companyList.forEach(x => {
if (x.id == this.priceData.OutBranchId && x.standardCurrencyId > 0) {
this.standardCurrencyName = x.standardCurrencyName
isShow = false
}
})
if(isShow){
if (isShow) {
this.standardCurrencyName = ''
}
},
......@@ -1978,8 +1987,8 @@
//获取车辆列表
getBusList() {
this.apipost("bus_get_GetBusTypePriceList", {
IsHaveBusNum:1
}, res => {
IsHaveBusNum: 1
}, res => {
if (res.data.resultCode == 1) {
this.busPriceList = res.data.data;
} else {
......@@ -2040,7 +2049,7 @@
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
this.initShowPriceList();
this.$emit("headCallBack", this.returnPriceList,this.priceData.OutGroupType);
this.$emit("headCallBack", this.returnPriceList, this.priceData.OutGroupType);
},
deep: true
},
......@@ -2048,7 +2057,7 @@
//深度监听，可监听到对象的变化
handler: function (val, oldVal) {
this.initShowPriceList();
this.$emit("headCallBack", this.returnPriceList,this.priceData.OutGroupType);
this.$emit("headCallBack", this.returnPriceList, this.priceData.OutGroupType);
},
deep: true
},
......
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