Skip to content

S
SuperMan
Commit 5b209b00 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

no message

parent 51edc946
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 18 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 5b209b00
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
<template> <template>
<div class="page_bdm" v-if="GetDetail" v-loading="loading"> <div class="page_bdm" v-if="GetDetail" v-loading="loading">
<p class="_tit">{{GetDetail.FinanceName}}</p> <p class="_tit">{{GetDetail.FinanceName}} <span style="color: red;" v-if="GetDetail.Status==4">已作废</span></p>
<div class="_conten"> <div class="_conten">
<template v-if="!otherTable"> <template v-if="!otherTable">
<template v-if="GetDetail.Type!==1 && GetDetail.Type!==7 && GetDetail.Type!=4 && showModel"> <template v-if="GetDetail.Type!==1 && GetDetail.Type!==7 && GetDetail.Type!=4 && showModel">
...@@ -1259,14 +1259,15 @@ ...@@ -1259,14 +1259,15 @@
</div> </div>
</template> </template>
</div> </div>
<div style="padding-left: 75px;" v-if="GetDetail.Status!=2"> <p style="color: red;" v-if="GetDetail.Status==4">该单据已作废，无法审核</p>
<template> <div style="padding-left: 75px;" v-if="GetDetail.Status!=2 ">
<template v-if="GetDetail.Status!=4">
<button class="normalBtn" @click="AuditOrRefund()">保存</button> <button class="normalBtn" @click="AuditOrRefund()">保存</button>
</template> </template>
<button class="hollowFixedBtn" @click="ReturnBack()">返回</button> <button class="hollowFixedBtn" @click="ReturnBack()">返回</button>
<!--<template v-if="AuditOrRefundMsg.Status !== '3'" v-for="step in GetDetail.AuditSteps">--> <!--<template v-if="AuditOrRefundMsg.Status !== '3'" v-for="step in GetDetail.AuditSteps">-->
<template v-for="step in GetDetail.AuditSteps"> <template v-for="step in GetDetail.AuditSteps">
<template v-if="step.NextStep === 1 && (step.SpecialNode === 2 || step.SpecialNode === 1 || RB_Post_Id==168)"> <template v-if="step.NextStep === 1 && (step.SpecialNode === 2 || step.SpecialNode === 1 || RB_Post_Id==168) && GetDetail.Status!=4">
<button class="normalBtn" @click="zanCun()" style="position: relative;left: 560px;">暂存</button> <button class="normalBtn" @click="zanCun()" style="position: relative;left: 560px;">暂存</button>
</template> </template>
</template> </template>
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 5b209b00
...@@ -556,8 +556,8 @@ ...@@ -556,8 +556,8 @@
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr> <tr>
<th>预付合计</th>
<th width="140">团号</th> <th width="140">团号</th>
<th>预付合计</th>
<th>实际领款</th> <th>实际领款</th>
<th>财务单号</th> <th>财务单号</th>
<th>操作</th> <th>操作</th>
...@@ -610,7 +610,11 @@ ...@@ -610,7 +610,11 @@
<th :colspan="7"> <th :colspan="7">
<span>追加团款</span> <span>追加团款</span>
</th> </th>
<th :colspan="1"><input type="button" value="制单" class="leader2Btn" @click="ZhuiJiaTuanKuan()"></th> <th :colspan="1" width="200">
<div v-for="item in nav" style="margin: 10px 0;">
<input type="button" :value="`${item.TCNUMS} 制单`" class="leader2Btn" @click="ZhuiJiaTuanKuan(item.OutBranchId)">
</div>
</th>
</tr> </tr>
<tr> <tr>
<th>单号</th> <th>单号</th>
...@@ -816,7 +820,7 @@ ...@@ -816,7 +820,7 @@
} }
}, err => {}) }, err => {})
}, },
ZhuiJiaTuanKuan() { ZhuiJiaTuanKuan(companyID) {
let TCIDARR = [this.$route.query.id] let TCIDARR = [this.$route.query.id]
let orderObj = { let orderObj = {
OrderID: 0, OrderID: 0,
...@@ -831,7 +835,7 @@ ...@@ -831,7 +835,7 @@
name: 'ChoiceAddFinancialDocuments', name: 'ChoiceAddFinancialDocuments',
query: { query: {
"Type": 2, "Type": 2,
"companyID": '', "companyID": companyID,
"path": "", "path": "",
'blank': 'y', 'blank': 'y',
'orderObj': JSON.stringify(orderObj), 'orderObj': JSON.stringify(orderObj),
......
src/components/SalesModule/enrollTotal.vue
View file @ 5b209b00
...@@ -338,7 +338,12 @@ ...@@ -338,7 +338,12 @@
<td colspan="16" class="RL_Order" style="height:20px"> <td colspan="16" class="RL_Order" style="height:20px">
<span style="font-size: 14px;color: #333333">名单:</span> <span style="font-size: 14px;color: #333333">名单:</span>
<span v-for="(childItem) in item.guestList" style="font-size: 14px;color: blue">{{childItem.userName}}&nbsp;&nbsp;</span> <span v-for="(childItem) in item.guestList" style="font-size: 14px;color: blue">{{childItem.userName}}&nbsp;&nbsp;</span>
<!-- <span v-else>暂无名单</span>--> <p v-if="item.cancelGuestList && item.cancelGuestList.length>0">
<span class="" >取消名单:</span>
<span class="RL-redType RL-remarkCon">
<span style="color: red;" v-for="(childItem) in item.cancelGuestList">{{childItem.userName}} &nbsp;&nbsp;</span>
</span>
</p>
<span style="display: block;font-size: 14px;color: #333333">房间信息<span v-if="item.oneSex>0" style="color: #e95252">（{{item.oneSex==1?'单男':'单女'}}）</span>：{{item.orderGuestHouseStr}}</span> <span style="display: block;font-size: 14px;color: #333333">房间信息<span v-if="item.oneSex>0" style="color: #e95252">（{{item.oneSex==1?'单男':'单女'}}）</span>：{{item.orderGuestHouseStr}}</span>
</td> </td>
</tr> </tr>
......
src/components/SalesModule/groupTourOrder.vue
View file @ 5b209b00
...@@ -1823,9 +1823,15 @@ ...@@ -1823,9 +1823,15 @@
<td colspan="17" class="RL_Order" style="height:20px"> <td colspan="17" class="RL_Order" style="height:20px">
<span class="RL-remarkTitle" v-if="item.guestList.length>0">名单:</span> <span class="RL-remarkTitle" v-if="item.guestList.length>0">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0"> <span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0">
<span v-for="(childItem) in item.guestList">{{childItem.userName}} <span v-if="childItem.isApplyPhoto == 1" style="color:red">(照)</span> &nbsp;&nbsp;</span> <span v-for="(childItem) in item.guestList" style="color: blue">{{childItem.userName}} <span v-if="childItem.isApplyPhoto == 1" style="color:red">(照)</span> &nbsp;&nbsp;</span>
<span v-if="item.photoNum>0">（照片一人 {{item.photoNum}}份）</span> <span v-if="item.photoNum>0">（照片一人 {{item.photoNum}}份）</span>
</span> </span>
<p v-if="item.cancelGuestList.length>0">
<span class="" >取消名单:</span>
<span class="RL-redType RL-remarkCon">
<span style="color: red;" v-for="(childItem) in item.cancelGuestList">{{childItem.userName}} &nbsp;&nbsp;</span>
</span>
</p>
<span style="display: block">房间信息<span v-if="item.oneSex>0" style="color: #e95252">（{{item.oneSex==1?'单男':'单女'}}）</span>：{{item.orderGuestHouseStr}}</span> <span style="display: block">房间信息<span v-if="item.oneSex>0" style="color: #e95252">（{{item.oneSex==1?'单男':'单女'}}）</span>：{{item.orderGuestHouseStr}}</span>
<div> <div>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 5b209b00
...@@ -2121,9 +2121,15 @@ ...@@ -2121,9 +2121,15 @@
v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">名单:</span> v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">名单:</span>
<span class="RL-redType RL-remarkCon" <span class="RL-redType RL-remarkCon"
v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) "> v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">
<span v-for="(childItem) in item.guestList">{{childItem.userName}}<span v-if="childItem.isApplyPhoto == 1" style="color:red">(照)</span>&nbsp;&nbsp;</span> <span v-for="(childItem) in item.guestList" style="color: blue">{{childItem.userName}}<span v-if="childItem.isApplyPhoto == 1" style="color:red">(照)</span>&nbsp;&nbsp;</span>
<span v-if="item.photoNum>0">（照片一人 {{item.photoNum}}份）</span> <span v-if="item.photoNum>0">（照片一人 {{item.photoNum}}份）</span>
</span> </span>
<p v-if="item.cancelGuestList && item.cancelGuestList.length>0">
<span class="" >取消名单:</span>
<span class="RL-redType RL-remarkCon">
<spa style="color: red;"n v-for="(childItem) in item.cancelGuestList">{{childItem.userName}} &nbsp;&nbsp;</spa>
</span>
</p>
<!-- <span class="RL-redType RL-remarkCon" v-else>--> <!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>--> <!-- <span>暂无名单</span>-->
<!-- </span>--> <!-- </span>-->
...@@ -2461,9 +2467,15 @@ ...@@ -2461,9 +2467,15 @@
v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">名单:</span> v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">名单:</span>
<span class="RL-redType RL-remarkCon" <span class="RL-redType RL-remarkCon"
v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) "> v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">
<span v-for="(childItem) in item.guestList">{{childItem.userName}}<span v-if="childItem.isApplyPhoto == 1" style="color:red">(照)</span>&nbsp;&nbsp;</span> <span v-for="(childItem) in item.guestList" style="color: blue">{{childItem.userName}}<span v-if="childItem.isApplyPhoto == 1" style="color:red">(照)</span>&nbsp;&nbsp;</span>
<span v-if="item.photoNum>0">（照片一人 {{item.photoNum}}份）</span> <span v-if="item.photoNum>0">（照片一人 {{item.photoNum}}份）</span>
</span> </span>
<p v-if="item.cancelGuestList && item.cancelGuestList.length>0">
<span class="" >取消名单:</span>
<span class="RL-redType RL-remarkCon">
<spa style="color: red;"n v-for="(childItem) in item.cancelGuestList">{{childItem.userName}} &nbsp;&nbsp;</spa>
</span>
</p>
<span style="display: block">房间信息<span v-if="item.oneSex>0" <span style="display: block">房间信息<span v-if="item.oneSex>0"
style="color: #e95252">（{{item.oneSex==1?'单男':'单女'}}）</span>：{{item.orderGuestHouseStr}}</span> style="color: #e95252">（{{item.oneSex==1?'单男':'单女'}}）</span>：{{item.orderGuestHouseStr}}</span>
<span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span> <span v-if="item.tipMoney" style="color:red">（小费：{{item.tipMoney}}）</span>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 5b209b00
...@@ -1756,7 +1756,7 @@ ...@@ -1756,7 +1756,7 @@
@click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'> @click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'>
设置额外金额</div> 设置额外金额</div>
<div @click="SetShouSunClick(item.OrderId,item.GuestNum)">设置收损金额</div> <div @click="SetShouSunClick(item.OrderId,item.GuestNum)">设置收损金额</div>
<div @click="ZhuiJiaTuanKuan(item.OrderId)">追加团款</div> <div @click="ZhuiJiaTuanKuan(item.OrderId)" v-if="RBBranchId == 0">追加团款</div>
<div @click='deleteItem(item)'>删除</div> <div @click='deleteItem(item)'>删除</div>
</div> </div>
<el-button slot="reference" type="primary" <el-button slot="reference" type="primary"
...@@ -1774,6 +1774,12 @@ ...@@ -1774,6 +1774,12 @@
<span style="color:blue !important" v-for="(childItem) in item.GuestList" <span style="color:blue !important" v-for="(childItem) in item.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span> @click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
</p> </p>
<p v-if="item.CancelGuestList.length>0">
<span class="" >取消名单:</span>
<span class="RL-redType RL-remarkCon">
<span v-for="(childItem) in item.CancelGuestList">{{childItem.userName}} &nbsp;&nbsp;</span>
</span>
</p>
<!-- <p class="RL-redType RL-remarkCon" v-else>--> <!-- <p class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>--> <!-- <span>暂无名单</span>-->
<!-- </p>--> <!-- </p>-->
...@@ -2046,7 +2052,7 @@ ...@@ -2046,7 +2052,7 @@
设置额外金额</div> 设置额外金额</div>
<div @click="SetShouSunClick(childItem.OrderId, childItem.GuestNum)">设置收损金额</div> <div @click="SetShouSunClick(childItem.OrderId, childItem.GuestNum)">设置收损金额</div>
<div @click="lianyunFY(childItem)">联运返佣</div> <div @click="lianyunFY(childItem)">联运返佣</div>
<div @click="ZhuiJiaTuanKuan(childItem.OrderId)">追加团款</div> <div @click="ZhuiJiaTuanKuan(childItem.OrderId)" v-if="RBBranchId == 0">追加团款</div>
<div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'" <div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
@click='deleteItem(childItem)'> @click='deleteItem(childItem)'>
删除 删除
...@@ -2069,6 +2075,12 @@ ...@@ -2069,6 +2075,12 @@
<span style="color:blue !important" v-for="(fourthItem) in childItem.GuestList" <span style="color:blue !important" v-for="(fourthItem) in childItem.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,fourthItem.OrderId,'旅客名单')">{{fourthItem.userName}}</span> @click="goUrl('TravelPassengerList',msg.TCID,fourthItem.OrderId,'旅客名单')">{{fourthItem.userName}}</span>
</span> </span>
<p v-if="childItem.CancelGuestList.length>0">
<span class="" >取消名单:</span>
<span class="RL-redType RL-remarkCon">
<span v-for="(subItem) in childItem.CancelGuestList">{{subItem.userName}} &nbsp;&nbsp;</span>
</span>
</p>
<!-- <span class="RL-redType RL-remarkCon" v-else>--> <!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>--> <!-- <span>暂无名单</span>-->
<!-- </span>--> <!-- </span>-->
...@@ -2403,7 +2415,7 @@ ...@@ -2403,7 +2415,7 @@
@click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'> @click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'>
设置额外金额</div> 设置额外金额</div>
<div @click="SetShouSunClick(item.OrderId, item.GuestNum)">设置收损金额</div> <div @click="SetShouSunClick(item.OrderId, item.GuestNum)">设置收损金额</div>
<div @click="ZhuiJiaTuanKuan(item.OrderId)">追加团款</div> <div @click="ZhuiJiaTuanKuan(item.OrderId)" v-if="RBBranchId == 0">追加团款</div>
<div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div> <div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div>
</div> </div>
<el-button slot="reference" type="primary" <el-button slot="reference" type="primary"
...@@ -2421,6 +2433,12 @@ ...@@ -2421,6 +2433,12 @@
<span style="color:blue !important" v-for="(childItem) in item.GuestList" <span style="color:blue !important" v-for="(childItem) in item.GuestList"
@click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span> @click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
</span> </span>
<p v-if="item.CancelGuestList.length>0">
<span class="" >取消名单:</span>
<span class="RL-redType RL-remarkCon">
<span style="color: red;" v-for="(childItem) in item.CancelGuestList">{{childItem.userName}} &nbsp;&nbsp;</span>
</span>
</p>
<!-- <span class="RL-redType RL-remarkCon" v-else>--> <!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>--> <!-- <span>暂无名单</span>-->
<!-- </span>--> <!-- </span>-->
...@@ -2808,14 +2826,14 @@ ...@@ -2808,14 +2826,14 @@
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
<el-dialog custom-class='w350' title="追加团款" :visible.sync="zhuijiaShow" center> <el-dialog custom-class='w450' title="追加团款" :visible.sync="zhuijiaShow" center>
<el-form label-width="110px"> <el-form label-width="110px">
<el-form-item label="追加团款金额：" class="w280"> <el-form-item label="追加团款金额：" class="">
<el-input placeholder="请输入" type="text" @keyup.native="checkPrice(zhuijiaMsg,'ChangePrice')" <el-input placeholder="请输入" type="text" @keyup.native="checkPrice(zhuijiaMsg,'ChangePrice')"
v-model="zhuijiaMsg.ChangePrice"> v-model="zhuijiaMsg.ChangePrice">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注：" class="w280"> <el-form-item label="备注：" class="">
<el-input placeholder="请输入" type="textarea" v-model="zhuijiaMsg.OP_Remarks"></el-input> <el-input placeholder="请输入" type="textarea" v-model="zhuijiaMsg.OP_Remarks"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -3248,6 +3266,7 @@ ...@@ -3248,6 +3266,7 @@
zhuijiaShow: false, zhuijiaShow: false,
zhuijiaMsg: {}, zhuijiaMsg: {},
SetShouSunGuestNum: 0, SetShouSunGuestNum: 0,
RBBranchId: '',
}; };
}, },
components: { components: {
...@@ -5317,6 +5336,7 @@ ...@@ -5317,6 +5336,7 @@
}, },
mounted() { mounted() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.RBBranchId = userInfo.RB_Branch_id
this.userId = userInfo.EmployeeId; this.userId = userInfo.EmployeeId;
this.msg.TCID = this.$route.query.id; this.msg.TCID = this.$route.query.id;
this.SetNoticeMsg.TCID = this.msg.TCID; this.SetNoticeMsg.TCID = this.msg.TCID;
......
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