Skip to content

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

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

parents 42d5709c 3b610874
Show whitespace changes
Inline Side-by-side
Showing with 945 additions and 382 deletions
src/components/FinancialModule/BankStatementReconciliation/comm/BankStatement.vue
View file @ 87307821
......@@ -33,7 +33,7 @@
value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item :label="$t('objFill.v103.qichuyue')" prop="StartBalance">
<el-input-number :disabled="msg.isImage" class="w170" v-model="msg.StartBalance" :min="Number(0)" :step="50" size="small"/>
<el-input-number :disabled="msg.StartBalance!=0" class="w170" v-model="msg.StartBalance" :min="Number(0)" :step="50" size="small"/>
</el-form-item>
<el-form-item style=" width: 500px;margin-top: 0px;" :label="$t('objFill.fj')" prop="Image">
<div style="display: flex;flex-direction: row;">
......
src/components/FinancialModule/BankStatementReconciliation/index.vue
View file @ 87307821
......@@ -93,7 +93,6 @@
}
.cm_content{
width: 100%;
height: 600px;
}
.BalanceBox{
......@@ -128,12 +127,33 @@
<div class='query-box'>
<el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding: 10px 0 0 0;">
<!-- <el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.zhanghuleixing')">
<el-select filterable v-model='accType' @change="getAccountList(msg.BankType),msg.BankId=''">
<el-option v-for='item in AccList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col> -->
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('tips.jiaoyifangshi')">
<el-select filterable v-model='msg.BankType'
@change="getAccountList(msg.BankType),msg.BankId=''">
<el-option value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in BranchAccountList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.zhanghuleixing')">
<el-select filterable v-model='msg.BankId'
@change="getList">
<el-option v-for='item in AccList'
:label='item.Name'
<el-option v-for='item in accountList'
:label='item.Alias'
:value='item.ID'
:key='item.ID'>
</el-option>
......@@ -152,9 +172,12 @@
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div>
<!-- <span>注：和工与和中信需每日维护银行流水得到期末余额，其他账户则根据财务单据自动计算期末余额</span> -->
<span>注：均根据填入的银行流水计算得到期末余额</span>
</div>
<ul>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
......@@ -167,7 +190,7 @@
</div>
<div class="cm_content">
<el-table ref="table" :data="SubjectList"
style="width: 100%;" height="600"
style="width: 100%;"
v-loading="loadingTable"
:span-method="objectSpanMethod"
:header-cell-style="{ width: '200px' }"
......@@ -186,6 +209,7 @@
:key="index"
align="center">
<template #header>
<!-- <div style="cursor: pointer;" @click="getTimeObj(item)">{{ String(item.StartDate) }} <i v-if="msg.BankType==1&&(msg.BankId==1||msg.BankId==35)" style="color: #33B3FF" class="el-icon-edit"></i> </div> -->
<div style="cursor: pointer;" @click="getTimeObj(item)">{{ String(item.StartDate) }} <i style="color: #33B3FF" class="el-icon-edit"></i> </div>
</template>
<el-table-column style="position: relative;" :label="String(item.StartBalance)" align="center">
......@@ -212,7 +236,7 @@
<template slot-scope="scope">
<div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" @click="goUrl(scope.row,scope.row.BalanceList[index],1)"
class="BalanceBox"
:class="[scope.row.BalanceList[index].FinanceIncome?'active':'']">
:class="[scope.row.BalanceList[index].Income!=scope.row.BalanceList[index].FinanceIncome?'active':'']">
{{ scope.row.BalanceList[index].FinanceIncome }}
</div>
</template>
......@@ -228,7 +252,7 @@
<template slot-scope="scope">
<div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" @click="goUrl(scope.row,scope.row.BalanceList[index],2)"
class="BalanceBox"
:class="[scope.row.BalanceList[index].FinanceExpenses?'active':'']">
:class="[scope.row.BalanceList[index].Expenses!=scope.row.BalanceList[index].FinanceExpenses?'active':'']">
{{ scope.row.BalanceList[index].FinanceExpenses }}
</div>
</template>
......@@ -236,9 +260,9 @@
</el-table-column>
</el-table-column>
</template>
</el-table>
</div>
<div style="height:30px"></div>
<SubjectList v-if="isShow" @changeData="changeData" @change="close"></SubjectList>
<addSubject v-if="isShowAdd" :obj="addMsg" @changeData="changeData" @change="close"></addSubject>
<BankStatement v-if="isShowBankSta" :obj="BankStaObj" @changeData="changeDataBan" @change="isShowBankSta=false"></BankStatement>
......@@ -257,11 +281,20 @@ export default {
BankId:1,
StartDate:'',
EndDate:'',
BankType:1
},
AccList: [
{Name: '和工',ID: 1},
{Name: '中信',ID: 35},
{Name: '公帐账户',ID: 3},
{Name: '私帐账户',ID: 4},
{Name: '现金账户',ID: 8},
{Name: '微信支付宝',ID: 13},
],
BranchAccountList:[
{Name: '银行',ID: 1},
{Name: '现金',ID: 3},
],
accountList:[],
accType:0,
loadingTable:false,
DateList: [],
SubjectList: [],
......@@ -279,6 +312,7 @@ export default {
isShowBankSta: false,
BankStaObj:{
BankId: 0,//银行ID
BankType: 1,
Date: '',// 日期
StartBalance: '',// 期初余额
Image: '',
......@@ -308,7 +342,8 @@ export default {
this.msg.EndDate=mon1;
let userInfo = this.getLocalStorage();
this.userId = userInfo.EmployeeId;
this.getSubjectList()
this.getSubjectList();
this.getAccountList(1);
this.getList();
},
methods:{
......@@ -318,7 +353,8 @@ export default {
name: "AccountStatementDetail",
query: {
ID: this.msg.BankId,
TypeId: 3,
Type: this.msg.BankType,
TypeId: 0,
sTradeDate: item.StartDate,
eTradeDate: item.StartDate,
SubjectId: row.SubjectId>0?row.SubjectId:-2,
......@@ -342,6 +378,7 @@ export default {
this.BankStaObj = {
Id: 0,
BankId: this.msg.BankId,
BankType: this.msg.BankType,
Date: '',
StartBalance: 0,
Image: '',
......@@ -361,9 +398,11 @@ export default {
this.isShowBankSta = true
},
getTimeObj(item){
// if(!(this.msg.BankType==1&&(this.msg.BankId==1||this.msg.BankId==35))){return;}
this.BankStaObj = {
Id: 1,
BankId: this.msg.BankId,
BankType: this.msg.BankType,
Date: item.StartDate,
StartBalance: item.StartBalance,
Image: '',
......@@ -461,6 +500,42 @@ export default {
this.titleEnd = this.msg.EndDate.slice(5,7)>9?this.msg.EndDate.slice(5,7):this.msg.EndDate.slice(6,7)
this.getList()
},
getAccountList(i){
if(i===1){
this.bankaccount_post_GetListS()
}
if(i===3){
this.BankAccount_post_GetCashAccountList()
}
},
BankAccount_post_GetCashAccountList(){ // 获取现金账户
let msg = {
TypeId:this.accType,
BranchId:-1,
Alias:''
};
this.apipost('BankAccount_post_GetCashAccountList',msg, res => {
if(res.data.resultCode === 1) {
let data = res.data.data;
data.forEach(x=>{
x.allName = x.Alias;
});
this.accountList = data;
}
}, err => {})
},
bankaccount_post_GetListS(){ // 获取银行账户
this.apipost('bankaccount_post_GetList',{TypeId:this.accType}, res => {
if(res.data.resultCode === 1) {
let data = res.data.data;
data.forEach(x=>{
x.allName = x.Alias+' '+x.BackNo;
});
this.accountList = data;
}
}, err => {})
},
},
mounted(){
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 87307821
......@@ -812,6 +812,7 @@
<el-dropdown-item><span @click="ToPICDetial()">PIC资金预算</span></el-dropdown-item>
<el-dropdown-item><span @click="ToYFDetial()">压房明细</span></el-dropdown-item>
<el-dropdown-item><span @click="ToHotelNoFDetial()">酒店临期未制单</span></el-dropdown-item>
<el-dropdown-item><span @click="outerVisible4=true">车资回送费分摊</span></el-dropdown-item>
</template>
<template v-if="ActionMenuCode.indexOf('isManageFinance')!=-1 || ActionMenuCode.indexOf('Finance_ExpenseType')!=-1">
<el-dropdown-item><span @click="openAirPayDialog()">机票今日应付款</span></el-dropdown-item>
......@@ -1825,6 +1826,60 @@
</el-dialog>
<el-dialog custom-class='w700' title="导入车资回送费分摊" :visible.sync="outerVisible4" center>
<el-upload drag class="upload-demo" :action="importFileUrl6" :on-success="handleAvatarSuccess3"
:before-upload="beforeAvatarUpload2">
<i class="el-icon-upload"></i>
<div class="el-upload__text">{{$t("tips.tuodongwenjian")}}<em>{{$t('tips.dianjishanhcuan')}}</em></div>
<div slot="tip" class="el-upload__tip">{{$t("ground.znscexcel")}}</div>
</el-upload>
<div class="_addUpload_box clearfix">
<el-form class="cdForm" label-width="80px">
<el-form-item label="预付单号" prop="KingdeeBId">
<el-input class="w220" v-model="carBackMsg.KingdeeBId"></el-input>
</el-form-item>
<el-form-item label="制单汇率" prop="KingdeeBId">
<el-input class="w220" v-model="carBackMsg.OrderId"></el-input>
</el-form-item>
</el-form>
<template v-for="(file,fIndex) in carBackMsg.Image">
<div v-if="file.Type==3" style="width:30px; float:left;">
<div class="iconfont ">
<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="deleteCarBackUploadFile(fIndex,index)"></span>
</div>
<div v-if="file.Type==1" style="width:30px; float:left;">
<div class="iconfont "
:class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'"
@click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" style="font-size:12px;"
@click="deleteCarBackUploadFile(fIndex,index)"></span>
</div>
<div v-if="file.Type==2" style="width:30px; float:left;">
<div class="iconfont icon-excel" @click="showUpLoadFile(file,index)">
</div>
<span class="iconfont icon-guanbi1" style="font-size:12px;"
@click="deleteCarBackUploadFile(fIndex,index)"></span>
</div>
</template>
<div class="_pic_upload financiaUpload">
<el-upload drag :http-request="uploadFileCarBackBtn" :multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">附件凭证</div>
</el-upload>
</div>
</div>
</el-dialog>
<editExchangeRate v-if="costmodeHL" :hlData="trabeListHL" @success="resetPageIndex(),
getPageList(),
costmodeHL=false" @cancel="costmodeHL=false"></editExchangeRate>
......@@ -2065,6 +2120,7 @@
outerVisible: false,
outerVisible2: false,
outerVisible3: false,
outerVisible4: false,
importData: "",
importDataIndex: 0,
picObj: [],
......@@ -2081,6 +2137,15 @@
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=21",
importFileUrl4: this.domainManager().UploadFileUrl +
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=21",
importFileUrl6: this.domainManager().UploadFileUrl +
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=27",
importFileUrl7: this.domainManager().UploadFileUrl +
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=27",
carBackMsg: {
Image:[],
KingdeeBId:'',
OrderId:''
},
hbMsg: {
FrIDList: [],
Type: 1
......@@ -2570,6 +2635,52 @@
// this.saveMsgInvoice.splice(i, 1);
this.expressageMsg.splice(i, 1);
},
uploadFileCarBackBtn(file) { //上传
if (file.file.size > 1024 * 1024 * 10) {
this.$message.warning(this.$t('tips.wjdxbncgsz'))
return
}
// 1 文档 2 数据 3 图片
let typeArr = [{
stringArr: 'GIF|JPG|JPEG|PNG|BMP',
type: 3
},
{
stringArr: 'DOCX|DOC|XLSX|XLS|PPT|PPTX|PDF',
type: 1
},
]
let ft = file.file.name.substring(file.file.name.lastIndexOf('.') + 1, file.file.name.length).toUpperCase();
let fileTypeNumber = 2;
let typeOk = false;
typeArr.forEach(x => {
if (x.stringArr.indexOf(ft) != '-1') {
fileTypeNumber = x.type;
typeOk = true;
}
})
if (!typeOk) return this.$message.error(this.$t('tips.qscWEfile'));
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
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);
this.carBackMsg.Image = [];
this.carBackMsg.Image.push({
Content: x.data.FilePath,
ID: 0,
Type: fileTypeNumber,
Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
})
this.importFileUrl6 = this.importFileUrl7 + '&CreateByName=' + this.carBackMsg.Image[0].Url+ '&KingdeeBId=' + this.carBackMsg.KingdeeBId+ '&OrderId=' + this.carBackMsg.OrderId;
this.$message.success(this.$t('tips.scchenggong'))
}, 1);
},
deleteCarBackUploadFile(i) { // 删除上传文件
// this.saveMsgInvoice.splice(i, 1);
this.carBackMsg.Image.splice(i, 1);
},
handleSelectionChange(val) {
this.multipleSelection = []
this.checkList = []
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 87307821
......@@ -978,7 +978,7 @@
<td @click="gotoTravelList(o)" v-if="GetDetail.CreateBy!=userInfo.EmployeeId"> <span class="_jump_page _font_bold">{{$t('objFill.cktd')}}</span> </td>
<td @click="jumpPage('RegistrationList',o.TCID,7)"> <span
class="_jump_page _font_bold">{{$t('salesModule.LookBM')}}</span> </td>
<td v-if="(qjGroupId==userInfo.RB_Group_id || TeamShouZhi) && GetDetail.CreateBy!=userInfo.EmployeeId"
<td v-if="(qjGroupId==userInfo.RB_Group_id || TeamShouZhi) && (GetDetail.CreateBy!=userInfo.EmployeeId || ActionMenuCode.indexOf('S_Travel_AirLoss') != -1)"
@click="GetDetail.TCIDAndTCNUMList.length==1?jumpPage('TeamBalancePayment',o.TCID,5):jumpPage('TeamBalancePayment',o.TCID,6)">
<span class="_jump_page _font_bold">{{$t('objFill.tdsz')}}</span> </td>
<td v-if="OrderSource==9&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail,2)"> <span
......
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ 87307821
......@@ -280,7 +280,7 @@
<td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
<td height="34px" colspan="7" class="_color_b">
<template v-for="(item,index) in GetDetail.CashierDetail">
<p class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（<span v-if="item.Rate!=1" style="margin-right:10px;">{{item.OriginalMoney}}/</span>{{item.Money}}） </p>
<p class=" clearfix"><span class="_bold">{{item.Alias}}-</span><span class="">{{item.TypeName}}-</span><span >{{item.AccountType==""?$t('fnc.no'):item.AccountType}}</span> {{item.BankNo?'-':''}} <span>{{item.BankNo}}</span>（<span v-if="item.Rate!=1" style="margin-right:10px;">{{item.OriginalMoney}}/</span>{{item.Money}}） <span v-if="item.MultiplePay>0">{{item.MultPayDate}}[{{item.MultiplePay}}]</span></p>
</template>
</td>
</tr>
......
src/components/FinancialModule/accDetail/AccountStatementDetail.vue
View file @ 87307821
......@@ -165,6 +165,7 @@
<th>{{$t('fnc.jiaoyiriqi')}}</th>
<th>{{$t('fnc.djleixing')}}</th>
<th>流水科目</th>
<th>单据状态</th>
<th width="440">{{$t('objFill.v101.FinancialModule.guanldhhbsh')}}</th>
<th width="340">{{$t('objFill.v101.FinancialModule.shoufkdx')}}</th>
<th>{{$t('hotel.hotel_Currency')}}</th>
......@@ -174,17 +175,18 @@
<th>{{$t('fnc.yueacc')}}</th>
</tr>
<tr>
<td :colspan="10">{{$t('fnc.a_qcyue')}}：</td>
<td :colspan="11">{{$t('fnc.a_qcyue')}}：</td>
<td>{{moneyFormat(StartMoney)}}</td>
</tr>
<tr v-for="(item,index) in DataList">
<td>
<input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
</td>
<td>{{item.AllotDate}}</td>
<td>{{item.AllotDate}}<span v-if="item.MultiplePay>0"> [{{item.MultiplePay}}]</span></td>
<td>{{(item.FType==1?$t('restaurant.res_income'):item.FType==2?$t('restaurant.res_outcome'):item.FType==4?$t('objFill.tiaobo'):'-')}}</td>
<!-- <td>{{item.FrIdStr}}</td> -->
<td>{{item.SubjectName}}</td>
<td>{{item.StatusName}}</td>
<td>
<span v-for="(qitem,qindex) in item.FrIdList" class="cursorpointer" :class="item.FType === 1 ? 'CAcc_bg_green' :item.FType === 2 ? 'CAcc_bg_red':'CAcc_bg_bule'" @click="goUrlNew(item.FType,qitem)">{{(qindex>0?',':'') + qitem}}</span>
</td>
......@@ -196,7 +198,7 @@
<td>{{ moneyFormat(item.EndMoney) }}</td>
</tr>
<tr>
<td :colspan="8">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
<td :colspan="9">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}）</td>
<td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td>
<td>{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}</td>
<td>{{ moneyFormat(allMoney) }}</td>
......@@ -330,6 +332,7 @@ export default {
if(this.$route.query.ID){
this.accType = parseInt(this.$route.query.TypeId);
this.AccountId=parseInt(this.$route.query.ID);
if(this.$route.query.Type){this.Type=parseInt(this.$route.query.Type)}
let mon1=this.$route.query.sTradeDate?this.$route.query.sTradeDate:moment().format("YYYY-MM-DD");
let mon2=this.$route.query.eTradeDate?this.$route.query.eTradeDate:moment().subtract(1, "months").format("YYYY-MM-DD");
this.productionDate=[mon2,mon1];
......@@ -340,7 +343,11 @@ export default {
Type:this.Type,
AccountId:this.AccountId
})
if(this.Type==1){
this.bankaccount_post_GetList();
}else if(this.Type==3){
this.BankAccount_post_GetCashAccountList();
}
this.getList();
}
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 87307821
......@@ -183,6 +183,7 @@
</el-form>
<ul>
<li>
<input type="button" class="hollowFixedBtn" value="追加付款" @click="MultPay"/>
<input type="button" class="hollowFixedBtn" :value="$t('fnc.a_hbdanju')" @click="addChuNaFun"/>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
<input type="button" class="normalBtn" :value="$t('visa.v_daochu')" @click="Export"/>
......@@ -488,6 +489,211 @@
</div>
</el-dialog>
<el-dialog custom-class='w750 height="34px"' title="多期付款" :visible.sync="MultPayShow" center :before-close="initAddChuNa" v-loading="allLoading">
<p class="_addChuNa_tit">
单据应付 <span>{{ moneyFormat(MultPayData.WBAgoMoney) }}</span>{{MultPayData.CurrencyName}} &nbsp;&nbsp;&nbsp;&nbsp;
剩余待付 <span>{{ moneyFormat(MultPayData.WBMoney) }}{{MultPayData.CurrencyName}}</span>
</p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center; width: 100%;">
<template>
<tr >
<th height="34px">{{$t('fnc.zhfenlei')}}</th>
<th height="34px">{{$t('fnc.fkfangshi')}}</th>
<th height="34px">{{$t('fnc.acc')}}</th>
<th height="34px">{{$t('fnc.jine')}}</th>
<th height="34px" width="70">{{$t('hotel.hotel_Currency')}}</th>
<th height="34px" width="50px">{{$t('hotel.hotel_CurrentRate')}}</th>
<th height="34px" width="100px">{{$t('fnc.a_zongjine')}}</th>
</tr>
<template v-for="(item,index) in payMsgList">
<tr v-if="!item.show" @click="payMsgList[index].show=true">
<td height="34px">{{item.AccName}}</td>
<td height="34px">{{item.Name}}</td>
<td height="34px">{{item.Account}}</td>
<td height="34px">{{moneyFormat(item.OriginalMoney)}}</td>
<td height="34px">{{item.CurrenName}}</td>
<td height="34px">{{item.Rate}}</td>
<td height="34px">{{moneyFormat(item.allMoney)}}</td>
</tr>
<tr v-else class="_show_class">
<td>
<el-select filterable v-model='item.AccName' @change="clearAccBank()" class=" _border_b_1">
<el-option v-for='i in AccListT'
:label='i.Name'
:value='i.Name'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-select filterable v-model='item.Type' @change="getAccountList(item.Type)" class=" _border_b_1">
<el-option v-for='i in GetAccountType'
:label='i.Name'
:value='i.ID'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-select filterable v-model='item.AccountId' :placeholder="$t('rule.qxzzhanghu')" @change="setAccountName(item.AccountId,1,index)" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-input v-model="item.OriginalMoney" @change="Calculation(1,index)"
@blur="item.show=false,CalculationMoney()"
:placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{item.CurrenName}}</p>
</td>
<td>
<el-input v-model="item.Rate" @blur="item.show=false,CalculationMoney()" @change="Calculation(1,index)"
type="number" class=" _border_b_1"></el-input>
</td>
<td>{{moneyFormat(item.allMoney)}} <i @click="deleteRow(item,index),CalculationMoney()" class="_delete_row iconfont icon-img_delete_small"></i></td>
</tr>
</template>
<tr>
<td>
<el-select filterable v-model='payMsg.AccName' @change="clearAccBank(),addList()" class=" _border_b_1">
<el-option v-for='i in AccListT'
:label='i.Name'
:value='i.Name'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-select filterable v-model='payMsg.Type' @change="getAccountList(payMsg.Type),addList()" class=" _border_b_1">
<el-option v-for='i in GetAccountType'
:label='i.Name'
:value='i.ID'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-select filterable v-model='payMsg.AccountId' :placeholder="$t('rule.qxzzhanghu')"
@change="setAccountName(payMsg.AccountId,2),addList()" class=" _border_b_1">
<el-option v-for='i in accountList'
:label='i.allName'
:value='i.ID'
:key='i.ID'>
</el-option>
</el-select>
</td>
<td>
<el-input v-model="payMsg.OriginalMoney" @change="Calculation(2)" @blur="addList()" :placeholder="$t('rule.qsrjine')" type="number" class=" _border_b_1"></el-input>
</td>
<td>
<p>{{payMsg.CurrenName}}</p>
</td>
<td>
<el-input v-model="payMsg.Rate" @blur="addList()" @change="Calculation(2)" type="number" class=" _border_b_1"></el-input>
</td>
<td>{{moneyFormat(payMsg.allMoney)}}</td>
</tr>
</template>
<tr>
<td height="34px">{{$t('fnc.a_zongjine')}}</td>
<td height="34px" colspan="7">
<el-input v-model="listAllMoney" type="number" :placeholder="$t('rule.qsrzjine')" class=" _border_b_1"></el-input>
</td>
</tr>
<tr v-if="BillType===2">
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="5">
<el-date-picker
class="width100b"
v-model="addMsg.TradeDate"
type="date"
:default-value="TradeDate"
value-format="yyyy-MM-dd"
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
</tr>
<tr v-if="BillType===1">
<td>{{$t('fnc.huikuanren')}}</td>
<td colspan="1">
<el-input v-model="addMsg.RemitterName" type="text" class=" _border_b_1"></el-input>
</td>
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="1">
<el-date-picker
class="width100b"
v-model="addMsg.TradeDate"
type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
<td>{{$t('objFill.v103.liushukemu')}}</td>
<td colspan="2">
<el-select class="width100b" v-model="addMsg.BankSubjectId"
filterable
:placeholder="$t('objFill.v103.qingxuanzlskm')">
<el-option
v-for="item in SubjectTypeList"
:key="item.Id"
:label="item.Name"
:value="item.Id"
/>
</el-select>
</td>
</tr>
</table>
<el-form label-width="110px">
<el-row>
<el-col :span="12" :gutter="35">
<el-form-item :label="$t('objFill.shangchuanpz')">
<div class="_addUpload_box clearfix" >
<template v-for="(file,fIndex) in saveMsg">
<div v-if="file.Type==3">
<div style="width:100%;height:100%;overflow: hidden;">
<img :src="file.Url?file.Url:file.Content" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type==1">
<div class="iconfont " :class="file.Content.substring(file.Content.lastIndexOf('.')+1,file.Content.length).toUpperCase()=='PDF'? 'icon-pdf' : 'icon-excel'" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
<div v-if="file.Type==2">
<div class="iconfont icon-excel" @click="showUpLoadFile(file)">
</div>
<span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
</div>
</template>
<div class="_pic_upload">
<el-upload
drag
:http-request="uploadFileBtn"
:multiple="true" :show-file-list="false" action="">
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t('active.ld_djscwj')}}</div>
</el-upload>
</div>
</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitMultPay">{{$t('pub.saveBtn')}}</button>
&nbsp;
<button class="hollowFixedBtn" @click="initAddChuNa">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<div v-if='picIsShow' class="_show_img_box" @click="picIsShow=false,picObj=[]">
<div style="position: absolute; width: 800px; height: 600px; left: 50%; top: 50%; margin-left: -400px; margin-top: -300px;">
<el-carousel :initial-index=initialIndex height="600px" :interval="5000" trigger="click">
......@@ -601,6 +807,8 @@ export default {
TradeDate:'',
initialIndex: 0,
SubjectTypeList: [],
MultPayShow:false,
MultPayData:{}
}
},
created(){
......@@ -842,6 +1050,7 @@ export default {
this.huikuanren = '';
this.TradeDate='';
this.addChuNa = false;
this.MultPayShow= false;
this.payMsg = {
ID:0,
FinanceId:'',
......@@ -1000,6 +1209,47 @@ export default {
this.payMsg.Type = '';
this.payMsg.AccountId = '';
},
submitMultPay(){
if(this.addMsg.TradeDate==='') return this.$message.error(this.$t('fnc.a_qxzjyriqi'));
if(this.BillType===1&&this.addMsg.RemitterName==='') return this.$message.error(this.$t('rule.qtxhkuanren')) ;
let str = '';
this.checkList.forEach(x=>{
if(x.FinanceId){
str = str+x.FinanceId+','
}
});
this.addMsg.FrIDs = str.substring(0,str.length-1);
this.addMsg.BankList = this.payMsgList;
this.addMsg.Money = this.listAllMoney;
this.allLoading = true
this.apipost('Financial_post_SetMultipleMergePay',this.addMsg,r=>{
if(r.data.resultCode === 1) {
this.MultPayShow = false;
this.saveMsg=[];
this.payMsgList = []
this.payMsg = {
ID:0,
FinanceId:'',
Type:'',
AccountId:'',
OriginalMoney:0,
CurrencyId:'',
Rate:0,
Fee:0,
Name:'',
CurrenName:'',
Account:'',
balance:'',
allMoney:0,
show:false,
}
this.$message.success(r.data.message)
}else{
this.$message.error(r.data.message)
}
this.allLoading = false
},null)
},
submitAddChuNa(){
// if(this.payMsgList.length===0) return this.$message.error(this.$t('fnc.a_qxzjyfangshi'));
if(this.addMsg.TradeDate==='') return this.$message.error(this.$t('fnc.a_qxzjyriqi'));
......@@ -1139,6 +1389,30 @@ export default {
this.$message.error(this.$t('fnc.a_qxzdanju'))
}
},
MultPay(){ // 添加出纳按钮点击事件
this.checkList.forEach(x=>{
if(x.FinanceId){
this.addMsg.FrIDs = this.addMsg.FrIDs + x.FinanceId + ',';
}
});
if(this.addMsg.FrIDs){
let s = this.addMsg.FrIDs;
s = s.substring(0,s.length - 1);
this.addMsg.FrIDs = s;
this.addMsg.IsAdvanceFinance='0';
this.addMsg.vorcherInos=[];
}else{
this.$message.error(this.$t('fnc.a_qxzdanju'))
}
this.apipost('Financial_post_GetMultipleMergePayBalance',this.addMsg,res=>{
if(res.data.resultCode==1){
this.MultPayData = res.data.data;
this.MultPayShow=true;
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
addList(){
if(this.payMsg.AccountId==='')return;
if(this.payMsg.OriginalMoney===0||this.payMsg.OriginalMoney==='')return;
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 87307821
......@@ -1053,6 +1053,7 @@
@click="goFncUrl('DebitNote', subItem.FinanceId)">{{$t('objFill.jiezhidan')}}</span></p>
</td>
<td width="80" class="_zhidan">
<template v-if="myLineId==90">
<div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
......@@ -1071,6 +1072,7 @@
<span style="color:red;" @click="GoCompanyAlipay(item)"> {{$t('objFill.v101.dmc.yikqqydf')}}</span>
</template>
</template>
<input style="margin-top:5px;" type="button" value="变更报价单" class="normalBtn" @click="gotoOfferChange(leadr.OfferId)" />
</div>
</template>
<template v-else>
......@@ -1098,6 +1100,7 @@
<template v-else-if="!item.hideZDBtn && index2==0">
<span>{{$t('objFill.chaoguowtsjxzwfzd')}}</span>
</template>
<input style="margin-top:5px;" type="button" value="变更报价单" class="normalBtn" @click="gotoOfferChange(leadr.OfferId)" />
</template>
</div>
</template>
......@@ -1760,8 +1763,20 @@
err => {}
);
},
//跳转报报价单
gotoOfferChange(offerId) {
if (offerId) {
this.$router.push({
name: 'OfferChange',
query: {
'offerid': offerId,
'Qtype': 3,
'blank': 'y',
}
});
}
},
ZhuiJiaTuanKuan(item) {
this.apipost('financestatistics_post_GetTravelPrerealContrast', {
TCID: item.TCIDS
}, res => {
......@@ -1773,14 +1788,7 @@
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$router.push({
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
this.gotoOfferChange(res.data.data.OfferId);
}).catch(() => {
});
......@@ -1790,14 +1798,7 @@
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$router.push({
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
this.gotoOfferChange(res.data.data.OfferId);
}).catch(() => {
});
......@@ -1916,14 +1917,7 @@
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$router.push({
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
this.gotoOfferChange(res.data.data.OfferId)
}).catch(() => {
});
......@@ -1933,17 +1927,8 @@
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.$router.push({
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
}).catch(() => {
});
this.gotoOfferChange(res.data.data.OfferId)
}).catch(() => {});
}
} else {
this.goDiJieZhiDan(obj, num, leadr, cur);
......@@ -2342,7 +2327,8 @@
LeaderGetPriceT: 0,
ShowTotalPrice: 0,
TCNUMS: x.TCNUMS,
TCIDS: x.TCIDS
TCIDS: x.TCIDS,
OfferId: x.OfferId,
};
x.LeaderGetPriceList.forEach(price => {
if (cur.CurrencyId == price.CurrencyId) {
......@@ -3152,11 +3138,6 @@
border-collapse: collapse;
}
/* table.OtherExpensesList th:first {
border: 1px solid #ccc;
padding: 8px;
background-color: #dedede ;
} */
table.OtherExpensesList th {
border: 1px solid #ccc;
padding: 8px;
......
src/components/SalesModule/Common/signedClientList.vue
View file @ 87307821
......@@ -507,7 +507,7 @@
<span>{{ item.contact }}</span>
</td>
<td>{{ item.contactNumber }}</td>
<td>{{ item.customerName }}</td>
<td> {{ item.customerName }} </td>
<td>{{ item.customerStatusStr }}</td>
<td><span @click="goUrlCC(item.customerId,3)"
style="cursor: pointer;text-decoration: underline;">{{item.tradeTotal}}</span></td>
......
src/components/SalesModule/MyCustomer.vue
View file @ 87307821
......@@ -842,6 +842,12 @@
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="" >
<el-checkbox v-model='addMsg.IsGuideOrLeader'>是否领队/导游
</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('hotel.hotel_remark')" prop="remark">
......@@ -916,6 +922,12 @@
<el-input v-model='updateMsg.Contact'></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="" >
<el-checkbox v-model='updateMsg.IsGuideOrLeader'>是否领队/导游
</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="6" v-if="currentUserInfo&&currentUserInfo.RB_Group_id!=2">
<el-form-item :label="$t('salesModule.c_email')" prop="Email">
<el-input v-model="updateMsg.email" :placeholder="$t('pub.pleaseImport')" maxlength="50"></el-input>
......@@ -1113,6 +1125,7 @@
},
addMsg: {
CustomerId: 0,
IsGuideOrLeader:false,
customerName: '',
contact: '',
contactNumber: '',
......@@ -1245,6 +1258,7 @@
contactNumber: '',
CustomerName: '',
CustomerId: 0,
IsGuideOrLeader:false,
Address: '',
Country: 2,
Province: 0,
......@@ -1492,6 +1506,7 @@
this.$message.error(this.$t('objFill.qingsrxqdz'))
return
}
this.updateMsg.IsGuideOrLeader = this.updateMsg.IsGuideOrLeader ? 1 : 0
this.apipost('app_customer_UpdateCustomerAddress', this.updateMsg, res => {
if (res.data.resultCode == 1) {
this.addLayer1 = false;
......@@ -1556,6 +1571,7 @@
this.updateMsg.CustomerName = x.customerName
this.updateMsg.Contact = x.contactName
this.updateMsg.CustomerId = x.customerId
this.updateMsg.IsGuideOrLeader=x.isGuideOrLeader==1?true:false
this.updateMsg.Address = x.address //x.address.split(',')[1]
this.updateMsg.Province = x.province
this.getCityNew()
......@@ -1713,6 +1729,7 @@
this.getRegion1()
this.addMsg.District = x.district
this.addMsg.Duty = x.duty
this.addMsg.IsGuideOrLeader=x.IsGuideOrLeader==1?true:false
this.addMsg.Premises = x.premises
this.addMsg.CustomerSourceType = x.customerSourceType
let dictid = []
......@@ -2016,8 +2033,10 @@
}
this.addMsgS.customerInfo = {
...this.addMsg,
SigningType: this.addMsg.SigningType ? 1 : 0
SigningType: this.addMsg.SigningType ? 1 : 0,
IsGuideOrLeader:this.addMsg.IsGuideOrLeader ? 1 : 0,
}
this.loadingSave = true
this.apipost('app_add_new_visit_customer', this.addMsgS, res => {
if (res.data.resultCode == 1) {
......@@ -2041,6 +2060,7 @@
},
cancelData() {
this.addMsg.CustomerId = 0;
this.addMsg.IsGuideOrLeader=false;
this.addMsg.customerName = "";
this.addMsg.contact = "";
this.addMsg.contactNumber = "";
......
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @ 87307821
......@@ -141,7 +141,7 @@
{{subItem.StartCityNames}}
</td>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
{{subItem.TCNUMS}}({{subItem.TCID}})
{{outItem.TCList[0].TCNUMS}}({{outItem.TCList[0].TCID}})
</td>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
{{subItem.LeaderName}}<span style="color:red;">{{subItem.IsLeaderDaiTuan==1?$t('objFill.v101.dmc.daituan'):$t('objFill.v101.dmc.budaituan')}}</span>
......@@ -155,6 +155,7 @@
{{subItem.StartCityNames}}
</td>
<td>
{{subItem.TCNUMS}}({{subItem.TCID}})
</td>
<td>
......
src/components/TravelContractConfirm.vue
View file @ 87307821
......@@ -1408,6 +1408,7 @@
<p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<br>
<p><b>四、旅游者、旅行社双方确认：</b></p>
<p>1、旅游者知悉且同意本合同《相关告知及提示》和《预定项目及要求》内容。并确认预定信息无误。</p>
......@@ -1938,6 +1939,7 @@
</p>
<p class="bold colorRed">支付宝收款账号：392336499@qq.com</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<h3>
<p class="toTopDistance">
{{$t('objFill.v101.Contract.diershiertiao')}}&nbsp;&nbsp;{{$t('objFill.v101.Contract.rensywshbx')}}
......@@ -2565,6 +2567,7 @@
<p>電話番号：0748－65－1011</p>
<p>SWIFT CODE: BOKFJPJZ</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<p>交通安排：</p>
<p>使用形式</p>
<p>
......
src/components/TravelContractDetail.vue
View file @ 87307821
......@@ -831,6 +831,7 @@
<p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<h3>第二十二条 人身意外伤害保险</h3>
<p>1.出境社提示旅游者购买人身意外伤害保险；</p>
<p>
......
src/components/TravelContractView.vue
View file @ 87307821
......@@ -890,6 +890,7 @@
<p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<br>
<p><b>四、旅游者、旅行社双方确认：</b></p>
<p>1、旅游者知悉且同意本合同《相关告知及提示》和《预定项目及要求》内容。并确认预定信息无误。</p>
......@@ -1363,6 +1364,7 @@
</p>
<p class="bold colorRed">支付宝收款账号：392336499@qq.com</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<h3>
<p class="toTopDistance">
{{$t('objFill.v101.Contract.diershiertiao')}}&nbsp;&nbsp;{{$t('objFill.v101.Contract.rensywshbx')}}
......@@ -1914,6 +1916,7 @@
<p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<p>交通安排：</p>
<p>使用形式</p>
<p>
......
src/components/TravelManager/TravelList/TravelpassengerList.vue
View file @ 87307821
......@@ -166,7 +166,7 @@
</el-select>
</td>
<td>{{subItem.GuestName}}</td>
<td>{{subItem.IsBed == 1 ?$t('op.TakeBed'):$t('op.NoneedBedNoneedBed')}}</td>
<td>{{subItem.IsBed == 1 ?$t('op.TakeBed'):$t('op.NoneedBed')}}</td>
<td>{{subItem.ESurName}}</td>
<td>{{subItem.EName}}</td>
<td>{{getSexStr(subItem)}}</td>
......@@ -208,7 +208,7 @@
{{subItem.GroupTypeStr}}
</td>
<td>{{subItem.GuestName}}</td>
<td>{{subItem.IsBed == 1 ?$t('op.TakeBed'):$t('op.NoneedBedNoneedBed')}}</td>
<td>{{subItem.IsBed == 1 ?$t('op.TakeBed'):$t('op.NoneedBed')}}</td>
<td>{{subItem.ESurName}}</td>
<td>{{subItem.EName}}</td>
<td>{{getSexStr(subItem)}}</td>
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ 87307821
......@@ -155,15 +155,16 @@
<td class="CP_ComTitle2 CostcomCenter">{{$t('hotel.hotel_CurrentRate')}}</td>
<td v-for='(item,index) in CostCurrencyList' :key="index+20000" style=" white-space: nowrap;">
{{item.ExchangeRate}}
<template v-if="item.OtherChangeModel!=null"> <font style="color:red;">
<template v-if="item.OtherChangeModel!=null">
<font style="color:red;">
<template v-if="item.OtherChangeModel.HotelChangeValue>0">
+{{item.OtherChangeModel.HotelChangeValue}}
</template>
<template v-else>
{{item.OtherChangeModel.HotelChangeValue}}
</template>
</font></template>
</font>
</template>
<!-- </br><a v-if="IsEdit==3" style="color:blue;cursor:pointer"
@click="showOfferChange(3,item,index)">{{$t('objFill.dayofferchange')}}</a> -->
</td>
......@@ -174,18 +175,19 @@
<td class="CP_ComTitle2 CostcomCenter">{{$t('admin.admin_personNumber')}}</td>
<td v-for="(item,index) in CostNumberList" :key="index+30000">
{{item.PeopleNumber}}
<template v-if="item.OtherChangeModel!=null"> <font style="color:red;">
<template v-if="item.OtherChangeModel!=null">
<font style="color:red;">
<template v-if="item.OtherChangeModel.HotelChangeValue>0">
+{{item.OtherChangeModel.HotelChangeValue}}
</template>
<template v-else>
{{item.OtherChangeModel.HotelChangeValue}}
</template>
</font></template>
</font>
</template>
<!-- <br/>
<a v-if="IsEdit==3" style="color:blue;cursor:pointer"
@click="showOfferChange(3,item,index)">{{$t('objFill.dayofferchange')}}</a> -->
</td>
<td :colspan="13-2-CostNumberList.length+1">
</td>
......@@ -219,6 +221,7 @@
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('system.query_airName')}}</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">{{$t('Operation.Op_price')}}</td>
</tr>
<template v-for="(subItem,subIndex) in dayCostPrice">
<tr :key="subIndex+100000">
<td align="center">
......@@ -288,8 +291,16 @@
<template v-if="subItem.BreakfastName&&subItem.BreakfastName!=''">
{{$t('objFill.v101.zaocanmc')}}: {{subItem.BreakfastName}}<br />
</template>
<template v-if="subItem.LunchName&&subItem.LunchName!=''">
{{$t('objFill.v101.wucanmc')}}: {{subItem.LunchName}}<br />
<template
v-if="(subItem.LunchName&&subItem.LunchName!='')||(subItem.IsLunchChange&&subItem.LunchChangeContent!='')">
{{$t('objFill.v101.wucanmc')}}:
<font v-if="subItem.LunchName!=''"
:style="(subItem.IsLunchChange&&subItem.LunchChangeContent!='')?'text-decoration: line-through;':''">
{{subItem.LunchName}}</font>
<font v-if="subItem.IsLunchChange&&subItem.LunchChangeContent!=''" style="color:red;">
<br /> {{subItem.LunchChangeContent}}
</font>
<br />
<template v-if="subItem.LunchRealName&&subItem.LunchRealName!=''">
<font style="color:#106BAF;">{{$t('ground.zhenshimingcheng')}}:
<template v-if="subItem.LunchUrl&&subItem.LunchUrl!=''">
......@@ -301,8 +312,16 @@
</font><br />
</template>
</template>
<template v-if="subItem.DinnerName&&subItem.DinnerName!=''">
{{$t('objFill.v101.wancaimc')}}: {{subItem.DinnerName}}<br />
<template
v-if="(subItem.DinnerName&&subItem.DinnerName!='')||(subItem.IsDinnerChange&&subItem.DinnerChangeContent!='')">
{{$t('objFill.v101.wancaimc')}}:
<font v-if="subItem.DinnerName!=''"
:style="(subItem.IsDinnerChange&&subItem.DinnerChangeContent!='')?'text-decoration: line-through;':''">
{{subItem.DinnerName}}
</font>
<font v-if="subItem.IsDinnerChange&&subItem.DinnerChangeContent!=''" style="color:red;">
<br /> {{subItem.DinnerChangeContent}}
</font>
<template v-if="subItem.DinnerRealName&&subItem.DinnerRealName!=''">
<font style="color:#106BAF;">{{$t('ground.zhenshimingcheng')}}:
<template v-if="subItem.DinnerUrl&&subItem.DinnerUrl!=''">
......@@ -314,6 +333,7 @@
</font><br />
</template>
</template>
</td>
<td style="white-space:nowrap;">
<template v-if="subItem.BreakfastCostPrice>0||subItem.IsBreakfastChange">
......@@ -367,9 +387,13 @@
</td>
<td>
<template v-for="(childItem,childIndex) in subItem.ScenicList">
<template v-if="childItem.TicketId>0||childItem.TicketName!=''">
<template
v-if="(childItem.TicketName&&childItem.TicketName!='')||(childItem.NewTicketName&&childItem.NewTicketName!='')">
<font>
{{childIndex+1}}、{{childItem.TicketName}}
{{childIndex+1}}、
<font v-if="childItem.TicketName!=''" :style="(childItem.TicketCostPrice+childItem.NewTicketCostPrice==0)?'text-decoration: line-through;':''">{{childItem.TicketName}}</font>
<font v-if="childItem.NewTicketName&&childItem.NewTicketName!=''" style="color：red;">
{{childItem.NewTicketName}}</font>
</font>
<br />
</template>
......@@ -377,19 +401,26 @@
</td>
<td style="white-space:nowrap;">
<template v-for="(childItem,childIndex) in subItem.ScenicList">
<template v-if="childItem.TicketId>0||childItem.TicketName!=''">
<template
v-if="(childItem.TicketName&&childItem.TicketName!='')||(childItem.NewTicketName&&childItem.NewTicketName!='')">
<font>
{{childItem.TicketCostPrice}}
</font>
<font v-if="childItem.NewTicketCostPrice!=0" style="color:red;">
<template v-if="childItem.NewTicketCostPrice>0">
+
</template>
{{childItem.NewTicketCostPrice}}={{childItem.TicketCostPrice+childItem.NewTicketCostPrice}}
</font>
<br />
</template>
</template>
<template v-if="subItem.IsScenicChange">
<br />
{{subItem.ScenicCostPrice}}
小计: {{subItem.ScenicCostPrice}}
<el-tooltip class="item" effect="dark" :content="subItem.ScenicChangeRemark" placement="top-start">
<font style="color:red;">
<template v-if="subItem.ScenicChangeValue>0">
<template v-if="subItem.ScenicChangeValue>=0">
+
</template>
{{subItem.ScenicChangeValue}}
......@@ -525,7 +556,8 @@
</template>
</font>
=<font style="color:red">{{Number(getDayXiaoJi(1,2))+Number(getDayChangeXiaoJi(1,2))+Number(getRateChangeXiaoJi(1))}}</font>
=<font style="color:red">
{{Number(getDayXiaoJi(1,2))+Number(getDayChangeXiaoJi(1,2))+Number(getRateChangeXiaoJi(1))}}</font>
</template>
</td>
<!--车资小计-->
......@@ -550,7 +582,8 @@
</template>
</template>
</font>
=<font style="color:red">{{Number(getDayXiaoJi(2,2))+Number(getDayChangeXiaoJi(2,2))+Number(getRateChangeXiaoJi(2))}}</font>
=<font style="color:red">
{{Number(getDayXiaoJi(2,2))+Number(getDayChangeXiaoJi(2,2))+Number(getRateChangeXiaoJi(2))}}</font>
</template>
</td>
<!--餐小计-->
......@@ -575,7 +608,8 @@
</template>
</template>
</font>
=<font style="color:red">{{Number(getDayXiaoJi(4,2))+Number(getDayChangeXiaoJi(4,2))+Number(getRateChangeXiaoJi(4))}}</font>
=<font style="color:red">
{{Number(getDayXiaoJi(4,2))+Number(getDayChangeXiaoJi(4,2))+Number(getRateChangeXiaoJi(4))}}</font>
</template>
</td>
<!--门票小计-->
......@@ -600,7 +634,8 @@
</template>
</template>
</font>
=<font style="color:red">{{Number(getDayXiaoJi(3,2))+Number(getDayChangeXiaoJi(3,2))+Number(getRateChangeXiaoJi(3))}}</font>
=<font style="color:red">
{{Number(getDayXiaoJi(3,2))+Number(getDayChangeXiaoJi(3,2))+Number(getRateChangeXiaoJi(3))}}</font>
</template>
</td>
<!--其它费用小计-->
......@@ -625,7 +660,8 @@
</template>
</template>
</font>
=<font style="color:red;">{{Number(getDayXiaoJi(9,2))+Number(getDayChangeXiaoJi(9,2))+Number(getRateChangeXiaoJi(9))}}</font>
=<font style="color:red;">
{{Number(getDayXiaoJi(9,2))+Number(getDayChangeXiaoJi(9,2))+Number(getRateChangeXiaoJi(9))}}</font>
</template>
</td>
</tr>
......@@ -1005,14 +1041,16 @@
{{$t('fnc.a_heji')}}
</td>
<td>
{{subItem.PeopleNumber}}<template v-if="subItem.OtherChangeModel!=null"> <font style="color:red;">
{{subItem.PeopleNumber}}<template v-if="subItem.OtherChangeModel!=null">
<font style="color:red;">
<template v-if="subItem.OtherChangeModel.HotelChangeValue>0">
+{{subItem.OtherChangeModel.HotelChangeValue}}
</template>
<template v-else>
{{subItem.OtherChangeModel.HotelChangeValue}}
</template>
</font></template>
</font>
</template>
</td>
<td>
{{getDayXiaoJi(1,1)}}
......@@ -1078,7 +1116,8 @@
</td>
<td style="white-space:nowrap;">
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
<template v-if="(getLocalJpyChangeTotalMoney(subItem.PeopleNumber)!=0||getPeopleNumJpyChangeTotalMoney(subItem))!=0">
<template
v-if="(getLocalJpyChangeTotalMoney(subItem.PeopleNumber)!=0||getPeopleNumJpyChangeTotalMoney(subItem))!=0">
<font style="color:red;">
<template v-if="getLocalJpyChangeTotalMoney(subItem.PeopleNumber)!=0">
<template v-if="getLocalJpyChangeTotalMoney(subItem.PeopleNumber)>0">
......@@ -1105,7 +1144,8 @@
<td colspan="2">
<template v-if="teamPrice&&teamPrice.SingleDMCPrice&&teamPrice.SingleDMCPrice>0">
{{teamPrice.SingleDMCPrice}}
<template v-if="(getLocalChangeTotalMoney(subItem.PeopleNumber)!=0||getPeopleNumberChangeTotalMoney(subItem))!=0">
<template
v-if="(getLocalChangeTotalMoney(subItem.PeopleNumber)!=0||getPeopleNumberChangeTotalMoney(subItem))!=0">
<font style="color:red;">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)!=0">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)>0">
......@@ -1131,7 +1171,8 @@
</template>
<template v-else-if="postConfig.LineId==14||postConfig.LineId==118">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
<template v-if="(getLocalChangeTotalMoney(subItem.PeopleNumber)+getPeopleNumberChangeTotalMoney(subItem))!=0">
<template
v-if="(getLocalChangeTotalMoney(subItem.PeopleNumber)+getPeopleNumberChangeTotalMoney(subItem))!=0">
<font style="color:red;">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)!=0">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)>0">
......@@ -1157,7 +1198,8 @@
</template>
<template v-else-if="postConfig.LineId==168">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
<template v-if="(getLocalChangeTotalMoney(subItem.PeopleNumber)+getPeopleNumberChangeTotalMoney(subItem))!=0">
<template
v-if="(getLocalChangeTotalMoney(subItem.PeopleNumber)+getPeopleNumberChangeTotalMoney(subItem))!=0">
<font style="color:red;">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)!=0">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)>0">
......@@ -1187,7 +1229,8 @@
</td>
<td colspan="2">
{{subItem.TotalMoney}}
<template v-if="(getLocalChangeTotalMoney(subItem.PeopleNumber))!=0||getPeopleNumberChangeTotalMoney(subItem)!=0||getChangeCostTotalMoney()!=0">
<template
v-if="(getLocalChangeTotalMoney(subItem.PeopleNumber))!=0||getPeopleNumberChangeTotalMoney(subItem)!=0||getChangeCostTotalMoney()!=0">
<font style="color:red;">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)!=0">
<template v-if="getLocalChangeTotalMoney(subItem.PeopleNumber)>0">
......@@ -1228,7 +1271,9 @@
<template v-if="postConfig.OutBranchId==1245">
<template v-if="subItem.SaleList&&subItem.SaleList.length>0">
<template v-for="(tItem,tIndex) in subItem.SaleList">
<br/> <font :key="`s_`+subIndex+`t_`+tIndex" style="color:blue;">{{tItem.ItemName}}：{{tItem.ItemPrice}}</font>
<br />
<font :key="`s_`+subIndex+`t_`+tIndex" style="color:blue;">
{{tItem.ItemName}}：{{tItem.ItemPrice}}</font>
</template>
</template>
</template>
......@@ -1353,17 +1398,19 @@
</template>
</template>
<template v-for="(cItem,cIndex) in CostCurrencyList">
<template
v-if="cItem.OtherChangeModel!=null&&cItem.OtherChangeModel.HotelChangeValue!=0">
<template v-if="cItem.OtherChangeModel!=null&&cItem.OtherChangeModel.HotelChangeValue!=0">
<p :key="cIndex">{{cItem.CurrencyName}}
汇率：{{cItem.OtherChangeModel.HotelChangeRemark}} (<font style="color:red">{{cItem.OtherChangeModel.HotelChangeValue}}</font>)
汇率：{{cItem.OtherChangeModel.HotelChangeRemark}} (<font style="color:red">
{{cItem.OtherChangeModel.HotelChangeValue}}</font>)
<template v-if="CostNumberList!=null&&CostNumberList.length>0">
<template v-if="CostNumberList[cIndex]!=null&&CostNumberList[cIndex].Id>0">
<template
v-if="CostNumberList[cIndex].OtherChangeModel!=null&&CostNumberList[cIndex].OtherChangeModel.HotelChangeValue!=0">
人数{{CostNumberList[cIndex].PeopleNumber}}
{{CostNumberList[cIndex].OtherChangeModel.HotelChangeRemark}} (<font style="color:red">{{CostNumberList[cIndex].OtherChangeModel.HotelChangeValue>0?"+":""}}{{CostNumberList[cIndex].OtherChangeModel.HotelChangeValue}}</font>)
{{CostNumberList[cIndex].OtherChangeModel.HotelChangeRemark}} (<font style="color:red">
{{CostNumberList[cIndex].OtherChangeModel.HotelChangeValue>0?"+":""}}{{CostNumberList[cIndex].OtherChangeModel.HotelChangeValue}}
</font>)
</template>
</template>
......@@ -1372,11 +1419,11 @@
</template>
</template>
<template v-for="(cItem,cIndex) in OtherChangeList">
<template
v-if="cItem.IsChange">
<template v-if="cItem.IsChange">
<p :key="cIndex">其它成本(人民币)
<template >
{{getChangeTypeText(cItem.ChangeType)}}：{{cItem.HotelChangeRemark}} (<font style="color:red">{{cItem.HotelChangeValue}}</font>)
<template>
{{getChangeTypeText(cItem.ChangeType)}}：{{cItem.HotelChangeRemark}} (<font style="color:red">
{{cItem.HotelChangeValue}}</font>)
</template>
</p>
</template>
......@@ -1411,20 +1458,27 @@
</div>
<template v-if="changMsg.EditType==3">
<el-dialog custom-class='w1006' :title="dialogDiningTitle" :visible.sync="changMsg.isShowChangeOffer" center modal>
<changeOfferExchangeRate v-if="changMsg.isShowChangeOffer" :OfferCurrency="changMsg" :costNumberList="CostNumberList" :costCurrencyList="CostCurrencyList" @success="refreshPage" @closeDialog="closeDialog">
<el-dialog custom-class='w1006' :title="dialogDiningTitle" :visible.sync="changMsg.isShowChangeOffer" center
modal>
<changeOfferExchangeRate v-if="changMsg.isShowChangeOffer" :OfferCurrency="changMsg"
:costNumberList="CostNumberList" :costCurrencyList="CostCurrencyList" @success="refreshPage"
@closeDialog="closeDialog">
</changeOfferExchangeRate>
</el-dialog>
</template>
<template v-else-if="changMsg.EditType==4">
<el-dialog custom-class='w1006' :title="dialogDiningTitle" :visible.sync="changMsg.isShowChangeOffer" center modal>
<changeOfferOtherCost v-if="changMsg.isShowChangeOffer" :OfferCurrency="changMsg" :otherPrice="OtherPrice" :teamPrice="teamPrice" @success="refreshPage" @closeDialog="closeDialog">
<el-dialog custom-class='w1006' :title="dialogDiningTitle" :visible.sync="changMsg.isShowChangeOffer" center
modal>
<changeOfferOtherCost v-if="changMsg.isShowChangeOffer" :OfferCurrency="changMsg" :otherPrice="OtherPrice"
:teamPrice="teamPrice" @success="refreshPage" @closeDialog="closeDialog">
</changeOfferOtherCost>
</el-dialog>
</template>
<template v-else>
<el-dialog custom-class='w1006' :title="dialogDiningTitle" :visible.sync="changMsg.isShowChangeOffer" center modal>
<changeOffer v-if="changMsg.isShowChangeOffer" :qMsg="changMsg" @success="refreshPage" @closeDialog="closeDialog">
<el-dialog custom-class='w1006' :title="dialogDiningTitle" :visible.sync="changMsg.isShowChangeOffer" center
modal>
<changeOffer v-if="changMsg.isShowChangeOffer" :qMsg="changMsg" @success="refreshPage"
@closeDialog="closeDialog">
</changeOffer>
</el-dialog>
</template>
......@@ -1441,7 +1495,7 @@
return {
AduitMsg: {}, //审核信息
OtherPrice: {},
OtherChangeList:[],
OtherChangeList: [],
dayCostPrice: [],
CostCurrencyList: [],
CostNumberList: [],
......@@ -1479,8 +1533,8 @@
},
components: {
changeOffer: changeOffer,
changeOfferExchangeRate:changeOfferExchangeRate,
changeOfferOtherCost:changeOfferOtherCost,
changeOfferExchangeRate: changeOfferExchangeRate,
changeOfferOtherCost: changeOfferOtherCost,
},
methods: {
switchOffer(dateStr) {
......@@ -1498,7 +1552,7 @@
})
if (selectOfferObj) {
this.OtherPrice = selectOfferObj.otherPrice;
this.OtherChangeList=selectOfferObj.otherChangeList;
this.OtherChangeList = selectOfferObj.otherChangeList;
this.teamPrice = selectOfferObj.teamPrice;
this.CostNumberList = selectOfferObj.CostNumberList;
this.offerDataObj = selectOfferObj;
......@@ -1525,19 +1579,16 @@
/**
* EditType:1-行程相关变更，2-基础数据变更,3-汇率/人数，4-其他成本变更
*/
showOfferChange(EditType, item,index) {
showOfferChange(EditType, item, index) {
this.changMsg.isShowChangeOffer = true;
this.changMsg.OfferId = item.OfferId;
this.changMsg.EditType = EditType;
if(EditType==3){
if (EditType == 3) {
this.dialogDiningTitle = "汇率/人数变更"
var costCurrency=this.CostCurrencyList[index];
}
else if(EditType==4)
{
var costCurrency = this.CostCurrencyList[index];
} else if (EditType == 4) {
this.dialogDiningTitle = "其他成本变更"
}
else{
} else {
this.dialogDiningTitle = "报价单变更"
if (item && item.DayNum) {
this.changMsg.DayNum = item.DayNum;
......@@ -1576,7 +1627,7 @@
getDayXiaoJi(type, currencyType) {
var xiaoJi = 0;
if (this.dayCostPrice && this.dayCostPrice.length > 0) {
this.dayCostPrice.forEach((item,index) => {
this.dayCostPrice.forEach((item, index) => {
var currencyRate = 1;
if (currencyType == 2) {
currencyRate = this.getCurrencyMoney(item.CurrencyId);
......@@ -1669,10 +1720,11 @@
//获取汇率/人数变更合计
getRateChangeXiaoJi(type) {
var xiaoJi = 0;
if(this.CostCurrencyList && this.CostCurrencyList.length > 0 && this.dayCostPrice && this.dayCostPrice.length > 0) {
if (this.CostCurrencyList && this.CostCurrencyList.length > 0 && this.dayCostPrice && this.dayCostPrice.length >
0) {
this.CostCurrencyList.forEach(currency => {
if(currency.OtherChangeModel!=null&&currency.OtherChangeModel.HotelChangeValue!=0){
if (currency.OtherChangeModel != null && currency.OtherChangeModel.HotelChangeValue != 0) {
var currencyRate = currency.OtherChangeModel.HotelChangeValue;
// 查找 dayCostPrice 中 CurrencyId 匹配当前 currency 的项
const matchedItems = this.dayCostPrice.filter(item => item.CurrencyId === currency.CurrencyId);
......@@ -1680,51 +1732,51 @@
matchedItems.forEach(item => {
//酒店
if (type == 1) {
var hotelPrice=Number(item.HotelCostPrice);
var hotelPrice = Number(item.HotelCostPrice);
if (item.IsHotelChange) {
hotelPrice += Number(item.HotelChangeValue) ;
hotelPrice += Number(item.HotelChangeValue);
}
xiaoJi += Number(hotelPrice)* Number(currencyRate);
xiaoJi += Number(hotelPrice) * Number(currencyRate);
}
//车
if (type == 2) {
var busPrice=Number(item.BusCostPrice);
var busPrice = Number(item.BusCostPrice);
if (item.IsBusChange) {
busPrice += Number(item.BusChangeValue) ;
busPrice += Number(item.BusChangeValue);
}
xiaoJi += Number(item.PassFee) * Number(currencyRate);
xiaoJi += Number(busPrice)* Number(currencyRate);
xiaoJi += Number(busPrice) * Number(currencyRate);
}
//景点
if (type == 3) {
var scenicPrice=Number(item.ScenicCostPrice);
var scenicPrice = Number(item.ScenicCostPrice);
if (item.IsScenicChange) {
scenicPrice += Number(item.ScenicChangeValue) ;
scenicPrice += Number(item.ScenicChangeValue);
}
xiaoJi += Number(scenicPrice)* Number(currencyRate);
xiaoJi += Number(scenicPrice) * Number(currencyRate);
}
//早餐
if (type == 4) {
var breakfastPrice=Number(item.BreakfastCostPrice);
var breakfastPrice = Number(item.BreakfastCostPrice);
if (item.IsBreakfastChange) {
breakfastPrice += Number(item.BreakfastChangeValue) ;
breakfastPrice += Number(item.BreakfastChangeValue);
}
xiaoJi += Number(breakfastPrice) * Number(currencyRate);
var lunchPrice=Number(item.LunchCostPrice) ;
var lunchPrice = Number(item.LunchCostPrice);
if (item.IsLunchChange) {
lunchPrice += Number(item.LunchChangeValue) ;
lunchPrice += Number(item.LunchChangeValue);
}
xiaoJi += Number(lunchPrice) * Number(currencyRate);
var dinnerPrice=Number(item.DinnerCostPrice) ;
var dinnerPrice = Number(item.DinnerCostPrice);
if (item.IsDinnerChange) {
dinnerPrice += Number(item.DinnerChangeValue) ;
dinnerPrice += Number(item.DinnerChangeValue);
}
xiaoJi += Number(dinnerPrice) * Number(currencyRate);
}
if (type == 9) {
var otherPrice=Number(item.OtherPrice) ;
var otherPrice = Number(item.OtherPrice);
if (item.IsOtherChange) {
otherPrice += Number(item.OtherChangeValue) ;
otherPrice += Number(item.OtherChangeValue);
}
xiaoJi += Number(otherPrice) * Number(currencyRate)
}
......@@ -1754,9 +1806,9 @@
getChangeCostTotalMoney() {
let totalMoney = 0.0;
//机票+中段机票+税金+领队导游分摊+联运+过夜+保险
if(this.OtherChangeList!=null&&this.OtherChangeList.length>0){
if (this.OtherChangeList != null && this.OtherChangeList.length > 0) {
this.OtherChangeList.forEach(item => {
totalMoney+=Number(this.getConvertMoney(item.HotelChangeValue) )
totalMoney += Number(this.getConvertMoney(item.HotelChangeValue))
});
}
return totalMoney.toFixed(2);
......@@ -1794,8 +1846,8 @@
let currency = 1;
this.CostCurrencyList.forEach(x => {
if (x.CurrencyId == currencyId) {
if(x.OtherChangeModel!=null&&x.OtherChangeModel.HotelChangeValue!=0)
currency = x.ExchangeRate+x.OtherChangeModel.HotelChangeValue;
if (x.OtherChangeModel != null && x.OtherChangeModel.HotelChangeValue != 0)
currency = x.ExchangeRate + x.OtherChangeModel.HotelChangeValue;
}
});
return currency;
......@@ -1875,15 +1927,14 @@
//地接成本（日元）
getPeopleNumJpyChangeTotalMoney(subItem) {
let totalMoney = 0.0;
var peopleNumber=Number(subItem.PeopleNumber);
if(subItem.OtherChangeModel!=null&&subItem.OtherChangeModel.HotelChangeValue!=0){
peopleNumber+=Number(subItem.OtherChangeModel.HotelChangeValue);
var peopleNumber = Number(subItem.PeopleNumber);
if (subItem.OtherChangeModel != null && subItem.OtherChangeModel.HotelChangeValue != 0) {
peopleNumber += Number(subItem.OtherChangeModel.HotelChangeValue);
var busFee = Number(this.getDayXiaoJi(2, 1)) / peopleNumber;
var otherPrice = Number(this.getDayXiaoJi(9, 1)) / peopleNumber; //其它费用
totalMoney = busFee + otherPrice;//hotelPrice + sencePrice + canPrice +
if(subItem.OtherChangeModel.HotelChangeValue>0){
totalMoney=Number(totalMoney)*Number(-1);
totalMoney = busFee + otherPrice; //hotelPrice + sencePrice + canPrice +
if (subItem.OtherChangeModel.HotelChangeValue > 0) {
totalMoney = Number(totalMoney) * Number(-1);
}
}
return totalMoney.toFixed(2);
......@@ -1895,24 +1946,23 @@
var sencePrice = Number(this.getRateChangeXiaoJi(3)); //景点费用
var canPrice = Number(this.getRateChangeXiaoJi(4)); //餐
var otherPrice = Number(this.getRateChangeXiaoJi(9)) / Number(subItem.PeopleNumber); //其它费用
var busFee = Number(this.getRateChangeXiaoJi(2)) /Number(subItem.PeopleNumber); //车费
var busFee = Number(this.getRateChangeXiaoJi(2)) / Number(subItem.PeopleNumber); //车费
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
var peopleNumber=subItem.PeopleNumber;
var peopleNumber = subItem.PeopleNumber;
if (subItem.PeopleNumber <= 0) {
peopleNumber = 1;
}
//人数的变更
if(subItem.OtherChangeModel!=null&&subItem.OtherChangeModel.HotelChangeValue!=0){
peopleNumber+=Number(subItem.OtherChangeModel.HotelChangeValue);
console.log(peopleNumber,"otherPrice",this.getRateChangeXiaoJi(9));
console.log(peopleNumber,"busFee",this.getRateChangeXiaoJi(2));
if(subItem.OtherChangeModel.HotelChangeValue>0){
if (subItem.OtherChangeModel != null && subItem.OtherChangeModel.HotelChangeValue != 0) {
peopleNumber += Number(subItem.OtherChangeModel.HotelChangeValue);
// console.log(peopleNumber, "otherPrice", this.getRateChangeXiaoJi(9));
// console.log(peopleNumber, "busFee", this.getRateChangeXiaoJi(2));
if (subItem.OtherChangeModel.HotelChangeValue > 0) {
totalMoney -= Number(this.getRateChangeXiaoJi(9)) / Number(peopleNumber); //其它费用
totalMoney -= Number(this.getRateChangeXiaoJi(2)) /Number(peopleNumber); //车费
}
else{
totalMoney -= Number(this.getRateChangeXiaoJi(2)) / Number(peopleNumber); //车费
} else {
totalMoney += Number(this.getRateChangeXiaoJi(9)) / Number(peopleNumber); //其它费用
totalMoney += Number(this.getRateChangeXiaoJi(2)) /Number(peopleNumber); //车费
totalMoney += Number(this.getRateChangeXiaoJi(2)) / Number(peopleNumber); //车费
}
}
return totalMoney.toFixed(2);
......
src/components/TravelManager/TravelNewQuotation/OfferChange.vue
View file @ 87307821
......@@ -15,11 +15,20 @@
<CostNewPriceAudit v-if="haveData" ref="CostNewPrice" :postConfig="postData" :OfferArray="OfferArray"
:IsEdit="IsEdit" @success="refreshPage"></CostNewPriceAudit>
</div>
<div class="btnFixedDiv" v-if="haveData">
<div class="toTop">
<i class="iconfont icon-huidaodingbu"></i>
</div>
<div class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="SaveData(2)">{{$t('fnc.tijiao')}}</div>
<div class="btnFixedDiv" v-if="haveData" style="margin:0 auto;">
<el-button @click="SaveData(2)" :loading="saveLoading"
style="background-color:#ffc2c2;color:#cc1212;font-size:12px;margin-left:7px;margin-top:10px;border:none;width:45px;height:45px;padding:0;">
{{$t('fnc.tijiao')}}
</el-button>
<template v-if="IsEdit==3">
<br />
<el-tooltip class="item" effect="dark" content="根据地接数据更新报价单" placement="top">
<el-button :loading="saveLoading" @click="ReCalcOffer()"
style="background-color:#ffc2c2;color:#cc1212;font-size:12px;margin-left:7px;margin-top:5px; border:none;width:45px;height:45px;padding:0;padding-top:10px;">
更新
</el-button>
</el-tooltip>
</template>
</div>
</div>
</template>
......@@ -80,28 +89,52 @@
AssistantList: [], //助理OP
PriceTeamType: 0, //团队类型,
PriceTeamTypeName: "", //团队类型,
OfferArray:[],
OfferArray: [],
OfferId: 0,
},
pMsg: {
offerId: 0,
// BatchNum: "",
},
isSubmit: true,
loading: false,
IsEdit: 0,
saveLoading: false,
};
},
methods: {
ReCalcOffer() {
this.saveLoading = true;
var newMsg = {
OfferId: this.pMsg.offerId,
}
this.apipost(
"travel_post_CalcChangeOffer", newMsg,
res => {
this.saveLoading = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getPostData();
} else {
this.Error(res.data.message);
}
},
err => {
this.saveLoading = false;
}
);
},
//保存数据
SaveData(Type) {
this.saveLoading = true;
var nObj = {
offerid:this.pMsg.offerId,
offerid: this.pMsg.offerId,
};
this.loading = true;
this.apipost(
"travel_post_SetOfferChangeAudit", nObj,
res => {
this.loading = false;
this.saveLoading = false;
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.goUrl('newQuotation');
......@@ -134,9 +167,13 @@
this.loading = false;
if (res.data.resultCode == 1) {
var tempData = res.data.data;
console.log("travel_get_PriceOfferInfo",tempData);
if (tempData.ID && tempData.ID > 0) {
this.postData.ID = tempData.ID;
}
if (tempData.OfferId && tempData.OfferId > 0) {
this.postData.OfferId = tempData.OfferId;
}
if (tempData.LineId && tempData.LineId > 0) {
this.postData.LineId = tempData.LineId;
}
......
src/components/clientConfirm.vue
View file @ 87307821
......@@ -970,6 +970,7 @@
<p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<h3>
<p class="toTopDistance">第二十二条 人身意外伤害保险</p>
</h3>
......
src/components/dmc/manager/dmcTotalTable_swt.vue
View file @ 87307821
......@@ -284,7 +284,6 @@
</div>
</td>
<td>
<!--"goUrlT('TravelPassengerList2',item.TCID,'旅客名单') @click="goRoomTip()" -->
<div class="fz16 fbold linkspan">
<span style="color: #4BCA81;" v-if="item.HouseResult==1">√</span>
<span class="colorE95252" v-else>{{item.HouseResult=='-1'?"x":"O"}}</span>
......
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