Skip to content

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

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

parents 1776c3c9 ed35ce19
Hide whitespace changes
Inline Side-by-side
Showing with 800 additions and 138 deletions
package.json
View file @ d905a4d6
......@@ -8,7 +8,7 @@
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
"start": "npm run dev",
"lint": "eslint --ext .js,.vue src",
"serve" : "node --max_old_space_size=4096 node_modules/.bin/vue-cli-service serve --open",
"serve": "node --max_old_space_size=4096 node_modules/.bin/vue-cli-service serve --open",
"build": "node --max-old-space-size=4096 build/build.js"
},
"dependencies": {
......@@ -28,6 +28,7 @@
"js-md5": "^0.7.3",
"jspdf": "^1.4.1",
"lrz": "^4.9.40",
"moment": "^2.24.0",
"node-sass": "^4.11.0",
"pdfjs-dist": "^2.0.489",
"pinyin": "^2.8.3",
......
src/components/FinancialModule/BasicDocuments.vue
View file @ d905a4d6
......@@ -263,7 +263,7 @@
<p class="_tit">{{GetDetail.FinanceName}}</p>
<div class="_conten">
<template v-if="GetDetail.Type!==1 && GetDetail.Type!==7">
<my-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-Bill>
<my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
</template>
<template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7">
<my-RVB-Bill :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-RVB-Bill>
......@@ -422,6 +422,40 @@
</div>
</div>
</div>
<template v-if="tuiDataList.length>0">
<div class="w890px">
<div class="_tit _tit2 w890px _border_bottom_none">
<p>
<span class="_text">原路退款</span>
<span class="_btn" v-if="tableShowTuikuan" @click="tableShowTuikuan=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShowTuikuan=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</p>
<div v-show="tableShowTuikuan" >
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="250">平台单号</th>
<th width="100">金额</th>
<th>支付方式</th>
<th>支付日期</th>
<th>状态</th>
<th>退款金额</th>
</tr>
<tr v-for="item in tuiDataList">
<td>{{item.Trade_Order}}</td>
<td>{{item.Money}}</td>
<td>{{item.PayWayName}}</td>
<td>{{item.Pay_Date}}</td>
<td>{{item.PayStatus}}</td>
<td>{{item.RefundMoney}}</td>
</tr>
</table>
<!-- <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" :page-size="queryMsg.pageSize"
layout="total,prev, pager, next, jumper" :total="queryMsg.total"></el-pagination> -->
</div>
</div>
</div>
</template>
<div class="_process clearfix">
<!-- <el-popover
popper-class="detailsIT_Journal"
......@@ -594,7 +628,7 @@
<td>{{i.allMoney}}</td>
</tr>
</template>
<tr @keyup.enter="addList()">
<tr @keyup.enter="addList()" v-if="choiceMsg.Status=='1'">
<td>
<el-select filterable v-model='payMsg.AccName' @change="clearAccBank()" class=" _border_b_1">
<el-option v-for='i in AccList'
......@@ -726,9 +760,40 @@
</p>
<textarea v-if="item.SpecialNode!=2||AuditOrRefundMsg.Status=='3'" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea>
<!-- <textarea v-if="AuditOrRefundMsg.Status=='3'&&item.SpecialNode!=0" class="_textarea" v-model="AuditOrRefundMsg.Description" placeholder="请输入..."></textarea> -->
<div class="_radio_lsit">
<el-radio v-model="AuditOrRefundMsg.Status" label="5">通过</el-radio>
<el-radio v-model="AuditOrRefundMsg.Status" label="3">驳回</el-radio>
<div class="_radio_lsit clearfix">
<div style="float:left">
<el-radio v-model="AuditOrRefundMsg.Status" label="5">通过</el-radio>
<el-radio v-model="AuditOrRefundMsg.Status" label="3">驳回</el-radio>
</div>
<div style="float:right" v-if="isShowChoice&&AuditOrRefundMsg.Status=='5'">
<el-radio v-model="choiceMsg.Status" label="1">常规</el-radio>
<el-radio v-model="choiceMsg.Status" label="2">原路退款</el-radio>
</div>
</div>
<div class="_pay_box" v-if="choiceMsg.Status=='2'">
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;" v-if="GetDetail.TradeDetailList&&GetDetail.TradeDetailList.length>0">
<tr>
<th>账户名称</th>
<th>收款总额</th>
<th>收款日期</th>
<th>类型</th>
<th>交易流水号</th>
<th>可退金额</th>
<th>操作</th>
</tr>
<tr v-for="(subItem,index) in GetDetail.TradeDetailList">
<td>{{subItem.AccountName}}</td>
<td>{{subItem.Money}}</td>
<td>{{subItem.Pay_DateStr}}</td>
<td>{{subItem.Pay_WayName}}</td>
<td>{{subItem.Trade_Order}}</td>
<td>{{subItem.CanRefundMoney}}</td>
<td>
<el-checkbox v-model="subItem.isChecked" @change="changeStatus(subItem,index)"></el-checkbox>
<el-input v-if="subItem.isChecked" v-model="subItem.RefundMoney" @blur="addPayList(subItem,index)" @keyup.native="checkPrice(subItem,'RefundMoney')" class="w80" placeholder="请输入退款金额"/>
</td>
</tr>
</table>
</div>
<div class="_pay_box" v-if="AuditOrRefundMsg.Status=='5'&&item.SpecialNode==2">
<!-- <div class="_pay_box"> -->
......@@ -755,7 +820,7 @@
<td>{{i.CurrenName}}</td>
<td>{{i.Rate}}</td>
<!-- <td>{{item.Fee}}</td> -->
<th>{{moneyFormat(i.allMoney)}}</th>
<td>{{moneyFormat(i.allMoney)}}</td>
<!-- <td></td> -->
</tr>
<tr v-else @keyup.enter="addList(2,index)">
......@@ -798,7 +863,7 @@
<td>{{i.allMoney}}</td>
</tr>
</template>
<tr @keyup.enter="addList()">
<tr @keyup.enter="addList()" v-if="choiceMsg.Status=='1'">
<td>
<el-select filterable v-model='payMsg.AccName' @change="clearAccBank()" class=" _border_b_1">
<el-option v-for='i in AccList'
......@@ -862,7 +927,7 @@
</tr> -->
<tr>
<td height="50px">实付金额</td>
<td class="_allMoney" height="50px" colspan="7">{{allMoney==0?'':allMoney.toFixed(2)}}</td>
<td class="_allMoney" height="50px" colspan="7">{{allMoney==0?'':allMoney}}</td>
</tr>
<tr>
<td>备注</td>
......@@ -1149,6 +1214,17 @@ export default {
},
//是否显示原路退款选项
isShowChoice:false,
tableShowTuikuan:false,
queryMsg:{
pageIndex:1,
pageSize:10,
FinanceId:'',
Type:2,
currentPage:1,
total: 0,
},
tuiDataList:[],
currentMoney:0,
}
},components:{
"my-FlowChartModule": myFlowChartModule,
......@@ -1162,22 +1238,24 @@ export default {
'my-HB-Bill':myhrBill,
},methods:{
payMsgListShow: function (type, index) {
this.payMsgList.forEach(x=>{
x.show = false
})
if(type.Type==1){
this.bankaccount_post_GetList()
}
if(type.Type==2){
this.BankAccount_post_GetPlatformList()
}
if(type.Type==3){
this.BankAccount_post_GetCashAccountList()
}
if(type.Type==4){
this.BankAccount_post_GetCashPoolList()
if(this.choiceMsg.Status==1){
this.payMsgList.forEach(x=>{
x.show = false
})
if(type.Type==1){
this.bankaccount_post_GetList()
}
if(type.Type==2){
this.BankAccount_post_GetPlatformList()
}
if(type.Type==3){
this.BankAccount_post_GetCashAccountList()
}
if(type.Type==4){
this.BankAccount_post_GetCashPoolList()
}
this.payMsgList[index].show = true
}
this.payMsgList[index].show = true
},
addList: function (type, index) {
if (type) {
......@@ -1212,9 +1290,9 @@ export default {
}
let allMoney = 0
this.payMsgList.forEach(x=>{
allMoney+=x.allMoney
allMoney+= parseFloat(x.allMoney);
})
this.allMoney = allMoney;
this.allMoney = allMoney.toFixed(2);
},
Financial_post_GetFinancLogList(){ // 获取单据日志
if(this.checkboxShow) return
......@@ -1392,6 +1470,7 @@ export default {
}
},
Calculation(type, index){ // 计算价格
console.log('aaaaaaaaaaaa');
if (type) {
this.payMsgList[index].Fee = isNaN(parseFloat(this.payMsgList[index].Fee))?0:parseFloat(this.payMsgList[index].Fee);
this.payMsgList[index].Rate = isNaN(parseFloat(this.payMsgList[index].Rate))?0:parseFloat(this.payMsgList[index].Rate);
......@@ -1408,6 +1487,8 @@ export default {
Rate = this.payMsg.Rate==0?1:this.payMsg.Rate,
Money = this.payMsg.OriginalMoney;
this.payMsg.allMoney = (Money*Rate)+fee;
console.log(this.payMsg,'payMsg');
}
// console.log(Rate+"+"+fee+"+"+Money)
},
......@@ -1597,8 +1678,6 @@ export default {
}, err => {})
},
AuditOrRefund(){ // 保存
console.log(this.GetDetail,'getdetail');
this.loading = true;
let imgArr = [];
this.uploadImgList.forEach(x=>{
imgArr.push(x.src);
......@@ -1628,7 +1707,13 @@ export default {
// }
// });
this.AuditOrRefundMsg.TradeDetailList = this.GetDetail.TradeDetailList;
// if(this.allMoney!=this.currentMoney){
// this.Error('原路退款金额与单据总金额不一致');
// return;
// }
this.loading = true;
this.apipost('Financial_post_AuditOrRefund',this.AuditOrRefundMsg,res=>{
this.loading = false;
if(res.data.resultCode==1){
this.$message.success(res.data.message);
// let _this = this;
......@@ -1776,15 +1861,15 @@ export default {
return;
}
var payMsg = {
AccName: subItem.AccountName,
AccName: subItem.AccountTypeName,
Account: subItem.BackNo,
AccountId: subItem.AccountTypeId,
AccountId: subItem.AccountId,
CurrenName: "人民币",
CurrencyId: 1,
Fee: 0,
FinanceId: "",
ID: 0,
Name: subItem.Pay_WayName,
Name: subItem.BankName,
OriginalMoney: subItem.RefundMoney,
Rate: 1,
Type: subItem.Type,
......@@ -1795,8 +1880,30 @@ export default {
show: false
}
this.payMsgList.push(payMsg);
this.Calculation();
let total = 0;
this.payMsgList.forEach(x=>{
total +=parseFloat(x.OriginalMoney);
})
this.allMoney = total.toFixed(2);
},
//获取列表
getTuikuan(){
this.apipost('OnlinePay_get_GetOrderPayMoneyInfo',this.queryMsg,res=>{
if(res.data.resultCode==1){
this.tuiDataList = res.data.data.pageData;
this.queryMsg.total = res.data.data.count;
}else{
}
},err=>{})
},
handleCurrentChange(val) {
this.queryMsg.pageIndex = val;
this.getTuikuan();
},
headCall: function (msg) { //回调方法，接收子组件传的参数
this.currentMoney = msg;
}
},created(){
if(this.$route.query.pageIndex){
this.pageIndex = this.$route.query.pageIndex;
......@@ -1807,10 +1914,12 @@ export default {
this.userId = userInfo.EmployeeId;
this.RB_Post_Id = userInfo.RB_Post_Id
this.ID = this.$route.query.id;
this.queryMsg.FinanceId = this.$route.query.id;
this.Financial_post_GetDetail(this.ID);
this.financeinfo_post_GetList();
this.BankAccount_post_GetAccountType();
this.AccountType_post_GetList();
this.getTuikuan();
if(this.$route.query.Conditon){
this.returnCode = this.$route.query.Conditon;
}
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ d905a4d6
......@@ -514,6 +514,40 @@
</div>
</div>
</div>
<template v-if="tuiDataList.length>0">
<div class="w890px">
<div class="_tit _tit2 w890px _border_bottom_none">
<p>
<span class="_text">原路退款</span>
<span class="_btn" v-if="tableShowTuikuan" @click="tableShowTuikuan=false">收起 <i class="iconfont icon-gengduo _rotate"></i> </span>
<span class="_btn" v-else @click="tableShowTuikuan=true">展开 <i class="iconfont icon-gengduo"></i> </span>
</p>
<div v-show="tableShowTuikuan" >
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="250">平台单号</th>
<th width="100">金额</th>
<th>支付方式</th>
<th>支付日期</th>
<th>状态</th>
<th>退款金额</th>
</tr>
<tr v-for="item in tuiDataList">
<td>{{item.Trade_Order}}</td>
<td>{{item.Money}}</td>
<td>{{item.PayWayName}}</td>
<td>{{item.Pay_Date}}</td>
<td>{{item.PayStatus}}</td>
<td>{{item.RefundMoney}}</td>
</tr>
</table>
<!-- <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" :page-size="queryMsg.pageSize"
layout="total,prev, pager, next, jumper" :total="queryMsg.total"></el-pagination> -->
</div>
</div>
</div>
</template>
<div class="_process clearfix">
<!-- <el-popover
popper-class="detailsIT_Journal"
......@@ -774,6 +808,16 @@ export default {
GetFinancLogList:[],
LogLoading:false,
IsBoHui: false,
tuiDataList:[],
tableShowTuikuan:false,
queryMsg:{
pageIndex:1,
pageSize:10,
FinanceId:'',
Type:2,
currentPage:1,
total: 0,
},
}
},components:{
'my-FlowChartModule': myFlowChartModule,
......@@ -1154,14 +1198,27 @@ export default {
Vue.component(this.name+this.z,this.componentTemp)
this.c=this.name+this.z
},
//获取列表
getTuikuan(){
this.apipost('OnlinePay_get_GetOrderPayMoneyInfo',this.queryMsg,res=>{
if(res.data.resultCode==1){
this.tuiDataList = res.data.data.pageData;
this.queryMsg.total = res.data.data.count;
}else{
}
},err=>{})
},
},mounted(){
// document.onkeydown = this.KeyDown
// document.onkeyup = this.KeyUp
// document.oncontextmenu = function(){return false;}
this.Financial_post_GetDetail(this.ID)
this.queryMsg.FinanceId = this.$route.query.id;
if(this.$route.query.Conditon){
this.returnCode = this.$route.query.Conditon;
}
this.getTuikuan();
}
}
</script>
src/components/FinancialModule/FinancialSubmodule/BillModule.vue
View file @ d905a4d6
......@@ -366,6 +366,7 @@ export default {
})
this.currentMoney = this.currentMoney.toFixed(2);
this.benMoney = this.benMoney.toFixed(2);
this.$emit('headCallBack', this.currentMoney);
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Money)
data.ChinesePayMoney = this.$commonUtils.changeMoneyToChinese(data.PayMoney)
data.PayMoney = this.$commonUtils.addCommas(data.PayMoney.toFixed(2))
......
src/components/FinancialModule/accDetail/CashAccDetail.vue
View file @ d905a4d6
......@@ -99,6 +99,17 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="发团日期">
<el-date-picker class="h34"
@change="timeAddByTC"
v-model="productionDateByTC"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul>
......@@ -362,6 +373,8 @@ export default {
ClientID:'',
sTradeDate:'',
eTradeDate:'',
QStartDate:'',
QEndDate:'',
BankList:[],
Is_Cashier:-1,
},
......@@ -379,6 +392,7 @@ export default {
accountList:[],
accountListT:[],
productionDate:[],
productionDateByTC:[],
ClientAccountList:[],
RB_Branch_Id:null,
loading:false,
......@@ -438,6 +452,7 @@ export default {
this.msg.sTradeDate = this.$route.query.sTradeDate;
this.msg.eTradeDate = this.$route.query.eTradeDate;
this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
this.productionDateByTC = [this.msg.QStartDate, this.msg.QEndDate];
this.getList();
this.BankAccount_post_GetCashAccountList("query");
}
......@@ -773,6 +788,15 @@ export default {
this.msg.sTradeDate = this.productionDate[0];
this.msg.eTradeDate = this.productionDate[1];
},
timeAddByTC(){ // 日期格式
if(!this.productionDateByTC){
this.msg.QStartDate = '';
this.msg.QEndDate = '';
return
}
this.msg.QStartDate = this.productionDateByTC[0];
this.msg.QEndDate = this.productionDateByTC[1];
},
bankaccount_post_GetList(){ // 获取银行账户
this.AccountId = '';
let msg = {
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ d905a4d6
......@@ -93,6 +93,17 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="发团日期">
<el-date-picker class="h34"
@change="timeAddByTC"
v-model="productionDateByTC"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul>
......@@ -321,6 +332,8 @@ export default {
ClientID:'',
sTradeDate:'',
eTradeDate:'',
QStartDate:'',
QEndDate:'',
BankList:[],
Is_Cashier:-1,
},
......@@ -333,6 +346,7 @@ export default {
GetAccountType:[],
accountList:[],
productionDate:[],
productionDateByTC:[],
ClientAccountList:[],
loading:false,
date:'',
......@@ -381,6 +395,7 @@ export default {
this.msg.sTradeDate = this.$route.query.sTradeDate;
this.msg.eTradeDate = this.$route.query.eTradeDate;
this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
this.productionDateByTC=[this.msg.QStartDate, this.msg.QEndDate];
this.getList();
this.bankaccount_post_GetListS("query");
}
......@@ -418,6 +433,15 @@ export default {
this.msg.sTradeDate = this.productionDate[0];
this.msg.eTradeDate = this.productionDate[1];
},
timeAddByTC(){ // 日期格式
if(!this.productionDateByTC){
this.msg.QStartDate = '';
this.msg.QEndDate = '';
return
}
this.msg.QStartDate = this.productionDateByTC[0];
this.msg.QEndDate = this.productionDateByTC[1];
},
bankaccount_post_GetList(){ // 获取银行账户
this.AccountId = '';
this.apipost('bankaccount_post_GetList',{TypeId:this.accType}, res => {
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ d905a4d6
......@@ -90,6 +90,17 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="发团日期">
<el-date-picker class="h34"
@change="timeAddByTC"
v-model="productionDateByTC"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul>
......@@ -309,6 +320,8 @@ export default {
ClientID:'',
sTradeDate:'',
eTradeDate:'',
QStartDate:'',
QEndDate:'',
BankList:[],
Is_Cashier:-1,
Status:-1,
......@@ -323,6 +336,7 @@ export default {
GetAccountType:[],
accountList:[],
productionDate:[],
productionDateByTC:[],
ClientAccountList:[],
loading:false,
RB_Branch_Id:null,
......@@ -372,6 +386,7 @@ export default {
this.msg.sTradeDate = this.$route.query.sTradeDate;
this.msg.eTradeDate = this.$route.query.eTradeDate;
this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
this.productionDateByTC = [this.msg.QStartDate, this.msg.QEndDate];
this.getList();
this.BankAccount_post_GetPlatformList("query");
}
......@@ -409,6 +424,15 @@ export default {
this.msg.sTradeDate = this.productionDate[0];
this.msg.eTradeDate = this.productionDate[1];
},
timeAddByTC(){ // 日期格式
if(!this.productionDateByTC){
this.msg.QStartDate = '';
this.msg.QEndDate = '';
return
}
this.msg.QStartDate = this.productionDateByTC[0];
this.msg.QEndDate = this.productionDateByTC[1];
},
bankaccount_post_GetList(){ // 获取平台账户
this.AccountId = '';
let msg = {
......
src/components/FinancialModule/accDetail/PoolAccDetail.vue
View file @ d905a4d6
......@@ -82,6 +82,17 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="发团日期">
<el-date-picker class="h34"
@change="timeAddByTC"
v-model="productionDateByTC"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul>
......@@ -339,6 +350,8 @@ export default {
ClientID:'',
sTradeDate:'',
eTradeDate:'',
QStartDate:'',
QEndDate:'',
BankList:[],
Is_Cashier:-1,
},
......@@ -354,6 +367,7 @@ export default {
GetAccountType:[],
accountList:[],
productionDate:[],
productionDateByTC:[],
ClientAccountList:[],
RB_Branch_Id:null,
loading:false,
......@@ -402,6 +416,7 @@ export default {
this.msg.sTradeDate = this.$route.query.sTradeDate;
this.msg.eTradeDate = this.$route.query.eTradeDate;
this.productionDate = [this.msg.sTradeDate, this.msg.eTradeDate];
this.productionDateByTC = [this.msg.QStartDate, this.msg.QEndDate];
this.getList();
this.BankAccount_post_GetCashPoolList("query");
}
......@@ -444,6 +459,15 @@ export default {
this.msg.sTradeDate = this.productionDate[0];
this.msg.eTradeDate = this.productionDate[1];
},
timeAddByTC(){ // 日期格式
if(!this.productionDateByTC){
this.msg.QStartDate = '';
this.msg.QEndDate = '';
return
}
this.msg.QStartDate = this.productionDateByTC[0];
this.msg.QEndDate = this.productionDateByTC[1];
},
bankaccount_post_GetList(){ // 获取银行账户
this.AccountId = '';
let msg = {
......
src/components/FinancialModule/refundQuery.vue 0 → 100644
View file @ d905a4d6
<style>
</style>
<template>
<div class='flexOne'>
<div class="query-box">
<ul>
<li>
<span>
<em>订单号</em>
<el-input type="text" v-model="msg.OrderId" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>订单来源</em>
<el-select v-model="msg.OrderSource" filterable clearable>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in orderList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li>
<span><em>商务订单</em>
<el-input type="text" v-model="msg.Pay_Order" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span><em>平台订单</em>
<el-input type="text" v-model="msg.Trade_Order" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>支付方式</em>
<el-select v-model="msg.Pay_Way" filterable clearable>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option label="微信" :value="1"></el-option>
<el-option label="QQ" :value="2"></el-option>
<el-option label="支付宝" :value="3"></el-option>
<el-option label="银联" :value="4"></el-option>
</el-select>
</span>
</li>
<li>
<span><em>商户号</em>
<el-input type="text" v-model="msg.Mch_Id" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>类型</em>
<el-select v-model="msg.Type" filterable clearable>
<el-option label="收款" :value="1"></el-option>
<el-option label="退款" :value="2"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>退款状态</em>
<el-select v-model="msg.RefundStatus" filterable clearable>
<el-option label="不限" :value="0"></el-option>
<el-option label="收款中" :value="1"></el-option>
<el-option label="退款成功" :value="2"></el-option>
<el-option label="退款失败" :value="3"></el-option>
<el-option label="转入代发" :value="4"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>财务单据</em>
<el-input type="text" v-model="msg.FinanceId" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>日期</em>
<el-date-picker type="date" v-model="msg.StartTime"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker type="date" v-model="msg.EndTime"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
<li>
<span>
<em>退款日期</em>
<el-date-picker type="date" v-model="msg.RefundStartTime"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> -
<el-date-picker type="date" v-model="msg.RefundEndTime"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="handleCurrentChange(),getList()" />
</li>
</ul>
</div>
<div class="cm_content">
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th width="250">平台单号</th>
<th width="100">金额</th>
<th>支付方式</th>
<th>支付日期</th>
<th>状态</th>
<th>退款金额</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.Trade_Order}}</td>
<td>{{item.Money}}</td>
<td>{{item.PayWayName}}</td>
<td>{{item.Pay_Date}}</td>
<td>{{item.PayStatus}}</td>
<td>{{item.RefundMoney}}</td>
</tr>
</table>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" :page-size="msg.pageSize"
layout="total,prev, pager, next, jumper" :total="msg.total"></el-pagination>
</div>
</template>
<script>
export default {
data(){
return{
msg:{
pageIndex:1,
pageSize:10,
OrderId:'',
OrderSource:0,
Pay_Order:'',
Trade_Order:'',
Pay_Way:0,
Mch_Id:'',
StartTime:'',
EndTime:'',
RefundStartTime:'',
RefundEndTime:'',
Type:2,
RefundStatus:0,
FinanceId:'',
currentPage:1,
total: 0,
},
loading:false,
orderList:[],
dataList:[],
pickerBeginDateBefore: {
disabledDate: time => {
let endTime = new Date(this.msg.EndTime)
return endTime.getTime() < time.getTime()
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.StartTime)
return startTime.getTime() >= time.getTime()
}
}
}
},
methods:{
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList(){ //获取列表
this.loading =true;
this.apipost('OnlinePay_get_GetOrderPayMoneyInfo',this.msg,res=>{
this.loading = false;
console.log(res,'res');
if(res.data.resultCode==1){
this.dataList = res.data.data.pageData;
this.msg.total = res.data.data.count;
}else{
this.Error(res.data.message);
}
},err=>{})
},
//订单来源
getOrderlist() {
this.apipost(
"order_post_GetOrderSource", {},
res => {
if (res.data.resultCode == 1) {
this.orderList = res.data.data;
}
},null);
},
},
mounted(){
this.getOrderlist();
this.getList();
}
}
</script>
src/components/Hotel/roomReservationsDetails.vue
View file @ d905a4d6
......@@ -406,6 +406,7 @@
//1-只查询有库存的酒店
IsMoreThanZero:0,
Country: "651",
IsAllHotel:1,
sDate:obj.CheckInDateStr
}, res => {
if (res.data.resultCode == 1) {
......
src/components/SalesModule/VisaFinancialDocuments.vue
View file @ d905a4d6
......@@ -140,7 +140,7 @@
<th width="100">实收</th>
<th width="100">平台税金</th>
<th width="150">交易日期</th>
<th width="150">旅客名单</th>
<!-- <th width="150">旅客名单</th> -->
<th width="100">制单人员</th>
<th width="120">当前状态</th>
</tr>
......@@ -179,7 +179,7 @@
<td width="">{{item.TradeDate}}</td>
<!-- 旅客名单 -->
<!-- <td width="">旅客名单</td> -->
<td>
<!-- <td>
<span v-if="item.GuestInfoList.length>0" >
<el-popover class="item" effect="dark" placement="top-start" width="350" trigger="click">
<span style="display:inline-block;cursor:pointer;margin:6px;word-break:break-all;" v-for="item2 in item.GuestInfoList" :key="item2.GuestId">{{item2.GuestName}} </span>
......@@ -189,7 +189,7 @@
</el-popover>
</span>
<span v-if="item.GuestInfoList.length==0">暂无名单</span>
</td>
</td> -->
<td width="">{{item.EmName}}</td>
<td width="">
<i v-if="item.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
......@@ -240,7 +240,7 @@
<th width="100">实付</th>
<th width="100">平台税金</th>
<th width="150">交易日期</th>
<th width="150">旅客名单</th>
<!-- <th width="150">旅客名单</th> -->
<th width="100">制单人员</th>
<th width="120">当前状态</th>
</tr>
......@@ -277,7 +277,7 @@
<p style="line-height:20px"><span>{{moneyFormat(item.Fee)}}</span></p>
</td>
<td width="">{{item.TradeDate}}</td>
<td>
<!-- <td>
<span v-if="item.GuestInfoList.length>0" >
<el-popover class="item" effect="dark" placement="top-start" width="350" trigger="click">
<span style="display:inline-block;cursor:pointer;margin:6px;word-break:break-all;" v-for="item2 in item.GuestInfoList" :key="item2.GuestId">{{item2.GuestName}} </span>
......@@ -287,7 +287,7 @@
</el-popover>
</span>
<span v-if="item.GuestInfoList.length==0">暂无名单</span>
</td>
</td> -->
<td width="">{{item.EmName}}</td>
<td width="">
<i v-if="item.Status==1" class="iconfont icon-daiqueren" style="color: #4BCA81"></i>
......
src/components/SalesModule/enrollTotal.vue
View file @ d905a4d6
......@@ -193,6 +193,8 @@
<p>发团：{{item.startDate}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
<div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span style="color:#e95252">{{item.extraRewardMoney}}</span></div>
<div v-if="item.extraDeductMoney!=null&&item.extraDeductMoney>0">扣除金额：<span style="color:#e95252">{{item.extraDeductMoney}}</span></div>
</td>
<td>
<p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ d905a4d6
......@@ -1739,6 +1739,8 @@
<div v-if="isUpdateOrder" @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.orderId'>OP备注</div>
<!-- v-if="item.isUpdateOrderCommission" -->
<div v-if="isUpdateOrderCommission" @click='TCMsg.OrderId = item.orderId, TCMsg.CommissionMinusRate = item.commissionMinusRate,TCMsg.LatestCommissionMoney=item.latestCommissionMoney, TiChengLoading = true'>修改提成</div>
<div v-if="isUpdateOrderCommission" @click='EwMsg.OrderId = item.orderId, EwMsg.ExtraRewardMoney = item.extraRewardMoney,EwMsg.ExtraDeductMoney=item.extraDeductMoney, OrderMoneyDialog = true'>设置额外金额</div>
<div v-if='item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0)' @click='goUrlAdd("invoicesManagerAdd", item.orderId, item.tcid, item.customerId)'>申请发票</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2')" @click='setChargeLoss(item)'>
<span v-if="item.isChargeLossOrders==1">恢复收损单</span>
......@@ -2151,6 +2153,24 @@
<button class="hollowFixedBtn" @click="initTCMsg">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<el-dialog custom-class='w350' title="修改订单额外金额" :visible.sync="OrderMoneyDialog" center>
<el-form label-width="110px">
<el-form-item label="额外奖励金额：" class="w280">
<el-input placeholder="请输入" type="text" @keyup.native="checkPrice(EwMsg,'ExtraRewardMoney')" v-model="EwMsg.ExtraRewardMoney">
</el-input>
</el-form-item>
<el-form-item label="额外扣除金额：" class="w280">
<el-input placeholder="请输入" type="number" @keyup.native="checkPrice(EwMsg,'ExtraDeductMoney')" v-model="EwMsg.ExtraDeductMoney">
</el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitEWMsg">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" @click="OrderMoneyDialog=false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
......@@ -2176,6 +2196,12 @@ export default {
OrderId: 0,
CommissionMinusRate: 0,
LatestCommissionMoney: '',
},
OrderMoneyDialog:false,
EwMsg:{
OrderId:0,
ExtraRewardMoney:'',
ExtraDeductMoney:''
},
checkedObj:{},
positionId:0,
......@@ -2543,6 +2569,18 @@ export default {
LatestCommissionMoney:''
}
},
//设置额外金额
submitEWMsg(){
this.apipost('sellorder_post_SetOrderExtraMoney', this.EwMsg, res=>{
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.getList()
this.OrderMoneyDialog = false
} else {
this.Error(res.data.message);
}
}, null)
},
TransferDocuments: function () {
this.apipost('sellorder_get_SetOrderOPRemarks', this.OPRemarkMsg, res=>{
if (res.data.resultCode == 1) {
......@@ -2934,13 +2972,10 @@ submitYSZEForm(){
res => {
if (res.data.resultCode == 1) {
this.isAllowUpdate = res.data.data.IsUpdatePlatOrder;
let x = res.data.data.model;
let modelPrice=res.data.data.modelPrice;
this.addMsg = x;
this.addObj = res.data.data.modelPrice;
this.addObj.OrderId=x.OrderId;
this.addObj.OpSetLossMoney=x.OpSetLossMoney;
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ d905a4d6
......@@ -1616,6 +1616,7 @@
<div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
<div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div>
<div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate,TCMsg.LatestCommissionMoney=item.LatestCommissionMoney, TiChengLoading = true'>修改提成</div>
<div v-if="OrderDataList.IsUpdateOrderCommission" @click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'>设置额外金额</div>
<div @click='deleteItem(item)'>删除</div>
</div>
<el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
......@@ -1841,6 +1842,7 @@
<div @click="OrderLoading=true,OrderLossInfo(childItem)">订单收损</div>
<div @click='zhuanLoading = true,OPRemarkMsg.OrderId = childItem.OrderId,OPRemarkMsg.OP_Remarks=childItem.OP_Remarks'>OP备注</div>
<div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = childItem.OrderId, TCMsg.CommissionMinusRate = childItem.CommissionMinusRate,TCMsg.LatestCommissionMoney=childItem.LatestCommissionMoney, TiChengLoading = true'>修改提成</div>
<div v-if="OrderDataList.IsUpdateOrderCommission" @click='EwMsg.OrderId = childItem.OrderId, EwMsg.ExtraRewardMoney = childItem.ExtraRewardMoney,EwMsg.ExtraDeductMoney=childItem.ExtraDeductMoney, OrderMoneyDialog = true'>设置额外金额</div>
<div v-if="childItem.OrderState=='1'||childItem.OrderState=='2'||childItem.OrderState=='3'"
@click='deleteItem(childItem)'>
删除
......@@ -2114,6 +2116,8 @@
<div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
<div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId,OPRemarkMsg.OP_Remarks=item.OP_Remarks'>OP备注</div>
<div v-if="OrderDataList.IsUpdateOrderCommission" @click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate,TCMsg.LatestCommissionMoney=item.LatestCommissionMoney, TiChengLoading = true'>修改提成</div>
<div v-if="OrderDataList.IsUpdateOrderCommission" @click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'>设置额外金额</div>
<div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div>
</div>
<el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
......@@ -2346,6 +2350,23 @@
</div>
</el-dialog>
<el-dialog custom-class='w350' title="修改订单额外金额" :visible.sync="OrderMoneyDialog" center>
<el-form label-width="110px">
<el-form-item label="额外奖励金额：" class="w280">
<el-input placeholder="请输入" type="text" @keyup.native="checkPrice(EwMsg,'ExtraRewardMoney')" v-model="EwMsg.ExtraRewardMoney">
</el-input>
</el-form-item>
<el-form-item label="额外扣除金额：" class="w280">
<el-input placeholder="请输入" type="number" @keyup.native="checkPrice(EwMsg,'ExtraDeductMoney')" v-model="EwMsg.ExtraDeductMoney">
</el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitEWMsg">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" @click="OrderMoneyDialog=false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center>
<table border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
......@@ -2461,6 +2482,12 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
CommissionMinusRate: 0,
LatestCommissionMoney:''
},
OrderMoneyDialog:false,
EwMsg:{
OrderId:0,
ExtraRewardMoney:'',
ExtraDeductMoney:''
},
zhuanLoading: false,
notUpdate: true,
//是否显示操作按钮
......@@ -3009,12 +3036,12 @@ submitYSZEForm(){
submitTCMsg: function () {
this.apipost('sellorder_post_SetOrderCommission', this.TCMsg, res=>{
if (res.data.resultCode == 1) {
this.$message.success(res.data.message)
this.Success(res.data.message)
this.getList()
this.initTCMsg()
this.TiChengLoading = false
} else {
this.$message.error(res.data.message);
this.Error(res.data.message);
}
}, null)
},
......@@ -3026,6 +3053,18 @@ submitYSZEForm(){
LatestCommissionMoney:''
}
},
//设置额外金额
submitEWMsg(){
this.apipost('sellorder_post_SetOrderExtraMoney', this.EwMsg, res=>{
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.getList()
this.OrderMoneyDialog = false
} else {
this.Error(res.data.message);
}
}, null)
},
goUrlSFD: function (path, name, item) {
let obj = JSON.parse(JSON.stringify(item))
obj.oP_Remarks = ''
......
src/components/administrative/statisticsCheckTime.vue
View file @ d905a4d6
......@@ -236,7 +236,7 @@
},
getWeekByDay(dayValue) {
var day = new Date(Date.parse(dayValue.replace(/-/g, '/')));
var today = new Array(this.$t('adm.adm_Sunday'), this.$t('adm.adm_Monday'), this.$t('adm.adm_adm_Tuesday'), this.$t('adm.adm_Wednesday'), this.$t('adm.adm_Thursday'), this.$t('adm.adm_Friday'), this.$t('adm.adm_Saturday'));
var today = new Array(this.$t('adm.adm_Sunday'), this.$t('adm.adm_Monday'), this.$t('adm.adm_Tuesday'), this.$t('adm.adm_Wednesday'), this.$t('adm.adm_Thursday'), this.$t('adm.adm_Friday'), this.$t('adm.adm_Saturday'));
return today[day.getDay()];
},
handleCurrentChange(val) {
......
src/components/index.vue
View file @ d905a4d6
......@@ -117,7 +117,7 @@
<i class="iconfont icon-imessage_top" :class="[hasNewMsg>0&&!IM_bodyIsShow?'animation red':'',IM_bodyIsShow?'red':'']" @click="IM_bodyIsShow=!IM_bodyIsShow"></i>
<!--<i class="iconfont icon-imessage_top" @click="togglebox($event)"></i>-->
</li>
<li><i class="iconfont icon-help_top"></i></li>
<li><i class="iconfont icon-banbengengxin" @click="goUrlLog()"></i></li>
<li>
<el-dropdown trigger="click">
<span class="el-dropdown-link">
......@@ -574,6 +574,18 @@
<div style="width: 100%; height: 50px;"></div>
</div>
</div>
<div class="logsBack" v-if="logsShow">
<div class="updateLogs">
<img src="../assets/img/logsImg.png" alt="" class="logsImg" />
<div class="logsTitle">
{{versionList[0].UpdateTitle}}版本更新
</div>
<div class="inlogs_Content" v-html="versionList[0].UpdateContent">
</div>
<input type="button" value="我知道了" class="normalBtn" style="margin:10px 0 0 155px;" @click="logsShow=false"/>
</div>
</div>
<div class="downmz" v-show="downmz">
<div class="top_1"></div>
<div style="text-align:center">
......@@ -924,6 +936,9 @@ export default {
displayNone: true,
dialogTitle: "",
outerVisible: false,
logsShow:false,
newVersion:'',
versionList:[],
msg: {
ParentId: 0,
MenuStatus: "",
......@@ -1249,7 +1264,7 @@ export default {
msglist() {
let msgs = this.$store.state.currSessionMsgs;
return msgs;
}
},
},
mounted() {
let that = this;
......@@ -1302,6 +1317,8 @@ export default {
this.allPartMsg.RB_Group_Id = this.deleteMsg.groupId = this.likeMsg.groupId = this.addDynamicMsg.rB_GroupId = this.dynamicMsg.groupId =
UserInfo.RB_Group_id;
this.addDynamicMsg.rB_BranchId = UserInfo.RB_Branch_id;
//获取版本
this.getVersion();
this.getMenu();
this.setCheckMenu();
......@@ -1382,6 +1399,34 @@ export default {
}
},
methods: {
//获取版本号
getVersion(){
let msg = {
pageIndex:1,
pageSize:5
}
this.apipost("sysrecord_get_GetPageList",msg,res => {
if (res.data.resultCode == 1) {
this.versionList = res.data.data.pageData;
if(this.versionList.length>0){
let oldVersion = localStorage.version;
this.newVersion = this.versionList[0].UpdateTitle;
if(this.newVersion!=oldVersion){
this.logsShow = true;
localStorage.version = this.newVersion;
}else{
this.logsShow = false;
}
}else{
this.logsShow = false;
}
} else {
//this.Error(res.data.message);
}
},err => {}
);
},
CloseZip(){
this.mazip=1;
localStorage.setItem("mazip",1);
......@@ -3010,6 +3055,9 @@ export default {
// this.$router.push({ path: url });
// }
},
goUrlLog(){
this.$router.push({ path: 'systemLogs', query:{} });
},
goUrlPayment() {
let eid=this.getLocalStorage().EmployeeId;
this.$router.push({ path: 'empBankAccount', query: { id: eid,type:10,blank:'y' } });
......@@ -4017,4 +4065,50 @@ export default {
._more_dropdown._dropdown.el-dropdown-menu{
top: 50px !important;
}
.logsBack{
position: fixed;
z-index: 999;
background: rgba(0, 0, 0, 0.2);
width: 100%;
height: 100%;
left: 0;
top: 0;
}
.updateLogs{
position: absolute;
width:400px;
height:400px;
left:50%;
top:50%;
margin-left:-200px;
margin-top:-200px;
border-radius: 4px;
border:1px solid #DCDCDC;
z-index: 9999;
background-color: #fff;
}
.logsTitle{
width:100%;
padding:0 10px;
text-align: center;
color:#333333;
font-size:12px;
margin-top:10px;
font-weight: bold;
}
.inlogs_Content{
width:100%;
padding:0 15px;
height:260px;
overflow: auto;
margin-top:20px;
color:#666666;
font-size:12px;
}
.logsImg{
margin-top:-30px;
margin-left:155px;
}
</style>
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ d905a4d6
......@@ -328,7 +328,12 @@
cursor: default !important;
box-shadow: none !important;
}
.lessPriceRule{
font-size:14px;
margin-left:40px;
text-decoration: underline;
cursor: pointer;
}
</style>
<template>
......@@ -429,6 +434,9 @@
<el-checkbox v-model="priceData.IsBookTeam" :true-label="CheckedVaule" v-if="PostConfig.LineId==14"
:false-label="UnCheckedVaule">订团
</el-checkbox>
<el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
:false-label="UnCheckedVaule">可少价
</el-checkbox>
<input type="button" class="normalBtn" value="酒店使用情况" @click="outerVisible=true" v-if="PostConfig.LineId==14 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
</div>
<el-form-item prop="B2BMemberPrice">
......@@ -765,6 +773,9 @@
</el-form-item>
</div>
</div>
<div class="TPright">
<span v-if="priceData.IsLessPrice==1" @click="getLessPriceInfo(),lessPriceVisible=true" class="lessPriceRule">少价规则</span>
</div>
</div>
</el-form>
</div>
......@@ -782,9 +793,9 @@
<td>
<div class="tp_divList" v-for="(subItem,index) in item.SubList">
<div>
{{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;【<span
style="color:#E95252;">库存：{{subItem.RemainingInventory}}</span>】&nbsp;&nbsp;
<el-checkbox v-model="item.CheckList[index].CheckStatus"
{{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;<span v-if="subItem.UseCount>0 && item.SubList.length==1">【<span style="color:green">本团使用库存：{{subItem.UseCount}}</span>】</span>【<span
style="color:#E95252;">剩余库存：{{subItem.RemainingInventory}}</span>】&nbsp;&nbsp;
<el-checkbox v-if="item.SubList.length>1" v-model="item.CheckList[index].CheckStatus"
@change="changeHotelStatus(item,index),changeHotelList()"></el-checkbox>
</div>
</div>
......@@ -807,6 +818,35 @@
<button class="hollowFixedBtn" :class="{'disClick':!isSaved}" @click="cancelHotelUseDetail()">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
<el-dialog custom-class='Tp_hotelDialog' title="少价规则" :visible.sync="lessPriceVisible" center>
<table class="TphotelTable" border="0" cellspacing='1' v-if="lessPriceData.length>0">
<tr>
<th>所有人</th>
<th>部门主管</th>
<th>分公司总经理</th>
</tr>
<tr v-for="item in lessPriceData">
<td>
<span v-if="item.LessMoney!=null" style="margin-right:30px;">{{item.LessMoney}}元</span><span v-if="item.LessPercent!=null">{{item.LessPercent}}%</span>
</td>
<td>
<span v-if="item.DeptLessMoney!=null" style="margin-right:30px;">{{item.DeptLessMoney}}元</span><span v-if="item.DeptLessPercent!=null">{{item.DeptLessPercent}}%</span>
</td>
<td>
<span v-if="item.FilialeLessMoney!=null" style="margin-right:30px;">{{item.FilialeLessMoney}}元</span><span v-if="item.FilialeLessPercent!=null">{{item.FilialeLessPercent}}%</span>
</td>
</tr>
</table>
<div class="noData" v-else>
{{$t('system.content_noData')}}
</div>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="lessPriceVisible=false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
<script>
......@@ -896,7 +936,10 @@
let startTime = new Date(this.QFlightDateStart);
return startTime.getTime() >= time.getTime();
}
}
},
//少价规则
lessPriceVisible:false,
lessPriceData:[],
};
},
methods: {
......@@ -999,6 +1042,8 @@
CanSellTicketNum: 2,
//是否订团，0-不订，1需要订
IsBookTeam: 0,
//少价,0-不少价，1少价
IsLessPrice: 0,
//是否重新生成行程数据
IsNew: false,
//选中的酒店数组
......@@ -1516,6 +1561,24 @@
err => {}
);
}
},
//获取少价信息
getLessPriceInfo(){
let msg = {
RB_Branch_id:this.priceData.OutBranchId,
LineID:this.PostConfig.LineId,
LineTeamId:this.PostConfig.LineteamId
}
this.apipost("sell_get_GetNewTCIDLessprice", msg,res => {
console.log(res,'res');
if (res.data.resultCode == 1) {
this.lessPriceData = res.data.data;
}else{
this.Error(res.data.message);
}
},
err => {}
);
}
},
mounted() {
......@@ -1557,6 +1620,7 @@
this.DateArr.push(x.StartDate);
});
this.initCalendar();
console.log(this.priceData,'pricedate');
},
deep: true
},
......
src/plug/index.js
View file @ d905a4d6
......@@ -117,10 +117,10 @@ export default {
Vue.prototype.domainManager = function () {
let domainUrl = '';
let locationName = window.location.hostname;
domainUrl = "http://192.168.2.65:8025"; //214主域名
// domainUrl = "http://192.168.2.65:8025"; //214主域名
// domainUrl = "http://192.168.2.214:8082"; //214主域名
// domainUrl = "http://192.168.0.119:8082";
// domainUrl = "http://192.168.2.106:8082";
domainUrl = "http://192.168.2.106:8082";
if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com";
} else if (locationName.indexOf('viitto') !== -1) {
......
src/router/config.js
View file @ d905a4d6
......@@ -2389,6 +2389,14 @@ export default {
title: '应收应付查询'
},
},
{ //财务 财务单据 原路退款查询
path: '/refundQuery',
name: 'refundQuery',
component: resolve => require(['@/components/FinancialModule/refundQuery'], resolve),
meta: {
title: '原路退款查询'
},
},
{ //财务 财务单据 出纳工作台
path: '/CashierWork',
name: 'CashierWork',
......
yarn.lock
View file @ d905a4d6
......@@ -46,11 +46,11 @@
esutils "^2.0.2"
js-tokens "^3.0.0"
"@babel/runtime@^7.0.0-beta.56":
version "7.0.0"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.0.0.tgz#adeb78fedfc855aa05bc041640f3f6f98e85424c"
"@babel/runtime@^7.0.0":
version "7.4.3"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.3.tgz#79888e452034223ad9609187a0ad1fe0d2ad4bdc"
dependencies:
regenerator-runtime "^0.12.0"
regenerator-runtime "^0.13.2"
"@babel/template@7.0.0-beta.44":
version "7.0.0-beta.44"
......@@ -84,17 +84,17 @@
lodash "^4.2.0"
to-fast-properties "^2.0.0"
"@riophae/vue-treeselect@0.0.36":
version "0.0.36"
resolved "https://registry.yarnpkg.com/@riophae/vue-treeselect/-/vue-treeselect-0.0.36.tgz#308dd6dfaf5fa550a2a64f881374666c9b01a962"
"@riophae/vue-treeselect@0.0.38":
version "0.0.38"
resolved "https://registry.yarnpkg.com/@riophae/vue-treeselect/-/vue-treeselect-0.0.38.tgz#13af5dfcd732a9f41fa96f99821108e72666dd4f"
dependencies:
"@babel/runtime" "^7.0.0-beta.56"
"@babel/runtime" "^7.0.0"
babel-helper-vue-jsx-merge-props "^2.0.3"
easings-css "^1.0.0"
fuzzysearch "^1.0.3"
google-material-color "^1.3.1"
is-promise "^2.1.0"
lodash "^4.0.0"
material-colors "^1.2.6"
watch-size "^2.0.0"
"@types/node@^10.11.7":
......@@ -195,7 +195,7 @@ ajv-keywords@^3.1.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
ajv@^5.0.0, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
ajv@^5.0.0, ajv@^5.2.3, ajv@^5.3.0:
version "5.5.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
dependencies:
......@@ -480,7 +480,7 @@ aws-sign2@~0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
aws4@^1.6.0, aws4@^1.8.0:
aws4@^1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
......@@ -499,7 +499,7 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
esutils "^2.0.2"
js-tokens "^3.0.2"
babel-core@^6.22.1, babel-core@^6.26.0:
babel-core@^6.26.0, babel-core@^6.26.3:
version "6.26.3"
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
dependencies:
......@@ -968,7 +968,7 @@ babel-plugin-transform-vue-jsx@^3.5.0:
dependencies:
esutils "^2.0.2"
babel-preset-env@^1.3.2:
babel-preset-env@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
dependencies:
......@@ -1711,7 +1711,7 @@ combined-stream@1.0.6:
dependencies:
delayed-stream "~1.0.0"
combined-stream@~1.0.5, combined-stream@~1.0.6:
combined-stream@~1.0.6:
version "1.0.7"
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
dependencies:
......@@ -2984,7 +2984,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
assign-symbols "^1.0.0"
is-extendable "^1.0.1"
extend@3, extend@^3.0.0, extend@^3.0.1, extend@^3.0.2, extend@~3.0.1, extend@~3.0.2:
extend@3, extend@^3.0.0, extend@^3.0.1, extend@^3.0.2, extend@~3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
......@@ -3208,7 +3208,7 @@ forever-agent@~0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
form-data@~2.3.1, form-data@~2.3.2:
form-data@~2.3.2:
version "2.3.2"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
dependencies:
......@@ -3446,12 +3446,6 @@ globule@^1.0.0:
lodash "~4.17.10"
minimatch "~3.0.2"
google-material-color@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/google-material-color/-/google-material-color-1.3.1.tgz#98082d4ed86af43bb3ab11c49a81eb99caca1056"
dependencies:
lodash "^2.4.1"
google-translate-api@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/google-translate-api/-/google-translate-api-2.3.0.tgz#626730a123da0d57af3735dd707cda71cee919c7"
......@@ -3518,13 +3512,6 @@ har-schema@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
har-validator@~5.0.3:
version "5.0.3"
resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
dependencies:
ajv "^5.1.0"
har-schema "^2.0.0"
har-validator@~5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
......@@ -4420,9 +4407,9 @@ less-loader@^4.1.0:
loader-utils "^1.1.0"
pify "^3.0.0"
less@^3.0.1:
version "3.8.1"
resolved "https://registry.yarnpkg.com/less/-/less-3.8.1.tgz#f31758598ef5a1930dd4caefa9e4340641e71e1d"
less@^3.9.0:
version "3.9.0"
resolved "https://registry.yarnpkg.com/less/-/less-3.9.0.tgz#b7511c43f37cf57dc87dffd9883ec121289b1474"
dependencies:
clone "^2.1.2"
optionalDependencies:
......@@ -4524,10 +4511,6 @@ lodash.uniq@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
lodash@^2.4.1:
version "2.4.2"
resolved "http://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"
lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@latest, lodash@~4.17.10:
version "4.17.11"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
......@@ -4608,6 +4591,10 @@ map-visit@^1.0.0:
dependencies:
object-visit "^1.0.0"
material-colors@^1.2.6:
version "1.2.6"
resolved "https://registry.yarnpkg.com/material-colors/-/material-colors-1.2.6.tgz#6d1958871126992ceecc72f4bcc4d8f010865f46"
math-expression-evaluator@^1.2.14:
version "1.2.17"
resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
......@@ -4986,9 +4973,9 @@ node-pre-gyp@^0.10.0:
semver "^5.3.0"
tar "^4"
node-sass@^4.8.3:
version "4.9.3"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.3.tgz#f407cf3d66f78308bb1e346b24fa428703196224"
node-sass@^4.11.0:
version "4.11.0"
resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
dependencies:
async-foreach "^0.1.3"
chalk "^1.1.1"
......@@ -5005,7 +4992,7 @@ node-sass@^4.8.3:
nan "^2.10.0"
node-gyp "^3.8.0"
npmlog "^4.0.0"
request "2.87.0"
request "^2.88.0"
sass-graph "^2.2.4"
stdout-stream "^1.4.0"
"true-case-path" "^1.0.2"
......@@ -5109,10 +5096,6 @@ number-is-nan@^1.0.0:
version "1.4.4"
resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.4.tgz#2285631f34a95f0d0395cd900c96ed39b58f346e"
oauth-sign@~0.8.2:
version "0.8.2"
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
oauth-sign@~0.9.0:
version "0.9.0"
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
......@@ -6018,7 +6001,7 @@ qs@6.5.1:
version "6.5.1"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
qs@^6.4.0, qs@~6.5.1, qs@~6.5.2:
qs@^6.4.0, qs@~6.5.2:
version "6.5.2"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
......@@ -6221,9 +6204,9 @@ regenerator-runtime@^0.11.0:
version "0.11.1"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
regenerator-runtime@^0.12.0:
version "0.12.1"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
regenerator-runtime@^0.13.2:
version "0.13.2"
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
regenerator-transform@^0.10.0:
version "0.10.1"
......@@ -6308,32 +6291,7 @@ repeating@^2.0.0:
dependencies:
is-finite "^1.0.0"
request@2.87.0:
version "2.87.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
dependencies:
aws-sign2 "~0.7.0"
aws4 "^1.6.0"
caseless "~0.12.0"
combined-stream "~1.0.5"
extend "~3.0.1"
forever-agent "~0.6.1"
form-data "~2.3.1"
har-validator "~5.0.3"
http-signature "~1.2.0"
is-typedarray "~1.0.0"
isstream "~0.1.2"
json-stringify-safe "~5.0.1"
mime-types "~2.1.17"
oauth-sign "~0.8.2"
performance-now "^2.1.0"
qs "~6.5.1"
safe-buffer "^5.1.1"
tough-cookie "~2.3.3"
tunnel-agent "^0.6.0"
uuid "^3.1.0"
request@^2.55.0, request@^2.83.0, request@^2.87.0:
request@^2.55.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
version "2.88.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
dependencies:
......@@ -7244,12 +7202,6 @@ tough-cookie@^2.2.0, tough-cookie@~2.4.3:
psl "^1.1.24"
punycode "^1.4.1"
tough-cookie@~2.3.3:
version "2.3.4"
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
dependencies:
punycode "^1.4.1"
tr46@~0.0.3:
version "0.0.3"
resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
......@@ -7527,7 +7479,7 @@ uuid@^2.0.1:
version "2.0.3"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
uuid@^3.0.1, uuid@^3.1.0, uuid@^3.3.2:
uuid@^3.0.1, uuid@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
......@@ -7585,9 +7537,9 @@ vue-draggable-resizable@^1.7.2:
version "1.7.2"
resolved "https://registry.yarnpkg.com/vue-draggable-resizable/-/vue-draggable-resizable-1.7.2.tgz#00f1116ff7979f40f825b308efd6dbfbd604ff4b"
vue-easytable@^1.7.1:
version "1.7.1"
resolved "http://registry.npm.taobao.org/vue-easytable/download/vue-easytable-1.7.1.tgz#fc228448e4dd963ee9b5bad97c20a4af9c13db61"
vue-easytable@^1.7.2:
version "1.7.2"
resolved "https://registry.yarnpkg.com/vue-easytable/-/vue-easytable-1.7.2.tgz#b5d1e54f7a6b38ba41d826dbfd105db48ece3568"
dependencies:
nprogress "^0.2.0"
vue "^2.2.6"
......@@ -7702,7 +7654,7 @@ vue-waterfall-easy@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/vue-waterfall-easy/-/vue-waterfall-easy-2.4.1.tgz#76a6182d367d8ac512eaf03a0b71cd3f80cc008e"
vue-websocket@^0.2.2:
vue-websocket@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/vue-websocket/-/vue-websocket-0.2.3.tgz#49b5b094fd0069ec4c1e1b1c0a873697feacc32f"
dependencies:
......
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