Skip to content

S
SuperMan
Commit 97aa1878 authored by 黄奎's avatar 黄奎
Browse files
Options

11

parents af0adff5 53ff14bb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 350 additions and 271 deletions
src/assets/common/lang/zhCN/fill.js
View file @ 97aa1878
......@@ -7548,6 +7548,46 @@ export const obj = {
chengbenxiaz: '成本下载',
caiwnbubeiz: '财务内部备注',
xinzbji: '新增/编辑',
daorubjiad: '导入报价单',
baojdbgen: '报价单变更',
fangcancmpiao: '(房、餐、车、门票)',
linduifentan: '领队分摊',
qitadinjia: '其他定价',
zhinscxls: '只能上传.xls/.xlsx文件',
xiazdrumob: '下载导入模板',
cibaojdan: '此报价单?',
qingxzxuyscdwj: '请选择需要上传的文件!',
qingshurzop: '请选择主OP',
zhulopbnhzopcx: '助理OP不能包含主OP,请重新选择!',
xianluxltmin: '线路.系列.团名',
tianshbshijsyrs: '天数.航班时间.适用人数',
lianfa: '连发',
tongyrshu: '通用人数',
linduihedy: '领队和导游',
gujiadaih: '估价代号',
fandianmc: '饭店名称',
jiudianjianm: '酒店減免',
meijin: '美金',
yuedun: '越盾',
cinshu: '次/N數',
fangrenshu: '房/人數',
jianmrenshu: '減免人數',
jiudianheji: '酒店合计',
canshijianm: '餐食減免',
canshiminc: '餐食名称',
cantinheji: '餐厅合计',
jindianjianm: '景点减免',
jindmenpheji: '景点门票合计',
cheziheji: '车资合计',
chuanhdyoujp: '船或导游机票',
yuenandun: '越南盾',
chuanheji: '船合计',
zazhiheji: '杂支合计',
gouwuzifei: '购物自费',
gouwuzifeihj: '购物自费合计',
xiaofeiheji: '小費合计',
gerentuanfei: '个人团费',
zhengtituanfei: '整团团费',
},
//#endregion
}
......
src/assets/common/lang/zhTW/fill.js
View file @ 97aa1878
......@@ -7548,6 +7548,46 @@ export const obj = {
chengbenxiaz: '成本下載',
caiwnbubeiz: '財務內部備注',
xinzbji: '新增/編輯',
daorubjiad: '導入報價單',
baojdbgen: '報價單變更',
fangcancmpiao: '(房、餐、車、門票)',
linduifentan: '領隊分攤',
qitadinjia: '其他定價',
zhinscxls: '只能上傳.xls/.xlsx文件',
xiazdrumob: '下載導入模板',
cibaojdan: '此報價單?',
qingxzxuyscdwj: '請選擇需要上傳的文件!',
qingshurzop: '請選擇主OP',
zhulopbnhzopcx: '助理OP不能包含主OP,請重新選擇!',
xianluxltmin: '線路.系列.團名',
tianshbshijsyrs: '天數.航班時間.適用人數',
lianfa: '連發',
tongyrshu: '通用人數',
linduihedy: '領隊和導遊',
gujiadaih: '估價代號',
fandianmc: '飯店名稱',
jiudianjianm: '酒店減免',
meijin: '美金',
yuedun: '越盾',
cinshu: '次/N數',
fangrenshu: '房/人數',
jianmrenshu: '減免人數',
jiudianheji: '酒店合計',
canshijianm: '餐食減免',
canshiminc: '餐食名稱',
cantinheji: '餐廳合計',
jindianjianm: '景點減免',
jindmenpheji: '景點門票合計',
cheziheji: '車資合計',
chuanhdyoujp: '船或導遊機票',
yuenandun: '越南盾',
chuanheji: '船合計',
zazhiheji: '雜支合計',
gouwuzifei: '購物自費',
gouwuzifeihj: '購物自費合計',
xiaofeiheji: '小費合計',
gerentuanfei: '個人團費',
zhengtituanfei: '整團團費',
}
//#endregion
}
......
src/components/FinancialModule/components/ClientBankAccount.vue
View file @ 97aa1878
......@@ -335,19 +335,19 @@
<template v-if="isFinance_ExpenseType">
<div class="border-b"></div>
<div class="OrderReceivablesAccount-title" style="display: flex;flex-direction: row;justify-content: space-between;">
<span>{{$t('objFill.v101.caiwnbubeiz')}}/{{$t('objFill.fj')}}</span>
<span>{{$t('objFill.v101.caiwnbubeiz')}}</span>
<div>
<el-button v-if="!idEditFinNote" size="mini" round @click="idEditFinNote=true">{{$t('objFill.v101.xinzbji')}}</el-button>
<el-button v-if="!idEditFinNote" size="mini" type="success" icon="el-icon-edit" circle round @click="idEditFinNote=true"></el-button>
<template v-else>
<el-button size="mini" round icon="el-icon-close" @click="closeFinNote"></el-button>
<el-button type="primary" size="mini" round @click="saveFinNote">{{$t('pub.saveBtn')}}</el-button>
</template>
</div>
</div>
<div class="OrderReceivablesAccount-center" style="margin-bottom: 10px;">
<div v-if="!idEditFinNote">
{{$t('fnc.beizhu')}}{{saveMsg.Remark}}
<template v-if="saveMsg.Remark">{{saveMsg.Remark}}</template>
<template v-else>{{$t('pub.noMsg')}}</template>
</div>
<div v-else>
<el-input
......@@ -370,15 +370,15 @@
</el-upload>
</div>
<div class="_pic_upload" v-for="(item,index) in saveMsg.Voucher" style="display: flex;flex-direction: row;flex-wrap: wrap;">
<div style="margin-left: 5px;width: 80px;height: 80px;border-radius: 3px; overflow: hidden;position: relative;">
<div style="margin-left: 5px;width: 60px;height: 50px;border-radius: 3px; overflow: hidden;position: relative;">
<el-image v-if="item.Type==3"
style="width: 80px; height: 80px"
style="width: 60px; height: 50px"
:src="item.Content"
:initial-index="index"
:preview-src-list="srcList"
fit="cover">
</el-image>
<div v-if="item.Type==1" style="width: 80px; height: 80px;text-align: center;line-height: 80px;background: #eee;">
<div v-if="item.Type==1" style="width: 60px; height: 50px;text-align: center;line-height: 60px;background: #eee;">
<div class="iconfont _wenjian_P"
:class="item.Content.substring(item.Content.lastIndexOf('.')+1,item.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"
@click="showUpLoadFile(item.Content)">
......@@ -453,7 +453,7 @@
if (ActionMenuCode.indexOf('Finance_ExpenseType') != -1) {
this.IsExpensesMonthlyShare=true;
}
if (ActionMenuCode.indexOf('Finance_ExpenseType') != -1) {
if (ActionMenuCode.indexOf('Finance_Inner') != -1) {
this.isFinance_ExpenseType=true;
}
......@@ -490,7 +490,7 @@
if (res.data.resultCode == 1) {
this.idEditFinNote = false
this.$message.success(res.data.message);
this.$emit('success')
//this.$emit('success')
} else {
this.$message.error(res.data.message);
}
......
src/components/TravelContractNew.vue
View file @ 97aa1878
......@@ -326,7 +326,7 @@
{{$t('pub.saveBtn')}}</el-button>
</template>
<template v-if="CurrentUserInfo.EmployeeId == 615">
<el-button type="primary" size="medium" @click="submitForm('CtObj')" :loading="SaveLoading">保存(S)</el-button>
<el-button type="primary" size="medium" @click="submitForm('CtObj')" :loading="SaveLoading">{{$t('pub.saveBtn')}}(S)</el-button>
</template>
</div>
</div>
......
src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue
View file @ 97aa1878
......@@ -1742,7 +1742,7 @@
totalMoney = busFee + hotelPrice + sencePrice + zaoPrice + wuPrice + wanPrice + otherPrice;
return totalMoney.toFixed(0);
},
//计算领队分摊
//计算{{$t('objFill.v101.linduifentan')}}
getLeaderShare() {
let that = this;
var AirTicketShareMoney = this.OtherPrice.AirTicketShareMoney;
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceMun.vue
View file @ 97aa1878
......@@ -80,17 +80,16 @@
<table>
<tr>
<th>
开团提示
{{$t('objFill.v101.kaituants')}}
</th>
<th colspan="5" style="text-align:left;line-height:40px;">
<p style="color:red;font-weight:bold;"> 1.“常规团”对应 “散拼”;&nbsp;&nbsp; 2.“小包团”(10人以下 或者
超过10人纯玩不进店);&nbsp;&nbsp;
3.“当地游”(不需要机票);
<p style="color:red;font-weight:bold;"> 1.{{$t('objFill.v101.changuitdyshnp')}}&nbsp;&nbsp; 2.{{$t('objFill.v101.xiaobtcgbjd')}}&nbsp;&nbsp;
3.{{$t('objFill.v101.dangdybxyjp')}}
</p>
</th>
</tr>
<tr>
<td width="80" class="txtRightCost">出团类型</td>
<td width="80" class="txtRightCost">{{$t('objFill.v101.chutuanleix')}}</td>
<td>
<el-select class="multiple_input" v-model="postConfig.TeamType"
@change="postConfig.LineId=0,postConfig.LineteamId=0">
......@@ -178,10 +177,10 @@
</td>
</tr>
<tr>
<td width="80" class="txtRightCost">团队标题</td>
<td width="80" class="txtRightCost">{{$t('sm.tuanduibiaoti')}}</td>
<td colspan="5">
<el-input v-model="postConfig.Title" type="textarea" :autosize="{minRows: 1, maxRows: 2 }" resize="none"
placeholder="请填写团队标题" maxlength="200"></el-input>
:placeholder="$t('objFill.v101.qingtxtdbti')" maxlength="200"></el-input>
</td>
</tr>
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 97aa1878
......@@ -471,7 +471,7 @@
return;
}
if (this.postData.OPId <= 0 || this.postData.OPId == '') {
this.$message.error('请选择主OP')
this.$message.error(this.$t('objFill.v101.qingshurzop'))
return;
}
this.postData.AssistantId = "";
......@@ -485,7 +485,7 @@
});
}
if (flag) {
this.Error('助理OP不能包含主OP,请重新选择!');
this.Error(this.$t('objFill.v101.zhulopbnhzopcx'));
return;
}
var postMsg = {
......
src/components/TravelManager/TravelNewQuotation/SWTAuditDan.vue
View file @ 97aa1878
......@@ -221,7 +221,7 @@
<tbody>
<tr height="36">
<td width="50%"><input id="IsShowTripPrice" type="checkbox" v-model="downLoadMsg.IsShowTripPrice" /><label
for="IsShowTripPrice">({{$t('objFill.v101.dmc.xingcbj')}})<br />(房、餐、车、门票)</label></td>
for="IsShowTripPrice">({{$t('objFill.v101.dmc.xingcbj')}})<br />{{$t('objFill.v101.fangcancmpiao')}}</label></td>
<td width="50%"><input id="IsShowTraffic" type="checkbox" v-model="downLoadMsg.IsShowTraffic" /><label
for="IsShowTraffic">{{$t('objFill.v101.jiaotobuf')}}</label></td>
</tr>
......@@ -239,13 +239,13 @@
</tr>
<tr height="36">
<td><input id="IsShowLeaderFenTan" type="checkbox" v-model="downLoadMsg.IsShowLeaderFenTan" /><label
for="IsShowLeaderFenTan">领队分摊</label></td>
for="IsShowLeaderFenTan">{{$t('objFill.v101.linduifentan')}}</label></td>
<td><input id="IsShowCost" type="checkbox" v-model="downLoadMsg.IsShowCost" /><label
for="IsShowCost">{{$t('objFill.v101.dmc.chengbentj')}}</label></td>
</tr>
<tr height="36">
<td><input id="IsShowOtherPrice" type="checkbox" v-model="downLoadMsg.IsShowOtherPrice" /><label
for="IsShowOtherPrice">其他定价</label></td>
for="IsShowOtherPrice">{{$t('objFill.v101.linduifentan')}}</label></td>
</tr>
</tbody>
<tr height="66">
......@@ -295,7 +295,7 @@
IsShowOtherZhichu: false, //其他支出
IsShowShouRu: false, //收入部分
IsShowTuanFuFee: false, //团负费
IsShowLeaderFenTan: false, //领队分摊
IsShowLeaderFenTan: false, //{{$t('objFill.v101.linduifentan')}}
IsShowCost: false, //成本统计
IsShowOtherPrice: false, //其他定价
},
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ 97aa1878
......@@ -109,7 +109,7 @@
<li>
<button class="hollowFixedBtn" @click="getList(),resetPageIndex()">{{$t('pub.searchBtn')}}</button>
<button class="hollowFixedBtn" @click="goMakeQuo('QuotationNewPrice',0)">{{$t('pub.addBtn')}}</button>
<button class="hollowFixedBtn" @click="ShowImportOffer()" style="">导入报价单</button>
<button class="hollowFixedBtn" @click="ShowImportOffer()" style="">{{$t('objFill.v101.daorubjiad')}}</button>
</li>
</ul>
</div>
......@@ -291,7 +291,7 @@
<template v-if="item.ChangeManagerAduitDate&&item.ChangeManagerAduitDate!=''">
<div class="priceContentDiv" style="margin-bottom:5px;" >
<div>
<span>审批结果</span>
<span>{{$t('objFill.v101.FinancialModule.shenpjg')}}</span>
<span class="AuditDate">{{item.ChangeManagerAduitDate}}</span>
</div>
<div>{{item.ChangeManagerAduitName}}:
......@@ -306,7 +306,7 @@
</template>
<div class="priceContentDiv" v-if="item.ChangeAduitDate&&item.ChangeAduitDate!=''" style="margin-bottom:5px;">
<div>
<span>审批结果</span>
<span>{{$t('objFill.v101.FinancialModule.shenpjg')}}</span>
<span class="AuditDate">{{item.ChangeAduitDate}}</span>
</div>
<div>{{item.ChangeAuditByName}}:
......@@ -324,9 +324,9 @@
</div>
<div style="width:134px;">
<span class="openGroup opbd" @click="goToOpenTravel(item)" v-if="item.TravelState==3&& item.OpenState==2">
<el-tooltip class="item" effect="dark" content="开团" placement="top-start" popper-class="max-w250">
<el-tooltip class="item" effect="dark" :content="$t('sm.kaituan')" placement="top-start" popper-class="max-w250">
</el-tooltip>
开
{{$t('op.Kai')}}
</span>
<span class="bianji newAopbdd"
v-if="item.TravelState==1||item.TravelState==2||item.TravelState==4||item.TravelState==5"
......@@ -350,7 +350,7 @@
</el-tooltip>
</span>
<span class="bianji newAopbdd" v-if="item.TravelState==3||item.TravelState==7">
<el-tooltip class="item" effect="dark" content="报价单变更" placement="top-start" popper-class="max-w250">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.baojdbgen')" placement="top-start" popper-class="max-w250">
<i @click="goUrl('OfferChange',item,3)" class="iconfont el-icon-edit"></i>
</el-tooltip>
</span>
......@@ -389,7 +389,7 @@
<tbody>
<tr height="36">
<td width="50%"><input id="IsShowTripPrice" type="checkbox" v-model="downLoadMsg.IsShowTripPrice" /><label
for="IsShowTripPrice">({{$t('objFill.v101.dmc.xingcbj')}})<br />(房、餐、车、门票)</label></td>
for="IsShowTripPrice">({{$t('objFill.v101.dmc.xingcbj')}})<br />{{$t('objFill.v101.fangcancmpiao')}}</label></td>
<td width="50%"><input id="IsShowTraffic" type="checkbox" v-model="downLoadMsg.IsShowTraffic" /><label
for="IsShowTraffic">{{$t('objFill.v101.jiaotobuf')}}</label></td>
</tr>
......@@ -407,7 +407,7 @@
</tr>
<tr height="36">
<td><input id="IsShowLeaderFenTan" type="checkbox" v-model="downLoadMsg.IsShowLeaderFenTan" /><label
for="IsShowLeaderFenTan">领队分摊</label></td>
for="IsShowLeaderFenTan">{{$t('objFill.v101.linduifentan')}}</label></td>
<td><input id="IsShowCost" type="checkbox" v-model="downLoadMsg.IsShowCost" /><label
for="IsShowCost">{{$t('objFill.v101.dmc.chengbentj')}}</label></td>
</tr>
......@@ -415,7 +415,7 @@
<td><input id="IsCostRebate" type="checkbox" v-model="downLoadMsg.IsCostRebate" /><label
for="IsCostRebate" >{{$t('objFill.v101.chengbhuko')}}</label></td>
<td><input id="IsShowOtherPrice" type="checkbox" v-model="downLoadMsg.IsShowOtherPrice" /><label
for="IsShowOtherPrice">其他定价</label></td>
for="IsShowOtherPrice">{{$t('objFill.v101.linduifentan')}}</label></td>
</tr>
</tbody>
<tr height="66">
......@@ -428,13 +428,13 @@
</div>
</el-dialog>
<!-- 导入报价单弹窗 -->
<el-dialog custom-class="w600" title="导入报价单" :visible.sync="isShowImportOffer" center>
<el-dialog custom-class="w600" :title="$t('objFill.v101.daorubjiad')" :visible.sync="isShowImportOffer" center>
<el-form label-width="80px">
<table style="width:570px;" border="0" cellspacing="0" cellpadding="0">
<tbody>
<tr>
<td>
<el-form-item label="出团类型">
<el-form-item :label="$t('objFill.v101.chutuanleix')">
<el-select v-model="postConfig.TeamType" @change="postConfig.LineId=0,postConfig.LineteamId=0"
style="width:180px">
<el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
......@@ -495,18 +495,18 @@
<el-upload class="upload-demo" action="" accept="*.*" :http-request="UploadAttachment"
:show-file-list="true" ref="uploadOffer">
<el-button size="small" type="primary">{{$t('tips.dianjishanhcuan')}}</el-button>
<div slot="tip" class="el-upload__tip">只能上传.xls/.xlsx文件</div>
<div slot="tip" class="el-upload__tip">{{$t('objFill.v101.zhinscxls')}}</div>
</el-upload>
</td>
<td>
<a :href="`${downLoadUrl}`" target="OfferTemplate.xls"
style="color:blue;text-decoration: underline">下载导入模板</a>
style="color:blue;text-decoration: underline">{{$t('objFill.v101.xiazdrumob')}}</a>
</td>
</tr>
</tbody>
<tr>
<td colspan="2" style="text-align:center;">
<el-button type="primary" class="normalBtn" :loading="importOfferLoading" @click="ImportOffer()">保存
<el-button type="primary" class="normalBtn" :loading="importOfferLoading" @click="ImportOffer()">{{$t('pub.saveBtn')}}
</el-button>
<input type="button" class="normalBtn" :value="$t('pub.closeSel')"
@click="isShowImportOffer=false,clearMsg()" />
......@@ -567,7 +567,7 @@
IsShowOtherZhichu: false, //其他支出
IsShowShouRu: false, //收入部分
IsShowTuanFuFee: false, //团负费
IsShowLeaderFenTan: false, //领队分摊
IsShowLeaderFenTan: false, //{{$t('objFill.v101.linduifentan')}}
IsShowCost: false, //成本统计
IsShowOtherPrice: false, //其他定价
IsCostRebate: false, //成本回扣
......@@ -618,7 +618,7 @@
//复制报价单
copyOffer(item) {
var that = this;
var tipMsg = "是否要复制【" + item.Title + "】此报价单?";
var tipMsg = that.$t('sm.shifyfzhi')+"【" + item.Title + "】"+that.$t('objFill.v101.cibaojdan');
that.Confirm(tipMsg, function () {
let offerMsg = {
OldOfferId: item.OfferId,
......@@ -669,11 +669,11 @@
//导入报价单
ImportOffer() {
if (this.postConfig.OutDateTime == '') {
this.Error("请选择出发时间!");
this.Error(this.$t('objFill.qingxzcfsj'));
return;
}
if (this.myfile == '') {
this.Error("请选择需要上传的文件!");
this.Error(this.$t('objFill.v101.qingxzxuyscdwj'));
return;
}
this.importOfferLoading = true;
......@@ -698,7 +698,7 @@
this.isShowImportOffer = false;
this.getList();
} else {
this.$message.error('上传失败!');
this.$message.error(this.$t('objFill.v101.Rest.shangchuansb')+'!');
}
}
}).catch(err => {
......
src/components/TravelManager/TravelNewQuotation/newQuotation_SWT.vue
View file @ 97aa1878
......@@ -348,7 +348,7 @@
//删除报价单
delQuotation(ID) {
var that = this;
that.Confirm(that.$t('sm.schbnhfjscz'), function () {
this.Confirm(that.$t('sm.schbnhfjscz'), function () {
let msg = {
Id: ID,
Status: 1,
......
src/components/TravelManager/TravelQuotationCenter/CostPrice.vue
View file @ 97aa1878
......@@ -763,7 +763,7 @@
this.shortPeopleNumber();
this.getSubtotalMoney();
},
//计算领队分摊
//计算{{$t('objFill.v101.linduifentan')}}
getLeaderShare() {
let that = this;
var AirTicketShareMoney = this.OfferCostPriceObj.AirTicketShareMoney;
......
src/components/TravelManager/TravelQuotationCenter/quoTation.vue
View file @ 97aa1878
......@@ -163,7 +163,7 @@
</el-tooltip>
</span>
<span class="openGroup opbd" v-if="item.TravelState==3&&item.OpenState==2" @click="goToOpenTravel('TravelManager',item.ID,item.OpenState)">
开
{{$t('op.Kai')}}
</span>
<span class="openGroup opbd" v-if="item.TravelState==3&&item.OpenState==2">
<el-tooltip class="item" effect="dark" content="查看报价单" placement="top-start" popper-class="max-w250">
......
src/components/WebSet/plug-in/choose_trip.vue
View file @ 97aa1878
......@@ -140,7 +140,7 @@
團號
</th>
<th>
天數
{{$t('objFill.tianshu')}}
</th>
<th>
價格
......
src/components/dmc/manager/CoastPrice.vue
View file @ 97aa1878
......@@ -763,7 +763,7 @@
this.shortPeopleNumber();
this.getSubtotalMoney();
},
//计算领队分摊
//计算{{$t('objFill.v101.linduifentan')}}
getLeaderShare() {
let that = this;
var AirTicketShareMoney = this.OfferCostPriceObj.AirTicketShareMoney;
......
src/components/index.vue
View file @ 97aa1878
......@@ -1165,7 +1165,7 @@
</div>
<div class="group-foot">
<button class="hollowFixedBtn" @click="showUpdateTeam(0)">取消</button>
<button class="normalBtn" @click="updateTeamName">保存</button>
<button class="normalBtn" @click="updateTeamName">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
<el-dialog custom-class='w800 PingFangSC' :title="dialogTitleNot" :visible.sync="outerVisibleNot" center
......
src/components/systemManagement/CostType.vue
View file @ 97aa1878
......@@ -156,7 +156,7 @@
<li>
<button class="hollowFixedBtn" @click="resetPageIndex(),initTableInfo()">{{$t('pub.searchBtn')}}</button>
<!-- <button type="button" class="normalBtn" @click="outerVisible=true">{{$t('objFill.daoru')}}</button>
<button type="button" class="normalBtn" @click="downMuban()">下载导入模板</button> -->
<button type="button" class="normalBtn" @click="downMuban()">{{$t('objFill.v101.xiazdrumob')}}</button> -->
<button class="normalBtn" @click="addShow=true,text=$t('pub.addBtn'),addFun(),resetInfo()" >{{$t('pub.addBtn')}}</button>
<el-tooltip class="item" effect="dark" :content="$t('fnc.qhpaiban')" placement="top-end">
<i v-if="transitionShow" class="iconfont icon-biaoge" @click="switchMethod(1)"></i>
......
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