Skip to content

S
SuperMan
Commit 2a9bc0e4 authored by 吴春's avatar 吴春
Browse files
Options

使用他人版本解决冲突

parents dd8e557e 760c01b8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 4853 additions and 3431 deletions
src/assets/common/lang/EN/fill.js
View file @ 2a9bc0e4
......@@ -1592,6 +1592,7 @@ export const obj = {
dianjikqksjp: 'Click to open tickets for sale',
jietuanriqi: 'Knot date',
xilietxbm: 'Series Group New Layout',
xilietdate: 'Series Group Date',
dangtuanxbm: 'New Layout of Dangtuan',
xiazaiqiyueshu: "Download The Contract",
tuisongxiaoxi: 'Push message',
......@@ -1627,7 +1628,7 @@ export const obj = {
renmingbxj: 'RMB Subtotal',
qitacbrmb: 'Other costs (RMB)',
zhongduanjp: 'Mid-course Ticket',
xiaojijpzdsjly: 'subtotal (air ticket + mid-course air ticket + tax + combined transport + tour guide allocation + overnight + visa + insurance)',
xiaojijpzdsjly: 'Subtotals (airfare+mid flight ticket+taxes+intermodal transportation+tour guide sharing+overnight stay+visa+insurance - KB headcount fee)',
lingduidyft: 'Lead and guide sharing',
guoye: 'Stay the night',
dandijcb: 'Single ground connection (cost)',
......
src/assets/common/lang/Japan/fill.js
View file @ 2a9bc0e4
......@@ -1592,6 +1592,7 @@ export const obj = {
dianjikqksjp: 'クリックして航空券を販売することができます',
jietuanriqi: '結団日',
xilietxbm: 'シリーズ団新版面',
xilietdate: 'シリーズ団期',
dangtuanxbm: '契約書のダウンロード',
xiazaiqiyueshu:"下載契約書",
tuisongxiaoxi: 'プッシュメッセージ',
......@@ -1627,7 +1628,7 @@ export const obj = {
renmingbxj: '人民元の小計',
qitacbrmb: 'その他のコスト(人民元)',
zhongduanjp: '航空券',
xiaojijpzdsjly: '小計(航空券+中段航空券+税金+連絡運輸+添乗員ガイド分担+宿泊ビザ+保険)',
xiaojijpzdsjly: '小計（航空券+中段航空券+税金+連絡輸送+添乗員割り当て+宿泊+ビザ+保険-KB頭金）',
lingduidyft: '添乗ガイド分担',
guoye: '夜を明かす',
dandijcb: 'コスト',
......
src/assets/common/lang/zhCN/fill.js
View file @ 2a9bc0e4
......@@ -1592,6 +1592,7 @@ export const obj = {
dianjikqksjp: '点击开启可售机票',
jietuanriqi: '结团日期',
xilietxbm: '系列团新版面',
xilietdate: '系列团期',
dangtuanxbm: '当团新版面',
xiazaiqiyueshu:"下载契约书",
tuisongxiaoxi: '推送消息',
......@@ -1627,7 +1628,7 @@ export const obj = {
renmingbxj: '人民币小计',
qitacbrmb: '其它成本(人民币)',
zhongduanjp: '中段机票',
xiaojijpzdsjly: '小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险)',
xiaojijpzdsjly: '小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险-KB人头费)',
lingduidyft: '领队导游分摊',
guoye: '过夜',
dandijcb: '单地接(成本)',
......@@ -8054,6 +8055,8 @@ export const obj = {
xitongxiaoxi: '系统消息',
xiazapdf: '下载PDF',
qiyemdijiefjs: '企业码地接费结算',
zicaidan: '二級菜单',
beijinse: '背景色',
},
//#endregion
}
......
src/assets/common/lang/zhTW/fill.js
View file @ 2a9bc0e4
......@@ -1592,6 +1592,7 @@ export const obj = {
dianjikqksjp: '點擊開啓可售機票',
jietuanriqi: '結團日期',
xilietxbm: '系列團新版面',
xilietdate: '系列團期',
dangtuanxbm: '當團新版面',
xiazaiqiyueshu: "下載契約書",
tuisongxiaoxi: '推送消息',
......@@ -1627,7 +1628,7 @@ export const obj = {
renmingbxj: '人民幣小計',
qitacbrmb: '其它成本(人民幣)',
zhongduanjp: '中段機票',
xiaojijpzdsjly: '小計(機票+中段機票+稅金+聯運+領隊導遊分攤+過夜+簽證+保險)',
xiaojijpzdsjly: '小計(機票+中段機票+稅金+聯運+領隊導遊分攤+過夜+簽證+保險-KB人頭費)',
lingduidyft: '領隊導遊分攤',
guoye: '過夜',
dandijcb: '單地接(成本)',
......@@ -8054,6 +8055,8 @@ export const obj = {
xitongxiaoxi: '系統消息',
xiazapdf: '下載PDF',
qiyemdijiefjs: '企業碼地接費結算',
zicaidan: '二級菜單',
beijinse: '背景色',
},
//#endregion
}
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ 2a9bc0e4
......@@ -197,7 +197,8 @@
<br />
{{GetDayStr(subItem.DayNum-1)}}
<br />
<a v-if="IsEdit==3" style="color:blue;cursor:pointer" @click="showOfferChange(1,subItem)">{{$t('objFill.dayofferchange')}}</a>
<a v-if="IsEdit==3" style="color:blue;cursor:pointer"
@click="showOfferChange(1,subItem)">{{$t('objFill.dayofferchange')}}</a>
</td>
<td align="center">
{{getCurrencyName(subItem.CurrencyId)}}
......@@ -292,7 +293,8 @@
<template v-if="subItem.BreakfastChangeValue>0">
+
</template>
{{subItem.BreakfastChangeValue}} <font style="color:#409eff;">({{subItem.BreakfastChangeRemark}})</font>
{{subItem.BreakfastChangeValue}} <font style="color:#409eff;">({{subItem.BreakfastChangeRemark}})
</font>
</font>
</template>
<template v-if="subItem.IsLunchChange">
......@@ -443,7 +445,12 @@
{{teamPrice.UnionPrice}}
</el-form-item>
</td>
<td colspan="6" rowspan="2">
<td colspan="2">
<el-form-item :label="`KB`+$t('objFill.rentoufei')">
{{OtherPrice.KBMoney}}
</el-form-item>
</td>
<td colspan="4" rowspan="2">
{{$t('objFill.xiaojijpzdsjly')}}:
<br />{{getCostTotalMoney()}}
</td>
......@@ -836,7 +843,7 @@
downloadFile(fileUrl, fileName) {
const link = document.createElement('a');
link.href = fileUrl;
link.target="_blank";
link.target = "_blank";
link.download = fileName;
document.body.appendChild(link);
link.click();
......@@ -941,7 +948,8 @@
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
this.getConvertMoney(this.teamPrice.NightPrice) +
this.getConvertMoney(this.teamPrice.VisaPrice) +
this.getConvertMoney(this.OtherPrice.SafeMoney)
this.getConvertMoney(this.OtherPrice.SafeMoney)-
this.getConvertMoney(this.OtherPrice.KBMoney)
return totalMoney;
},
//获取汇率
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue
View file @ 2a9bc0e4
......@@ -346,6 +346,11 @@
{{teamPrice.UnionPrice}}
</el-form-item>
</td>
<td colspan="2">
<el-form-item :label="`KB`+$t('objFill.rentoufei')">
{{OtherPrice.KBMoney}}
</el-form-item>
</td>
<td colspan="6" rowspan="2">
{{$t('objFill.xiaojijpzdsjly')}}:
<br />{{getCostTotalMoney()}}
......@@ -587,8 +592,8 @@
</p>
</template>
<template>
<el-button type="primary" class="normalBtn" style="float:right;margin-right:40px;" :loading="downLoadloading"
@click="downLoadOffer(postConfig)">{{$t('objFill.xiazaxtbjd')}}
<el-button type="primary" class="normalBtn" style="float:right;margin-right:40px;"
:loading="downLoadloading" @click="downLoadOffer(postConfig)">{{$t('objFill.xiazaxtbjd')}}
</el-button>
</template>
</td>
......@@ -760,7 +765,8 @@
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
this.getConvertMoney(this.teamPrice.NightPrice) +
this.getConvertMoney(this.teamPrice.VisaPrice) +
this.getConvertMoney(this.OtherPrice.SafeMoney)
this.getConvertMoney(this.OtherPrice.SafeMoney)-
this.getConvertMoney(this.OtherPrice.KBMoney)
return totalMoney;
},
//获取汇率
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ 2a9bc0e4
......@@ -413,7 +413,13 @@
@keyup.native="checkPrice(teamPrice,'UnionPrice'),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="6" rowspan="2">
<td colspan="2">
<el-form-item :label="`KB`+$t('objFill.rentoufei')">
<el-input type="text" v-model='otherPrice.KBMoney' class="w100"
@keyup.native="checkPrice(otherPrice,'KBMoney',true),getchange()"></el-input>
</el-form-item>
</td>
<td colspan="4" rowspan="2">
{{$t('objFill.xiaojijpzdsjly')}}:
<br /> {{getCostTotalMoney()}}
</td>
......@@ -1014,7 +1020,8 @@
this.getConvertMoney(this.otherPrice.AirTicketShareMoney) +
this.getConvertMoney(this.teamPrice.NightPrice) +
this.getConvertMoney(this.teamPrice.VisaPrice) +
this.getConvertMoney(this.otherPrice.SafeMoney)
this.getConvertMoney(this.otherPrice.SafeMoney)-
this.getConvertMoney(this.otherPrice.KBMoney)
return totalMoney;
},
//获取币种对应 的人数报价
......
src/components/WebSet/WebSiteEdit.vue
View file @ 2a9bc0e4
......@@ -278,6 +278,14 @@
<searcheldialog v-if="currentEditItem.Id=='search_el'" :plugData="currentEditItemData"></searcheldialog>
<!-- 自定版型 其他 -->
<otherdialog v-if="currentEditItem.Id=='white_label_other'" :plugData="currentEditItemData"></otherdialog>
<!-- 首页组件1 -->
<indexNav v-if="currentEditItem.Id=='index_nav'" :plugData="currentEditItemData"> </indexNav>
<!-- 首页组件2 -->
<indexSlider1 v-if="currentEditItem.Id=='index_slider1'" :plugData="currentEditItemData"> </indexSlider1>
<!-- 首页组件3 -->
<indexRoll1 v-if="currentEditItem.Id=='index_roll1'" :plugData="currentEditItemData"> </indexRoll1>
<!-- 首页组件4 -->
<indexRoll2 v-if="currentEditItem.Id=='index_roll2'" :plugData="currentEditItemData"> </indexRoll2>
<span slot="footer" class="dialog-footer">
<el-button @click="isShowDialog = false" size="small">{{$t('pub.cancelBtn')}}</el-button>
<el-button type="danger" size="small" @click="setSubPlugData()">{{$t('pub.sureBtn')}}</el-button>
......@@ -303,6 +311,10 @@
import searchsdialog from "../WebSet/plug-in/searchs_dialog.vue"
import searcheldialog from "../WebSet/plug-in/searchel_dialog"
import otherdialog from "../WebSet/plug-in/other_dialog"
import indexNav from "../WebSet/home/indexNav"
import indexSlider1 from "../WebSet/home/indexSlider1"
import indexRoll1 from "../WebSet/home/indexRoll1"
import indexRoll2 from "../WebSet/home/indexRoll2"
export default {
props: ["templateData"],
data() {
......@@ -384,7 +396,11 @@
searchfdialog,
searchsdialog,
searcheldialog,
otherdialog
otherdialog,
indexNav,
indexSlider1,
indexRoll1,
indexRoll2,
},
methods: {
changeCountry(){
......@@ -443,6 +459,7 @@
this.currentEditItem = item;
this.commonTitle = item.plugData.Title;
this.currentEditItemData = JSON.parse(JSON.stringify(item.plugData));
if(!this.currentEditItemData.BottomList) this.$set(this.currentEditItemData,'BottomList',[])
},
//获取数据
setSubPlugData() {
......
src/components/WebSet/home/indexNav.vue 0 → 100644
View file @ 2a9bc0e4
This diff is collapsed.
src/components/WebSet/home/indexRoll1.vue 0 → 100644
View file @ 2a9bc0e4
<style scoped>
.WebSite_slider .text-warning {
color: #8a6d3b;
}
.WebSite_slider .webSliderDiv {
width: 150px;
line-height: 0;
height: 100px;
overflow: hidden;
/* height: 234px; */
border: 1px solid #ccc;
cursor: pointer;
position: relative;
}
.WebSite_slider .webSliderDiv .web_imgUrl {
width: 100%;
height: 100%;
}
.WebSite_slider .webSliderDiv .addIconDiv {
position: absolute;
width: 100%;
height: 100%;
top: 0;
background-color: transparent;
display: flex;
align-items: center;
justify-content: center;
}
.WebSite_slider .webSliderDiv i {
font-size: 50px;
color: #d1d1d1;
cursor: pointer;
}
.webSliderDiv .addIconDiv:hover {
background: rgba(0, 0, 0, 0.5);
color: #fff;
}
/deep/.WebSite_slider .el-form-item__content{
line-height: 20px;
}
.caidantext{
font-size: 16px;
font-weight: bold;
color: #f45c43;
}
.caidantext.caidantext2{
color: dodgerblue;
}
.row{
display: flex;
flex-direction: row;
}
.rowSbAc{
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.rowEnd{
display: flex;
flex-direction: row;
justify-content: end;
}
.colAs{
display: flex;
flex-direction: column;
justify-content: start;
align-items: stretch;
}
.flex{
flex: 1;
}
.flex-shrink{
flex: 1;
flex-shrink: 0;
}
</style>
<template>
<div class="WebSite_slider">
<el-form label-width="100px">
<!-- <el-row>
<el-col :span="24">
<el-form-item>
<p class="text-warning">※ {{$t('objFill.v101.wutuzbxians')}}</p>
</el-form-item>
</el-col>
</el-row> -->
<el-row class="row">
<el-form-item :label="$t('objFill.v101.zhubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
<el-input type="text" v-model="plugData.Title"></el-input>
</el-form-item>
<el-form-item :label="$t('objFill.fubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
<el-input type="text" v-model="plugData.SubTitle"></el-input>
</el-form-item>
</el-row>
<el-row style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
<el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
<div class="webSliderDiv" style="width: 100px;height: 100px;">
<el-upload :http-request="UploadAttachmentCover" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="plugData.CoverImg" :src="plugData.CoverImg" class="web_imgUrl" alt="" />
<div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i>
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;" @click.stop="plugData.CoverImg=''"></i>
</div>
</el-upload>
</div>
</el-form-item>
<el-form-item :label="$t('objFill.v101.jianjie')" class="flex" style="margin-bottom: 0;">
<el-input type="textarea"
:rows="2" v-model="plugData.Describe"></el-input>
</el-form-item>
<el-form-item :label="$t('objFill.v101.beijinse')" style="margin-bottom: 0;flex-shrink: 0;">
<el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker>
</el-form-item>
</el-row>
<table>
<tbody v-for="(item,index) in plugData.NavList" :key="index">
<tr>
<td class="caidantext">
{{$t('objFill.caidan')}}{{index+1}}:
</td>
<td></td>
<td class="rowEnd">
<div>
<el-tooltip class="item" effect="dark" :content="'+ '+$t('objFill.caidan')" placement="top">
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu(1)"></el-button>
</el-tooltip>
<el-tooltip v-show="plugData.NavList.length>1" class="item" effect="dark" :content="'- '+$t('objFill.caidan')" placement="top">
<el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(1,index)"></el-button>
</el-tooltip>
</div>
</td>
</tr>
<tr>
<td class="w350">
<el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
<div class="webSliderDiv" @click="clickIndex=index">
<el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="item.FileUrl" :src="item.FileUrl" class="web_imgUrl" alt="" />
<div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i>
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;" @click.stop="item.FileUrl=''"></i>
</div>
</el-upload>
<el-upload v-if="item.FileType==2" :http-request="UploadAttachment" :multiple="true"
accept="video/mp4,video/webm" :show-file-list="false" action="">
<video v-if="item.FileUrl" :src="item.FileUrl" class="web_imgUrl" alt=""></video>
<div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i>
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;" @click.stop="item.FileUrl=''"></i>
</div>
</el-upload>
</div>
<div v-if="plugData.Type==1">{{$t('objFill.v101.tupiqscsqin')}}</div>
<div v-else>{{$t('objFill.v101.tupiqscersw')}}</div>
</el-form-item>
</td>
<td class="flex">
<el-form-item :label="$t('objFill.v101.fengmian')+$t('system.query_type')+(index+1)" style="margin-bottom: 0;">
<el-select v-model="item.FileType" style="width: 100%;">
<el-option
v-for="item in typeList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('objFill.v101.lianjie')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.LinkUrl"></el-input>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_describle')+(index+1)">
<el-input type="textarea"
:rows="2" v-model="item.SubDescribe"></el-input>
</el-form-item>
</td>
<td class="colAs">
<el-form-item :label="$t('objFill.v101.zhubiaoti')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.SubName"></el-input>
</el-form-item>
<el-form-item :label="$t('objFill.fubiaoti')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.SubEnName"></el-input>
</el-form-item>
</td>
</tr>
</tbody>
</table>
</el-form>
</div>
</template>
<script>
export default {
props: ["plugData"],
data() {
return {
clickIndex: 0, //点击图片索引
typeList: [
{Name: this.$t('system.label_img'),Id: 1},
{Name: this.$t('objFill.shipin'),Id: 2},
],
clickType: 0,//1主菜单 2二级菜单
MenuList:{
FileType: 1,
FileUrl: '',
LinkUrl: '',
MenuName: '',
MenuSubName: '',
},
SubMenuList: {
FileType: 1,
FileUrl: '',
LinkUrl: '',
MenuName: '',
MenuSubName: '',
SubMenuList: null,
}
};
},
created() {
},
methods: {
addMenu(type,index){
this.clickType = type
this.plugData.NavList.push(JSON.parse(JSON.stringify(this.MenuList)))
},
delMenu(type,index,i){
this.clickType = type
if(type==1){
this.plugData.NavList.splice(index,1)
}
},
//上传图片
UploadAttachment(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/WebSite/";
this.UploadSelfFileT(path, newArr, x => {
var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + str;
this.plugData.NavList[this.clickIndex].FileUrl = imgUrl;
});
},
UploadAttachmentCover(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/WebSite/";
this.UploadSelfFileT(path, newArr, x => {
var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + str;
this.plugData.CoverImg = imgUrl;
});
},
},
mounted() {}
};
</script>
src/components/WebSet/home/indexRoll2.vue 0 → 100644
View file @ 2a9bc0e4
<style scoped>
.WebSite_slider .text-warning {
color: #8a6d3b;
}
.WebSite_slider .webSliderDiv {
width: 150px;
line-height: 0;
height: 100px;
overflow: hidden;
/* height: 234px; */
border: 1px solid #ccc;
cursor: pointer;
position: relative;
}
.WebSite_slider .webSliderDiv .web_imgUrl {
width: 100%;
height: 100%;
}
.WebSite_slider .webSliderDiv .addIconDiv {
position: absolute;
width: 100%;
height: 100%;
top: 0;
background-color: transparent;
display: flex;
align-items: center;
justify-content: center;
}
.WebSite_slider .webSliderDiv i {
font-size: 50px;
color: #d1d1d1;
cursor: pointer;
}
.webSliderDiv .addIconDiv:hover {
background: rgba(0, 0, 0, 0.5);
color: #fff;
}
/deep/.WebSite_slider .el-form-item__content{
line-height: 20px;
}
.caidantext{
font-size: 16px;
font-weight: bold;
color: #f45c43;
}
.caidantext.caidantext2{
color: dodgerblue;
}
.row{
display: flex;
flex-direction: row;
}
.rowSbAc{
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.rowEnd{
display: flex;
flex-direction: row;
justify-content: end;
}
.colAs{
display: flex;
flex-direction: column;
justify-content: start;
align-items: stretch;
}
.flex{
flex: 1;
}
.flex-shrink{
flex: 1;
flex-shrink: 0;
}
</style>
<template>
<div class="WebSite_slider">
<el-form label-width="100px">
<!-- <el-row>
<el-col :span="24">
<el-form-item>
<p class="text-warning">※ {{$t('objFill.v101.wutuzbxians')}}</p>
</el-form-item>
</el-col>
</el-row> -->
<el-row class="row">
<el-form-item :label="$t('objFill.v101.zhubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
<el-input type="text" v-model="plugData.Title"></el-input>
</el-form-item>
<el-form-item :label="$t('objFill.fubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
<el-input type="text" v-model="plugData.SubTitle"></el-input>
</el-form-item>
</el-row>
<el-row style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
<el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
<div class="webSliderDiv" style="width: 100px;height: 100px;">
<el-upload :http-request="UploadAttachmentCover" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="plugData.CoverImg" :src="plugData.CoverImg" class="web_imgUrl" alt="" />
<div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i>
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;" @click.stop="plugData.CoverImg=''"></i>
</div>
</el-upload>
</div>
</el-form-item>
<el-form-item :label="$t('objFill.v101.jianjie')" class="flex" style="margin-bottom: 0;">
<el-input type="textarea"
:rows="2" v-model="plugData.Describe"></el-input>
</el-form-item>
<el-form-item :label="$t('objFill.v101.beijinse')" style="margin-bottom: 0;flex-shrink: 0;">
<el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker>
</el-form-item>
</el-row>
<table>
<tbody v-for="(item,index) in plugData.NavList" :key="index">
<tr>
<td class="caidantext">
{{$t('objFill.caidan')}}{{index+1}}:
</td>
<td></td>
<td class="rowEnd">
<div>
<el-tooltip class="item" effect="dark" :content="'+ '+$t('objFill.caidan')" placement="top">
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu(1)"></el-button>
</el-tooltip>
<el-tooltip v-show="plugData.NavList.length>1" class="item" effect="dark" :content="'- '+$t('objFill.caidan')" placement="top">
<el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(1,index)"></el-button>
</el-tooltip>
</div>
</td>
</tr>
<tr>
<td class="w350">
<el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
<div class="webSliderDiv" @click="clickIndex=index">
<el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="item.FileUrl" :src="item.FileUrl" class="web_imgUrl" alt="" />
<div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i>
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;" @click.stop="item.FileUrl=''"></i>
</div>
</el-upload>
<el-upload v-if="item.FileType==2" :http-request="UploadAttachment" :multiple="true"
accept="video/mp4,video/webm" :show-file-list="false" action="">
<video v-if="item.FileUrl" :src="item.FileUrl" class="web_imgUrl" alt=""></video>
<div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i>
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;" @click.stop="item.FileUrl=''"></i>
</div>
</el-upload>
</div>
<div v-if="plugData.Type==1">{{$t('objFill.v101.tupiqscsqin')}}</div>
<div v-else>{{$t('objFill.v101.tupiqscersw')}}</div>
</el-form-item>
</td>
<td class="flex">
<el-form-item :label="$t('objFill.v101.fengmian')+$t('system.query_type')+(index+1)" style="margin-bottom: 0;">
<el-select v-model="item.FileType" style="width: 100%;">
<el-option
v-for="item in typeList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('objFill.v101.lianjie')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.LinkUrl"></el-input>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_describle')+(index+1)">
<el-input type="textarea"
:rows="2" v-model="item.SubDescribe"></el-input>
</el-form-item>
</td>
<td class="colAs">
<el-form-item :label="$t('objFill.v101.zhubiaoti')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.SubName"></el-input>
</el-form-item>
<el-form-item :label="$t('objFill.fubiaoti')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.SubEnName"></el-input>
</el-form-item>
</td>
</tr>
</tbody>
</table>
</el-form>
</div>
</template>
<script>
export default {
props: ["plugData"],
data() {
return {
clickIndex: 0, //点击图片索引
typeList: [
{Name: this.$t('system.label_img'),Id: 1},
{Name: this.$t('objFill.shipin'),Id: 2},
],
clickType: 0,//1主菜单 2二级菜单
MenuList:{
FileType: 1,
FileUrl: '',
LinkUrl: '',
MenuName: '',
MenuSubName: '',
},
SubMenuList: {
FileType: 1,
FileUrl: '',
LinkUrl: '',
MenuName: '',
MenuSubName: '',
SubMenuList: null,
}
};
},
created() {
},
methods: {
addMenu(type,index){
this.clickType = type
this.plugData.NavList.push(JSON.parse(JSON.stringify(this.MenuList)))
},
delMenu(type,index,i){
this.clickType = type
if(type==1){
this.plugData.NavList.splice(index,1)
}
},
//上传图片
UploadAttachment(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/WebSite/";
this.UploadSelfFileT(path, newArr, x => {
var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + str;
this.plugData.NavList[this.clickIndex].FileUrl = imgUrl;
});
},
UploadAttachmentCover(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/WebSite/";
this.UploadSelfFileT(path, newArr, x => {
var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + str;
this.plugData.CoverImg = imgUrl;
});
},
},
mounted() {}
};
</script>
src/components/WebSet/home/indexSlider1.vue 0 → 100644
View file @ 2a9bc0e4
<style scoped>
.WebSite_slider .text-warning {
color: #8a6d3b;
}
.WebSite_slider .webSliderDiv {
width: 150px;
line-height: 0;
height: 100px;
overflow: hidden;
/* height: 234px; */
border: 1px solid #ccc;
cursor: pointer;
position: relative;
}
.WebSite_slider .webSliderDiv .web_imgUrl {
width: 100%;
height: 100%;
}
.WebSite_slider .webSliderDiv .addIconDiv {
position: absolute;
width: 100%;
height: 100%;
top: 0;
background-color: transparent;
display: flex;
align-items: center;
justify-content: center;
}
.WebSite_slider .webSliderDiv i {
font-size: 50px;
color: #d1d1d1;
cursor: pointer;
}
.webSliderDiv .addIconDiv:hover {
background: rgba(0, 0, 0, 0.5);
color: #fff;
}
/deep/.WebSite_slider .el-form-item__content{
line-height: 20px;
}
.caidantext{
font-size: 16px;
font-weight: bold;
color: #f45c43;
}
.caidantext.caidantext2{
color: dodgerblue;
}
.row{
display: flex;
flex-direction: row;
}
.rowSbAc{
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.rowEnd{
display: flex;
flex-direction: row;
justify-content: end;
}
.colAs{
display: flex;
flex-direction: column;
justify-content: start;
align-items: stretch;
}
.flex{
flex: 1;
}
.flex-shrink{
flex: 1;
flex-shrink: 0;
}
</style>
<template>
<div class="WebSite_slider">
<el-form label-width="100px">
<!-- <el-row>
<el-col :span="24">
<el-form-item>
<p class="text-warning">※ {{$t('objFill.v101.wutuzbxians')}}</p>
</el-form-item>
</el-col>
</el-row> -->
<el-row class="row">
<el-form-item :label="$t('objFill.v101.zhubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
<el-input type="text" v-model="plugData.Title"></el-input>
</el-form-item>
<el-form-item :label="$t('objFill.fubiaoti')" class="flex-shrink" style="margin-bottom: 0;">
<el-input type="text" v-model="plugData.SubTitle"></el-input>
</el-form-item>
</el-row>
<el-row style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
<el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
<div class="webSliderDiv" style="width: 100px;height: 100px;">
<el-upload :http-request="UploadAttachmentCover" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="plugData.CoverImg" :src="plugData.CoverImg" class="web_imgUrl" alt="" />
<div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i>
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;" @click.stop="plugData.CoverImg=''"></i>
</div>
</el-upload>
</div>
</el-form-item>
<el-form-item :label="$t('objFill.v101.jianjie')" class="flex" style="margin-bottom: 0;">
<el-input type="textarea"
:rows="2" v-model="plugData.Describe"></el-input>
</el-form-item>
<el-form-item :label="$t('objFill.v101.beijinse')" style="margin-bottom: 0;flex-shrink: 0;">
<el-color-picker style='vertical-align: middle;' v-model="plugData.BgColor"></el-color-picker>
</el-form-item>
</el-row>
<table>
<tbody v-for="(item,index) in plugData.NavList" :key="index">
<tr>
<td class="caidantext">
{{$t('objFill.caidan')}}{{index+1}}:
</td>
<td></td>
<td class="rowEnd">
<div>
<el-tooltip class="item" effect="dark" :content="'+ '+$t('objFill.caidan')" placement="top">
<el-button type="primary" icon="el-icon-plus" size="mini" circle @click="addMenu(1)"></el-button>
</el-tooltip>
<el-tooltip v-show="plugData.NavList.length>1" class="item" effect="dark" :content="'- '+$t('objFill.caidan')" placement="top">
<el-button type="danger" icon="el-icon-minus" size="mini" circle @click="delMenu(1,index)"></el-button>
</el-tooltip>
</div>
</td>
</tr>
<tr>
<td class="w350">
<el-form-item :label="$t('objFill.v101.fengmian')" style="margin-bottom: 0;">
<div class="webSliderDiv" @click="clickIndex=index">
<el-upload v-if="item.FileType==1" :http-request="UploadAttachment" :multiple="true"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="item.FileUrl" :src="item.FileUrl" class="web_imgUrl" alt="" />
<div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i>
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;" @click.stop="item.FileUrl=''"></i>
</div>
</el-upload>
<el-upload v-if="item.FileType==2" :http-request="UploadAttachment" :multiple="true"
accept="video/mp4,video/webm" :show-file-list="false" action="">
<video v-if="item.FileUrl" :src="item.FileUrl" class="web_imgUrl" alt=""></video>
<div class="addIconDiv">
<i class="web_addImg iconfont icon-img_haha"></i>
<i class="web_delImg iconfont icon-img_delete_small" style="margin-left:10px;" @click.stop="item.FileUrl=''"></i>
</div>
</el-upload>
</div>
<div v-if="plugData.Type==1">{{$t('objFill.v101.tupiqscsqin')}}</div>
<div v-else>{{$t('objFill.v101.tupiqscersw')}}</div>
</el-form-item>
</td>
<td class="flex">
<el-form-item :label="$t('objFill.v101.fengmian')+$t('system.query_type')+(index+1)" style="margin-bottom: 0;">
<el-select v-model="item.FileType" style="width: 100%;">
<el-option
v-for="item in typeList"
:key="item.Id"
:label="item.Name"
:value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('objFill.v101.lianjie')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.LinkUrl"></el-input>
</el-form-item>
<el-form-item :label="$t('hotel.hotel_describle')+(index+1)">
<el-input type="textarea"
:rows="2" v-model="item.SubDescribe"></el-input>
</el-form-item>
</td>
<td class="colAs">
<el-form-item :label="$t('objFill.v101.zhubiaoti')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.SubName"></el-input>
</el-form-item>
<el-form-item :label="$t('objFill.fubiaoti')+(index+1)" style="margin-bottom: 0;">
<el-input type="text" v-model="item.SubEnName"></el-input>
</el-form-item>
</td>
</tr>
</tbody>
</table>
</el-form>
</div>
</template>
<script>
export default {
props: ["plugData"],
data() {
return {
clickIndex: 0, //点击图片索引
typeList: [
{Name: this.$t('system.label_img'),Id: 1},
{Name: this.$t('objFill.shipin'),Id: 2},
],
clickType: 0,//1主菜单 2二级菜单
MenuList:{
FileType: 1,
FileUrl: '',
LinkUrl: '',
MenuName: '',
MenuSubName: '',
},
SubMenuList: {
FileType: 1,
FileUrl: '',
LinkUrl: '',
MenuName: '',
MenuSubName: '',
SubMenuList: null,
}
};
},
created() {
},
methods: {
addMenu(type,index){
this.clickType = type
this.plugData.NavList.push(JSON.parse(JSON.stringify(this.MenuList)))
},
delMenu(type,index,i){
this.clickType = type
if(type==1){
this.plugData.NavList.splice(index,1)
}
},
//上传图片
UploadAttachment(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/WebSite/";
this.UploadSelfFileT(path, newArr, x => {
var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + str;
this.plugData.NavList[this.clickIndex].FileUrl = imgUrl;
});
},
UploadAttachmentCover(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/WebSite/";
this.UploadSelfFileT(path, newArr, x => {
var str = x.data.FilePath;
var imgUrl = this.domainManager().ViittoFileUrl + str;
this.plugData.CoverImg = imgUrl;
});
},
},
mounted() {}
};
</script>
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 2a9bc0e4
......@@ -662,7 +662,7 @@
<el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span>
<el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName"
:disabled="CurrentUserInfo.RB_Group_id==2">
:disabled="CurrentUserInfo.RB_Group_id==2 &&PostConfig.OfferId>0">
<el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
</el-option>
......@@ -904,7 +904,7 @@
</div>
<div class="clearfix">
<div class="TPright clearfix">
<el-form-item prop="OutBranchId" style="margin-top:1px;">
<el-form-item style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.tuanduilx')}}</span>
<el-select class="w180" v-model="priceData.PriceTeamType">
<template v-for="item in TeamListArr">
......
src/components/newTravelmanager/travelLineTrip/HotelTripThree.vue
View file @ 2a9bc0e4
......@@ -387,7 +387,7 @@
},
//早餐切换
changeBreakfastList(breakfastObj) {
if (breakfastObj.BreakfastUseType != 0) {
if (breakfastObj&&breakfastObj.BreakfastUseType != 0) {
//获取当前选中的对象
let obj = {};
obj = this.breakFirstList.find(item => {
......
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