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
Expand all Hide 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 @@ ...@@ -33,7 +33,7 @@
value-format="yyyy-MM-dd"></el-date-picker> value-format="yyyy-MM-dd"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item :label="$t('objFill.v103.qichuyue')" prop="StartBalance"> <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>
<el-form-item style=" width: 500px;margin-top: 0px;" :label="$t('objFill.fj')" prop="Image"> <el-form-item style=" width: 500px;margin-top: 0px;" :label="$t('objFill.fj')" prop="Image">
<div style="display: flex;flex-direction: row;"> <div style="display: flex;flex-direction: row;">
......
src/components/FinancialModule/BankStatementReconciliation/index.vue
View file @ 87307821
...@@ -93,7 +93,6 @@ ...@@ -93,7 +93,6 @@
} }
.cm_content{ .cm_content{
width: 100%; width: 100%;
height: 600px;
} }
.BalanceBox{ .BalanceBox{
...@@ -128,12 +127,33 @@ ...@@ -128,12 +127,33 @@
<div class='query-box'> <div class='query-box'>
<el-form class="_info_box clearfix" label-width="110px"> <el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding: 10px 0 0 0;"> <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-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.zhanghuleixing')"> <el-form-item :label="$t('fnc.zhanghuleixing')">
<el-select filterable v-model='msg.BankId' <el-select filterable v-model='msg.BankId'
@change="getList"> @change="getList">
<el-option v-for='item in AccList' <el-option v-for='item in accountList'
:label='item.Name' :label='item.Alias'
:value='item.ID' :value='item.ID'
:key='item.ID'> :key='item.ID'>
</el-option> </el-option>
...@@ -152,9 +172,12 @@ ...@@ -152,9 +172,12 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div>
<!-- <span>注：和工与和中信需每日维护银行流水得到期末余额，其他账户则根据财务单据自动计算期末余额</span> -->
<span>注：均根据填入的银行流水计算得到期末余额</span>
</div>
<ul> <ul>
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()"/>
...@@ -167,7 +190,7 @@ ...@@ -167,7 +190,7 @@
</div> </div>
<div class="cm_content"> <div class="cm_content">
<el-table ref="table" :data="SubjectList" <el-table ref="table" :data="SubjectList"
style="width: 100%;" height="600" style="width: 100%;"
v-loading="loadingTable" v-loading="loadingTable"
:span-method="objectSpanMethod" :span-method="objectSpanMethod"
:header-cell-style="{ width: '200px' }" :header-cell-style="{ width: '200px' }"
...@@ -186,6 +209,7 @@ ...@@ -186,6 +209,7 @@
:key="index" :key="index"
align="center"> align="center">
<template #header> <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> <div style="cursor: pointer;" @click="getTimeObj(item)">{{ String(item.StartDate) }} <i style="color: #33B3FF" class="el-icon-edit"></i> </div>
</template> </template>
<el-table-column style="position: relative;" :label="String(item.StartBalance)" align="center"> <el-table-column style="position: relative;" :label="String(item.StartBalance)" align="center">
...@@ -212,7 +236,7 @@ ...@@ -212,7 +236,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" @click="goUrl(scope.row,scope.row.BalanceList[index],1)" <div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" @click="goUrl(scope.row,scope.row.BalanceList[index],1)"
class="BalanceBox" 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 }} {{ scope.row.BalanceList[index].FinanceIncome }}
</div> </div>
</template> </template>
...@@ -228,7 +252,7 @@ ...@@ -228,7 +252,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" @click="goUrl(scope.row,scope.row.BalanceList[index],2)" <div v-if="scope.row.SubjectId!=-6&&scope.row.SubjectId!=-5" @click="goUrl(scope.row,scope.row.BalanceList[index],2)"
class="BalanceBox" 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 }} {{ scope.row.BalanceList[index].FinanceExpenses }}
</div> </div>
</template> </template>
...@@ -236,9 +260,9 @@ ...@@ -236,9 +260,9 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</template> </template>
</el-table> </el-table>
</div> </div>
<div style="height:30px"></div>
<SubjectList v-if="isShow" @changeData="changeData" @change="close"></SubjectList> <SubjectList v-if="isShow" @changeData="changeData" @change="close"></SubjectList>
<addSubject v-if="isShowAdd" :obj="addMsg" @changeData="changeData" @change="close"></addSubject> <addSubject v-if="isShowAdd" :obj="addMsg" @changeData="changeData" @change="close"></addSubject>
<BankStatement v-if="isShowBankSta" :obj="BankStaObj" @changeData="changeDataBan" @change="isShowBankSta=false"></BankStatement> <BankStatement v-if="isShowBankSta" :obj="BankStaObj" @changeData="changeDataBan" @change="isShowBankSta=false"></BankStatement>
...@@ -257,11 +281,20 @@ export default { ...@@ -257,11 +281,20 @@ export default {
BankId:1, BankId:1,
StartDate:'', StartDate:'',
EndDate:'', EndDate:'',
BankType:1
}, },
AccList: [ AccList: [
{Name: '和工',ID: 1}, {Name: '公帐账户',ID: 3},
{Name: '中信',ID: 35}, {Name: '私帐账户',ID: 4},
{Name: '现金账户',ID: 8},
{Name: '微信支付宝',ID: 13},
],
BranchAccountList:[
{Name: '银行',ID: 1},
{Name: '现金',ID: 3},
], ],
accountList:[],
accType:0,
loadingTable:false, loadingTable:false,
DateList: [], DateList: [],
SubjectList: [], SubjectList: [],
...@@ -279,6 +312,7 @@ export default { ...@@ -279,6 +312,7 @@ export default {
isShowBankSta: false, isShowBankSta: false,
BankStaObj:{ BankStaObj:{
BankId: 0,//银行ID BankId: 0,//银行ID
BankType: 1,
Date: '',// 日期 Date: '',// 日期
StartBalance: '',// 期初余额 StartBalance: '',// 期初余额
Image: '', Image: '',
...@@ -308,7 +342,8 @@ export default { ...@@ -308,7 +342,8 @@ export default {
this.msg.EndDate=mon1; this.msg.EndDate=mon1;
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.userId = userInfo.EmployeeId; this.userId = userInfo.EmployeeId;
this.getSubjectList() this.getSubjectList();
this.getAccountList(1);
this.getList(); this.getList();
}, },
methods:{ methods:{
...@@ -318,7 +353,8 @@ export default { ...@@ -318,7 +353,8 @@ export default {
name: "AccountStatementDetail", name: "AccountStatementDetail",
query: { query: {
ID: this.msg.BankId, ID: this.msg.BankId,
TypeId: 3, Type: this.msg.BankType,
TypeId: 0,
sTradeDate: item.StartDate, sTradeDate: item.StartDate,
eTradeDate: item.StartDate, eTradeDate: item.StartDate,
SubjectId: row.SubjectId>0?row.SubjectId:-2, SubjectId: row.SubjectId>0?row.SubjectId:-2,
...@@ -342,6 +378,7 @@ export default { ...@@ -342,6 +378,7 @@ export default {
this.BankStaObj = { this.BankStaObj = {
Id: 0, Id: 0,
BankId: this.msg.BankId, BankId: this.msg.BankId,
BankType: this.msg.BankType,
Date: '', Date: '',
StartBalance: 0, StartBalance: 0,
Image: '', Image: '',
...@@ -361,9 +398,11 @@ export default { ...@@ -361,9 +398,11 @@ export default {
this.isShowBankSta = true this.isShowBankSta = true
}, },
getTimeObj(item){ getTimeObj(item){
// if(!(this.msg.BankType==1&&(this.msg.BankId==1||this.msg.BankId==35))){return;}
this.BankStaObj = { this.BankStaObj = {
Id: 1, Id: 1,
BankId: this.msg.BankId, BankId: this.msg.BankId,
BankType: this.msg.BankType,
Date: item.StartDate, Date: item.StartDate,
StartBalance: item.StartBalance, StartBalance: item.StartBalance,
Image: '', Image: '',
...@@ -461,6 +500,42 @@ export default { ...@@ -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.titleEnd = this.msg.EndDate.slice(5,7)>9?this.msg.EndDate.slice(5,7):this.msg.EndDate.slice(6,7)
this.getList() 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(){ mounted(){
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 87307821
...@@ -812,6 +812,7 @@ ...@@ -812,6 +812,7 @@
<el-dropdown-item><span @click="ToPICDetial()">PIC资金预算</span></el-dropdown-item> <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="ToYFDetial()">压房明细</span></el-dropdown-item>
<el-dropdown-item><span @click="ToHotelNoFDetial()">酒店临期未制单</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>
<template v-if="ActionMenuCode.indexOf('isManageFinance')!=-1 || ActionMenuCode.indexOf('Finance_ExpenseType')!=-1"> <template v-if="ActionMenuCode.indexOf('isManageFinance')!=-1 || ActionMenuCode.indexOf('Finance_ExpenseType')!=-1">
<el-dropdown-item><span @click="openAirPayDialog()">机票今日应付款</span></el-dropdown-item> <el-dropdown-item><span @click="openAirPayDialog()">机票今日应付款</span></el-dropdown-item>
...@@ -1825,6 +1826,60 @@ ...@@ -1825,6 +1826,60 @@
</el-dialog> </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(), <editExchangeRate v-if="costmodeHL" :hlData="trabeListHL" @success="resetPageIndex(),
getPageList(), getPageList(),
costmodeHL=false" @cancel="costmodeHL=false"></editExchangeRate> costmodeHL=false" @cancel="costmodeHL=false"></editExchangeRate>
...@@ -2065,6 +2120,7 @@ ...@@ -2065,6 +2120,7 @@
outerVisible: false, outerVisible: false,
outerVisible2: false, outerVisible2: false,
outerVisible3: false, outerVisible3: false,
outerVisible4: false,
importData: "", importData: "",
importDataIndex: 0, importDataIndex: 0,
picObj: [], picObj: [],
...@@ -2081,6 +2137,15 @@ ...@@ -2081,6 +2137,15 @@
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=21", "?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=21",
importFileUrl4: this.domainManager().UploadFileUrl + importFileUrl4: this.domainManager().UploadFileUrl +
"?cmd=dmc_post_LocalFileUpload&fileType=1&fileLimit=1&RB_Group_id=2&Type=21", "?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: { hbMsg: {
FrIDList: [], FrIDList: [],
Type: 1 Type: 1
...@@ -2570,6 +2635,52 @@ ...@@ -2570,6 +2635,52 @@
// this.saveMsgInvoice.splice(i, 1); // this.saveMsgInvoice.splice(i, 1);
this.expressageMsg.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) { handleSelectionChange(val) {
this.multipleSelection = [] this.multipleSelection = []
this.checkList = [] this.checkList = []
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 87307821
...@@ -978,7 +978,7 @@ ...@@ -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="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 <td @click="jumpPage('RegistrationList',o.TCID,7)"> <span
class="_jump_page _font_bold">{{$t('salesModule.LookBM')}}</span> </td> 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)"> @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> <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 <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 @@ ...@@ -280,7 +280,7 @@
<td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td> <td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
<td height="34px" colspan="7" class="_color_b"> <td height="34px" colspan="7" class="_color_b">
<template v-for="(item,index) in GetDetail.CashierDetail"> <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> </template>
</td> </td>
</tr> </tr>
......
src/components/FinancialModule/accDetail/AccountStatementDetail.vue
View file @ 87307821
...@@ -165,6 +165,7 @@ ...@@ -165,6 +165,7 @@
<th>{{$t('fnc.jiaoyiriqi')}}</th> <th>{{$t('fnc.jiaoyiriqi')}}</th>
<th>{{$t('fnc.djleixing')}}</th> <th>{{$t('fnc.djleixing')}}</th>
<th>流水科目</th> <th>流水科目</th>
<th>单据状态</th>
<th width="440">{{$t('objFill.v101.FinancialModule.guanldhhbsh')}}</th> <th width="440">{{$t('objFill.v101.FinancialModule.guanldhhbsh')}}</th>
<th width="340">{{$t('objFill.v101.FinancialModule.shoufkdx')}}</th> <th width="340">{{$t('objFill.v101.FinancialModule.shoufkdx')}}</th>
<th>{{$t('hotel.hotel_Currency')}}</th> <th>{{$t('hotel.hotel_Currency')}}</th>
...@@ -174,17 +175,18 @@ ...@@ -174,17 +175,18 @@
<th>{{$t('fnc.yueacc')}}</th> <th>{{$t('fnc.yueacc')}}</th>
</tr> </tr>
<tr> <tr>
<td :colspan="10">{{$t('fnc.a_qcyue')}}：</td> <td :colspan="11">{{$t('fnc.a_qcyue')}}：</td>
<td>{{moneyFormat(StartMoney)}}</td> <td>{{moneyFormat(StartMoney)}}</td>
</tr> </tr>
<tr v-for="(item,index) in DataList"> <tr v-for="(item,index) in DataList">
<td> <td>
<input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)"> <input type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
</td> </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.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.FrIdStr}}</td> -->
<td>{{item.SubjectName}}</td> <td>{{item.SubjectName}}</td>
<td>{{item.StatusName}}</td>
<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> <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> </td>
...@@ -196,7 +198,7 @@ ...@@ -196,7 +198,7 @@
<td>{{ moneyFormat(item.EndMoney) }}</td> <td>{{ moneyFormat(item.EndMoney) }}</td>
</tr> </tr>
<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>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td>
<td>{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}</td> <td>{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}</td>
<td>{{ moneyFormat(allMoney) }}</td> <td>{{ moneyFormat(allMoney) }}</td>
...@@ -330,6 +332,7 @@ export default { ...@@ -330,6 +332,7 @@ export default {
if(this.$route.query.ID){ if(this.$route.query.ID){
this.accType = parseInt(this.$route.query.TypeId); this.accType = parseInt(this.$route.query.TypeId);
this.AccountId=parseInt(this.$route.query.ID); 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 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"); let mon2=this.$route.query.eTradeDate?this.$route.query.eTradeDate:moment().subtract(1, "months").format("YYYY-MM-DD");
this.productionDate=[mon2,mon1]; this.productionDate=[mon2,mon1];
...@@ -340,7 +343,11 @@ export default { ...@@ -340,7 +343,11 @@ export default {
Type:this.Type, Type:this.Type,
AccountId:this.AccountId AccountId:this.AccountId
}) })
this.bankaccount_post_GetList(); if(this.Type==1){
this.bankaccount_post_GetList();
}else if(this.Type==3){
this.BankAccount_post_GetCashAccountList();
}
this.getList(); this.getList();
} }
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 87307821
...@@ -1053,6 +1053,7 @@ ...@@ -1053,6 +1053,7 @@
@click="goFncUrl('DebitNote', subItem.FinanceId)">{{$t('objFill.jiezhidan')}}</span></p> @click="goFncUrl('DebitNote', subItem.FinanceId)">{{$t('objFill.jiezhidan')}}</span></p>
</td> </td>
<td width="80" class="_zhidan"> <td width="80" class="_zhidan">
<template v-if="myLineId==90"> <template v-if="myLineId==90">
<div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney"> <div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS"> <template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
...@@ -1071,6 +1072,7 @@ ...@@ -1071,6 +1072,7 @@
<span style="color:red;" @click="GoCompanyAlipay(item)"> {{$t('objFill.v101.dmc.yikqqydf')}}</span> <span style="color:red;" @click="GoCompanyAlipay(item)"> {{$t('objFill.v101.dmc.yikqqydf')}}</span>
</template> </template>
</template> </template>
<input style="margin-top:5px;" type="button" value="变更报价单" class="normalBtn" @click="gotoOfferChange(leadr.OfferId)" />
</div> </div>
</template> </template>
<template v-else> <template v-else>
...@@ -1098,6 +1100,7 @@ ...@@ -1098,6 +1100,7 @@
<template v-else-if="!item.hideZDBtn && index2==0"> <template v-else-if="!item.hideZDBtn && index2==0">
<span>{{$t('objFill.chaoguowtsjxzwfzd')}}</span> <span>{{$t('objFill.chaoguowtsjxzwfzd')}}</span>
</template> </template>
<input style="margin-top:5px;" type="button" value="变更报价单" class="normalBtn" @click="gotoOfferChange(leadr.OfferId)" />
</template> </template>
</div> </div>
</template> </template>
...@@ -1760,8 +1763,20 @@ ...@@ -1760,8 +1763,20 @@
err => {} err => {}
); );
}, },
//跳转报报价单
gotoOfferChange(offerId) {
if (offerId) {
this.$router.push({
name: 'OfferChange',
query: {
'offerid': offerId,
'Qtype': 3,
'blank': 'y',
}
});
}
},
ZhuiJiaTuanKuan(item) { ZhuiJiaTuanKuan(item) {
this.apipost('financestatistics_post_GetTravelPrerealContrast', { this.apipost('financestatistics_post_GetTravelPrerealContrast', {
TCID: item.TCIDS TCID: item.TCIDS
}, res => { }, res => {
...@@ -1773,14 +1788,7 @@ ...@@ -1773,14 +1788,7 @@
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$router.push({ this.gotoOfferChange(res.data.data.OfferId);
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
}).catch(() => { }).catch(() => {
}); });
...@@ -1790,14 +1798,7 @@ ...@@ -1790,14 +1798,7 @@
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$router.push({ this.gotoOfferChange(res.data.data.OfferId);
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
}).catch(() => { }).catch(() => {
}); });
...@@ -1916,14 +1917,7 @@ ...@@ -1916,14 +1917,7 @@
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$router.push({ this.gotoOfferChange(res.data.data.OfferId)
name: 'OfferChange',
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
}).catch(() => { }).catch(() => {
}); });
...@@ -1933,17 +1927,8 @@ ...@@ -1933,17 +1927,8 @@
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$router.push({ this.gotoOfferChange(res.data.data.OfferId)
name: 'OfferChange', }).catch(() => {});
query: {
'offerid': res.data.data.OfferId,
'Qtype': 3,
'blank': 'y',
}
});
}).catch(() => {
});
} }
} else { } else {
this.goDiJieZhiDan(obj, num, leadr, cur); this.goDiJieZhiDan(obj, num, leadr, cur);
...@@ -2342,7 +2327,8 @@ ...@@ -2342,7 +2327,8 @@
LeaderGetPriceT: 0, LeaderGetPriceT: 0,
ShowTotalPrice: 0, ShowTotalPrice: 0,
TCNUMS: x.TCNUMS, TCNUMS: x.TCNUMS,
TCIDS: x.TCIDS TCIDS: x.TCIDS,
OfferId: x.OfferId,
}; };
x.LeaderGetPriceList.forEach(price => { x.LeaderGetPriceList.forEach(price => {
if (cur.CurrencyId == price.CurrencyId) { if (cur.CurrencyId == price.CurrencyId) {
...@@ -3152,11 +3138,6 @@ ...@@ -3152,11 +3138,6 @@
border-collapse: collapse; border-collapse: collapse;
} }
/* table.OtherExpensesList th:first {
border: 1px solid #ccc;
padding: 8px;
background-color: #dedede ;
} */
table.OtherExpensesList th { table.OtherExpensesList th {
border: 1px solid #ccc; border: 1px solid #ccc;
padding: 8px; padding: 8px;
......
src/components/SalesModule/Common/signedClientList.vue
View file @ 87307821
...@@ -507,7 +507,7 @@ ...@@ -507,7 +507,7 @@
<span>{{ item.contact }}</span> <span>{{ item.contact }}</span>
</td> </td>
<td>{{ item.contactNumber }}</td> <td>{{ item.contactNumber }}</td>
<td>{{ item.customerName }}</td> <td> {{ item.customerName }} </td>
<td>{{ item.customerStatusStr }}</td> <td>{{ item.customerStatusStr }}</td>
<td><span @click="goUrlCC(item.customerId,3)" <td><span @click="goUrlCC(item.customerId,3)"
style="cursor: pointer;text-decoration: underline;">{{item.tradeTotal}}</span></td> style="cursor: pointer;text-decoration: underline;">{{item.tradeTotal}}</span></td>
......
src/components/SalesModule/MyCustomer.vue
View file @ 87307821
...@@ -842,6 +842,12 @@ ...@@ -842,6 +842,12 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </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>
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('hotel.hotel_remark')" prop="remark"> <el-form-item :label="$t('hotel.hotel_remark')" prop="remark">
...@@ -916,6 +922,12 @@ ...@@ -916,6 +922,12 @@
<el-input v-model='updateMsg.Contact'></el-input> <el-input v-model='updateMsg.Contact'></el-input>
</el-form-item> </el-form-item>
</el-col> </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-col :span="6" v-if="currentUserInfo&&currentUserInfo.RB_Group_id!=2">
<el-form-item :label="$t('salesModule.c_email')" prop="Email"> <el-form-item :label="$t('salesModule.c_email')" prop="Email">
<el-input v-model="updateMsg.email" :placeholder="$t('pub.pleaseImport')" maxlength="50"></el-input> <el-input v-model="updateMsg.email" :placeholder="$t('pub.pleaseImport')" maxlength="50"></el-input>
...@@ -1113,6 +1125,7 @@ ...@@ -1113,6 +1125,7 @@
}, },
addMsg: { addMsg: {
CustomerId: 0, CustomerId: 0,
IsGuideOrLeader:false,
customerName: '', customerName: '',
contact: '', contact: '',
contactNumber: '', contactNumber: '',
...@@ -1245,6 +1258,7 @@ ...@@ -1245,6 +1258,7 @@
contactNumber: '', contactNumber: '',
CustomerName: '', CustomerName: '',
CustomerId: 0, CustomerId: 0,
IsGuideOrLeader:false,
Address: '', Address: '',
Country: 2, Country: 2,
Province: 0, Province: 0,
...@@ -1492,6 +1506,7 @@ ...@@ -1492,6 +1506,7 @@
this.$message.error(this.$t('objFill.qingsrxqdz')) this.$message.error(this.$t('objFill.qingsrxqdz'))
return return
} }
this.updateMsg.IsGuideOrLeader = this.updateMsg.IsGuideOrLeader ? 1 : 0
this.apipost('app_customer_UpdateCustomerAddress', this.updateMsg, res => { this.apipost('app_customer_UpdateCustomerAddress', this.updateMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.addLayer1 = false; this.addLayer1 = false;
...@@ -1556,6 +1571,7 @@ ...@@ -1556,6 +1571,7 @@
this.updateMsg.CustomerName = x.customerName this.updateMsg.CustomerName = x.customerName
this.updateMsg.Contact = x.contactName this.updateMsg.Contact = x.contactName
this.updateMsg.CustomerId = x.customerId this.updateMsg.CustomerId = x.customerId
this.updateMsg.IsGuideOrLeader=x.isGuideOrLeader==1?true:false
this.updateMsg.Address = x.address //x.address.split(',')[1] this.updateMsg.Address = x.address //x.address.split(',')[1]
this.updateMsg.Province = x.province this.updateMsg.Province = x.province
this.getCityNew() this.getCityNew()
...@@ -1713,6 +1729,7 @@ ...@@ -1713,6 +1729,7 @@
this.getRegion1() this.getRegion1()
this.addMsg.District = x.district this.addMsg.District = x.district
this.addMsg.Duty = x.duty this.addMsg.Duty = x.duty
this.addMsg.IsGuideOrLeader=x.IsGuideOrLeader==1?true:false
this.addMsg.Premises = x.premises this.addMsg.Premises = x.premises
this.addMsg.CustomerSourceType = x.customerSourceType this.addMsg.CustomerSourceType = x.customerSourceType
let dictid = [] let dictid = []
...@@ -2016,8 +2033,10 @@ ...@@ -2016,8 +2033,10 @@
} }
this.addMsgS.customerInfo = { this.addMsgS.customerInfo = {
...this.addMsg, ...this.addMsg,
SigningType: this.addMsg.SigningType ? 1 : 0 SigningType: this.addMsg.SigningType ? 1 : 0,
IsGuideOrLeader:this.addMsg.IsGuideOrLeader ? 1 : 0,
} }
this.loadingSave = true this.loadingSave = true
this.apipost('app_add_new_visit_customer', this.addMsgS, res => { this.apipost('app_add_new_visit_customer', this.addMsgS, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -2041,6 +2060,7 @@ ...@@ -2041,6 +2060,7 @@
}, },
cancelData() { cancelData() {
this.addMsg.CustomerId = 0; this.addMsg.CustomerId = 0;
this.addMsg.IsGuideOrLeader=false;
this.addMsg.customerName = ""; this.addMsg.customerName = "";
this.addMsg.contact = ""; this.addMsg.contact = "";
this.addMsg.contactNumber = ""; this.addMsg.contactNumber = "";
......
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @ 87307821
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
{{subItem.StartCityNames}} {{subItem.StartCityNames}}
</td> </td>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0"> <td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
{{subItem.TCNUMS}}({{subItem.TCID}}) {{outItem.TCList[0].TCNUMS}}({{outItem.TCList[0].TCID}})
</td> </td>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0"> <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> {{subItem.LeaderName}}<span style="color:red;">{{subItem.IsLeaderDaiTuan==1?$t('objFill.v101.dmc.daituan'):$t('objFill.v101.dmc.budaituan')}}</span>
...@@ -155,6 +155,7 @@ ...@@ -155,6 +155,7 @@
{{subItem.StartCityNames}} {{subItem.StartCityNames}}
</td> </td>
<td> <td>
{{subItem.TCNUMS}}({{subItem.TCID}}) {{subItem.TCNUMS}}({{subItem.TCID}})
</td> </td>
<td> <td>
......
src/components/TravelContractConfirm.vue
View file @ 87307821
...@@ -1408,6 +1408,7 @@ ...@@ -1408,6 +1408,7 @@
<p class="bold colorRed">電話番号：0748－65－1011</p> <p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p> <p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template> </template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<br> <br>
<p><b>四、旅游者、旅行社双方确认：</b></p> <p><b>四、旅游者、旅行社双方确认：</b></p>
<p>1、旅游者知悉且同意本合同《相关告知及提示》和《预定项目及要求》内容。并确认预定信息无误。</p> <p>1、旅游者知悉且同意本合同《相关告知及提示》和《预定项目及要求》内容。并确认预定信息无误。</p>
...@@ -1938,6 +1939,7 @@ ...@@ -1938,6 +1939,7 @@
</p> </p>
<p class="bold colorRed">支付宝收款账号：392336499@qq.com</p> <p class="bold colorRed">支付宝收款账号：392336499@qq.com</p>
</template> </template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<h3> <h3>
<p class="toTopDistance"> <p class="toTopDistance">
{{$t('objFill.v101.Contract.diershiertiao')}}&nbsp;&nbsp;{{$t('objFill.v101.Contract.rensywshbx')}} {{$t('objFill.v101.Contract.diershiertiao')}}&nbsp;&nbsp;{{$t('objFill.v101.Contract.rensywshbx')}}
...@@ -2565,6 +2567,7 @@ ...@@ -2565,6 +2567,7 @@
<p>電話番号：0748－65－1011</p> <p>電話番号：0748－65－1011</p>
<p>SWIFT CODE: BOKFJPJZ</p> <p>SWIFT CODE: BOKFJPJZ</p>
</template> </template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<p>交通安排：</p> <p>交通安排：</p>
<p>使用形式</p> <p>使用形式</p>
<p> <p>
......
src/components/TravelContractDetail.vue
View file @ 87307821
...@@ -831,6 +831,7 @@ ...@@ -831,6 +831,7 @@
<p class="bold colorRed">電話番号：0748－65－1011</p> <p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p> <p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template> </template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<h3>第二十二条 人身意外伤害保险</h3> <h3>第二十二条 人身意外伤害保险</h3>
<p>1.出境社提示旅游者购买人身意外伤害保险；</p> <p>1.出境社提示旅游者购买人身意外伤害保险；</p>
<p> <p>
......
src/components/TravelContractView.vue
View file @ 87307821
...@@ -890,6 +890,7 @@ ...@@ -890,6 +890,7 @@
<p class="bold colorRed">電話番号：0748－65－1011</p> <p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p> <p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template> </template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<br> <br>
<p><b>四、旅游者、旅行社双方确认：</b></p> <p><b>四、旅游者、旅行社双方确认：</b></p>
<p>1、旅游者知悉且同意本合同《相关告知及提示》和《预定项目及要求》内容。并确认预定信息无误。</p> <p>1、旅游者知悉且同意本合同《相关告知及提示》和《预定项目及要求》内容。并确认预定信息无误。</p>
...@@ -1363,6 +1364,7 @@ ...@@ -1363,6 +1364,7 @@
</p> </p>
<p class="bold colorRed">支付宝收款账号：392336499@qq.com</p> <p class="bold colorRed">支付宝收款账号：392336499@qq.com</p>
</template> </template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<h3> <h3>
<p class="toTopDistance"> <p class="toTopDistance">
{{$t('objFill.v101.Contract.diershiertiao')}}&nbsp;&nbsp;{{$t('objFill.v101.Contract.rensywshbx')}} {{$t('objFill.v101.Contract.diershiertiao')}}&nbsp;&nbsp;{{$t('objFill.v101.Contract.rensywshbx')}}
...@@ -1914,6 +1916,7 @@ ...@@ -1914,6 +1916,7 @@
<p class="bold colorRed">電話番号：0748－65－1011</p> <p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p> <p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template> </template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<p>交通安排：</p> <p>交通安排：</p>
<p>使用形式</p> <p>使用形式</p>
<p> <p>
......
src/components/TravelManager/TravelList/TravelpassengerList.vue
View file @ 87307821
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
</el-select> </el-select>
</td> </td>
<td>{{subItem.GuestName}}</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.ESurName}}</td>
<td>{{subItem.EName}}</td> <td>{{subItem.EName}}</td>
<td>{{getSexStr(subItem)}}</td> <td>{{getSexStr(subItem)}}</td>
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
{{subItem.GroupTypeStr}} {{subItem.GroupTypeStr}}
</td> </td>
<td>{{subItem.GuestName}}</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.ESurName}}</td>
<td>{{subItem.EName}}</td> <td>{{subItem.EName}}</td>
<td>{{getSexStr(subItem)}}</td> <td>{{getSexStr(subItem)}}</td>
......
src/components/TravelManager/TravelNewQuotation/OfferChange.vue
View file @ 87307821
...@@ -15,11 +15,20 @@ ...@@ -15,11 +15,20 @@
<CostNewPriceAudit v-if="haveData" ref="CostNewPrice" :postConfig="postData" :OfferArray="OfferArray" <CostNewPriceAudit v-if="haveData" ref="CostNewPrice" :postConfig="postData" :OfferArray="OfferArray"
:IsEdit="IsEdit" @success="refreshPage"></CostNewPriceAudit> :IsEdit="IsEdit" @success="refreshPage"></CostNewPriceAudit>
</div> </div>
<div class="btnFixedDiv" v-if="haveData"> <div class="btnFixedDiv" v-if="haveData" style="margin:0 auto;">
<div class="toTop"> <el-button @click="SaveData(2)" :loading="saveLoading"
<i class="iconfont icon-huidaodingbu"></i> style="background-color:#ffc2c2;color:#cc1212;font-size:12px;margin-left:7px;margin-top:10px;border:none;width:45px;height:45px;padding:0;">
</div> {{$t('fnc.tijiao')}}
<div class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="SaveData(2)">{{$t('fnc.tijiao')}}</div> </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>
</div> </div>
</template> </template>
...@@ -80,28 +89,52 @@ ...@@ -80,28 +89,52 @@
AssistantList: [], //助理OP AssistantList: [], //助理OP
PriceTeamType: 0, //团队类型, PriceTeamType: 0, //团队类型,
PriceTeamTypeName: "", //团队类型, PriceTeamTypeName: "", //团队类型,
OfferArray:[], OfferArray: [],
OfferId: 0,
}, },
pMsg: { pMsg: {
offerId: 0, offerId: 0,
// BatchNum: "",
}, },
isSubmit: true,
loading: false, loading: false,
IsEdit: 0, IsEdit: 0,
saveLoading: false,
}; };
}, },
methods: { 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) { SaveData(Type) {
this.saveLoading = true;
var nObj = { var nObj = {
offerid:this.pMsg.offerId, offerid: this.pMsg.offerId,
}; };
this.loading = true; this.loading = true;
this.apipost( this.apipost(
"travel_post_SetOfferChangeAudit", nObj, "travel_post_SetOfferChangeAudit", nObj,
res => { res => {
this.loading = false; this.loading = false;
this.saveLoading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.goUrl('newQuotation'); this.goUrl('newQuotation');
...@@ -134,9 +167,13 @@ ...@@ -134,9 +167,13 @@
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var tempData = res.data.data; var tempData = res.data.data;
console.log("travel_get_PriceOfferInfo",tempData);
if (tempData.ID && tempData.ID > 0) { if (tempData.ID && tempData.ID > 0) {
this.postData.ID = tempData.ID; this.postData.ID = tempData.ID;
} }
if (tempData.OfferId && tempData.OfferId > 0) {
this.postData.OfferId = tempData.OfferId;
}
if (tempData.LineId && tempData.LineId > 0) { if (tempData.LineId && tempData.LineId > 0) {
this.postData.LineId = tempData.LineId; this.postData.LineId = tempData.LineId;
} }
......
src/components/clientConfirm.vue
View file @ 87307821
...@@ -970,6 +970,7 @@ ...@@ -970,6 +970,7 @@
<p class="bold colorRed">電話番号：0748－65－1011</p> <p class="bold colorRed">電話番号：0748－65－1011</p>
<p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p> <p class="bold colorRed">SWIFT CODE: BOKFJPJZ</p>
</template> </template>
<p class="bold colorRed">款项必须支付至本合同指定公账，如转账到其他账户或私人账户则与公司无关、支付无效，视为未支付旅游费用，公司有权选择解除合同或者继续向旅游者要求费用支付</p>
<h3> <h3>
<p class="toTopDistance">第二十二条 人身意外伤害保险</p> <p class="toTopDistance">第二十二条 人身意外伤害保险</p>
</h3> </h3>
......
src/components/dmc/manager/dmcTotalTable_swt.vue
View file @ 87307821
...@@ -284,7 +284,6 @@ ...@@ -284,7 +284,6 @@
</div> </div>
</td> </td>
<td> <td>
<!--"goUrlT('TravelPassengerList2',item.TCID,'旅客名单') @click="goRoomTip()" -->
<div class="fz16 fbold linkspan"> <div class="fz16 fbold linkspan">
<span style="color: #4BCA81;" v-if="item.HouseResult==1">√</span> <span style="color: #4BCA81;" v-if="item.HouseResult==1">√</span>
<span class="colorE95252" v-else>{{item.HouseResult=='-1'?"x":"O"}}</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