Commit a6bc1076 authored by zhengke's avatar zhengke
parents ac896bc9 4e1cf046
......@@ -652,8 +652,8 @@
let fileName = file.file.name;
let myDate = new Date();
let path = "/Upload/Editor/" + myDate.getFullYear() + "/" + (myDate.getMonth() + 1) + "/";
this.uploadFile(path, newArr, x => {
let url = this.$commonUtils.GetALiFileUrl(x.res.requestUrls[0]);
this.UploadSelfFileT(path, newArr, x => {
let url = this.domainManager().ViittoFileUrl + x.data.FilePath;
// 如果上传成功
if (url != null && url.length > 0) {
// 获取光标所在位置
......
......@@ -245,32 +245,49 @@
<th>团队编号</th>
<th>发团日期</th>
<th>订单号</th>
<th>客户信息</th>
<th>业务员</th>
<th>应收金额</th>
<th>实收金额</th>
<th>待收金额</th>
<th>已退款</th>
<th>平台税金</th>
<th>在途金额</th>
</tr>
<tr v-for=" ( item , index ) in DataList ">
<td> <span class="_link_hover" @click="jumpPage('RegistrationList', item.TCID, 1, 0)"> {{ item.TCNUM }}{{ item.TCID }}</span> </td>
<td> {{ item.StartDate }} </td>
<td colspan="7">
<td colspan="9">
<table class="_singeRowTable_two" style="width: 100%;table-layout: fixed;border-collapse: collapse;" cellspacing="0" cellpadding="0" border="0">
<tbody>
<tr v-for=" ( son , sIndex ) in item.OrderList ">
<td> <span class="_link_hover" @click="jumpPage('RegistrationList', son.OrderId, 2, item.TCID)"> {{ son.OrderId }} </span> </td>
<td> {{ son.ContactName }} </td>
<td> {{ son.EmName }} </td>
<td> {{ son.PreferPrice }} </td>
<td> <span :class="son.DaiShou > 0 ? '':'_color_red'"> {{ son.Income }} </span> </td>
<td> <span :class="son.DaiShou > 0 ? '_color_red':''"> {{ son.Income }} </span> </td>
<td>{{ son.DaiShou}} </td>
<td> {{ son.Refund }} </td>
<td> {{ son.PlatformTax }} </td>
<td> {{ son.ZaiTuMoney }} </td>
</tr>
</tbody>
</table>
</td>
</tr>
<tr>
<td>合计</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td>{{Statistics.PreferPrice}}</td>
<td>{{Statistics.Income}}</td>
<td>{{Statistics.DueinMoney}}</td>
<td>{{Statistics.Refund}}</td>
<td>{{Statistics.PlatformTax}}</td>
<td>{{Statistics.ZaiTuMoney}}</td>
</tr>
</table>
<div class="noDataNotice" v-if="noData">
<i class="iconfont icon-kong"></i>
......@@ -332,6 +349,7 @@ export default {
IsLeave:0,
},
DataList:[],
Statistics:{},
DepartmentList:[],
EmployeeList:[],
CompanyList:[],
......@@ -485,7 +503,8 @@ export default {
this.apipost('Financial_post_GetInComePayInfoList',this.msg,res=>{
if(res.data.resultCode == 1) {
this.total = res.data.data.count;
this.DataList = res.data.data.pageData;
this.DataList = res.data.data.pageData.List;
this.Statistics=res.data.data.pageData.Statistics;
if(this.DataList.length==0){
this.noData = true;
}else{
......
......@@ -1598,7 +1598,7 @@ export default {
return this.priceFormat(rowData.YongJinShouRu);
if (field === "YingFu") return this.priceFormat(rowData.YingFu);
if (field === "MaoLi") return this.priceFormat(rowData.MaoLi);
if (field === "MaoLiRate") return this.priceFormat(rowData.MaoLiRate*100)+'%';
if (field === "MaoLiRate") return rowData.MaoLiRate+'%';
if (field === "ShiJiLiRun") return this.priceFormat(rowData.ShiJiLiRun);
if (field === "TransportCost")
return this.priceFormat(rowData.TransportCost);
......
......@@ -359,7 +359,7 @@ export default {
return {
msg: {
FrID: 0,
TemplateId: 27,
TemplateId: 0,
Status: 1,
IsPublic: 0,
RB_Depart_Id: 0,
......@@ -404,6 +404,11 @@ export default {
let userInfo = this.getLocalStorage();
this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
if(this.msg.RB_Branch_Id===0 || this.msg.RB_Branch_Id===45 || this.msg.RB_Branch_Id===49){
this.msg.TemplateId=34;
}else{
this.msg.TemplateId=35;
}
}
},
methods:{
......
......@@ -821,13 +821,13 @@
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info('上传中...')
this.uploadFile(path, newArr, x => {
this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.saveMsg.push({
Content: x.name,
Content: x.data.FilePath,
ID:0,
Type:fileTypeNumber,
Url:x.res.requestUrls[0].split("?")[0],
Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
})
this.$message.success('上传成功');
});
......
......@@ -789,13 +789,13 @@
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info('上传中...')
this.uploadFile(path, newArr, x => {
this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.saveMsg.push({
Content: x.name,
Content: x.data.FilePath,
ID:0,
Type:fileTypeNumber,
Url:x.res.requestUrls[0].split("?")[0],
Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
})
this.$message.success('上传成功');
});
......
......@@ -687,6 +687,41 @@
font-size: 14px;
vertical-align: top;
}
.Ysze{
position: relative;
}
.Ysze .changeYsze{
position: absolute;
left: 110%;
z-index: 10000;
top: 0;
width: 700px;
background: #fff;
box-shadow: 0 0 8px #888;
padding:10px;
box-sizing: border-box;
}
.Ysze .Ysze-button{
position: absolute;
left: 98%;
top:3px;
border-radius: 4px;
cursor: pointer;
}
.Ysze .changeYsze .el-form-item{
display: inline-block;
width:30%;
margin-bottom: 5px;
}
.Ysze .changeYsze .el-icon-close{
position: absolute;
right: 6px;
top:6px;
color: #f78989;
font-size:20px;
cursor: pointer;
}
</style>
<template>
......@@ -904,10 +939,59 @@
<el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="4" class="Ysze">
<el-form-item label="应收总额" prop="PreferPrice">
<el-input v-model='addMsg.PreferPrice' :disabled="true"></el-input>
</el-form-item>
<button @click="Yszefz" type="button" class="Ysze-button el-button--primary" style="background: rgb(0, 198, 255); border-color: rgb(0, 198, 255);">
<i class="iconfont icon-nav-hangzheng" style="font-size:12px"></i>
</button>
<!-- 修改应收总额 -->
<div class="changeYsze" v-show="Ysze">
<el-form :model="addMsg_form" ref="addMsg_form" label-position="right" label-width="100px">
<span class="el-icon-close" @click="Ysze=false"></span>
<el-form-item label="签证费">
<el-input v-model='addMsg_form.VisaPrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="退签证费">
<el-input v-model='addMsg_form.BackVisaPrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="杂费">
<el-input v-model='addMsg_form.OtherPrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="老人附加费">
<el-input v-model='addMsg_form.OldManChargePrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="儿童附加费">
<el-input v-model='addMsg_form.BabyChargePrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="单房差">
<el-input v-model='addMsg_form.SingleRoomPrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="儿童占床增收">
<el-input v-model='addMsg_form.ChildNeedPrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="儿童不占床减免">
<el-input v-model='addMsg_form.ChildNoNeedPrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="收损金额">
<el-input v-model='addMsg_form.OpSetLossMoney' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="单地接">
<el-input v-model='addMsg_form.SingleDMCPrice' :disabled="true"></el-input>
</el-form-item>
<el-form-item label="婴儿价">
<el-input v-model='addMsg_form.BabyPrice' :disabled="true"></el-input>
</el-form-item>
<!-- <el-form-item v-if="IsUpdateOrderMoney">
<el-button type="primary" style="padding:6px 15px" @click="submitYSZEForm">确定</el-button>
<el-button type="danger" style="padding:6px" @click="Ysze=false">关闭</el-button> -->
<!-- </el-form-item> -->
</el-form >
</div>
</el-col>
<el-col :span="4">
<el-form-item label="预计提成" prop="Commission">
......@@ -1730,6 +1814,10 @@
export default {
data () {
return {
// 修改应收总额
Ysze:false,
addMsg_form:{},
pickerOptions0: {
disabledDate: time => {
let starTime = new Date(this.starTime)
......@@ -1985,6 +2073,11 @@
}
},
methods: {
// 给其他费用赋值
Yszefz(){
this.Ysze=true;
this.addMsg_form=Object.assign({},this.addObj);
},
//跳转
goUrlTS (path, id, orderId, title) {
this.$router.push({
......@@ -2406,6 +2499,7 @@
this.remarksMsg.isOrder = obj.isOrder
},
getDetail (obj) {
this.Ysze=false;
this.starTime = obj.startDate
this.endTime = obj.backDate
this.getMinPrice(obj.orderId)
......@@ -2418,9 +2512,13 @@
if (res.data.resultCode == 1) {
this.IsUnion = res.data.data.IsUnion
this.isAllowUpdate = res.data.data.IsUpdatePlatOrder
this.addObj = res.data.data.modelPrice
let x = res.data.data.model
this.addMsg = x
this.addObj = res.data.data.modelPrice
let x = res.data.data.model;
this.addObj.OrderId=x.OrderId;
this.addObj.OpSetLossMoney=x.OpSetLossMoney;
this.addMsg = x;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr
this.addMsg.PlatformAccount = ''
this.getScenicRefund(obj.tcid)
......
......@@ -637,7 +637,7 @@ export default {
let newArr = [];
newArr.push(file.file);
let path = "/Upload/Temporary/";
this.UploadSelfFile(path, newArr, x => {
this.UploadSelfFileT(path, newArr, x => {
this.apipost(
"dmc_get_visa_UploadVisaAdvertisingImage",
{
......
......@@ -298,7 +298,7 @@ export default {
this.loading = false;
this.dataList.forEach(x=>{
this.PreferPrice+=x.TotalPrice;
this.IncomePrice+=x.Income;
this.IncomePrice+=(x.Income+x.PlatformTax-x.RefundMoney);
})
}
},err=>{})
......
......@@ -191,7 +191,7 @@ export default {
this.UploadSelfFileT(path, newArr, x => {
that.PostConfig.fileList[
this.updateChoseIndex
].Url = this.$commonUtils.GetALiFileUrl(str);
].Url = this.domainManager().ViittoFileUrl + x.data.FilePath;
that.PostConfig.fileList[this.updateChoseIndex].Name = fileName;
});
},
......
......@@ -199,7 +199,7 @@ export default {
this.UploadSelfFileT(path, newArr, x => {
that.FeatureData.fileList[
this.updateChoseIndex
].Url = this.$commonUtils.GetALiFileUrl(str);
].Url = this.domainManager().ViittoFileUrl + x.data.FilePath;
that.FeatureData.fileList[this.updateChoseIndex].Name = fileName;
});
},
......
......@@ -216,7 +216,7 @@ export default {
var str = x.res.requestUrls[0];
that.PostConfig.fileList[
this.updateChoseIndex
].Url = this.$commonUtils.GetALiFileUrl(str);
].Url = this.domainManager().ViittoFileUrl + x.data.FilePath;
that.PostConfig.fileList[this.updateChoseIndex].Name = fileName;
});
},
......
......@@ -348,7 +348,7 @@ export default {
var str = x.res.requestUrls[0];
that.FeatureData.fileList[
this.updateChoseIndex
].Url = this.$commonUtils.GetALiFileUrl(str);
].Url = this.domainManager().ViittoFileUrl + x.data.FilePath;
that.FeatureData.fileList[this.updateChoseIndex].Name = fileName;
});
},
......
......@@ -179,10 +179,11 @@
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_lirun">
<i class="iconfont icon-qian"></i>
</span>提成
</span>其他
</div>
<div class="Team_Incontent">
<div>预计提成<span>{{DataList.ExpectedCut}}</span></div>
<div>&nbsp;&nbsp;&nbsp;<span>{{DataList.ExpectedCut}}</span></div>
<div>联运成本<span>{{DataList.LYCB}}</span></div>
</div>
</div>
</el-col>
......@@ -209,7 +210,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FiniceReciveList">
<tr v-if="isExists(item.CostTypeList,'团费')">
<tr v-if="isExists(item.CostTypeList,'团费') || isExists(item.CostTypeList,'团款')">
<td><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}}</span></td>
<td>
......@@ -429,7 +430,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FiniceReciveList">
<tr v-if="NotExists(item.CostTypeList,'团费') && NotExists(item.CostTypeList,'地接费(结算)') && NotExists(item.CostTypeList,'小费收入')&& NotExists(item.CostTypeList,'自费收入')&& NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7">
<tr v-if="NotExists(item.CostTypeList,'团费') && NotExists(item.CostTypeList,'团款') && NotExists(item.CostTypeList,'地接费(结算)') && NotExists(item.CostTypeList,'小费收入') && NotExists(item.CostTypeList,'自费') && NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7">
<td><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}}</span></td>
<td>
......@@ -1189,7 +1190,7 @@
this.$router.push({
name: path,
query: {
id: id
id: id,blank: "y"
}
});
},
......
......@@ -317,10 +317,9 @@ export default {
newArr.push(item.file);
let path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, x => {
// var str = x.res.requestUrls[0];
var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.$commonUtils.GetALiFileUrl(str);
fileObj.fileName = x.name;
fileObj.Url = this.domainManager().ViittoFileUrl + x.data.FilePath,
fileObj.fileName = x.data.FileName;
item.data.ImaArray.push(fileObj);
});
},
......
......@@ -220,10 +220,9 @@
newArr.push(item.file);
let path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, x => {
// var str = x.res.requestUrls[0];
var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.$commonUtils.GetALiFileUrl(str);
fileObj.fileName = x.name;
fileObj.Url = this.domainManager().ViittoFileUrl + x.data.FilePath,
fileObj.fileName = x.data.FileName;
item.data.ImaArray.push(fileObj);
});
},
......
......@@ -145,10 +145,9 @@
newArr.push(item.file);
let path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, x => {
// var str = x.res.requestUrls[0];
var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.$commonUtils.GetALiFileUrl(str);
fileObj.fileName = x.name;
fileObj.Url = this.domainManager().ViittoFileUrl + x.data.FilePath,
fileObj.fileName = x.data.FileName;
item.data.ImaArray.push(fileObj);
});
},
......
......@@ -371,10 +371,9 @@ export default {
newArr.push(item.file);
let path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, x => {
// var str = x.res.requestUrls[0];
var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.$commonUtils.GetALiFileUrl(str);
fileObj.fileName = x.name;
fileObj.Url = this.domainManager().ViittoFileUrl + x.data.FilePath,
fileObj.fileName = x.data.FileName;
item.data.ImaArray.push(fileObj);
});
},
......
......@@ -215,10 +215,9 @@
newArr.push(item.file);
let path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, x => {
// var str = x.res.requestUrls[0];
var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.$commonUtils.GetALiFileUrl(str);
fileObj.fileName = x.data.FilePath;
fileObj.Url = this.domainManager().ViittoFileUrl + x.data.FilePath,
fileObj.fileName = x.data.FileName;
item.data.ImaArray.push(fileObj);
});
},
......
......@@ -304,10 +304,9 @@
newArr.push(item.file);
let path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, x => {
// var str = x.res.requestUrls[0];
var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.$commonUtils.GetALiFileUrl(str);
fileObj.fileName = x.data.FilePath;
fileObj.Url = this.domainManager().ViittoFileUrl + x.data.FilePath,
fileObj.fileName = x.data.FileName;
item.data.ImaArray.push(fileObj);
});
},
......
......@@ -199,8 +199,8 @@
this.UploadSelfFileT(path, newArr, x => {
var str = x.res.requestUrls[0];
var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.$commonUtils.GetALiFileUrl(str);
fileObj.fileName = x.data.FilePath
fileObj.Url = this.domainManager().ViittoFileUrl + x.data.FilePath,
fileObj.fileName = x.data.FileName;
item.data.ImaArray.push(fileObj);
});
},
......
......@@ -548,9 +548,9 @@ export default {
newArr.push(file.file)
let path = "/Upload/activity/"
this.$message.info('上传中...')
this.uploadFile(path, newArr, x => {
this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.addMsg.image = x.res.requestUrls[0].split('?')[0]
this.addMsg.image = this.domainManager().ViittoFileUrl + x.data.FilePath
this.$message.success('上传成功');
this.$forceUpdate();
});
......
......@@ -460,10 +460,10 @@
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.uploadFile(path, newArr, x => {
this.UploadSelfFileT(path, newArr, x => {
this.saveMsg = []
this.saveMsg.push({
Path: x.name,
Path: x.data.FilePath,
FileName: file.file.name,
MD5Sign: file.file.uid,
FileSize: (file.file.size / 1024).toFixed(0),
......
......@@ -998,14 +998,13 @@ export default {
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info('上传中...')
this.uploadFile(path, newArr, x => {
console.log(x.res.requestUrls[0])
this.UploadSelfFileT(path, newArr, x => {
let fileSize = file.file.size<1024? file.file.size:(file.file.size / 1024).toFixed(0);
this.saveMsg.push({
Content: x.name,
Content: x.data.FilePath,
ID:0,
Type:fileTypeNumber,
Url:x.res.requestUrls[0].split("?")[0],
Url: this.domainManager().ViittoFileUrl + x.data.FilePath,
})
this.addMsg.VorList = this.saveMsg;
this.Success('上传成功');
......
......@@ -256,7 +256,8 @@
<div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p>
<div v-if="outItem.StaticsReportList[index].DMCNum && outItem.StaticsReportList[index].DMCNum!=''" class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.StaticsReportList[index].DMCNum}}</div>
<div v-show="outItem.StaticsReportList[index].OPRemark!=''" class="colorE95252" style="padding-top:5px;">OP备注:{{outItem.StaticsReportList[index].OPRemark}}</div>
<div v-show="outItem.StaticsReportList[index].OPInnerRemark!=''" class="colorE95252" style="padding-top:5px;">OP备注:{{outItem.StaticsReportList[index].OPInnerRemark}}</div>
<div v-show="outItem.StaticsReportList[index].OPRemark!=''" class="colorE95252" style="padding-top:5px;">OP对外备注:{{outItem.StaticsReportList[index].OPRemark}}</div>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252" style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[index].DMCRemark}}</div>
</div>
</td>
......
......@@ -2689,9 +2689,10 @@ export default {
let newArr = [];
newArr.push(file.file);
let path = "/Upload/Temporary/";
this.uploadFile(path, newArr, x => {
this.appMsg.Image.push(x.res.requestUrls[0]);
this.fileList.push({ url: x.res.requestUrls[0] });
this.UploadSelfFileT(path, newArr, x => {
let src = this.domainManager().ViittoFileUrl + x.data.FilePath
this.appMsg.Image.push(src);
this.fileList.push({ url: src});
});
},
handleRemove(file) {
......
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