Skip to content

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

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

parents c3164d9a bdc2b803
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 20 deletions
src/components/Hotel/reservation/OrderList.vue
View file @ eb6bd286
......@@ -524,7 +524,7 @@
}}</span>
</template>
</el-table-column> -->
<el-table-column label="毛利" min-width="100">
<el-table-column label="利润" min-width="100">
<template slot-scope="scope">
<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>
......
src/components/Hotel/reservation/correlationOP.vue
View file @ eb6bd286
<template>
<el-dialog title="关联OP" width="400px" :visible.sync="isShow" center @close="close">
<el-dialog :title="Title" width="400px" :visible.sync="isShow" center @close="close">
<el-form class="cdForm" label-width="90px" :model="msg" :rules="rules" ref="msg">
<template v-if="CorrelationObj.TypeNum!=4">
<el-form-item label="OP" prop="OpEmpId">
<el-select filterable v-model='msg.OpEmpId' placeholder="请选择OP">
<el-option v-for='item in EmployeeList'
......@@ -10,6 +11,12 @@
</el-option>
</el-select>
</el-form-item>
</template>
<template v-else>
<el-form-item label="总价" prop="Money">
<el-input v-model='msg.Money' placeholder="请输入总金额"></el-input>
</el-form-item>
</template>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="close">{{$t('pub.cancelBtn')}}</button>
......@@ -27,9 +34,11 @@
},
data() {
return {
Title: '',
msg:{
OrderId: 0,
OpEmpId: null,
Money: 0
},
rules:{
OpEmpId: [{
......@@ -37,6 +46,11 @@
message: '请选择需要关联的OP',
trigger: 'change'
}],
Money: [{
required: true,
message: '请输入总金额',
trigger: 'blur'
}],
},
employeeMsg:{ // 员工
GroupId:'',
......@@ -55,6 +69,12 @@
this.CorrelationObj = newValue
this.msg.OrderId = newValue.OrderId
this.msg.OpEmpId = newValue.OpEmpId?newValue.OpEmpId:null
if(newValue.TypeNum==4){
this.msg.Money = newValue.Money
this.Title = '编辑总金额'
}else{
this.Title = '关联OP'
}
},
deep:true,
},
......@@ -67,12 +87,18 @@
mounted() {
this.msg.OrderId = this.CorrelationObj.OrderId
this.msg.OpEmpId = this.CorrelationObj.OpEmpId?this.CorrelationObj.OpEmpId:null
if(this.CorrelationObj.TypeNum==4){
this.msg.Money = this.CorrelationObj.Money
this.Title = '修改总价'
}else{
this.Title = '关联OP'
}
this.getEmployee()
},
methods: {
sureBtn(){
let url
let msg
if(this.CorrelationObj.TypeNum==1){
url = 'dict_post_SetCustomerOrderOP'
}
......@@ -82,10 +108,23 @@
if(this.CorrelationObj.TypeNum===3){
url = 'CarSingle_post_SetCarOrderOP'
}
if(this.CorrelationObj.TypeNum===4){
msg = {
OrderId: this.msg.OrderId,
Money: this.msg.Money
}
url = 'ticket_post_SetTicketOrderMoney'
}else{
msg = {
OrderId: this.msg.OrderId,
OpEmpId: this.msg.OpEmpId
}
}
this.$refs['msg'].validate((valid) => {
if (valid) {
this.apipost(url, this.msg, res => {
this.apipost(url, msg, res => {
if(res.data.resultCode == 1) {
this.$emit('success')
}
......
src/components/SingleAirTicket/components/OrderList.vue
View file @ eb6bd286
......@@ -675,7 +675,7 @@
<span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
</template>
</el-table-column>
<el-table-column label="毛利" min-width="100">
<el-table-column label="利润" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?scope.row.Income-scope.row.CostMoney-scope.row.Refund:'-' }}</span>
</template>
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ eb6bd286
......@@ -339,10 +339,8 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in auditList">
<tr
v-if="NotExists(item.CostTypeList,'领队奖励金')&&NotExists(item.CostTypeList,'机票折让费')&&NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费（领取）') && NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿') && NotExists(item.CostTypeList,'保险费') && NotExists(item.CostTypeList,'旅游责任险')&& NotExists(item.CostTypeList,'团队保险')">
<tr>
<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>
......@@ -374,12 +372,12 @@
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">收入</div>
<template v-if="IsHaveAuth">
<div v-if="IsHaveAuth" style="padding: 5px 0 0 0;">
<input type="button" value="团队小费" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn"
@click="AddTipDiv" />
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn"
@click="AddIncomeDetail" />
</template>
</div>
</div>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">团费收入：
......@@ -1744,7 +1742,7 @@
if(res.data.resultCode == 1) {
let data = res.data.data.pageData.list;
this.auditList = data
this.auditCoun = res.data.data.count;
this.auditCoun = this.auditList.length>0?this.auditList.length:0;
}else{
this.loading= false;
......
src/components/busManagement/BookAcar/components/orderList.vue
View file @ eb6bd286
......@@ -571,7 +571,7 @@
<span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
</template>
</el-table-column>
<el-table-column label="毛利" min-width="100">
<el-table-column label="利润" min-width="100">
<template slot-scope="scope">
<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>
......
src/components/busManagement/BookAcar/components/tripBusOrderList.vue
View file @ eb6bd286
......@@ -535,7 +535,7 @@
<span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
</template>
</el-table-column>
<el-table-column label="毛利" min-width="100">
<el-table-column label="利润" min-width="100">
<template slot-scope="scope">
<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>
......
src/components/scenicSpot/reservation/OrderList.vue
View file @ eb6bd286
......@@ -611,7 +611,12 @@
<span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
</template>
</el-table-column>
<el-table-column label="毛利" min-width="100">
<el-table-column label="待收" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold" :class="{'cF1416C':(item.Money-scope.row.Income-scope.row.PlatformTax+scope.row.Refund).toFixed(2)!=0}">{{ (item.Money-scope.row.Income-scope.row.PlatformTax+scope.row.Refund).toFixed(2)}}</span>
</template>
</el-table-column>
<el-table-column label="利润" min-width="100">
<template slot-scope="scope">
<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>
......@@ -750,7 +755,7 @@
<span class="fz12 c9e">订单总金额</span>
<div class="ml">
<span class="fz15 fbold">{{ item.Money.toFixed(2) }}</span>
<span class="fz12 ml">{{ item.CurrencyName }}</span>
<span class="fz12">{{ item.CurrencyName }}</span>
</div>
</div>
<div
......@@ -827,6 +832,14 @@
>
<span class="c059FF6">编辑关联OP</span>
</div>
<div
v-if="item.OrderStatus != 3
&&pagesTitle=='OP'"
class="row-c cursor-pointer radius5 change py5"
@click="clickCorrelation(item,2)"
>
<span class="c059FF6">编辑总金额</span>
</div>
<!-- <template v-if="item.OrderStatus==2">
<div class="column-jac fz12 flex-s c20C997">
<div class="mb5">已支付</div>
......@@ -985,7 +998,7 @@
</el-dialog>
<offset :isShow="cdState" :obj="queryObj" @close="cdState=false"></offset>
<correlationOP :isShowCorrelation="isShowCorrelation" :CorrelationObj="CorrelationObj"
@close="isShowCorrelation=false"
@close="close"
@success="success"></correlationOP>
</div>
</template>
......@@ -1128,14 +1141,20 @@ export default {
methods: {
close(){
this.isShowCorrelation = false
this.CorrelationObj.TypeNum=null
},
success(){
this.CorrelationObj.TypeNum=null
this.close()
this.$emit('success')
},
clickCorrelation(item,type){
this.CorrelationObj = item
this.CorrelationObj.TypeNum = 2
if(type==2){
this.CorrelationObj.TypeNum = 4 //编辑总价
}else{
this.CorrelationObj.TypeNum = 2
}
this.isShowCorrelation = true
},
isOffset(row, index, num){
......
src/components/scenicSpot/reservation/ReservationOrder.vue
View file @ eb6bd286
......@@ -302,6 +302,7 @@ export default {
{ Name: '自行取票', ID: '1' },
{ Name: '邮寄票券', ID: '2' },
// {Name: '已邮寄票券',ID:'3'},
{Name: '电子券',ID:'4'},
],
orderType: [
{ Name: this.$t('OrderList.orderType.tour'), ID: '1' },
......@@ -423,12 +424,12 @@ export default {
}
addList(data)
data.forEach((x) => {
x.Money = 0
// x.Money = 0
let Money = 0
x.DetailList.forEach((y) => {
Money+=y.Money
})
x.Money= Number(Money+x.MailingMoney)
// x.Money= Number(Money+x.MailingMoney)
})
this.OrderList = data;
......
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