Skip to content

S
SuperMan
Commit 3aca937a authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 64e596d3 d2c74558
Hide whitespace changes
Inline Side-by-side
Showing with 861 additions and 39 deletions
src/components/Hotel/reservation/OrderList.vue
View file @ 3aca937a
...@@ -524,6 +524,11 @@ ...@@ -524,6 +524,11 @@
}}</span> }}</span>
</template> </template>
</el-table-column> --> </el-table-column> -->
<el-table-column label="待收金额" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.DueInMoney || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="利润" min-width="100"> <el-table-column label="利润" min-width="100">
<template slot-scope="scope"> <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> <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>
...@@ -698,7 +703,7 @@ ...@@ -698,7 +703,7 @@
></i> ></i>
</el-tooltip> </el-tooltip>
</div>--> </div>-->
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;"> <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
<div class="row-c justify-sb borderD pb5"> <div class="row-c justify-sb borderD pb5">
<span class="fz12 c9e">订单总金额</span> <span class="fz12 c9e">订单总金额</span>
<div class="ml"> <div class="ml">
......
src/components/Hotel/reservation/correlationOP.vue
View file @ 3aca937a
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</el-form-item> </el-form-item>
</template> </template>
<template v-else> <template v-else>
<el-form-item label="总价" prop="Money"> <el-form-item label="总金额" prop="Money">
<el-input v-model='msg.Money' placeholder="请输入总金额"></el-input> <el-input v-model='msg.Money' placeholder="请输入总金额"></el-input>
</el-form-item> </el-form-item>
</template> </template>
......
src/components/Hotel/singleProduct/components/OrderList.vue
View file @ 3aca937a
...@@ -668,7 +668,7 @@ ...@@ -668,7 +668,7 @@
></i> ></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;"> <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
<div class="row-c justify-sb borderD pb5"> <div class="row-c justify-sb borderD pb5">
<span class="fz12 c9e">订单总金额</span> <span class="fz12 c9e">订单总金额</span>
<div class="ml"> <div class="ml">
......
src/components/SalesVisa/VisaProductOrder.vue
View file @ 3aca937a
...@@ -874,18 +874,20 @@ ...@@ -874,18 +874,20 @@
<th width="6%">业务员</th> <th width="6%">业务员</th>
<th width="6%">公司</th> <th width="6%">公司</th>
<th width="4%">人数</th> <th width="4%">人数</th>
<th width="8%">出发日期</th> <th width="7%">出发日期</th>
<th width="8%">报名日期</th> <th width="7%">报名日期</th>
<th width="8%">应收总额</th> <th width="7%">应收总额</th>
<th width="8%">实收</th>
<th width="6%">退款</th> <th width="7%">实收</th>
<th width="6%">平台税金</th> <th width="5%">退款</th>
<th width="6%">优惠</th> <th width="5%">平台税金</th>
<th width="7%">成本</th>
<th width="5%">优惠</th>
<th width="5%">待收</th> <th width="5%">待收</th>
<th width="5%">在途</th> <th width="5%">在途</th>
<th width="6%">订单状态</th> <th width="4%">订单状态</th>
<th width="5%">状态</th> <th width="5%">状态</th>
<th width="12%">操作</th> <th width="14%">操作</th>
</tr> </tr>
<tbody v-for='(item,index) in dataList'> <tbody v-for='(item,index) in dataList'>
<tr> <tr>
...@@ -917,6 +919,9 @@ ...@@ -917,6 +919,9 @@
<td> <td>
<span>￥{{moneyFormat(item.PlatformTax)}}</span> <span>￥{{moneyFormat(item.PlatformTax)}}</span>
</td> </td>
<td>
<span>￥{{moneyFormat(item.CostMoney)}}</span>
</td>
<td> <td>
<span>￥{{moneyFormat(item.DiscountMoney)}}</span> <span>￥{{moneyFormat(item.DiscountMoney)}}</span>
</td> </td>
...@@ -967,7 +972,7 @@ ...@@ -967,7 +972,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="16" class="RL_Order" style="height:40px;"> <td colspan="17" class="RL_Order" style="height:40px;">
<span class="VO-remarkTitle">名单:</span> <span class="VO-remarkTitle">名单:</span>
<span class="VO-redType VO-remarkCon" v-if="item.GuestList.length>0" style="cursor:pointer"> <span class="VO-redType VO-remarkCon" v-if="item.GuestList.length>0" style="cursor:pointer">
<span v-for="(childItem) in item.GuestList" style="margin-right:10px;" <span v-for="(childItem) in item.GuestList" style="margin-right:10px;"
...@@ -987,7 +992,7 @@ ...@@ -987,7 +992,7 @@
</div> </div>
</div> </div>
</td> </td>
<td colspan="8" class="groupTourOrder_tickets2" style="height: 40px;"> <td colspan="9" class="groupTourOrder_tickets2" style="height: 40px;">
<div> <div>
<div class="row justify-sb wrap mr"> <div class="row justify-sb wrap mr">
<div class="row relative" style="margin-top: 5px;"> <div class="row relative" style="margin-top: 5px;">
...@@ -1080,11 +1085,11 @@ ...@@ -1080,11 +1085,11 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="17" style="height: 1px;magrin:0;padding: 0;background-color: #000;"></td> <td colspan="18" style="height: 1px;magrin:0;padding: 0;background-color: #000;"></td>
</tr> </tr>
</tbody> </tbody>
<tr v-show="dataList.length==0"> <tr v-show="dataList.length==0">
<td v-show="dataList.length==0" colspan="17" align="center">暂无数据</td> <td colspan="18" align="center">暂无数据</td>
</tr> </tr>
</table> </table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total"
......
src/components/SalesVisa/saleOrderSettlement.vue
View file @ 3aca937a
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
<td>{{item.CreateBy}}</td> <td>{{item.CreateBy}}</td>
<td>{{item.PeopleNum}}</td> <td>{{item.PeopleNum}}</td>
<td>￥{{moneyFormat(item.CommissionMoney)}}</td> <td>￥{{moneyFormat(item.CommissionMoney)}}</td>
<td><input type="checkbox" :value="item.Id" v-model="OrderIds"></td> <td><input type="checkbox" :value="item.Id" v-model="OrderIds" :disabled="isDisabled"></td>
</tr> </tr>
<tr class="h40" v-show="tichengList.length==0"> <tr class="h40" v-show="tichengList.length==0">
<td colspan="10" align="center"> <td colspan="10" align="center">
...@@ -215,6 +215,7 @@ ...@@ -215,6 +215,7 @@
export default { export default {
data(){ data(){
return{ return{
isDisabled: true,
OrderIds:[], OrderIds:[],
total: 0, total: 0,
currentPage: 1, currentPage: 1,
......
src/components/SingleAirTicket/components/OrderList.vue
View file @ 3aca937a
...@@ -765,7 +765,7 @@ ...@@ -765,7 +765,7 @@
</el-tooltip> </el-tooltip>
</div> --> </div> -->
</div> </div>
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;"> <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
<div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}"> <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
<span class="fz12 c9e">订单总金额</span> <span class="fz12 c9e">订单总金额</span>
<div class="ml"> <div class="ml">
......
src/components/administrative/empBankAccount.vue
View file @ 3aca937a
...@@ -9,6 +9,14 @@ ...@@ -9,6 +9,14 @@
.empBankAccountTable tr{background: #fff;text-align: left;} .empBankAccountTable tr{background: #fff;text-align: left;}
.empBankAccountTable tr:nth-child(2n+1){background: #E5E5E5;} .empBankAccountTable tr:nth-child(2n+1){background: #E5E5E5;}
.empBankAccountTable tr td{height: 60px; padding-left:20px; border-right: 1px solid #DCDCDC; border-bottom: 1px solid #DCDCDC;} .empBankAccountTable tr td{height: 60px; padding-left:20px; border-right: 1px solid #DCDCDC; border-bottom: 1px solid #DCDCDC;}
.popTable{width: 80%; font-size:14px; color: #333; background: #ccc;}
.popTable tr{border-bottom: 2px solid #333;}
.popTable tr th{background: #BDBDBD;height:30px; font-size: 12px; text-align: left; text-indent: 20px;}
.popTable tr{background: #fff;text-align: left;}
.popTable tr:nth-child(2n+1){background: #E5E5E5;}
.popTable tr td{height: 60px; padding-left:20px; border-right: 1px solid #DCDCDC; border-bottom: 1px solid #DCDCDC;}
.empBankAccountIcon button{width: 30px; height: 30px;border-radius:4px;} .empBankAccountIcon button{width: 30px; height: 30px;border-radius:4px;}
.empBankAccountIcon .el-button--primary {padding: 5px;margin: 0;font-size: 14px!important;} .empBankAccountIcon .el-button--primary {padding: 5px;margin: 0;font-size: 14px!important;}
.empBankAccountIcon .el-button+.el-button{margin-left: 0!important;} .empBankAccountIcon .el-button+.el-button{margin-left: 0!important;}
...@@ -61,6 +69,31 @@ ...@@ -61,6 +69,31 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<div v-if="accountList.length" style="padding: 20px; display: flex; justify-content: center; align-items: center;flex-direction: column">
<div style="padding: 10px">已存在相同的账户信息</div>
<table class="popTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>{{$t("ground.zhanghumingcheng")}}</th>
<th>{{$t("fnc.w_zhbieming")}}</th>
<th>{{$t("ground.zhanghuleibie")}}</th>
<th>{{$t("ground.suoshujigou")}}</th>
<th>{{$t("fnc.acc")}}</th>
</tr>
<tr v-for="(item,index) in accountList">
<td>{{item.OpenBankName}}</td>
<td>{{item.AccountAlias}}</td>
<td>
<span v-if="item.AccountClassify==1">{{$t('fnc.a_ptzhanghu')}}</span>
<span v-if="item.AccountClassify==2">银行账户</span>
<span v-if="item.AccountClassify==3">虚拟账户</span>
<span v-if="item.AccountClassify==4">微信支付宝</span>
</td>
<td>{{item.BankName}}</td>
<td>{{item.CardNum}}
<br/>{{item.AccountHolder}}</td>
</tr>
</table>
</div>
</div> </div>
<div class="query-box"> <div class="query-box">
<ul> <ul>
...@@ -120,12 +153,14 @@ ...@@ -120,12 +153,14 @@
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
accountList: [],
nameA: this.$t("ground.zhanghumingcheng2"), nameA: this.$t("ground.zhanghumingcheng2"),
nameB: this.$t("fnc.khuren"), nameB: this.$t("fnc.khuren"),
nameC: this.$t("ground.kahao"), nameC: this.$t("ground.kahao"),
...@@ -259,6 +294,10 @@ ...@@ -259,6 +294,10 @@
this.$message.error(this.$t('visaT.Pleasefillin')+this.nameD) this.$message.error(this.$t('visaT.Pleasefillin')+this.nameD)
return return
} }
// 查询是否有冲突的账户信息
this.checkCanAdd()
},
addAccount() {
this.apipost("admin_post_SetEmpBankAccount",this.addMsg,res=>{ this.apipost("admin_post_SetEmpBankAccount",this.addMsg,res=>{
if(res.data.resultCode==1) if(res.data.resultCode==1)
{ {
...@@ -270,8 +309,19 @@ ...@@ -270,8 +309,19 @@
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
},err=>{})},
checkCanAdd() {
this.apipost('admin_post_GetBackAccount',{RB_Group_Id: this.addMsg.ObjID, ...this.addMsg},res=>{
if(res.data.resultCode==1){
if(res.data.data && res.data.data.length) {
this.accountList = res.data.data
} else {
this.addAccount()
}
}else{
this.$message.error(res.data.message)}
},err=>{}) },err=>{})
}, },
updateData(id){ //修改角色 updateData(id){ //修改角色
this.apipost('admin_get_GetEmpBackAccount',{BAId:id},res=>{ this.apipost('admin_get_GetEmpBackAccount',{BAId:id},res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
...@@ -327,6 +377,7 @@ ...@@ -327,6 +377,7 @@
this.resetForm('addMsg'); this.resetForm('addMsg');
}, },
resetForm(formName) {//弹出框取消 初始化谈框内表单 resetForm(formName) {//弹出框取消 初始化谈框内表单
this.accountList = []
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
this.addMsg.AccountType='1'; this.addMsg.AccountType='1';
this.addMsg.AccountClassify='2'; this.addMsg.AccountClassify='2';
......
src/components/administrative/empBankAccountAll.vue 0 → 100644
View file @ 3aca937a
<style>
.empBankAccountTableLayer {
overflow: auto;
position: fixed;
min-height: 300px;
max-height: 400px;
z-index: 50;
bottom: 0;
left: 50px;
border-top: 3px solid #38425d;
background-color: #ffffff;
padding: 10px 10px 0;
width: 100%;
}
.empBankAccountTableLayer .el-form-item__label {
font-size: 12px !important;
}
.empBankAccountTableLayer > p {
border-left: 3px solid #e95252;
text-indent: 15px;
height: 16px;
padding-right: 50px;
font-family: "PingFangSc-Fine";
font-size: 16px;
margin-bottom: 20px;
line-height: 14px;
color: #000;
}
.empBankAccountTable {
width: 100%;
min-width: 1500px;
font-size: 14px;
color: #333;
background: #ccc;
}
.empBankAccountTable tr {
border-bottom: 2px solid #333;
}
.empBankAccountTable tr th {
background: #bdbdbd;
height: 30px;
font-size: 12px;
text-align: left;
text-indent: 20px;
}
.empBankAccountTable tr {
background: #fff;
text-align: left;
}
.empBankAccountTable tr:nth-child(2n + 1) {
background: #e5e5e5;
}
.empBankAccountTable tr td {
height: 60px;
padding-left: 20px;
border-right: 1px solid #dcdcdc;
border-bottom: 1px solid #dcdcdc;
}
.empBankAccountIcon button {
width: 30px;
height: 30px;
border-radius: 4px;
}
.empBankAccountIcon .el-button--primary {
padding: 5px;
margin: 0;
font-size: 14px !important;
}
.empBankAccountIcon .el-button + .el-button {
margin-left: 0 !important;
}
.popTable {
width: 80%;
font-size: 14px;
color: #333;
background: #ccc;
}
.popTable tr {
border-bottom: 2px solid #333;
}
.popTable tr th {
background: #bdbdbd;
height: 30px;
font-size: 12px;
text-align: left;
text-indent: 20px;
}
.popTable tr {
background: #fff;
text-align: left;
}
.popTable tr:nth-child(2n + 1) {
background: #e5e5e5;
}
.popTable tr td {
height: 60px;
padding-left: 20px;
border-right: 1px solid #dcdcdc;
border-bottom: 1px solid #dcdcdc;
}
</style>
<template>
<div class="flexOne domesticScenic">
<div class="empBankAccountTableLayer" v-show="outerVisible">
<p>
{{ dialogTitle }}
<span class="fr">
<button
class="hollowFixedBtn"
@click="(outerVisible = false), resetForm('addMsg')"
>
{{ $t("pub.cancelBtn") }}
</button>
<button
class="normalBtn"
type="primary"
@click="submitForm('addMsg')"
>
{{ $t("pub.saveBtn") }}
</button>
</span>
</p>
<el-form
:model="addMsg"
:rules="rules"
ref="addMsg"
label-width="90px"
style="padding-right: 80px"
>
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.zhfenlei')" prop="AccountClassify">
<el-select
v-model="addMsg.AccountClassify"
:placeholder="$t('pub.pleaseSel')"
@change="changeTitle"
>
<el-option
:label="$t('fnc.yinhang')"
value="2"
key="2"
></el-option>
<el-option
:label="$t('ground.xunizhanghu')"
value="3"
key="3"
></el-option>
<el-option label="微信支付宝" value="4" key="4"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4" v-if="addMsg.AccountClassify == 2" :gutter="35">
<el-form-item :label="$t('fnc.ssjigou')" prop="BankName">
<el-input
type="text"
v-model="addMsg.BankName"
:placeholder="$t('ground.liruicbc')"
></el-input>
</el-form-item>
</el-col>
<el-col
:span="4"
v-if="addMsg.AccountClassify != 3 && addMsg.AccountClassify != 4"
:gutter="35"
>
<el-form-item :label="nameA" prop="OpenBankName">
<el-input
type="text"
v-model="addMsg.OpenBankName"
:placeholder="$t('ground.liruzhihang')"
></el-input>
</el-form-item>
</el-col>
<el-col
:span="4"
v-if="addMsg.AccountClassify != 3 && addMsg.AccountClassify != 4"
:gutter="35"
>
<el-form-item :label="nameB" prop="AccountHolder">
<el-input type="text" v-model="addMsg.AccountHolder"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="nameC" prop="CardNum">
<el-input type="text" v-model="addMsg.CardNum"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="nameD" prop="AccountAlias">
<el-input type="text" v-model="addMsg.AccountAlias"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
<el-form-item :label="nameE" prop="Type">
<el-select
filterable
v-model="addMsg.Type"
:placeholder="$t('fnc.khleixing')"
class="w135 _border_b_1"
>
<el-option
v-for="item in ClientTypeList"
:label="item.Name"
:value="item.ID"
:key="item.ID"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div
v-if="accountList.length"
style="
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
"
>
<div style="padding: 10px">已存在相同的账户信息</div>
<table class="popTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>{{ $t("ground.zhanghumingcheng") }}</th>
<th>{{ $t("fnc.w_zhbieming") }}</th>
<th>{{ $t("ground.zhanghuleibie") }}</th>
<th>{{ $t("ground.suoshujigou") }}</th>
<th>{{ $t("fnc.acc") }}</th>
</tr>
<tr v-for="(item, index) in accountList">
<td>{{ item.OpenBankName }}</td>
<td>{{ item.AccountAlias }}</td>
<td>
<span v-if="item.AccountClassify == 1">{{
$t("fnc.a_ptzhanghu")
}}</span>
<span v-if="item.AccountClassify == 2">银行账户</span>
<span v-if="item.AccountClassify == 3">虚拟账户</span>
<span v-if="item.AccountClassify == 4">微信支付宝</span>
</td>
<td>{{ item.BankName }}</td>
<td>{{ item.CardNum }} <br />{{ item.AccountHolder }}</td>
</tr>
</table>
</div>
</div>
<div class="query-box" style="border-bottom: none;">
<ul>
<li>
<span><em>客户类型</em>
<el-select
filterable
v-model="msg.Type"
:placeholder="$t('fnc.khleixing')"
class="w135 _border_b_1"
>
<el-option
v-for="item in ClientTypeList"
:label="item.Name"
:value="item.ID"
:key="item.ID"
>
</el-option>
</el-select>
</span>
</li>
<li>
<span style="margin-left: 80px"><em>账户分类</em>
<el-select
v-model="msg.AccountClassify"
:placeholder="$t('pub.pleaseSel')"
@change="changeTitle"
>
<el-option label="不限" value="" key="0"> </el-option>
<el-option
:label="$t('fnc.yinhang')"
value="2"
key="2"
></el-option>
<el-option
:label="$t('ground.xunizhanghu')"
value="3"
key="3"
></el-option>
<el-option label="微信支付宝" value="4" key="4"></el-option>
</el-select>
</span>
</li>
<li>
<span><em>关键字</em>
<el-input
type="text"
v-model="msg.KeyWord"
></el-input>
</span>
</li>
<li>
<input
type="button"
@click="getList"
class="normalBtn"
value="查询"
/>
<input
type="button"
@click="
(outerVisible = true),
(dialogTitle = $t('ground.xinzengzhanghu')),
resetForm('addMsg')
"
class="normalBtn"
:value="$t('pub.addBtn')"
/>
</li>
</ul>
</div>
<table
class="empBankAccountTable"
border="0"
cellspacing="0"
cellpadding="0"
>
<tr>
<th>{{ $t("fnc.khleixing") }}</th>
<th>{{ $t("ground.zhanghumingcheng") }}</th>
<th>{{ $t("fnc.w_zhbieming") }}</th>
<th>{{ $t("ground.zhanghuleibie") }}</th>
<th>{{ $t("ground.suoshujigou") }}</th>
<th>{{ $t("fnc.acc") }}</th>
<th>{{ $t("admin.admin_status") }}</th>
<th>{{ $t("ground.leijijiaoyi") }}</th>
<th>{{ $t("admin.admin_operate") }}</th>
</tr>
<tr v-for="(item, index) in list">
<td>{{ item.TypeName }}</td>
<td>{{ item.OpenBankName }}</td>
<td>{{ item.AccountAlias }}</td>
<td>
<span v-if="item.AccountClassify == 1">{{
$t("fnc.a_ptzhanghu")
}}</span>
<span v-if="item.AccountClassify == 2">银行账户</span>
<span v-if="item.AccountClassify == 3">虚拟账户</span>
<span v-if="item.AccountClassify == 4">微信支付宝</span>
</td>
<td>{{ item.BankName }}</td>
<td>{{ item.CardNum }} <br />{{ item.AccountHolder }}</td>
<td>
<span v-if="item.Status != 0" style="color: #e95252">{{
$t("pub.fressSel")
}}</span>
<span v-if="item.Status == 0" style="color: #09d49d">{{
$t("pub.normalSel")
}}</span>
</td>
<td style="color: #ff9c00">￥{{ moneyFormat(item.PayMoney) }}</td>
<td class="empBankAccountIcon">
<el-button-group>
<el-tooltip
class="item"
effect="dark"
:content="$t('pub.updateMsg')"
placement="top-start"
>
<el-button
@click="
(outerVisible = true),
(dialogTitle = $t('ground.xiugaizhanghu')),
updateData(item.ID)
"
type="primary"
style="background: #409eff; border-color: #409eff"
icon="iconfont icon-bianji-smal"
></el-button>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
:content="
item.Status == '1' ? $t('fnc.qiyong') : $t('pub.fressSel')
"
placement="top-start"
>
<el-button
v-if="item.Status == 1"
@click="deleteData(item.ID)"
type="primary"
style="background: #09d49d; border-color: #09d49d"
icon="iconfont icon-qidong"
></el-button>
<el-button
v-if="item.Status == 0"
@click="deleteData(item.ID)"
type="primary"
style="background: #e95252; border-color: #e95252"
icon="iconfont icon-dongjie"
></el-button>
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
:content="$t('ground.mingxi')"
placement="top-start"
>
<el-button
type="primary"
style="background: #e6a014; border-color: #e6a014"
icon="iconfont icon-rizhi1"
></el-button>
</el-tooltip>
</el-button-group>
</td>
</tr>
</table>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize"
:total="total"
>
</el-pagination>
</div>
</template>
<script>
export default {
data() {
return {
accountList: [],
ClientTypeList: [],
nameA: this.$t("ground.zhanghumingcheng2"),
nameB: this.$t("fnc.khuren"),
nameC: this.$t("ground.kahao"),
nameD: this.$t("fnc.accBming"),
nameE: this.$t("fnc.khleixing"),
switchValue: "1",
dialogTitle: "",
insideDialogTxt: this.$t("tips.saveYes"),
outerVisible: false,
innerVisible: false,
isRight: true,
versions: [],
total: 0,
currentPage: 1,
//请求数据
msg: {
BranchId: "-1",
EmpId: 0,
BankId: "",
AccountHolder: "",
AccountAlias: "",
pageIndex: 1,
pageSize: 15,
Type: "",
},
getCompanyMsg: {
RB_Group_Id: "0",
Status: "0",
},
getUserMsg: {
RB_Branch_id: "-1",
},
//返回数据
list: [],
bankList: [],
layerItem: [],
addMsg: {
Id: "0",
ObjID: "-1",
BankId: "-1",
OpenBankName: "",
BankName: "",
AccountHolder: "",
CardNum: "",
AccountAlias: "",
AccountType: "1",
AccountClassify: "2",
Type: "",
},
rules: {
BankName: [
{
required: true,
message: this.$t("ground.qingtianxieyh"),
trigger: "blur",
},
],
},
};
},
mounted() {
let userInfo = this.getLocalStorage();
// let id = this.$route.query.type ? Number(this.$route.query.type) : 0
this.getUserMsg.RB_Group_id = this.getCompanyMsg.RB_Group_Id =
userInfo.RB_Group_id; //集团ID
// this.msg.EmpId=0;
// this.msg.Type= id;
// this.addMsg.ObjID=this.$route.query.id || 0;
// this.addMsg.Type= id;
this.financeinfo_post_GetClientTypeList();
this.getBank();
this.changeTitle();
},
methods: {
financeinfo_post_GetClientTypeList() {
// 获取对象类型
this.apipost(
"financeinfo_post_GetClientTypeList",
{},
(res) => {
if (res.data.resultCode == 1) {
this.ClientTypeList = res.data.data;
this.msg.Type = this.ClientTypeList[0].ID
this.getList();
}
},
(err) => {}
);
},
changeTitle() {
if (this.addMsg.AccountClassify == 1) {
this.nameA = this.$t("ground.pingtaimingcheng");
this.nameB = this.$t("ground.yonghumingcheng");
this.nameC = this.$t("fnc.ptAcc");
this.nameD = this.$t("fnc.accBming");
this.addMsg.AccountType = "1";
} else if (this.addMsg.AccountClassify == 2) {
this.nameA = this.$t("ground.zhanghumingcheng2");
this.nameB = this.$t("fnc.khuren");
this.nameC = this.$t("ground.kahao");
this.nameD = this.$t("fnc.accBming");
} else if (this.addMsg.AccountClassify == 3) {
this.nameA = this.$t("ground.pingtaimingcheng");
this.nameB = this.$t("ground.yonghumingcheng");
this.nameC = this.$t("fnc.ptAcc");
this.nameD = this.$t("fnc.accBming");
} else if (this.addMsg.AccountClassify == 4) {
this.nameA = this.$t("ground.pingtaimingcheng");
this.nameB = this.$t("ground.yonghumingcheng");
this.nameC = "账号";
this.nameD = "名称";
}
},
getList() {
//获取列表数据
this.apipost(
"admin_get_GetEmpBankAccountPageList",
this.msg,
(res) => {
if (res.data.resultCode == 1) {
this.list = res.data.data.pageData;
this.total = res.data.data.count;
} else {
}
},
(err) => {}
);
},
// getCompany(){
// this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
// if(res.data.resultCode==1){
// this.companyList=res.data.data;
// }else{}
// },err=>{})
// },
getBank() {
this.apipost(
"FinancialInstitutions_post_GetList",
{ Type: 0 },
(res) => {
if (res.data.resultCode == 1) {
this.bankList = res.data.data;
} else {
}
},
(err) => {}
);
},
addData() {
//添加角色
this.addMsg.ObjID = this.$route.query.id;
if (
this.addMsg.AccountClassify != "3" &&
this.addMsg.AccountClassify != "4"
) {
if (this.addMsg.OpenBankName == "") {
this.$message.error(this.$t("visaT.Pleasefillin") + this.nameA);
return;
}
if (this.addMsg.AccountHolder == "") {
this.$message.error(this.$t("visaT.Pleasefillin") + this.nameB);
return;
}
}
if (this.addMsg.CardNum == "") {
this.$message.error(this.$t("visaT.Pleasefillin") + this.nameC);
return;
}
if (this.addMsg.AccountAlias == "") {
this.$message.error(this.$t("visaT.Pleasefillin") + this.nameD);
return;
}
if (this.addMsg.Type == "") {
this.$message.error(this.$t("visaT.Pleasefillin") + this.nameE);
return;
}
// 查询是否有冲突的账户信息
this.checkCanAdd();
},
addAccount() {
this.apipost(
"admin_post_SetEmpBankAccount",
this.addMsg,
(res) => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.outerVisible = false;
this.getList();
this.resetForm("addMsg");
} else {
this.$message.error(res.data.message);
}
},
(err) => {}
);
},
checkCanAdd() {
this.apipost(
"admin_post_GetBackAccount",
{ RB_Group_Id: this.addMsg.ObjID, ...this.addMsg },
(res) => {
if (res.data.resultCode == 1) {
if (res.data.data && res.data.data.length) {
this.accountList = res.data.data;
} else {
this.addAccount();
}
} else {
this.$message.error(res.data.message);
}
},
(err) => {}
);
},
updateData(id) {
//修改角色
this.apipost(
"admin_get_GetEmpBackAccount",
{ BAId: id },
(res) => {
if (res.data.resultCode == 1) {
this.addMsg = res.data.data;
this.addMsg.AccountType = res.data.data.AccountType.toString();
this.addMsg.AccountClassify =
res.data.data.AccountClassify.toString();
this.addMsg.BankId = res.data.data.BankId;
this.changeTitle();
} else {
}
},
(err) => {}
);
// this.addMsg = this.dataList[index]
// this.addMsg.Status = this.dataList[index].Status.toString();
},
deleteData(id) {
this.$confirm(this.$t("ground.querenqiyong"), "提示", {
confirmButtonText: this.$t("pub.sureBtn"),
cancelButtonText: this.$t("pub.cancelBtn"),
type: "warning",
})
.then(() => {
this.apipost(
"admin_post_DelEmpBankAccount",
{
BAId: id,
},
(res) => {
if (res.data.resultCode == 1) {
this.$message.success(thi.$t("pub.saveYes"));
this.getList();
}
},
(err) => {}
);
})
.catch(() => {
this.$message.info(this.$t("ground.yiquxiao"));
});
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
submitForm(addMsg) {
//提交创建、修改表单
this.$refs[addMsg].validate((valid) => {
if (valid) {
this.addData();
} else {
return false;
}
});
},
closeChangeMachie(done) {
//弹出框关闭初始化弹框内表单
done();
this.resetForm("addMsg");
},
resetForm(formName) {
//弹出框取消 初始化谈框内表单
this.accountList = [];
this.$refs[formName].resetFields();
this.addMsg.AccountType = "1";
this.addMsg.AccountClassify = "2";
this.addMsg.Id = "0";
this.addMsg.ObjID = "-1";
this.addMsg.BankId = "-1";
this.addMsg.OpenBankName = "";
this.addMsg.BankName = "";
this.addMsg.AccountHolder = "";
this.addMsg.CardNum = "";
this.addMsg.AccountAlias = "";
},
},
};
</script>
src/components/busManagement/BookAcar/components/BookAcarOrder.vue
View file @ 3aca937a
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
</div> </div>
</template> </template>
<script> <script>
import OrderList from './OrderList.vue'; import OrderList from './orderList';
export default { export default {
props:['pagesTitle','dataObj'], props:['pagesTitle','dataObj'],
components: { OrderList }, components: { OrderList },
......
src/components/busManagement/BookAcar/components/orderList.vue
View file @ 3aca937a
...@@ -421,7 +421,7 @@ ...@@ -421,7 +421,7 @@
<div class="c9e fz12"> <div class="c9e fz12">
<span>客人信息：{{ item.SurName }}{{ item.Name }}/{{ item.Mobile }}</span> <span>客人信息：{{ item.SurName }}{{ item.Name }}/{{ item.Mobile }}</span>
<span v-if="pagesTitle!='销售'"> <span v-if="pagesTitle!='销售'">
/来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template> <template v-if="item.SurName||item.Name"> /</template>来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
<template v-if="!item.OrderSource&&item.CustomerId>0">B2B</template> <template v-if="!item.OrderSource&&item.CustomerId>0">B2B</template>
<template v-if="item.OrderSource==1">B2C</template> <template v-if="item.OrderSource==1">B2C</template>
</span> </span>
...@@ -571,6 +571,11 @@ ...@@ -571,6 +571,11 @@
<span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span> <span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="待收金额" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.DueInMoney || '-' }}</span>
</template>
</el-table-column>
<el-table-column label="利润" min-width="100"> <el-table-column label="利润" min-width="100">
<template slot-scope="scope"> <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> <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>
...@@ -666,7 +671,7 @@ ...@@ -666,7 +671,7 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;"> <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
<div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}"> <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
<span class="fz12 c9e">订单总金额</span> <span class="fz12 c9e">订单总金额</span>
<div class="ml"> <div class="ml">
......
src/components/busManagement/BookAcar/components/tripBusOrderList.vue
View file @ 3aca937a
...@@ -371,7 +371,7 @@ ...@@ -371,7 +371,7 @@
</template> </template>
<span v-if="item.CustomerTel">/{{item.CustomerTel}}</span> </span> <span v-if="item.CustomerTel">/{{item.CustomerTel}}</span> </span>
<span v-if="pagesTitle!='销售'"> <span v-if="pagesTitle!='销售'">
/来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template> <template v-if="item.UseCompName||item.CustomerName"> /</template>来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
<template v-if="!item.OrderSource&&item.CustomerId>0">B2B</template> <template v-if="!item.OrderSource&&item.CustomerId>0">B2B</template>
<template v-if="item.OrderSource==1">B2C</template> <template v-if="item.OrderSource==1">B2C</template>
</span> </span>
...@@ -625,7 +625,7 @@ ...@@ -625,7 +625,7 @@
</el-tooltip> </el-tooltip>
</div> </div>
</div> </div>
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;"> <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
<div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}"> <div class="row-c justify-sb pb5" :class="{'borderD':item.DiscountsMoney>0}">
<span class="fz12 c9e">订单总金额</span> <span class="fz12 c9e">订单总金额</span>
<div class="ml"> <div class="ml">
......
src/components/public/offset.vue
View file @ 3aca937a
...@@ -112,16 +112,18 @@ ...@@ -112,16 +112,18 @@
isShow: { isShow: {
handler(newValue,onldValue) { handler(newValue,onldValue) {
this.cdState = newValue this.cdState = newValue
// this.czgetList() if(this.cdState==true){
// this.getCostTypeList() this.czgetList()
this.getCostTypeList()
}
}, },
// deep:true, // deep:true,
immediate: false immediate: false
} }
}, },
mounted() { mounted() {
this.czgetList() // this.czgetList()
this.getCostTypeList() // this.getCostTypeList()
}, },
methods: { methods: {
close(){ close(){
......
src/components/scenicSpot/reservation/OrderList.vue
View file @ 3aca937a
...@@ -375,9 +375,10 @@ ...@@ -375,9 +375,10 @@
} }
.orderop div { .orderop div {
width: 100px; width: auto;
height: 50%; height: 30px;
display: flex; display: flex;
padding: 0 5px;
justify-content: center; justify-content: center;
} }
...@@ -520,7 +521,7 @@ ...@@ -520,7 +521,7 @@
<div class="c9e fz12"> <div class="c9e fz12">
<span v-if="item.Name||item.EName">客人信息：{{ item.Name }}({{ item.EName }})<template v-if="item.Mobile"> /{{ item.Mobile }}</template></span> <span v-if="item.Name||item.EName">客人信息：{{ item.Name }}({{ item.EName }})<template v-if="item.Mobile"> /{{ item.Mobile }}</template></span>
<span v-if="pagesTitle!='销售'"> <span v-if="pagesTitle!='销售'">
/来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template> <template v-if="item.Name||item.EName"> /</template>来源<template v-if="!item.OrderSource&&!item.CustomerId">销售</template>
<template v-if="!item.OrderSource&&item.CustomerId>0">B2B</template> <template v-if="!item.OrderSource&&item.CustomerId>0">B2B</template>
<template v-if="item.OrderSource==1">B2C</template> <template v-if="item.OrderSource==1">B2C</template>
</span> </span>
...@@ -613,7 +614,10 @@ ...@@ -613,7 +614,10 @@
</el-table-column> </el-table-column>
<el-table-column label="待收" min-width="100"> <el-table-column label="待收" min-width="100">
<template slot-scope="scope"> <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> <span class="fz15 fbold"
:class="{'cF1416C':item.DaiShou>0}">
{{item.DaiShou}}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="利润" min-width="100"> <el-table-column label="利润" min-width="100">
...@@ -629,7 +633,7 @@ ...@@ -629,7 +633,7 @@
</el-table> </el-table>
<div class="row justify-sb mt mb20"> <div class="row justify-sb mt mb20">
<div class="column px15 bjFFF3E0 radius5 flex-g pa relative" style="max-width: 300px;"> <div class="column px15 bjFFF3E0 radius5 flex-g pa relative" style="max-width: 300px;min-width: 150px;">
<div class="fz12 row justify-sb" v-if="item.MailingState != 4"> <div class="fz12 row justify-sb" v-if="item.MailingState != 4">
<span>{{ item.MailingState > 1 ? '收货地址：' : '自取地址：' }}</span> <span>{{ item.MailingState > 1 ? '收货地址：' : '自取地址：' }}</span>
<div :class="{ 'cF1416C': item.MailingState == 2, 'c02C854': item.MailingState == 3 }"> <div :class="{ 'cF1416C': item.MailingState == 2, 'c02C854': item.MailingState == 3 }">
...@@ -750,11 +754,11 @@ ...@@ -750,11 +754,11 @@
</div> </div>
</div> </div>
<div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="max-width: 270px;"> <div class="column justify-c px15 bgf5 radius5 ml flex-g pa20" style="min-width: 230px;">
<div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}"> <div class="row-c justify-sb pb5" :class="{'borderD':item.MailingMoney>0||item.DiscountsMoney>0}">
<span class="fz12 c9e">订单总金额</span> <span class="fz12 c9e">订单总金额</span>
<div class="ml"> <div class="ml">
<span class="fz15 fbold">{{ item.Money.toFixed(2) }}</span> <span class="fz15 fbold">{{ (item.Money+item.MailingMoney).toFixed(2) }}</span>
<span class="fz12">{{ item.CurrencyName }}</span> <span class="fz12">{{ item.CurrencyName }}</span>
</div> </div>
</div> </div>
...@@ -781,7 +785,7 @@ ...@@ -781,7 +785,7 @@
</div> </div>
</div> </div>
<div v-if="item.OrderStatus > 0 && item.OrderStatus < 4 && item.OrderStatus != 3" <div v-if="item.OrderStatus > 0 && item.OrderStatus < 4 && item.OrderStatus != 3"
class="column justify-c px15 bgE8F5E9 radius5 ml fz12 orderop pa20 flex-s"> class="row-c wrap justify-c px15 bgE8F5E9 radius5 ml fz12 orderop flex-s">
<div v-if=" <div v-if="
item.OrderStatus == 1 && item.OrderStatus == 1 &&
item.IncomeList.length == 0 && item.IncomeList.length == 0 &&
...@@ -1141,15 +1145,15 @@ export default { ...@@ -1141,15 +1145,15 @@ export default {
methods: { methods: {
close(){ close(){
this.isShowCorrelation = false this.isShowCorrelation = false
this.CorrelationObj.TypeNum=null this.CorrelationObj.TypeNum = null
this.CorrelationObj.Money = null
}, },
success(){ success(){
this.CorrelationObj.TypeNum=null
this.close() this.close()
this.$emit('success') this.$emit('success')
}, },
clickCorrelation(item,type){ clickCorrelation(item,type){
this.CorrelationObj = item this.CorrelationObj = JSON.parse(JSON.stringify(item))
if(type==2){ if(type==2){
this.CorrelationObj.TypeNum = 4 //编辑总价 this.CorrelationObj.TypeNum = 4 //编辑总价
}else{ }else{
......
src/components/scenicSpot/reservation/ReservationOrder.vue
View file @ 3aca937a
...@@ -302,6 +302,7 @@ export default { ...@@ -302,6 +302,7 @@ export default {
{ Name: '自行取票', ID: '1' }, { Name: '自行取票', ID: '1' },
{ Name: '邮寄票券', ID: '2' }, { Name: '邮寄票券', ID: '2' },
// {Name: '已邮寄票券',ID:'3'}, // {Name: '已邮寄票券',ID:'3'},
{Name: '电子券',ID:'4'},
], ],
orderType: [ orderType: [
{ Name: this.$t('OrderList.orderType.tour'), ID: '1' }, { Name: this.$t('OrderList.orderType.tour'), ID: '1' },
...@@ -419,11 +420,13 @@ export default { ...@@ -419,11 +420,13 @@ export default {
let addList = function(arr){ let addList = function(arr){
arr.forEach(x=>{ arr.forEach(x=>{
x.list = [] x.list = []
x.DaiShou = 0
}) })
} }
addList(data) addList(data)
data.forEach((x) => { data.forEach((x) => {
// x.Money = 0 // x.Money = 0
let Money = 0 let Money = 0
x.DetailList.forEach((y) => { x.DetailList.forEach((y) => {
Money+=y.Money Money+=y.Money
...@@ -439,6 +442,9 @@ export default { ...@@ -439,6 +442,9 @@ export default {
PlatformTax: item.PlatformTax, PlatformTax: item.PlatformTax,
Refund: item.Refund Refund: item.Refund
} }
let DaiShou
DaiShou = Number(item.Money+item.MailingMoney-item.Income-item.PlatformTax+item.Refund)
item.DaiShou = DaiShou.toFixed(2)==='-0.00'?'0.00':DaiShou.toFixed(2)
item.list.push(datas) item.list.push(datas)
}) })
this.total = res.data.data.count; this.total = res.data.data.count;
......
src/router/config.js
View file @ 3aca937a
...@@ -262,6 +262,15 @@ export default { ...@@ -262,6 +262,15 @@ export default {
title: '新增付款对象' title: '新增付款对象'
}, },
}, },
{
path: '/empBankAccountAll', //付款对象管理
name: 'empBankAccountAll',
component: resolve => require(['@/components/administrative/empBankAccountAll'], resolve),
meta: {
title: '付款对象管理'
},
},
{ {
path: '/CommissionManagement', //提成管理 path: '/CommissionManagement', //提成管理
name: 'CommissionManagement', name: 'CommissionManagement',
......
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