Skip to content

S
SuperMan
Commit 53ff14bb authored by youjie's avatar youjie
Browse files
Options

no message

parents c57c2169 f52f1b9b
Show whitespace changes
Inline Side-by-side
Showing with 306 additions and 277 deletions
src/assets/common/lang/zhCN/fill.js
View file @ 53ff14bb
......@@ -7518,7 +7518,7 @@ export const obj = {
tianxctmccyjg: '填写餐厅名称才能带出价格',
tianxjqcaiyjg: '填写景点名称才能带出价格',
hancan: '含餐',
guolfqcfei: '过路费、请车费"',
guolfqcfei: '过路费、停车费',
zaocanmc: '早餐名称',
wucanmc: '午餐名称',
wancaimc: '晚餐名称',
......
src/components/FinancialModule/components/ClientBankAccount.vue
View file @ 53ff14bb
......@@ -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/LeaderManagement/leaderReimbursement.vue
View file @ 53ff14bb
......@@ -43,7 +43,8 @@
<el-popover width="1000" trigger="click" popper-class="DMC_HotelPop">
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"
:TCID="item.TCIDS" :DMCNum="NewCombinationNum" :TCNUM="item.TCNUMS"></commonHotelInfo>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">{{$t('objFill.jiudianxinxi')}}</span>
<span slot="reference" class="price"
style="cursor:pointer;text-decoration:underline;">{{$t('objFill.jiudianxinxi')}}</span>
</el-popover>
</td>
</tr>
......@@ -310,10 +311,12 @@
{{subItem.HotelName}}
</template>
<br />
<span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiajiudian')}}：<font style="color:red;">{{subItem.OfferHotelName}}(
<span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiajiudian')}}：<font style="color:red;">
{{subItem.OfferHotelName}}(
{{subItem.OfferUnitPrice}}/{{$t('hotel.hotel_people')}})</font></span>
<br />
<span style="color:red" v-if="subItem.StandardRoomPrice">{{$t('objFill.shijijine')}}:{{subItem.StandardRoomPrice}}/{{$t('objFill.v101.LeaderManagement.renbiaoj')}}</span>
<span style="color:red"
v-if="subItem.StandardRoomPrice">{{$t('objFill.shijijine')}}:{{subItem.StandardRoomPrice}}/{{$t('objFill.v101.LeaderManagement.renbiaoj')}}</span>
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length" style="text-align:left; ">
<a target="_blank" v-if="subItem.ContractUrl!==''" :href="subItem.ContractUrl"
......@@ -480,7 +483,8 @@
</template>
</span>
<div v-if="subItem.IsHaveShouPeiFee==0" style="color:red;">{{$t('objFill.wushoupeifei')}}</div>
<div v-if="subItem.IsHaveShouPeiFee==1" style="color:red;">{{$t('objFill.handpartscharge')}}:{{subItem.ShouPeiMoney}}</div>
<div v-if="subItem.IsHaveShouPeiFee==1" style="color:red;">
{{$t('objFill.handpartscharge')}}:{{subItem.ShouPeiMoney}}</div>
</td>
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
<template v-if="subItem.DMCState==1">
......@@ -719,7 +723,8 @@
{{subItem.ScenicName}}
<template v-if="subItem.ScenicOfferPrice&& subItem.ScenicOfferPrice>0">
<br />
<span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiajingdian')}}:<font style="color:red;">
<span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiajingdian')}}:<font
style="color:red;">
{{subItem.ScenicOfferName}}
({{subItem.ScenicOfferPrice}}/{{$t('hotel.hotel_people')}})</font>
</span>
......@@ -807,15 +812,16 @@
</table>
<!-- 其他支出费用 -->
<template v-if="myLineId==90">
<p class="teamRevenueExpenditureTitle" >
<p class="teamRevenueExpenditureTitle">
{{$t('objFill.v101.dmc.qitazhic')}}
<span class="fr" style="margin-top: -8px;" v-if="DanjuNum==0">
<input type="button" class="normalBtn" :value="$t('objFill.v101.dmc.xinzengqtzc')" @click="addOtherExpenses" />
<input type="button" class="normalBtn" :value="$t('objFill.v101.dmc.xinzengqtzc')"
@click="addOtherExpenses" />
</span>
</p>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th >{{$t('objFill.v101.dmc.fieyongmc')}}</th>
<th>{{$t('objFill.v101.dmc.fieyongmc')}}</th>
<th>{{$t('objFill.v101.dmc.feiyongjg')}}</th>
<th>{{$t('objFill.zffs')}}</th>
<th width="">{{$t('hotel.hotel_Currency')}}</th>
......@@ -828,7 +834,8 @@
<td>{{item.PayTypeName}}</td>
<td>{{item.CurrencyName}}</td>
<td>
<span @click="editorOtherExpenses(item,index)" class="el-icon-delete itc-delete" v-if="DanjuNum==0"></span>
<span @click="editorOtherExpenses(item,index)" class="el-icon-delete itc-delete"
v-if="DanjuNum==0"></span>
</td>
</tr>
</template>
......@@ -862,7 +869,8 @@
<td>{{item.CreateDate}}</td>
<td>
<div v-for="childItem in item.TradeWayList">
{{$t('objFill.zffs')}}：{{childItem.Alias}}<span class="TB_Rate">{{$t('hotel.hotel_Currency')}}：{{childItem.CurrencyName}}</span>
{{$t('objFill.zffs')}}：{{childItem.Alias}}<span
class="TB_Rate">{{$t('hotel.hotel_Currency')}}：{{childItem.CurrencyName}}</span>
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate">{{$t('hotel.hotel_CurrentRate')}}：{{childItem.Rate}}</span>
</div>
......@@ -993,8 +1001,9 @@
{{subItem.FinanceId}}({{subItem.Status == 3 ? $t('ios.bohui') : subItem.Status == 2 ?$t('ios.tonggei') : $t('fnc.a_shezhong')}})</span>&nbsp;&nbsp;
<span v-if="subItem.Status == 3" class="cursorpointer text-decoration"
@click="goFncEditUrl('addFinancialDocuments', subItem.CurrencyId, subItem.FinanceId)"
style="color: red;">{{$t('objFill.chongxingfaqi')}}</span>&nbsp;&nbsp;<span class="cursorpointer text-decoration"
@click="goFncUrl('Application', subItem.FinanceId)" v-if="subItem.IsPublic === 4">{{$t('objFill.sqs')}}</span>
style="color: red;">{{$t('objFill.chongxingfaqi')}}</span>&nbsp;&nbsp;<span
class="cursorpointer text-decoration" @click="goFncUrl('Application', subItem.FinanceId)"
v-if="subItem.IsPublic === 4">{{$t('objFill.sqs')}}</span>
&nbsp;&nbsp;<span class="cursorpointer text-decoration"
@click="goFncUrl('DebitNote', subItem.FinanceId)">{{$t('objFill.jiezhidan')}}</span></p>
</td>
......@@ -1004,11 +1013,14 @@
<div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
<el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
<input type="button" :value="$t('objFill.preparedocument')" class="normalBtn" @click="goDiJieZhiDan(item,0,leadr,cur)" />
<input type="button" :value="$t('objFill.preparedocument')" class="normalBtn"
@click="goDiJieZhiDan(item,0,leadr,cur)" />
</el-tooltip>
<template v-if="item.CompanyAlipay==0&&leadr.CurrencyId===1">
<el-tooltip class="item" effect="dark" placement="top" :content="currencyTypeObj[leadr.CurrencyId]" >
<input style="margin-top:5px;" type="button" :value="$t('objFill.v101.LeaderManagement.kaiqiqydsdf')" class="normalBtn" @click="OpenCompanyAlipay(item,0,leadr,cur)" />
<el-tooltip class="item" effect="dark" placement="top" :content="currencyTypeObj[leadr.CurrencyId]">
<input style="margin-top:5px;" type="button"
:value="$t('objFill.v101.LeaderManagement.kaiqiqydsdf')" class="normalBtn"
@click="OpenCompanyAlipay(item,0,leadr,cur)" />
</el-tooltip>
</template>
......@@ -1021,20 +1033,24 @@
<template v-else>
<div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
<input type="button" v-if="item.TeamType == 1 && index2==0" :value="$t('objFill.ridang')" class="normalBtn"
@click="goDiJieZhiDan(item, 2)" />
<input type="button" v-if="item.TeamType == 1 && index2==0" :value="$t('objFill.ridang')"
class="normalBtn" @click="goDiJieZhiDan(item, 2)" />
<template v-if="item.hideZDBtn ">
<el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
<input type="button" :value="$t('objFill.preparedocument')" class="normalBtn" @click="goDiJieZhiDan(item,0,leadr,cur)" />
<input type="button" :value="$t('objFill.preparedocument')" class="normalBtn"
@click="goDiJieZhiDan(item,0,leadr,cur)" />
</el-tooltip>
<template v-if="item.CompanyAlipay==0&&leadr.CurrencyId===1">
<el-tooltip class="item" effect="dark" placement="top" :content="currencyTypeObj[leadr.CurrencyId]" >
<input style="margin-top:5px;" type="button" :value="$t('objFill.v101.LeaderManagement.kaiqiqydsdf')" class="normalBtn" @click="OpenCompanyAlipay(item,0,leadr,cur)" />
<el-tooltip class="item" effect="dark" placement="top" :content="currencyTypeObj[leadr.CurrencyId]">
<input style="margin-top:5px;" type="button"
:value="$t('objFill.v101.LeaderManagement.kaiqiqydsdf')" class="normalBtn"
@click="OpenCompanyAlipay(item,0,leadr,cur)" />
</el-tooltip>
</template>
<template v-else-if="item.CompanyAlipay===1&&leadr.CurrencyId===1">
<span style="color:red;text-decoration: underline;" @click="GoCompanyAlipay(item)"> {{$t('objFill.v101.dmc.yikqqydf')}}</span>
<span style="color:red;text-decoration: underline;" @click="GoCompanyAlipay(item)">
{{$t('objFill.v101.dmc.yikqqydf')}}</span>
</template>
</template>
<template v-else-if="!item.hideZDBtn && index2==0">
......@@ -1129,22 +1145,27 @@
</el-carousel-item>
</el-carousel>
</div>
<el-dialog :visible.sync="ShowCompanyAlipay" width="800px" :title="$t('objFill.v101.LeaderManagement.feikongzhid')" @close="clearMsg()">
<companyalipay ref="companyalipay" @change="getMsg" :UseTotalPrice="UseTotalPrice" :CompanyAlipayTCID="CompanyAlipayTCID" :TeamStartDateList="TeamStartDateList" >
<el-dialog :visible.sync="ShowCompanyAlipay" width="800px" :title="$t('objFill.v101.LeaderManagement.feikongzhid')"
@close="clearMsg()">
<companyalipay ref="companyalipay" @change="getMsg" :UseTotalPrice="UseTotalPrice"
:CompanyAlipayTCID="CompanyAlipayTCID" :TeamStartDateList="TeamStartDateList">
</companyalipay>
<el-row :gutter="20">
<el-col style="text-align: right;margin-bottom:20px;" :style="msgCompanyAlipay.QuotaCreateList&&msgCompanyAlipay.QuotaCreateList.length>0? 'margin-top:20px;':''">
<el-col style="text-align: right;margin-bottom:20px;"
:style="msgCompanyAlipay.QuotaCreateList&&msgCompanyAlipay.QuotaCreateList.length>0? 'margin-top:20px;':''">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="clearMsg()" />
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="SaveQuota()" />
</el-col>
</el-row>
</el-dialog>
<el-dialog :visible.sync="showOtherExpenses" width="1000px" :title="OtherExpensesTitle" @close="clearOtherExpensesMsg()">
<el-dialog :visible.sync="showOtherExpenses" width="1000px" :title="OtherExpensesTitle"
@close="clearOtherExpensesMsg()">
<el-form :model="OtherExpensesMsg" ref="OtherExpensesMsg" :rules="rules" label-width="100px">
<el-form-item class="ImpressionTicketing-OuterFrame" label-width="0" style="width: 100%;">
<table class="OtherExpensesList" style="width: 100%;">
<tr style="width:100%;">
<th colspan="5" style="color:red !important; ">{{$t('objFill.v101.dmc.qitazhic')}}<span @click="addOExpenses()" class="el-icon-circle-plus-outline itc-outline"></span></th>
<th colspan="5" style="color:red !important; ">{{$t('objFill.v101.dmc.qitazhic')}}<span
@click="addOExpenses()" class="el-icon-circle-plus-outline itc-outline"></span></th>
</tr>
<tr style="width:100%;">
<th style="width:50%;">{{$t('objFill.v101.dmc.fieyongmc')}}</th>
......@@ -1154,20 +1175,18 @@
<th style="width:10%;">{{$t('hotel.Operate')}}</th>
</tr>
<tr v-for="(item,index) in OtherExpensesMsg.OtherExpensesList" :key="index">
<td> <el-form-item :prop="`OtherExpensesList.${index}.OtherName`"
:rules="rules.OtherName">
<td>
<el-form-item :prop="`OtherExpensesList.${index}.OtherName`" :rules="rules.OtherName">
<el-input v-model="item.OtherName" clearable maxlength="200"></el-input>
</el-form-item>
</td>
<td> <el-form-item
:prop="`OtherExpensesList.${index}.OtherPrice`"
:rules="rules.OtherPrice">
<td>
<el-form-item :prop="`OtherExpensesList.${index}.OtherPrice`" :rules="rules.OtherPrice">
<el-input v-model="item.OtherPrice" type="number" clearable></el-input>
</el-form-item></td>
</el-form-item>
</td>
<td>
<el-form-item
:prop="`OtherExpensesList.${index}.PayType`"
:rules="rules.PayType">
<el-form-item :prop="`OtherExpensesList.${index}.PayType`" :rules="rules.PayType">
<el-select class='w135 sel' v-model='item.PayType' :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('ground.xianfu')" :value='1'></el-option>
<el-option :label="$t('ground.qiandan')" :value='2'></el-option>
......@@ -1183,9 +1202,7 @@
</el-form-item>
</td>
<td>
<el-form-item
:prop="`OtherExpensesList.${index}.CurrencyId`"
:rules="rules.CurrencyId">
<el-form-item :prop="`OtherExpensesList.${index}.CurrencyId`" :rules="rules.CurrencyId">
<el-select v-model="item.CurrencyId" :placeholder="$t('pub.pleaseSel')">
<el-option v-for="(items,index) in allCurrencyList" :key="index" :label="items.Name"
:value="items.ID">
......@@ -1203,7 +1220,8 @@
<div slot="footer" class="dialog-footer">
<el-button class="hollowFixedBtn" @click="clearOtherExpensesMsg()">{{$t('pub.cancelBtn')}}</el-button>
<el-button class="normalBtn" type="primary" @click="submitFormOther('OtherExpensesMsg')" :loading="OtherLoading">{{$t('pub.saveBtn')}}</el-button> &nbsp;
<el-button class="normalBtn" type="primary" @click="submitFormOther('OtherExpensesMsg')"
:loading="OtherLoading">{{$t('pub.saveBtn')}}</el-button> &nbsp;
</div>
</el-dialog>
</div>
......@@ -1278,20 +1296,20 @@
myLineId: 0, //zk新增
comRate: 1, //公用乘以 zk新增
msgList: [],
ShowCompanyAlipay:false,
CompanyAlipayTCID:0,
ShowCompanyAlipay: false,
CompanyAlipayTCID: 0,
msgCompanyAlipay: {},
TeamStartDateList:[],
UseTotalPrice:0,
TeamStartDateList: [],
UseTotalPrice: 0,
OtherExpensesTitle: '',
showOtherExpenses: false,
DanjuNum:0,
DanjuNum: 0,
OtherExpensesObj: {
ID:0,
OtherName:'',
OtherPrice:'',
PayType:'',
CurrencyId:''
ID: 0,
OtherName: '',
OtherPrice: '',
PayType: '',
CurrencyId: ''
},
OtherExpensesMsg: {
OtherExpensesList: [
......@@ -1359,33 +1377,33 @@
}
})
},
addOExpenses(){
addOExpenses() {
this.OtherExpensesMsg.OtherExpensesList.push(JSON.parse(JSON.stringify(this.OtherExpensesObj)))
},
deleteOExpenses(index){
this.OtherExpensesMsg.OtherExpensesList.splice(index,1)
deleteOExpenses(index) {
this.OtherExpensesMsg.OtherExpensesList.splice(index, 1)
},
addOtherExpenses() {
this.OtherExpensesTitle = this.$t('objFill.v101.dmc.xinzengqtzc');
if(this.TotalNav.leaderOtherExpensesList&&this.TotalNav.leaderOtherExpensesList.length>0){
this.OtherExpensesMsg.OtherExpensesList=JSON.parse(JSON.stringify(this.TotalNav.leaderOtherExpensesList))
if (this.TotalNav.leaderOtherExpensesList && this.TotalNav.leaderOtherExpensesList.length > 0) {
this.OtherExpensesMsg.OtherExpensesList = JSON.parse(JSON.stringify(this.TotalNav.leaderOtherExpensesList))
}
this.showOtherExpenses = true
},
editorOtherExpenses(item,index) {
editorOtherExpenses(item, index) {
this.$confirm(this.$t('objFill.ydscbkhf'), this.$t("tips.tips"), {
confirmButtonText: this.$t("pub.sureBtn"),
cancelButtonText: this.$t("pub.cancelBtn"),
type: "warning"
}
)
})
.then(() => {
this.OtherExpensesMsg.OtherExpensesList=[];
this.OtherExpensesMsg.OtherExpensesList = [];
this.OtherExpensesMsg.TCID = this.msg.TCIDs = this.$route.query.id;
if(this.TotalNav.leaderOtherExpensesList&&this.TotalNav.leaderOtherExpensesList.length>0){
this.OtherExpensesMsg.OtherExpensesList=JSON.parse(JSON.stringify(this.TotalNav.leaderOtherExpensesList))
if (this.TotalNav.leaderOtherExpensesList && this.TotalNav.leaderOtherExpensesList.length > 0) {
this.OtherExpensesMsg.OtherExpensesList = JSON.parse(JSON.stringify(this.TotalNav
.leaderOtherExpensesList))
}
if(this.OtherExpensesMsg.OtherExpensesList&&this.OtherExpensesMsg.OtherExpensesList.length>0){
if (this.OtherExpensesMsg.OtherExpensesList && this.OtherExpensesMsg.OtherExpensesList.length > 0) {
this.OtherExpensesMsg.OtherExpensesList.splice(index, 1);
}
this.apipost(
......@@ -1428,7 +1446,8 @@
this.$forceUpdate();
},
getTips(x) {
let title = `${this.$t('objFill.fukuanzhanghao')}：${x.AccountNumber},${this.$t('fnc.yuanbi')}：${String(x.WBMoney)}`
let title =
`${this.$t('objFill.fukuanzhanghao')}：${x.AccountNumber},${this.$t('fnc.yuanbi')}：${String(x.WBMoney)}`
let text = []
x.TradeWayList.forEach(childItem => {
let i = `${this.$t('objFill.zffs')}：${childItem.Alias}${this.$t('hotel.hotel_Currency')}：${childItem.CurrencyName}
......@@ -1458,7 +1477,7 @@
}
});
},
GoCompanyAlipay(obj){
GoCompanyAlipay(obj) {
let routeData = this.$router.resolve({
name: 'AlipayManagementDetail',
query: {
......@@ -1818,7 +1837,7 @@
}
});
if (totalUseMoney > 0 && totalUsePercentMoney > 0 && totalUseMoney > totalUsePercentMoney) {
this.$message.error(this.$t('objFill.zonglkbnc')+"【" + totalUsePercentMoney + "】");
this.$message.error(this.$t('objFill.zonglkbnc') + "【" + totalUsePercentMoney + "】");
return;
}
}
......@@ -1841,23 +1860,23 @@
this.goZhiDan2(obj, num, leadr, cur);
}
},
getMsg(msg){
this.msgCompanyAlipay=JSON.parse(JSON.stringify(msg));
getMsg(msg) {
this.msgCompanyAlipay = JSON.parse(JSON.stringify(msg));
},
SaveQuota(){
let leaderGetPrice=0;
SaveQuota() {
let leaderGetPrice = 0;
//leadr.LeaderGetPriceT
if(this.msgCompanyAlipay.QuotaCreateList&&this.msgCompanyAlipay.QuotaCreateList.length>0){
this.msgCompanyAlipay.QuotaCreateList.forEach((x,index)=>{
leaderGetPrice+=Number(x.QuotaValue);
if (this.msgCompanyAlipay.QuotaCreateList && this.msgCompanyAlipay.QuotaCreateList.length > 0) {
this.msgCompanyAlipay.QuotaCreateList.forEach((x, index) => {
leaderGetPrice += Number(x.QuotaValue);
if (x.effectiveDateList && x.effectiveDateList.length > 0) {
x.EffectiveStartDate = x.effectiveDateList[0];
x.EffectiveEndDate = x.effectiveDateList[1];
}
else {
} else {
x.EffectiveStartDate = '';
x.EffectiveEndDate = '';
this.Error(this.$t('system.table_staffs')+x.EmployeeName+this.$t('objFill.v101.LeaderManagement.weixuanedyxq'));
this.Error(this.$t('system.table_staffs') + x.EmployeeName + this.$t(
'objFill.v101.LeaderManagement.weixuanedyxq'));
return;
}
})
......@@ -1866,51 +1885,49 @@
this.msgCompanyAlipay.EffectiveStartDate = this.msgCompanyAlipay.EffectiveDateList[0];
this.msgCompanyAlipay.EffectiveEndDate = this.msgCompanyAlipay.EffectiveDateList[1];
}
if(leaderGetPrice>Number(this.UseTotalPrice)){
this.Error(this.$t('objFill.v101.LeaderManagement.zongedbncg')+this.UseTotalPrice);
if (leaderGetPrice > Number(this.UseTotalPrice)) {
this.Error(this.$t('objFill.v101.LeaderManagement.zongedbncg') + this.UseTotalPrice);
return;
}
if(this.msgCompanyAlipay.EmployeeIdList&&this.msgCompanyAlipay.EmployeeIdList.length>0){
this.msgCompanyAlipay.EmployeeIds=this.msgCompanyAlipay.EmployeeIdList.join(",");
}
else{
if (this.msgCompanyAlipay.EmployeeIdList && this.msgCompanyAlipay.EmployeeIdList.length > 0) {
this.msgCompanyAlipay.EmployeeIds = this.msgCompanyAlipay.EmployeeIdList.join(",");
} else {
this.Error(this.$t('objFill.v101.FinancialModule.qingxuanzyg'));
return;
}
if(this.msgCompanyAlipay.TCID===0){
this.msgCompanyAlipay.TCID=this.CompanyAlipayTCID;
if (this.msgCompanyAlipay.TCID === 0) {
this.msgCompanyAlipay.TCID = this.CompanyAlipayTCID;
}
this.apipost('alipay_post_InvoiceInstitutionAndQuotaCreate', this.msgCompanyAlipay, res => {
if(res.data.resultCode == 1) {
if (res.data.resultCode == 1) {
this.Success(this.$t('objFill.v101.LeaderManagement.kaiqiqydfcg'));
this.clearMsg();
this.getNav();
this.getList();
}
else{
} else {
this.Error(res.data.message);
}
}, err => {})
},
clearMsg(){
this.msgCompanyAlipay.EmployeeIds="";
this.msgCompanyAlipay.TCID=0;
this.ShowCompanyAlipay=false;
this.CompanyAlipayTCID=0;
this.UseTotalPrice=0;
this.msgCompanyAlipay.EmployeeIdList=[];
this.msgCompanyAlipay.QuotaCreateList=[];
this.msgCompanyAlipay.InstitutionName="";
this.msgCompanyAlipay.InstitutionDesc="";
clearMsg() {
this.msgCompanyAlipay.EmployeeIds = "";
this.msgCompanyAlipay.TCID = 0;
this.ShowCompanyAlipay = false;
this.CompanyAlipayTCID = 0;
this.UseTotalPrice = 0;
this.msgCompanyAlipay.EmployeeIdList = [];
this.msgCompanyAlipay.QuotaCreateList = [];
this.msgCompanyAlipay.InstitutionName = "";
this.msgCompanyAlipay.InstitutionDesc = "";
this.$refs['companyalipay'].clearMsg()
},
clearOtherExpensesMsg(){
this.showOtherExpenses=false;
this.OtherExpensesMsg.TCID=0;
this.OtherExpensesMsg.OtherExpensesList=[];
clearOtherExpensesMsg() {
this.showOtherExpenses = false;
this.OtherExpensesMsg.TCID = 0;
this.OtherExpensesMsg.OtherExpensesList = [];
},
OpenCompanyAlipay(obj, num, leadr, cur){
OpenCompanyAlipay(obj, num, leadr, cur) {
let totailMoney = (Number(leadr.LeaderGetPriceT) + Number(cur.yiLing)).toFixed(2);
let leadrPlanPrice = 0;
if (leadr && leadr.PlanPrice) {
......@@ -1935,22 +1952,23 @@
}
});
if (totalUseMoney > 0 && totalUsePercentMoney > 0 && totalUseMoney > totalUsePercentMoney) {
this.$message.error(this.$t('objFill.zonglkbnc')+"【" + totalUsePercentMoney + "】");
this.$message.error(this.$t('objFill.zonglkbnc') + "【" + totalUsePercentMoney + "】");
return;
}
}
this.CompanyAlipayTCID=obj.TCIDS;
this.ShowCompanyAlipay=true;
this.TeamStartDateList=[];
this.CompanyAlipayTCID = obj.TCIDS;
this.ShowCompanyAlipay = true;
this.TeamStartDateList = [];
this.TeamStartDateList.push(obj.StartDateStr);
var nowStartDate=new Date(obj.StartDateStr);
var nowStartDate = new Date(obj.StartDateStr);
nowStartDate.setDate(nowStartDate.getDate() + Number(obj.DayNum));
var Y = nowStartDate.getFullYear() + '-';
var M = (nowStartDate.getMonth() + 1 < 10 ? '0' + (nowStartDate.getMonth() + 1) : nowStartDate.getMonth() + 1) + '-';
var M = (nowStartDate.getMonth() + 1 < 10 ? '0' + (nowStartDate.getMonth() + 1) : nowStartDate.getMonth() + 1) +
'-';
var D = (nowStartDate.getDate() < 10 ? '0' + (nowStartDate.getDate()) : nowStartDate.getDate());
this.TeamStartDateList.push(Y + M + D);
this.UseTotalPrice=leadr.LeaderGetPriceT;
console.log("CompanyAlipayTCID222",this.CompanyAlipayTCID);
this.UseTotalPrice = leadr.LeaderGetPriceT;
console.log("CompanyAlipayTCID222", this.CompanyAlipayTCID);
},
addOtherList(index, id) {
this.list.OtherOrderReportList.OtherList.push({
......@@ -2030,8 +2048,8 @@
if (obj.TaxType == 2) {
coefficient = 1 + 0.1;
}
if (obj.PayStyle === 1 || obj.PayStyle === 11|| obj.PayStyle === 15) {
if (index == 4 && obj.DMCPayType !== 1 && obj.DMCPayType !== 11&& obj.DMCPayType !== 15) {
if (obj.PayStyle === 1 || obj.PayStyle === 11 || obj.PayStyle === 15) {
if (index == 4 && obj.DMCPayType !== 1 && obj.DMCPayType !== 11 && obj.DMCPayType !== 15) {
totalPrice += 0;
} else {
totalPrice +=
......@@ -2057,7 +2075,7 @@
(x.UsePeopleNum - x.Discount) *
(1 - x.DiscountPrice / 100);
});
if (!(sObj.PayStyle == 1 || sObj.PayStyle == 11|| sObj.PayStyle === 15)) {
if (!(sObj.PayStyle == 1 || sObj.PayStyle == 11 || sObj.PayStyle === 15)) {
totalPrice = 0;
}
return this.moneyFormat(totalPrice);
......@@ -2070,7 +2088,7 @@
(x.UsePeopleNum - x.Discount) *
(1 - x.DiscountPrice / 100);
});
if (sObj.PayStyle !== 1||sObj.PayStyle !== 15) {
if (sObj.PayStyle !== 1 && sObj.PayStyle !== 15) {
totalPrice = 0;
}
return this.moneyFormat(totalPrice);
......@@ -2132,7 +2150,7 @@
res => {
if (res.data.resultCode == 1) {
let nav = res.data.data.list;
this.DanjuNum=res.data.data.DanjuNum;
this.DanjuNum = res.data.data.DanjuNum;
this.LineId = res.data.data.EntryId;
if (nav[0].OutBranchId == 1216 || this.myLineId == 90) {
this.IsShowRMB = true;
......@@ -2175,7 +2193,7 @@
this.CurrencyListMoney.push(obj);
});
}
var isreceive = 0;//是否领取过用款（1-领取过，0-未领取)
var isreceive = 0; //是否领取过用款（1-领取过，0-未领取)
this.CurrencyListMoney.forEach((cur, i) => {
cur.yiLing = 0;
cur.LeaderGetPriceArr = [];
......@@ -2222,9 +2240,9 @@
} else {
//领取过，直接用计划金额(精确到万)-已领取的金额
if (this.myLineId == 14) {
lead.LeaderGetPriceT = tempShowPrice-cur.yiLing;
lead.LeaderGetPriceT = tempShowPrice - cur.yiLing;
} else {
lead.LeaderGetPriceT = tempShowPrice-cur.yiLing;
lead.LeaderGetPriceT = tempShowPrice - cur.yiLing;
}
}
lead.ShowTotalPrice = tempShowPrice;
......@@ -2597,30 +2615,32 @@
this.getTuanMsg()
}
};
</script>
<style scoped>
.itc-delete{
.itc-delete {
color: #E95252;
font-size: 16px;
cursor: pointer;
display: inline-block;
padding: 10px;
}
.itc-outline{
.itc-outline {
color: #409EFF;
font-size: 16px;
cursor: pointer;
display: inline-block;
padding: 10px;
}
.ImpressionTicketing-msgbox{
.ImpressionTicketing-msgbox {
display: flex;
flex-direction: row;
justify-content: space-between;
margin-bottom: 20px;
}
.teamRevenueExpenditureTitle {
border-left: 3px solid #E95252;
text-indent: 10px;
......@@ -2886,7 +2906,6 @@
._bank_type2 {
background-color: #ff9c01;
}
</style>
<style scoped>
.cblack {
......@@ -2984,13 +3003,15 @@
.cursor-pointer {
cursor: pointer;
}
table.OtherExpensesList {
font-family: verdana,arial,sans-serif;
font-size:11px;
color:#333333;
font-family: verdana, arial, sans-serif;
font-size: 11px;
color: #333333;
border: 1px solid #DCDFE6;
border-collapse: collapse;
}
/* table.OtherExpensesList th:first {
border: 1px solid #ccc;
padding: 8px;
......@@ -2999,8 +3020,9 @@
table.OtherExpensesList th {
border: 1px solid #ccc;
padding: 8px;
background-color: #dedede ;
background-color: #dedede;
}
table.OtherExpensesList td {
border: 1px solid #DCDFE6;
padding: 8px;
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ 53ff14bb
......@@ -68,7 +68,7 @@
<table class="CostNewTable" style="width:1600px;">
<thead>
<tr>
<td colspan="13" class="CP_ComTitle2 CostcomCenter">报价信息</td>
<td colspan="13" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.baojiaxinxi')}}</td>
</tr>
<tr>
<td class="CP_ComTitle2 CostcomCenter" style="width:120px">{{$t('hotel.hotel_Currency')}}</td>
......@@ -116,7 +116,8 @@
<el-button slot="append" class="iconfont icon-img_haha" @click="addPeoNunber"></el-button>
</el-input>
</el-form-item>
<div colspan="13" style="color: #f12121;font-weigth: bold;">填入人数后请点击"+"</div>
<div colspan="13" style="color: #f12121;font-weigth: bold;">{{$t('objFill.v101.tianrrshqindj')}}"+"
</div>
</td>
</tr>
</thead>
......@@ -125,23 +126,26 @@
<td rowspan="2" style="width:120px" class="CP_ComTitle2 CostcomCenter">{{$t('hotel.hotel_Currency')}}</td>
<td rowspan="2" style="width:180px" class="CP_ComTitle2 CostcomCenter">{{$t('Airticket.Air_Trip')}}</td>
<td colspan="2" style="width:220px;" class="CP_ComTitle2 CostcomCenter">{{$t('hotel.hotel')}}</td>
<td colspan="2" style="width:120px" class="CP_ComTitle2 CostcomCenter">车/天</td>
<td colspan="2" style="width:120px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.v101.chetian')}}</td>
<td colspan="2" style="width:200px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.can')}}</td>
<td colspan="2" style="width:150px" class="CP_ComTitle2 CostcomCenter">{{$t('scen.sc_piao')}}</td>
<td colspan="2" style="width:100px" class="CP_ComTitle2 CostcomCenter">其它费用<br />(保险、司导杂费等)</td>
<td colspan="2" style="width:100px" class="CP_ComTitle2 CostcomCenter">
{{$t('objFill.qitafy')}}<br />({{$t('objFill.baoxiansdzfd')}})</td>
</tr>
<tr>
<td style="width:150px" class="CP_ComTitle2 CostcomCenter">{{$t('hotel.table_hotelname')}}</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/人</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.chezi')}}/天</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">过路费<br />停车费/天</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.v101.jiageren')}}</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.chezi')}}/{{$t('hotel.hotel_day')}}
</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">
{{$t('objFill.guolufei')}}<br />{{$t('objFill.v101.tingcheft')}}</td>
<td style="width:110px" class="CP_ComTitle2 CostcomCenter">{{$t('restaurant.res_resName')}}<br /><span
style="color:red;">填写餐厅名称才能带出价格</span></td>
<td style="width:90px" class="CP_ComTitle2 CostcomCenter">价格/餐</td>
style="color:red;">{{$t('objFill.v101.tianxctmccyjg')}}</span></td>
<td style="width:90px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.v101.jiagecan')}}</td>
<td style="width:150px" class="CP_ComTitle2 CostcomCenter">{{$t('visaT.jdname')}}<br />
<span style="color:red;">填写景点名称才能带出价格</span>
<span style="color:red;">{{$t('objFill.v101.tianxjqcaiyjg')}}</span>
</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/人</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('objFill.v101.jiageren')}}</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('system.query_airName')}}</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">{{$t('Operation.Op_price')}}</td>
</tr>
......@@ -174,18 +178,18 @@
</el-option>
</el-select>
<el-form-item label="含餐:">
<el-select v-model='subItem.ContainDinnerType' style="width:100px;" placeholder="含餐类型"
<el-select v-model='subItem.ContainDinnerType' style="width:100px;" :placeholder="$t('objFill.v101.hancanlxin')"
@change="DinnerTypeChange(subItem)">
<el-option label="含餐类型" :value='0'></el-option>
<el-option label="含早餐" :value='1'></el-option>
<el-option label="含晚餐" :value='2'></el-option>
<el-option label="含早晚餐" :value='3'></el-option>
<el-option :label="$t('objFill.v101.hancanlxin')" :value='0'></el-option>
<el-option :label="$t('objFill.hanzaocan')" :value='1'></el-option>
<el-option :label="$t('objFill.hanwancan')" :value='2'></el-option>
<el-option :label="$t('objFill.v101.hanzaowanc')" :value='3'></el-option>
</el-select>
</el-form-item>
</td>
<td>
<el-input type='text' v-model="subItem.HotelCostPrice" class="w70"
@keyup.native="checkPrice(subItem,'HotelCostPrice'),getchange(1)" placeholder="酒店价格"></el-input>
@keyup.native="checkPrice(subItem,'HotelCostPrice'),getchange(1)" :placeholder="$t('objFill.v101.jiudianjge')"></el-input>
<template v-if="subItem.IsHotelChange">
<font style="color:red;">
<template v-if="subItem.HotelChangeValue>0">
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 53ff14bb
......@@ -79,7 +79,9 @@
{{$t('objFill.v101.kaituants')}}
</th>
<th colspan="7" style="text-align:left;line-height:40px;">
<p style="color:red;font-weight:bold;"> 1.{{$t('objFill.v101.changuitdyshnp')}}&nbsp;&nbsp; 2.{{$t('objFill.v101.xiaobtcgbjd')}}&nbsp;&nbsp;
<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>
......@@ -152,7 +154,8 @@
</td>
<td width="80" class="txtRightCost">{{$t('fnc.khmingcheng')}}</td>
<td>
<el-input v-model="postData.CustomerName" type="text" placeholder="客户名称" maxlength="200">
<el-input v-model="postData.CustomerName" type="text" :placeholder="$t('fnc.khmingcheng')"
maxlength="200">
</el-input>
</td>
</tr>
......
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