Skip to content

S
SuperMan
Commit e4072859 authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents fa8f3651 4cfd37db
Show whitespace changes
Inline Side-by-side
Showing with 179 additions and 89 deletions
src/components/FinancialModule/Kingdee/RecPayQuery.vue
View file @ e4072859
......@@ -1095,10 +1095,10 @@
}
}
})
let cmsg='是否确认标记此查询条件的下所有财务单据以导入至金蝶？';
if(refinanceIdList){
let cmsg='是否确认标记此查询条件的下所有财务单据已导入至金蝶？';
if(refinanceIdList.length>0){
this.msg.ReFinanceIds = refinanceIdList.join(',');
cmsg ='是否确认标记勾选的'+refinanceIdList.length+'张财务单据以导入至金蝶？';
cmsg ='是否确认标记勾选的'+refinanceIdList.length+'张财务单据已导入至金蝶？';
}
this.$confirm(cmsg, '提示', {
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ e4072859
......@@ -1667,6 +1667,16 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "TotalDJMoney",
formatter: this.moneyFormat,
title: "地接款汇总(不进利润)",
width: 90,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "ZiFei",
formatter: this.moneyFormat,
......@@ -2447,6 +2457,7 @@ export default {
"其他",
"地接款支出",
"地接款收入",
"地接款汇总(不进利润)",
"自费收入",
"小费收入",
"单据小费",
......
src/components/SalesModule/MyCustomer.vue
View file @ e4072859
......@@ -600,8 +600,20 @@
<el-col :span="6">
<el-form-item label="Email" prop="Email">
<el-input v-model="addMsg.Email" placeholder="请输入Email" style="width: 240px;"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="合同照片">
<div style="display: flex;">
<el-upload class="avatar-uploader" action="" :http-request="uploadImg"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false">
<img v-if="BusinessCardPhotos" :src="BusinessCardPhotos" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
<span class="q-pl-lg text-grey-8" style="cursor: pointer;margin-left: 10px;color: gray;"
@click="isShow=!isShow">{{isShow?'收起':'展开'}}</span>
</div>
</el-form-item>
</el-col>
</el-row>
......@@ -682,15 +694,7 @@
</el-col>
</el-row>
<el-row v-if="isShow" :gutter="20">
<el-col :span="6">
<el-form-item :label="$t('salesModule.BusinessPhoto')">
<el-upload class="avatar-uploader" action="" :http-request="uploadImg"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false">
<img v-if="BusinessCardPhotos" :src="BusinessCardPhotos" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('salesModule.doorPhoto')">
<el-upload class="avatar-uploader" action="" :http-request="uploadImg1"
......@@ -777,6 +781,15 @@
<el-input class='w200' v-model='updateMsg.email'></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="合同照片：">
<el-upload class="avatar-uploader" action="" :http-request="uploadImgNew"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false">
<img v-if="BusinessCardPhotos" :src="BusinessCardPhotos" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
......@@ -839,15 +852,7 @@
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="名片照片：">
<el-upload class="avatar-uploader" action="" :http-request="uploadImgNew"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false">
<img v-if="BusinessCardPhotosNew" :src="BusinessCardPhotosNew" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="门牌照片：">
<el-upload class="avatar-uploader" action="" :http-request="uploadImg1New"
......@@ -1238,30 +1243,39 @@
})
},
uploadImgNew(file) {
let that = this;
that.$message.info('上传中...')
//上传
let newArr = [];
newArr.push(file.file);
let path = "/Upload/Temporary/";
this.UploadSelfFileT(path, newArr, x => {
this.BusinessCardPhotosNew = this.domainManager().ViittoFileUrl + x.data.FilePath
this.BusinessCardPhotos = this.domainManager().ViittoFileUrl + x.data.FilePath
that.$message.success('上传成功');
});
},
uploadImg1New(file) {
let that = this;
that.$message.info('上传中...')
//上传
let newArr = [];
newArr.push(file.file);
let path = "/Upload/Temporary/";
this.UploadSelfFileT(path, newArr, x => {
this.HousePhotosNew = this.domainManager().ViittoFileUrl + x.data.FilePath
that.$message.success('上传成功');
});
},
uploadImg2New(file) {
let that = this;
that.$message.info('上传中...')
//上传
let newArr = [];
newArr.push(file.file);
let path = "/Upload/Temporary/";
this.UploadSelfFileT(path, newArr, x => {
this.ImagesNew = this.domainManager().ViittoFileUrl + x.data.FilePath
that.$message.success('上传成功');
});
},
getMyCustomerInfo() {
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ e4072859
......@@ -1356,7 +1356,60 @@
</tr>
<template v-for="item in DataList.FinicePayList">
<tr
v-if="(isExists(item.CostTypeList,'地接费（领取）') || (isExists(item.CostTypeList,'地接费（结算）'))) && item.Type==2">
v-if="(isExists(item.CostTypeList,'地接费（领取）') || (isExists(item.CostTypeList,'地接费（结算）')) || (isExists(item.CostTypeList,'国内团导游报账')) || (isExists(item.CostTypeList,'国内地接费领取'))) && item.Type==2">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}<br /></span></td>
<td>
<div class="Team_ComCoin" v-for="childItem in item.TradeWayList">
支付方式：{{childItem.Alias}}&nbsp;币种：{{childItem.CurrencyName}}
<span class="Team_Coins">{{childItem.OriginalMoney}}*{{childItem.Rate}}</span>
<span class="TB_Rate">汇率 {{childItem.Rate}}</span>
</div>
</td>
<td style="font-size:14px;">
应付：{{item.Money}}<br />
实付：{{item.PayMoney}}
</td>
<td>{{item.TradeDate}}</td>
<td>
<div>{{item.EmName}}</div>
<div class="Team_btmDiv">{{item.CreateDate}}</div>
</td>
<td>{{item.StatusStr}}</td>
<td>
<div v-for="AuditItem in item.AuditList">
{{AuditItem.EmName}}
<span class="TB_Rate">{{AuditItem.AuditDate}}</span>
</div>
</td>
</tr>
</template>
</table>
<div class="clearfix TB_PrintDiv" v-if="DataList.DJFinanceList && DataList.DJFinanceList.length>0">
<div class="TB_comtitle TB-Title">地接款原单（不进利润）：
<span v-if="moneyAll.dijieTyf>0 || moneyAll.dijieTsf>0">
<span class="span_all">应付：¥{{moneyFormat(moneyAll.dijieTyf)}}</span>
<span class="span_all">实付：¥{{moneyFormat(moneyAll.dijieTsf)}}</span>
</span>
</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-if="DataList.DJFinanceList && DataList.DJFinanceList.length>0">
<tr>
<th width="180">单号</th>
<th width="200">费用类型</th>
<th width="500">交易明细</th>
<th width="300">金额</th>
<th width="200">交易日期</th>
<th width="250">制单人员</th>
<th width='180'>审核状态</th>
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.DJFinanceList">
<tr
v-if="item.Type==2">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -1574,6 +1627,8 @@
&& NotExists(item.CostTypeList,'签证')
&& NotExists(item.CostTypeList,'地接费（领取）')
&& NotExists(item.CostTypeList,'地接费（结算）')
&& NotExists(item.CostTypeList,'国内团导游报账')
&& NotExists(item.CostTypeList,'国内地接费领取')
&& NotExists(item.CostTypeList,'提成')
&& NotExists(item.CostTypeList,'国内联运')
&& NotExists(item.CostTypeList,'车')
......@@ -2072,6 +2127,11 @@
// 成本 地接
dijieyf: 0,
dijiesf: 0,
// 汇总 地接原单
dijieTyf: 0,
dijieTsf: 0,
// 成本 赔偿
peichangyf: 0,
peichangsf: 0,
......@@ -2511,6 +2571,8 @@
this.moneyAll.tichengsf = 0;
this.moneyAll.dijieyf = 0;
this.moneyAll.dijiesf = 0;
this.moneyAll.dijieTyf = 0;
this.moneyAll.dijieTsf = 0;
this.moneyAll.peichangyf = 0;
this.moneyAll.peichangsf = 0;
this.moneyAll.baoxianyf = 0;
......@@ -2565,6 +2627,8 @@
that.NotExists(item.CostTypeList, '签证') &&
that.NotExists(item.CostTypeList, '地接费（领取）') &&
that.NotExists(item.CostTypeList, '地接费（结算）') &&
that.NotExists(item.CostTypeList, '国内团导游报账') &&
that.NotExists(item.CostTypeList, '国内地接费领取') &&
that.NotExists(item.CostTypeList, '提成') &&
that.NotExists(item.CostTypeList, '国内联运') &&
that.NotExists(item.CostTypeList, '车') &&
......@@ -2684,8 +2748,8 @@
this.moneyAll.tichengsf += item.PayMoney;
}
// 地接
if ((that.isExists(item.CostTypeList, '地接费（领取）') || (that.isExists(item.CostTypeList,
'地接费（结算）'))) && item.Type == 2) {
if ((that.isExists(item.CostTypeList, '地接费（领取）') || (that.isExists(item.CostTypeList,'地接费（结算）'))
|| (that.isExists(item.CostTypeList,'国内团导游报账'))|| (that.isExists(item.CostTypeList,'国内地接费领取'))) && item.Type == 2) {
this.moneyAll.dijieyf += item.Money;
this.moneyAll.dijiesf += item.PayMoney;
......@@ -2709,6 +2773,7 @@
// 其他
if (that.NotExists(item.CostTypeList, '签证')
&& that.NotExists(item.CostTypeList, '地接费（领取）') && that.NotExists(item.CostTypeList, '地接费（结算）')
&& that.NotExists(item.CostTypeList, '国内团导游报账') && that.NotExists(item.CostTypeList, '国内地接费领取')
&& that.NotExists(item.CostTypeList, '提成') && that.NotExists(item.CostTypeList, '国内联运')
&& that.NotExists(item.CostTypeList, '车')&& that.NotExists(item.CostTypeList, '房')
&& that.NotExists(item.CostTypeList, '餐费')&& that.NotExists(item.CostTypeList, '订餐')
......@@ -2739,6 +2804,10 @@
this.moneyAll.RefundAll += item.Money;
this.moneyAll.PayRefundAll += item.PayMoney;
})
this.DataList.DJFinanceList.forEach(item =>{
this.moneyAll.dijieTyf += item.Money;
this.moneyAll.dijieTsf += item.PayMoney;
})
}
});
......
src/components/activity/CouponList.vue
View file @ e4072859
......@@ -306,7 +306,7 @@
@change="getcouponPriceList">
<el-option
v-for="(item,index) in queryCommonData.dataList"
:label="item.LineName+item.LtName" :value="item.TCID" :key="index"></el-option>
:label="item.TCNUM+'('+item.TCID+')'" :value="item.TCID" :key="index"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -403,51 +403,27 @@
tripDataList: [],
//查询团参数
queryMsg: {
QOutGroupAuditReject: 0, //只查看审核驳回 1
QSendCommissionState: 0, //提成状态 0不限， 1已发放， 2未发放
//出团公司集合
OutBranchIds: [],
pageIndex: 1,
pageSize: 50,
LineId: 0,
PlaceID: 0,
LineIdList: [],
LineteamId: 0,
TCNUM: "",
StartGroupDate: "",
EndGroupDate: "",
OutBranchId: -1,
AirTicketId: 0,
TeamMinNum: "",
TeamMaxNum: "",
CreateBy: 0,
ApplyMinNum: "",
ApplyMaxNum: "",
DayNum: "",
OnlyShowOverTeam: false,
TCState: [1, 3], //去掉默认显示
GroupState: [],
LineId: "-1",
LineTeamId: "-1",
AimPlaceId: "-1",
TCID: "",
StartTime: "",
EndTime: "",
BranchId: "-1",
CityId: "-1",
DaysTrip: "",
SalePlat: [],
UnionCityId: 0,
SaleBranchId: [],
total: 0,
//是否有数据
noData: false,
currentPage: 1,
//航班配置
FlightState: 0,
//预警团
IsWarning: false,
minGroupSize: "",
maxGroupSize: "",
minApplySize: "",
maxApplySize: "",
FlightID: "-1",
TCIDList: "",
WarningQuery: "-1",
RateOnDay: "-1",
RateOn: "-1",
TeamType: 0, //一般常规团
IsShowUnion: -1,
TCID: "",
HotelId: 0, //酒店编号
HotelUseTime: "", //酒店使用时间
QBusNumber: "",
PriceTeamType: "", //团队类型
Title: "", //团名
},
......@@ -540,7 +516,7 @@
remark: "",
autoGrant:"",
openPlatformList:[],
couponPriceLists: '',
couponPriceLists:[],
couponPriceList: [],
},
pwdMsg: {
......@@ -587,28 +563,41 @@
getcouponPriceList(){
this.addMsg.couponPriceList = []
this.addMsg.couponPriceLists.forEach(item=>{
this.queryCommonData.dataList.forEach(dataItem=>{
if(item==dataItem.TCID) {
let obj = {
TCID: item
TCID: dataItem.TCID,
TCNUM: dataItem.TCNUM
}
this.addMsg.couponPriceList.push(obj)
}
});
})
},
getTravelPrciePageList(){
console.log("getTravelPrciePageList111",this.addMsg);
this.queryCommonData.loading = true;
this.queryMsg.LineId = this.addMsg.lineId
this.queryMsg.LineteamId = this.addMsg.lineteamId
this.queryMsg.StartGroupDate = this.addMsg.effectDate
this.queryMsg.EndGroupDate = this.addMsg.expirationDate
this.queryMsg.LineTeamId = this.addMsg.lineteamId
this.queryMsg.StartTime = this.addMsg.effectDate
this.queryMsg.EndTime = this.addMsg.expirationDate
this.apipost(
"travel_get_GetTravelPrciePageList_V2",
"TaskManagemnet_get_GetSellProductCenter",
this.queryMsg,
res => {
this.queryCommonData.loading = false;
if (this.queryMsg.TCID == "0") {
this.queryMsg.TCID = "";
}
console.log("getTravelPrciePageList",this.queryMsg);
if (res.data.resultCode == 1) {
this.queryCommonData.dataList = res.data.data.pageData;
console.log("addMsg.couponPriceList11", this.addMsg.couponPriceList);
if( this.addMsg.couponPriceList&& this.addMsg.couponPriceList.length>0){
this.addMsg.couponPriceList.forEach(item=>{
console.log("item",item);
this.addMsg.couponPriceLists.push(item.tcid);
})
console.log("item.couponPriceLists", this.addMsg.couponPriceLists);
}
console.log(this.queryCommonData.dataList,'----')
}
},
......@@ -624,12 +613,11 @@
});
},
EditItem(item) {
console.log("item222",item);
if(item.couponPriceList&&item.couponPriceList.length>0){
item.couponPriceLists = item.couponPriceList.map(item=> {return item.TCID})
}
this.addMsg = Object.assign({}, item);
if(item.couponPriceLists||item.lineId||item.lineteamId||item.effectDate||item.expirationDate){
this.getTravelPrciePageList()
}
},
......@@ -746,7 +734,6 @@
},
// 修改
updateData(item) {
console.log("item",item)
this.getLineTeamList(item.lineId)
this.addMsg.couponsName = item.couponsName
this.addMsg.effectDate = item.effectDate
......
src/components/administrative/empBankAccount.vue
View file @ e4072859
......@@ -134,7 +134,7 @@
class="normalBtn"
value="查询"
/>
<input type="button" @click="outerVisible = true,dialogTitle=$t('ground.xinzengzhanghu'),resetForm('addMsg')" class="normalBtn" :value="$t('pub.addBtn')" />
<input v-if="list&&list.length==0" type="button" @click="AddAccount" class="normalBtn" :value="$t('pub.addBtn')" />
</li>
</ul>
</div>
......@@ -266,6 +266,15 @@
this.changeTitle()
},
methods: {
AddAccount(){
if(this.list&&this.list.length==1){
this.$message.info('已有账户')
return
}
this.outerVisible = true,
this.dialogTitle=$t('ground.xinzengzhanghu'),
this.resetForm('addMsg')
},
changeTitle(){
if(this.addMsg.AccountClassify==1){
this.nameA= this.$t("ground.pingtaimingcheng")
......
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