Skip to content

S
SuperMan
Commit d714baea authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents ad3bc7f8 0f8d0cab
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 531 additions and 320 deletions
src/components/DomesticTravelcontract.vue
View file @ d714baea
......@@ -761,7 +761,7 @@
<el-option label="1" :value="1"></el-option>
<el-option label="2" :value="2"></el-option>
</el-select>
{{$t('objFill.v101.Contract.zhongfangs')}}
{{$t('objFill.zhongfangs')}}
</el-form-item>
<el-form-item label="1、提交" v-if="CtObj.C_SolveType == 1" label-width="110px">
<el-input type="text" class="w300" v-model="CtObj.C_SolveRemark"></el-input>&nbsp;仲裁委员会仲裁；
......@@ -891,8 +891,7 @@
<commonTripList @tripData="tripData" :ContractTripList="CtObj.ContractTripList" :TripType="CtObj.TripType">
</commonTripList>
</div> -->
<div v-if="CtObj.ID>0&&CtObj.ContractTripList&&CtObj.ContractTripList.length==1"
v-html="CtObj.ContractTripList[0].TravelContent" ref="TcTravel_Table"></div>
<div v-if="CtObj.ID>0" ref="TcTravel_Table" v-html="CtObj.ContractTripList[0].TravelContent" ></div>
<div v-else ref="TcTravel_Table">
<table class="TcTravel_Table">
<tbody>
......@@ -999,8 +998,7 @@
火车：普通车/空调车/动车组（其中：软卧/硬卧/软座/硬座）；
</div>
<div style="color: red" v-if="CtObj.CType!=3">
注：用房
：全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。
注：用房全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。
</div>
<template v-if="CtObj.TeamType == 2">
<div>
......@@ -1029,10 +1027,6 @@
</tbody>
</table>
</div>
<div style="padding:10px;background:#f9f9f9;color:red;" v-if="CtObj.CType!=3">
注：用房
：全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。
</div>
</div>
<div class="block mtop15" id="anchor-5" ref="anchor5">
<div class="blockTitle">
......@@ -1402,7 +1396,14 @@
TicketAndHotelTotalPrice: "0", // 机票加酒店组合总费用
ContractShopList: [], //自愿购物活动补充协议
ContractGuestList: [], //旅客名单
ContractTripList: [], //行程列表
ContractTripList: [{
TripType: 1,
DayNum: 1,
Go: "",
GoProvice: "",
IsOut: 0,
TravelContent: ""
}], //行程列表
ContractSelfFeeList: [], //自愿付费项目补充协议
TripType: 0, //行程类型(0-简易行程，1-标准行程)
TCID: 0,
......
src/components/Educationvideo.vue
View file @ d714baea
This diff is collapsed.
src/components/FinancialModule/FinancialDocuments.vue
View file @ d714baea
......@@ -691,7 +691,53 @@
width: 830px;
position: relative;
}
.UploadMsg-box{
display: flex;
flex-wrap: wrap;
}
.UploadMsg-list{
width: 110px;
/* height: 80px; */
position: relative;
border-radius: 3px;
/* overflow: hidden; */
margin: 0 6px 13px 6px;
}
.UploadMsg-text{
width: 100%;
height: 20px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
cursor: pointer;
}
.UploadMsg-icon{
color: #409eff;
position: absolute;
right: 0;
top: -10px;
z-index: 2;
cursor: pointer;
font-size: 20px;
}
.UploadMsgGrow{
width: 100%;
}
/deep/.UploadMsg-box .el-upload-dragger{
width: 110px;
height: 80px;
padding: 0 5px;
}
/deep/.UploadMsg-box .el-upload-dragger .el-icon-upload{
margin: 0;
}
/deep/.UploadMsg-box .el-upload__tip{
margin-top: 0;
margin-bottom: 7px;
}
/deep/.UploadMsg-box .el-upload-dragger .el-icon-upload{
line-height: 35px;
}
</style>
<template>
......@@ -1561,7 +1607,7 @@
<button v-loading="matchBtn" class="normalBtn" @click="sureMatchTransfer()"
style="margin-left: 150px;margin-bottom: 10px">确认转移</button>
</el-dialog>
<!--工资单信息-->
<div v-if="fillShow" class="btmAddStore" :class="{'fillShow':fillShow}">
<div class="btmTitle">{{$t('objFill.daorugzdxx')}}</div>
<div style="color:red;padding:10px 0" v-if="BatchAddWagesMessage">提示：{{BatchAddWagesMessage}}</div>
......@@ -1599,7 +1645,6 @@
<el-image style="height:16px;" :src="file.Url?file.Url:file.Content"
:preview-src-list="[file.Url?file.Url:file.Content]">
</el-image>
<!-- <img :src="file.Url?file.Url:file.Content" @click="showUpLoadFile(file,index)" style="height:16px;"> -->
</div>
<span class="iconfont icon-guanbi1" style="font-size:12px;"
@click="deleteInvoiceUploadFile(fIndex,index)"></span>
......@@ -1642,10 +1687,12 @@
</table>
</div>
<div class="btmBtn impotBtn" style="padding:10px 0">
<input type="button" class="normalBtn" value="批量上传附件" @click="isUploadAttachment=true;" />
<input type="button" class="normalBtn" @click="importInfo" :value="$t('ground.qrdr')" />
<input type="button" class="hollowFixedBtn" @click="hideFill" :value="$t('pub.cancelBtn')" />
</div>
</div>
<!--工资单导入弹窗-->
<el-dialog custom-class='w700' :title="$t('objFill.daoruyinxiaosj')" :visible.sync="outerVisible" center>
<el-upload drag class="upload-demo" :action="importFileUrl2" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload">
......@@ -1654,6 +1701,48 @@
<div slot="tip" class="el-upload__tip">{{$t("ground.znscexcel")}}</div>
</el-upload>
</el-dialog>
<el-dialog :title="saveUploadMsg.length>0?'批量上传附件/已传'+saveUploadMsg.length:'批量上传附件'"
:visible.sync="isUploadAttachment" width="780px"
:close-on-click-modal="false"
:show-close="false" @close="cancel">
<!--工资单附件导入弹窗-->
<div class="UploadMsg-box">
<div :class="[saveUploadMsg.length>0?'':'UploadMsgGrow']" style="text-align: center;">
<el-upload
class="upload-demo"
drag
accept="image/jpeg,image/jpg, image/png, image/bmp"
action=""
:http-request="uploadGZFileBtn"
multiple
:show-file-list="false">
<i class="el-icon-upload" style="font-size: 30px;"></i>
<div class="el-upload__text">文件拖到此处，或<em>{{$t('tips.dianjishanhcuan')}}</em></div>
<div class="el-upload__tip" slot="tip">只能上传jpg/png文件</div>
</el-upload>
</div>
<template v-for="(item,index) in saveUploadMsg">
<div class="UploadMsg-list">
<el-image
style="width: 100%; height: 80px;border-radius: 5px;"
:src="item.DMCOPCredentials"
fit="cover"
:initial-index="index"
:preview-src-list="saveUploadMsg.map(x=>{return x.DMCOPCredentials})"></el-image>
<div class="UploadMsg-text">
<el-tooltip class="item" effect="dark" :content="item.BrandName" placement="top">
<p>{{item.BrandName}}</p>
</el-tooltip>
</div>
<i class="UploadMsg-icon el-icon-circle-close" @click="handleGZRemove(index)"></i>
</div>
</template>
</div>
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="cancel" :disabled="loading">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="saveAttachments" :loading="loading">{{$t('pub.sureBtn')}}</el-button>
</div>
</el-dialog>
<el-dialog custom-class='w700' title="导入车行ETC差额" :visible.sync="outerVisible3" center>
<el-upload drag class="upload-demo" :action="importFileUrl5+'&EmployeeId='+userId" :on-success="handleAvatarSuccess3"
:before-upload="beforeAvatarUpload2">
......@@ -2072,6 +2161,12 @@
CurrencyName: ''
},
isQueryHistoryData: false,
//工资单附件开始
saveUploadMsg: [],
loadingGZPic: false,
isUploadAttachment: false,
imgLength: 0,
//工资单附件结束
};
},
created() {
......@@ -2212,6 +2307,73 @@
this.$refs.multipleTable.clearSelection();
}
},
//工资单附件方法：
cancel() {
this.imgLength = 0;
this.saveUploadMsg = [];
this.isUploadAttachment = false;
this.loading = false;
},
saveAttachments() {
if(this.saveUploadMsg.length==0) return this.$message.error('请上传附件');
this.loading = true;
this.importData.forEach(x => {
this.saveUploadMsg.forEach(y => {
if (x.BrandName == y.BrandName) {
if(x.vorcherInos&&x.vorcherInos.length==0){
x.vorcherInos=[];
}
x.vorcherInos.push({
Content: y.Content,
ID:0,
Type:y.Type,
Url: y.DMCOPCredentials,
});
}
})
})
this.$forceUpdate();
this.cancel();
},
uploadGZFileBtn(file) { //上传
// 1 文档 2 数据 3 图片
if(file) this.imgLength++
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('请上传图');
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
if(this.imgLength==1) this.$message.info(this.$t('tips.shangchuanzhong'))
this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
let SourceFileName = x.data.SourceFileName.split('.')
this.saveUploadMsg.push({
Content:x.data.FilePath,
Type: fileTypeNumber,
DMCOPCredentials: this.domainManager().ViittoFileUrl + x.data.FilePath,
BrandName: SourceFileName[0]
})
if(this.imgLength>0) this.imgLength--
if(!this.imgLength) this.$message.success(this.$t('tips.scchenggong'))
});
},
handleGZRemove(index) {
this.saveUploadMsg.splice(index,1)
},
uploadFileExpressFeeBtn(file) { //上传
if (file.file.size > 1024 * 1024 * 10) {
this.$message.warning(this.$t('tips.wjdxbncgsz'))
......@@ -3965,7 +4127,9 @@
);
}
},
watch: {}
watch: {
}
};
</script>
src/components/Restaurant/RestaurantPackage.vue
View file @ d714baea
......@@ -132,7 +132,7 @@
<span class="tit_name T1">
{{item.CurrencyName==''?'':item.CurrencyName}}<span
v-if="item.CurrencyCode">({{item.CurrencyCode}})</span></span><span
class='tit_name T2'>{{item.LPrice}}/{$t('hotel.hotel_people')}}</span>
class='tit_name T2'>{{item.LPrice}}/{{$t('hotel.hotel_people')}}</span>
</p>
<p class="Ldata">{{item.LDate}}</p>
</td>
......@@ -141,7 +141,7 @@
<span class="tit_name T1">
{{item.CurrencyName==''?'':item.CurrencyName}}<span
v-if="item.CurrencyCode">({{item.CurrencyCode}})</span></span><span
class='tit_name HP'>{{item.HPrice}}/{$t('hotel.hotel_people')}}</span>
class='tit_name HP'>{{item.HPrice}}/{{$t('hotel.hotel_people')}}</span>
</p>
<p class="Ldata">{{item.HDate}}</p>
</td>
......
src/components/TravelContractView.vue
View file @ d714baea
......@@ -1635,8 +1635,7 @@
</template>
</div>
<br />
<div style="color:red;" v-if="CtObj.CType!=3">注：用房
：全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。</div>
<div style="color:red;" v-if="CtObj.CType!=3">注：用房全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。</div>
</div>
<!-- 自愿购物 -->
<div class="shoppings" :class="{'checkedNav':ActiveTab==6}">
......@@ -2146,9 +2145,7 @@
</template>
</div>
<br>
<div style="color:red;" v-if="CtObj.CType!=3">注：用房
：全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。</div>
<div style="color:red;" v-if="CtObj.CType!=3">注：用房全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。</div>
</div>
<!-- 自愿补充协议 -->
<div class="activitys" :class="{'checkedNav':ActiveTab==7}">
......
src/components/onedayTripContract.vue
View file @ d714baea
......@@ -925,8 +925,8 @@
<commonTripList @tripData="tripData" :ContractTripList="CtObj.ContractTripList" :TripType="CtObj.TripType">
</commonTripList>
</div> -->
<div v-if="CtObj.ID>0&&CtObj.ContractTripList&&CtObj.ContractTripList.length==1"
v-html="CtObj.ContractTripList[0].TravelContent" ref="TcTravel_Table"></div>
<div v-if="CtObj.ID>0" v-html="CtObj.ContractTripList[0].TravelContent" ref="TcTravel_Table"></div>
<div v-else ref="TcTravel_Table">
<table class="TcTravel_Table">
<tbody>
......@@ -1033,8 +1033,7 @@
火车：普通车/空调车/动车组（其中：软卧/硬卧/软座/硬座）；
</div>
<div style="color: red" v-if="CtObj.CType!=3">
注：用房
：全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。
注：用房全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。
</div>
<template v-if="CtObj.TeamType == 2">
<div>
......@@ -1352,7 +1351,14 @@
TicketAndHotelTotalPrice: "0", // 机票加酒店组合总费用
ContractShopList: [], //自愿购物活动补充协议
ContractGuestList: [], //旅客名单
ContractTripList: [], //行程列表
ContractTripList: [{
TripType: 1,
DayNum: 1,
Go: "",
GoProvice: "",
IsOut: 0,
TravelContent: ""
}], //行程列表
TCID: 0,
OrderId: 0,
},
......@@ -1461,6 +1467,8 @@
if (this.isSubmit) {
if (this.CtObj.ContractTripList && this.CtObj.ContractTripList.length > 0) {
this.CtObj.ContractTripList[0].TravelContent = this.$refs.TcTravel_Table.innerHTML;
} else {
this.CtObj.ContractTripList[0].TravelContent = this.$refs.TcTravel_Table.innerHTML;
}
this.isSubmit = false;
this.apipost(
......@@ -1755,6 +1763,7 @@
};
this.CtObj.ContractTripList.push(tripObj);
}
} else {
this.Error(res.data.message);
}
......@@ -2071,4 +2080,5 @@
});
}
};
</script>
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