Skip to content

S
SuperMan
Commit b26a7341 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 5850551e 7c6a0337
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 79 deletions
src/components/FinancialModule/invoicesManagerDetail.vue
View file @ b26a7341
......@@ -778,12 +778,12 @@
// let OrderResource = this.$route.query.InvoiceApplyType ? 10 : 8
let OrderResource = 8 //团队订
if(this.$route.query.InvoiceApplyType){
if(this.$route.query.InvoiceApplyType == 1) query2.OrderType = 8 // 团队
if(this.$route.query.InvoiceApplyType == 2) query2.OrderType = 10 // 签证
if(this.$route.query.InvoiceApplyType == 4) query2.OrderType = 12 // 机票
if(this.$route.query.InvoiceApplyType == 5) query2.OrderType = 5 // 车
if(this.$route.query.InvoiceApplyType == 6) query2.OrderType = 1 // 酒店
if(this.$route.query.InvoiceApplyType == 7) query2.OrderType = 3 // 门票
if(this.$route.query.InvoiceApplyType == 1) OrderResource = 8 // 团队
if(this.$route.query.InvoiceApplyType == 2) OrderResource = 10 // 签证
if(this.$route.query.InvoiceApplyType == 4) OrderResource = 12 // 机票
if(this.$route.query.InvoiceApplyType == 5) OrderResource = 5 // 车
if(this.$route.query.InvoiceApplyType == 6) OrderResource = 1 // 酒店
if(this.$route.query.InvoiceApplyType == 7) OrderResource = 3 // 门票
}
this.apipost(
'InvoiceApply_get_GetOrderFinanceList', {
......
src/components/Hotel/reservation/HotelOrderList.vue
View file @ b26a7341
......@@ -113,7 +113,7 @@
<el-input type="Number" v-model="msg.orderId" :placeholder="$t('OrderList.search.orderId')" class="w200"/>
</span>
</li> -->
<!-- <li>
<span>
<em>{{$t('OrderList.search.orderType')}}</em>
......@@ -205,7 +205,7 @@
},
watch: {
pagesTitle(val,oldval){
}
},
methods: {
......@@ -337,7 +337,8 @@
PlatformMoney:item.PlatformMoney,
HandFittingIncome: item.HandFittingIncome,
HandFittingTax: item.HandFittingTax,
DueInMoney:item.DueInMoney
DueInMoney:item.DueInMoney,
...item
}
item.list.push(datas)
})
......
src/components/Hotel/reservation/OrderList.vue
View file @ b26a7341
......@@ -562,7 +562,8 @@
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
</template>
</el-table-column>
<el-table-column v-if="(scope.row.SellCommission&&scope.row.SellCommission>0)||(scope.row.OPCommission&&scope.row.OPCommission>0)" label="提成" style="background:#EAEAEA">
<el-table-column v-if="(scope.row.SellCommission&&scope.row.SellCommission>0)||(scope.row.OPCommission&&scope.row.OPCommission>0)"
label="提成" style="background:#EAEAEA">
<template slot-scope="scope">
<div class="width100-float-l" v-if="scope.row.SellCommission&&scope.row.SellCommission>0"><span class="float-l">销售：</span>
<commissionDialog :objNew="scope.row" :OP="0"></commissionDialog>
......
src/components/SalesVisa/components/visaOrderList.vue
View file @ b26a7341
......@@ -650,7 +650,8 @@
</template>
</el-table-column>
<el-table-column label="提成" style="background:#EAEAEA"
v-if="(scope.row.commissionMoney&&scope.row.commissionMoney>0)||(scope.row.opCommission&&scope.row.opCommission>0)">
v-if="(scope.row.commissionMoney&&scope.row.commissionMoney>0)||(scope.row.opCommission&&scope.row.opCommission>0)"
min-width="100">
<template slot-scope="scope">
<div class="width100-float-l" v-if="scope.row.commissionMoney&&scope.row.commissionMoney>0">
<span class="float-l">销售：<span class="cF1416C">￥</span></span>
......
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @ b26a7341
......@@ -127,15 +127,21 @@
</td>
<td width="80">
{{subItem.LeaderCommission}}
<span v-if="subItem.LeaderCommission>0&&subItem.LeaderCommissionFrId" style="color:red;text-decoration: underline;cursor:pointer;" @click="goUrlFinancial('财务单据','FinancialDocumentsDetail',subItem.LeaderCommissionFrId)"> {{subItem.LeaderCommissionFrId}}</span>
</td>
<td width="80">
{{subItem.GuideCommission}}
<span v-if="subItem.GuideCommission>0&&subItem.GuideCommissionFrId" style="color:red;text-decoration: underline;cursor:pointer;" @click="goUrlFinancial('财务单据','FinancialDocumentsDetail',subItem.GuideCommissionFrId)"> {{subItem.GuideCommissionFrId}}</span>
</td>
<td width="80">
{{subItem.PICCommission}}
<span v-if="subItem.PICCommission>0&&subItem.CompanyCommissionFrId" style="color:red;text-decoration: underline;cursor:pointer;" @click="goUrlFinancial('财务单据','FinancialDocumentsDetail',subItem.CompanyCommissionFrId)"> {{subItem.CompanyCommissionFrId}}</span>
</td>
<td width="80">
{{subItem.CompanyCommission}}
<span v-if="subItem.CompanyCommission>0&&subItem.PICCommissionFrId" style="color:red;text-decoration: underline;cursor:pointer;" @click="goUrlFinancial('财务单据','FinancialDocumentsDetail',subItem.PICCommissionFrId)"> {{subItem.PICCommissionFrId}}</span>
</td>
<td width="80" :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'>
{{subItem.OtherDeduct}}
......@@ -398,6 +404,10 @@
}
});
},
goUrlFinancial: function (name, path, id ) {
this.$router.push({ name: path, query: { id: id, blank: 'y', tab: name} });
},
goUrl(path, obj, title) {
this.$router.push({
name: path,
......
src/components/busManagement/BookAcar/components/BookAcarOrder.vue
View file @ b26a7341
......@@ -117,8 +117,8 @@
</el-date-picker>
</span>
</li>
<li>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="msg.pageIndex=1,currentPage=1,GetList()" />
</li>
......
src/components/confirmationOrderDownLoadNew.vue
View file @ b26a7341
......@@ -533,16 +533,15 @@
// 生成pdf
toPDF_2023: function () {
this.pdfLoading = true;
var that = this;
let urlObj = this.domainManager();
let msg = this.getPostMsg();
var title = this.orderMsg.startDate + this.orderMsg.lineteamName+this.orderMsg.dayNum+'日游';
var title = this.orderMsg.startDate + this.orderMsg.lineteamName + this.orderMsg.dayNum + '日游';
//欧洲
if(this.dataAll.lineId==168||this.dataAll.lineId==119)
{
title =this.orderMsg.startDate+ this.dataAll.title;
if (this.dataAll.lineId == 168 || this.dataAll.lineId == 119) {
title = this.orderMsg.startDate + this.dataAll.title;
}
var fileName = title + ".pdf";
console.log("fileNmae",fileName);
if (this.orderId && this.orderId > 0) {
//出团通知书下载
this.pdfDownLoad(fileName, msg);
......@@ -554,12 +553,12 @@
var objFileKey = "TripDownLoad"
objFileKey += "/" + msg.configId + "_" + msg.tcid;
objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf";
this.downloadChengDuFileRename(objFileKey, fileName, res => {
that.downloadChengDuFileRename(objFileKey, fileName, res => {
console.log("ali_doanload", res)
if (res.resultCode == 0) {
this.pdfDownLoad(fileName, msg);
that.pdfDownLoad(fileName, msg);
} else {
this.pdfLoading = false;
that.pdfLoading = false;
}
})
}
......
src/components/myOrdersAllType/components/OrderList.vue
View file @ b26a7341
<template>
<div>
<div class="myAllTypeOrder">
<div v-if="pagesTitle=='申请'||pagesTitle=='审核'" v-for="(item,index) in OrderList">
<el-table
border
......@@ -19,7 +19,7 @@
]"
>
<el-table-column
width="140"
width="130"
prop="CreateTimeStr"
label="订单Id"
fixed="left"
......@@ -41,7 +41,7 @@
</template>
</el-table-column>
<el-table-column
width="170"
width="180"
prop="CreateTimeStr"
label="团号"
show-overflow-tooltip
......@@ -124,14 +124,14 @@
prop="PreferTipAmount"
label="人头小费"
min-width="110"
min-width="100"
>
</el-table-column>
<el-table-column
prop="PlatformTax"
label="手续费"
min-width="100"
min-width="90"
>
</el-table-column>
<el-table-column prop="Refund" label="退款"> </el-table-column>
......@@ -145,10 +145,9 @@
</template>
</el-table-column>
<el-table-column
prop="OrderProfit"
label="预期利润"
min-width="110"
min-width="100"
>
<template slot-scope="scope">
<span :class="{ red: scope.row.OrderProfit > 0 }">{{
......@@ -223,6 +222,7 @@
prop="StateName"
label="状态"
show-overflow-tooltip
min-width="70"
>
<template slot-scope="scope">
<span>{{ scope.row.StateName }}</span>
......@@ -277,7 +277,9 @@
</template>
</template>
</el-table-column>
<template slot="append" v-if="pagesTitle == '审核'||pagesTitle == '申请'">
<template slot="append" v-if="(pagesTitle == '审核'||pagesTitle == '申请')
&&(item.SaleRemarks||item.OP_Remarks||item.ApplyForState
||(userInfo.EmployeeId==1&&item.ManagerExamineName))">
<div style="padding:10px;">
<div>
<p style="font-size: 13px;" v-if="item.SaleRemarks">
......@@ -293,8 +295,9 @@
}}</span>
</p>
</div>
<div style="margin-top: 10px;">
<template v-if="pagesTitle == '审核'||pagesTitle == '申请'">
<div style="margin-top: 10px;" v-if="item.ApplyForState
||(item.ApplyForState==1&&item.ManagerExamineName)
||(userInfo.EmployeeId==1&&item.ManagerExamineName)">
<template v-if="item.ApplyForState">
<span>
申请改价金额：<span style="color: red;">{{item.ApplyForMoney}}</span>
......@@ -303,7 +306,7 @@
申请理由：<span style="color: red;">{{item.ApplyForReason}}</span>
</span>
</template>
<span style="margin-left: 20px;" v-if="item.ApplyForState==1">
<span style="margin-left: 20px;" v-if="item.ApplyForState==1&&item.ManagerExamineName">
<span style="color: red;">待主管 {{item.ManagerExamineName}} 审核</span>
</span>
<span v-if="pagesTitle=='审核'" style="margin-left: 20px;">
......@@ -328,7 +331,6 @@
<span v-if="item.ManagerExamineName" style="color: red;">{{item.ManagerExamineName }}</span>
<span v-if="item.ManagerExamineTimeStr">/ {{item.ManagerExamineTimeStr}}</span>
</span>
</template>
</div>
</div>
</template>
......@@ -353,7 +355,7 @@
]"
>
<el-table-column
width="140"
width="130"
prop="CreateTimeStr"
label="订单Id"
fixed="left"
......@@ -375,7 +377,7 @@
</template>
</el-table-column>
<el-table-column
width="170"
width="180"
prop="CreateTimeStr"
label="团号"
show-overflow-tooltip
......@@ -458,14 +460,14 @@
sortable
prop="PreferTipAmount"
label="人头小费"
min-width="110"
min-width="100"
>
</el-table-column>
<el-table-column
sortable
prop="PlatformTax"
label="手续费"
min-width="100"
min-width="90"
>
</el-table-column>
<el-table-column sortable prop="Refund" label="退款"> </el-table-column>
......@@ -482,7 +484,7 @@
sortable
prop="OrderProfit"
label="预期利润"
min-width="110"
min-width="100"
>
<template slot-scope="scope">
<span :class="{ red: scope.row.OrderProfit > 0 }">{{
......@@ -557,6 +559,7 @@
prop="StateName"
label="状态"
show-overflow-tooltip
min-width="70"
>
<template slot-scope="scope">
<span>{{ scope.row.StateName }}</span>
......@@ -629,23 +632,25 @@
</button>
</div>
<el-form label-width="100px">
<el-col :span="4">
<el-form-item label="应收总金额" prop="">
<el-input
type="number"
v-model="changePriceMsg.Money"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="改价原因" prop="">
<el-input
type="textarea"
v-model="changePriceMsg.ApplyForReason"
autosize
></el-input>
</el-form-item>
</el-col>
<el-row>
<el-col :span="4">
<el-form-item label="应收总金额" prop="">
<el-input
type="number"
v-model="changePriceMsg.Money"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="改价原因" prop="">
<el-input
type="textarea"
v-model="changePriceMsg.ApplyForReason"
autosize
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
......@@ -1547,4 +1552,10 @@ export default {
.text-center {
text-align: center;
}
/deep/.myAllTypeOrder .el-table th.el-table__cell{
background-color: #f5f7fa !important;
}
/deep/.myAllTypeOrder .el-table__fixed-right::before, /deep/.myAllTypeOrder .el-table__fixed::before{
background-color: rgba(23,23,23,0) !important;
}
</style>
src/components/orderCommon/order-form2.vue
View file @ b26a7341
......@@ -553,7 +553,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" style="display: none;">
<el-col :span="4">
<!--交易方式-->
<el-form-item :label="$t('tips.jiaoyifangshi')" prop="TradeWay"
v-show="addMsg.ClientSource == 1 || addMsg.ClientSource == 4">
......
src/components/scenicSpot/reservation/ReservationOrder.vue
View file @ b26a7341
......@@ -3,12 +3,12 @@
display: flex;
flex-direction: column;
}
.listone-box,
.listtwo-card {
margin-top: 15px;
}
.listone-form {
padding: 10px;
border-radius: 5px;
......@@ -19,7 +19,7 @@
margin-bottom: 10px;
overflow: hidden;
}
.listone-img {
width: 130px;
flex-shrink: 0;
......@@ -27,7 +27,7 @@
border-radius: 5px;
display: block;
}
.listone-list {
flex-grow: 1;
display: flex;
......@@ -44,40 +44,40 @@
margin-bottom: 5px;
cursor: pointer;
}
.list-left div {
color: #7E8299;
font-size: 13px;
margin-top: 7px;
}
.list-left div a {
color: #009EF7;
font-size: 12px;
margin-left: 15px;
cursor: pointer;
}
.list-right {
flex-shrink: 1;
margin-left: 15px;
}
.list-right p {
margin-bottom: 10px;
}
.list-right p b {
font-size: 18px;
color: #F1416C;
}
.list-right p span {
color: #8A8C9F;
font-size: 12px;
margin-left: 10px;
}
.listtwo-form {
height: 100%;
display: flex;
......@@ -86,11 +86,11 @@
background: #ffffff;
border-radius: 5px;
}
.card-centent {
padding: 10px;
}
.card-centent p {
color: #7E8299;
white-space: nowrap;
......@@ -98,34 +98,34 @@
text-overflow: ellipsis;
font-size: 13px;
}
.card-text {
margin-top: 20px;
display: flex;
justify-content: space-between;
align-items: inherit;
}
.card-text b {
font-size: 14px;
}
.card-form {
display: flex;
align-items: inherit;
flex-wrap: wrap;
}
.listtwo-col {
margin-bottom: 15px;
}
.listtwo-img {
height: 200px;
border-radius: 5px;
display: block;
}
.iconfont {
cursor: pointer;
background-color: #E95252;
......@@ -138,7 +138,7 @@
border-radius: 50%;
margin-left: 10px;
}
.image-slot {
height: 100%;
display: flex;
......@@ -336,7 +336,7 @@ export default {
}, err => {})
},
getDatesUse() {
if(this.DatelistUse){
if(this.DatelistUse){
if (this.DatelistUse[0]) {
this.msg.UseSTime = this.DatelistUse[0]
} if (this.DatelistUse[1]) {
......@@ -426,7 +426,7 @@ export default {
addList(data)
data.forEach((x) => {
// x.Money = 0
let Money = 0
x.DetailList.forEach((y) => {
Money+=y.Money
......@@ -442,7 +442,8 @@ export default {
PlatformTax: item.PlatformTax,
Refund: item.Refund,
PlatformMoney: item.PlatformMoney,
DueInMoney: item.DueInMoney
DueInMoney: item.DueInMoney,
...item
}
let DaiShou
DaiShou = Number(item.Money-item.Income-item.PlatformTax-item.PlatformMoney+item.Refund)
......
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