Skip to content

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

解决 src/plug/index.js冲突

parents 42434fa7 a4c72007
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1354 additions and 456 deletions
src/assets/css/cssReset.css
View file @ 364d09f4
......@@ -543,12 +543,13 @@ vertical-align:middle
bottom: 0;
left: 50px;
padding: 10px;
overflow: auto;
overflow: hidden;
font-family: 'PingFangSc-Fine';
z-index: 999;
right: 0;
background-color: #fff;
border-top: 3px solid #38425d;
padding-bottom: 30px;
}
.bottom-box .btm-title{
padding-left: 10px;
......@@ -570,3 +571,45 @@ vertical-align:middle
.page_ShoppingReimbursementDetails .avatar-uploader-icon {
height: auto !important;
}
/************************** luochao 重新定义表格样式 BEGIN *******************************/
.al-tab{
width: 100%;
border-collapse: collapse;
}
.al-tab .center.th,.al-tab .center.td{
text-align: center !important;
}
.al-tab,.al-tab th, .al-tab td{
border:1px solid #ddd;
}
.al-tab caption{
font-size: 18px;
color: #333;
height: 40px;
line-height: 40px;
text-align: left;
padding-left: 12px;
}
.al-tab th{
background: #E6E6E6;
height: 40px;
line-height: 40px;
color: #333;
font-size: 16px;
font-weight: 300;
text-align: left;
padding-left:5px;
}
.al-tab td{
height: 40px;
line-height: 40px;
color: #333;
font-size: 12px;
font-weight: 300;
text-align: left;
padding-left:5px;
}
/************************** luochao 重新定义表格样式 END *******************************/
\ No newline at end of file
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 364d09f4
......@@ -793,9 +793,13 @@ export default {
let f = parseFloat(this.msg.OriginalFee);
this.msg.Fee = (r*f).toFixed(2);
let allPrice = 0;
// this.msg.detailList.forEach(x=>{ //2019-02-01注释：页面手续费只需要计算一次，多个费用说明，重复计算 BY:W
// allPrice = allPrice+parseFloat(x.bTotalPrice)-parseFloat(this.msg.Fee);
// })
this.msg.detailList.forEach(x=>{
allPrice = allPrice+parseFloat(x.bTotalPrice)-parseFloat(this.msg.Fee);
allPrice = allPrice+parseFloat(x.bTotalPrice);
})
allPrice =allPrice-parseFloat(this.msg.Fee);
this.allPrice = allPrice.toFixed(2);
this.allPriceTo =this.$commonUtils.addCommas(this.allPrice);
this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice);
......@@ -805,9 +809,14 @@ export default {
let f = parseFloat(this.msg.OriginalFee);
this.msg.Fee = (r*f).toFixed(2);
let allPrice = 0;
// this.msg.detailList.forEach(x=>{ //2019-02-01注释：页面手续费只需要计算一次，多个费用说明，重复计算 BY:W
// allPrice = allPrice+parseFloat(x.bTotalPrice)-parseFloat(this.msg.Fee);
// });
this.msg.detailList.forEach(x=>{
allPrice = allPrice+parseFloat(x.bTotalPrice)-parseFloat(this.msg.Fee);
allPrice = allPrice+parseFloat(x.bTotalPrice);
})
allPrice =allPrice-parseFloat(this.msg.Fee);
this.allPrice = allPrice.toFixed(2);
this.allPriceTo =this.$commonUtils.addCommas(this.allPrice);
this.chinaAllPrice=this.$commonUtils.changeMoneyToChinese(this.allPrice) ;
......
src/components/SalesModule/enrollTotal.vue
View file @ 364d09f4
......@@ -376,7 +376,7 @@
CreateBy:'',
OrderId:0
},
userId:0
userId:0,
};
},
methods: {
......
src/components/SalesModule/enrollTotalTwo.vue
View file @ 364d09f4
......@@ -263,7 +263,7 @@
<td>{{item.refund}}</td>
<td>{{item.platformTax}}</td>
<td>{{moneyFormat(item.zaiTuMoney)}}</td>
<td>{{moneyFormat(item.weiShouMoney)}}</td>
<td class="weiShou">{{moneyFormat(item.weiShouMoney)}}</td>
<td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
</tr>
<tr>
......@@ -939,5 +939,8 @@
display: inline-block;
margin: 0 10px 0 0;
}
.enrollTotalSearchTable .weiShou{
color: red;
}
</style>
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @ 364d09f4
......@@ -57,7 +57,7 @@
<th width="80">返佣总计</th>
<th width="80">汇率</th>
<th width="80">凭证</th>
<th width="80" >财务单据</th>
<th width="80">财务单据</th>
<th width="80">操作</th>
</tr>
<tr v-if="list.length==0">
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 364d09f4
......@@ -799,6 +799,10 @@
font-size: 14px;
vertical-align: top;
}
.RegistrationList .nowrap{
white-space:nowrap;
}
</style>
<template>
......@@ -1316,6 +1320,8 @@
</div>
</div>
<div class="RL_rightBtn" v-if="isShow===true">
<!--item.TCID,item.OutBranchId-->
<input type="button" class="normalBtn" @click="goTeamBalance(ConfigData.Config.TCID,ConfigData.Config.OutBranchId)" value="团报" />
<input type="button" class="normalBtn" @click="SetOutNotice()" :value="'出团通知书('+(SetNoticeMsg.OutNotice==1?'OK':'暂定')+')'" />
<input type="button" @click="CancelLeader" v-if="ConfigData.Leader!=null&&ConfigData.Leader.LeaderId>0" class="normalBtn"
value="重选领队" />
......@@ -1330,18 +1336,18 @@
<tr>
<th width="240">单号</th>
<th width="150">客户信息</th>
<th width="70">人数/机位数</th>
<th width="110">单价</th>
<th width="110">成交单价</th>
<th width="110">应收总额</th>
<th width="110">实收</th>
<th width="110">退款</th>
<th width="110">平台税金</th>
<th width="110">平台在途</th>
<th width="80">待收金额</th>
<th width="100">状态</th>
<th width="130">确认函</th>
<th width="150">操作</th>
<th width="70" class="nowrap">人数/机位数</th>
<th width="110" class="nowrap">单价</th>
<th width="110" class="nowrap">成交单价</th>
<th width="110" class="nowrap">应收总额</th>
<th width="110" class="nowrap">实收</th>
<th width="110" class="nowrap">退款</th>
<th width="110" class="nowrap">平台税金</th>
<th width="110" class="nowrap">平台在途</th>
<th width="110" class="nowrap">待收金额</th>
<th width="100" class="nowrap">状态</th>
<th width="130" class="nowrap">确认函</th>
<th width="150" class="nowrap">操作</th>
</tr>
<tr>
<td v-show="OrderDataList.Length==0" colspan="14" align="center">暂无数据</td>
......@@ -1394,9 +1400,9 @@
</tr>
</table>
</div>
<span v-if='item.GuestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==1' style="color:#1AA86B; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==2' style="color:#E95252; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
</el-popover>
</td>
<td>{{item.TC_Price}}</td>
......@@ -1571,17 +1577,17 @@
</tr>
</table>
</div>
<span v-if='childItem.GuestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==3' style="color:#666;" class="personNo" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==1' style="color:#1AA86B; " class="personNo nowrap" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==2' style="color:#E95252;" class="personNo nowrap" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==3' style="color:#666; " class="personNo nowrap" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
</el-popover>
</td>
<td>{{childItem.TC_Price}}</td>
<td class="nowrap">{{childItem.TC_Price}}</td>
<td>{{childItem.Unit_Price}}</td>
<td>
<td class="nowrap">
<p>{{childItem.PreferPrice}}</p>
</td>
<td>
<td class="nowrap">
<el-popover style='padding: 0;' width="400" trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
......@@ -1608,10 +1614,10 @@
@click="getOrderDetail(childItem)" slot="reference">{{childItem.Income}}</span>
</el-popover>
</td>
<td>{{childItem.Refund}}</td>
<td>{{childItem.PlatformTax}}</td>
<td>{{childItem.ZaiTuMoney}}</td>
<td><span :class="{color_red_order:childItem.DueInMoney!==childItem.PreferPrice}">{{childItem.DueInMoney}}</span></td>
<td class="nowrap">{{childItem.Refund}}</td>
<td class="nowrap">{{childItem.PlatformTax}}</td>
<td class="nowrap">{{childItem.ZaiTuMoney}}</td>
<td class="nowrap"><span :class="{color_red_order:childItem.DueInMoney!==childItem.PreferPrice}">{{childItem.DueInMoney}}</span></td>
<td class="fz12"><span :class="{'RL-redType':childItem.statsstr=='候补'}">{{childItem.statsstr}}</span></td>
<td>
<div @click="goOpenUrl('confirmationOrder',childItem.OrderId)" style="cursor:pointer;">电子确认函</div>
......@@ -2824,14 +2830,14 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
if (this.addMsg.Commission > 0) {
this.addMsg.CommissionShareMoney = this.addMsg.Commission / 2;
this.addMsg.Commission =
this.addMsg.Commission - this.addMsg.CommissionShareMoney;
(this.addMsg.Commission - this.addMsg.CommissionShareMoney).toFixed(2);
} else {
this.addMsg.CommissionShareMoney = "0";
}
}
}
} else {
this.addMsg.Commission = Number(this.addMsg.PreferPrice) * 0.01
this.addMsg.Commission = (Number(this.addMsg.PreferPrice) * 0.01).toFixed(2)
}
},
getHouseNo() {
......@@ -3808,6 +3814,18 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
//关闭修改业务员
closeSalseDiv(){
this.showChangeSales=false;
},
//跳转到团报
goTeamBalance(id, OutBranchId) {
this.$router.push({
name: "TeamBalancePayment",
query: {
id: id,
OutBranchId: OutBranchId,
blank: "y",
tab: "团队收支明细"
}
});
}
},
mounted() {
......
src/components/administrative/CommissionDetail.vue 0 → 100644
View file @ 364d09f4
<style>
.ComDetail_nav{margin: 20px 0 0 0 ;background-color: #f5f5f5;margin-bottom:20px;}
.ComDetail_nav li{float: left;font-size: 14px;color: #666666;padding: 15px 20px;cursor: pointer;position: relative;background-color: #f1f1f1;margin-right: 5px}
.ComDetail_nav li._active{background-color:#FFFFFF;color: #333333 }
.ComDetail_nav li._active::after{content: "";width: 20px;height: 3px;background-color: #E95252;display: inline-block;position: absolute;bottom: 0;left: 38%;}
.CD_orderNum{
color: #3980C8;
border-bottom: 1px dotted #3980C8;
cursor: pointer;
}
</style>
<template>
<div>
<!-- <ul class="ComDetail_nav clearfix">
<li :class="active==1?'_active':''" @click="active=1,commonName='姓名'">按人排序</li>
<li :class="active==2?'_active':''" @click="active=2,commonName='公司名'">按公司排序</li>
</ul> -->
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="按人排序" name="first"></el-tab-pane>
<el-tab-pane label="按公司排序" name="second"></el-tab-pane>
</el-tabs>
<table border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="300">{{commonName}}</th>
<th>提成金额</th>
<th>期数</th>
<th width="500">备注</th>
<th>操作</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.createByStr}}</td>
<td>{{item.commissionMoney}}</td>
<td>{{item.periods}}</td>
<!-- <td>{{item.ruleName}}</td> -->
<td></td>
<td>
<input type="button" @click="getInfo(item)" class="normalBtn" value="详情"/>
</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{
activeName: "first",
commonName:'姓名',
loading:false,
msg:{
pageIndex: 1,
pageSize: 20,
ParentId:0,
OrderStr:'UserId'
},
total:0,
currentPage: 1,
dataList:[]
}
},methods:{
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getList(){
this.loading = true;
this.apipost(
"sellcommission_GetDetailsList",
this.msg,
res => {
this.loading = false;
if(res.data.resultCode==1){
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
console.log(this.dataList,'dataList');
}else{
this.Error(res.data.message);
}
},
null
);
},
//切换排序
handleClick(tab, event) {
if (this.activeName == "first") {
// this.commonName='姓名'
this.msg.OrderStr = 'UserId'
}else {
// this.commonName='公司名'
this.msg.OrderStr = 'RB_Branch_Id'
}
this.getList();
},
//跳转
getInfo(item){
var dateStr = item.periods;
var year = dateStr.substring(0,4);
var month = dateStr.substring(4,6);
var nextMonthFirstDay=new Date(year,month,1);
var oneDay=1000*60*60*24;
var entDay = new Date(nextMonthFirstDay-oneDay).Format("yyyy-MM-dd");
var startDay = year + '-' + month + '-' + '01';
var userId = item.userId;
this.$router.push({
path: 'enrollTotal',
query: {
EmployeeId:userId,
starTime:startDay,
endTime:entDay,
}
});
}
},mounted(){
this.msg.ParentId = this.$route.query.ParentId;
this.getList();
}
}
</script>
src/components/administrative/CommissionManagement.vue 0 → 100644
View file @ 364d09f4
<style>
.CM_look{
padding:4px!important;
position: relative;
top:1px;
}
</style>
<template>
<div class="flexOne">
<div class="query-box">
<ul>
<li>
<input type="button" class="normalBtn" @click="generateTable" value="生成提成报表"/>
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>期数</th>
<th>提成总金额</th>
<th>操作人</th>
<th>日期</th>
<th>操作</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.periods}}</td>
<td>{{item.sumPrice}}</td>
<td>{{item.createByStr}}</td>
<td>{{item.createStr}}</td>
<td>
<!-- <el-tooltip class="item" effect="dark" content="取消" placement="top">
<el-button type="danger" icon="el-icon-delete" circle></el-button>
</el-tooltip> -->
<el-tooltip class="item" effect="dark" content="查看" placement="top">
<el-button type="primary" class="CM_look" @click="goUrl('CommissionDetail',item.id)" icon="iconfont icon-chakan" circle></el-button>
</el-tooltip>
</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 {
msg: {
PageIndex: 1,
PageSize: 20
},
loading:false,
//数据源
dataList:[],
total:0,
currentPage: 1,
}
},
mounted() {
this.getList();
},
methods: {
handleCurrentChange(val) {
this.msg.PageIndex = val;
this.getList();
},
goUrl(path,id) {
this.$router.push({
path: path,
query: {
ParentId:id,
blank: 'y',
tab: '报价详情'
}
});
},
//获取数据
getList() {
this.loading = true;
this.apipost(
"sellcommission_GetPageList",
this.msg,
res => {
this.loading = false;
if(res.data.resultCode==1){
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
}else{
this.Error(res.data.message);
}
},
null
);
},
//生成提成报表
generateTable(){
let msg = {
UserId: 0
}
this.apipost(
"sellcommission_SetGenerateCommission",msg,
res => {
if(res.data.resultCode==1){
this.dataList = res.data.data.pageData;
this.total = res.data.data.count;
}else{
this.Error(res.data.message);
}
},
null
);
}
}
}
</script>
src/components/confirmationOrderDownLoad.vue
View file @ 364d09f4
<style>
.confirmOrder{
width:950px;
}
</style>
<template>
<div class="travelControlTrip detail-box">
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
......@@ -454,7 +460,7 @@
</div>
</div>
</div>
<el-dialog title="修改信息" :visible.sync="editMsgShow" center>
<el-dialog title="修改信息" custom-class="confirmOrder" :visible.sync="editMsgShow" center>
<el-form :model="editForm" label-width="100px">
<p class="edit_form_box_tit">集合地点&联系人</p>
<div class="edit_form_box">
......@@ -527,6 +533,14 @@
<el-button type="danger" icon="el-icon-delete" @click="removePriceFlight(index,priceFlight,1)"
circle></el-button>
</el-tooltip>
<el-tooltip class="item" v-if="index!=0" style="margin-left:0" effect="dark" content="上移" placement="top-start">
<el-button type="danger" icon="iconfont icon-shangyi" @click="MoveItem(priceFlight,index,0)"
circle></el-button>
</el-tooltip>
<el-tooltip class="item" v-if="index!=editForm.travelOrderFlightList.length-1" style="margin-left:0" effect="dark" content="下移" placement="top-start">
<el-button type="danger" icon="iconfont icon-xiayi1" @click="MoveItem(priceFlight,index,1)"
circle></el-button>
</el-tooltip>
</td>
</tr>
</table>
......@@ -1115,7 +1129,29 @@
this.$set(this.tripList, j, x)
x.dateTime = this.setDate(j);
})
},
//上移下移(IsUp:0上移，1下移)
MoveItem(item, subIndex, IsUp) {
var currentItem = this.editForm.travelOrderFlightList[subIndex];
//上移
if (IsUp == 0) {
if (subIndex > 0) {
var upItem = this.editForm.travelOrderFlightList[subIndex - 1];
this.$set(this.editForm.travelOrderFlightList, subIndex - 1, currentItem);
this.$set(this.editForm.travelOrderFlightList, subIndex, upItem);
this.$forceUpdate();
}
} else {
//下移
if (subIndex != this.editForm.travelOrderFlightList.length - 1) {
var downItem = this.editForm.travelOrderFlightList[subIndex + 1];
this.$set(this.editForm.travelOrderFlightList, subIndex + 1, currentItem);
this.$set(this.editForm.travelOrderFlightList, subIndex, downItem);
this.$forceUpdate();
}
}
},
},
components: {
oneday,
......
src/components/systemManagement/LessPriceManagement.vue 0 → 100644
View file @ 364d09f4
<style>
.LM_mainDiv {
overflow-y: auto;
}
.LP_table {
margin-top: 10px;
background-color: #fff;
border-top: 1px solid #d1d1d1;
border-left: 1px solid #d1d1d1;
border-right: 1px solid #d1d1d1;
font-size: 14px;
/* width:100%; */
min-width: 5752px;
padding-bottom: 5px;
}
.LP_table tr {
height: 40px;
}
.LP_table tr th {
border-bottom: 1px solid #d1d1d1;
border-right: 1px solid #d1d1d1;
position: relative;
background-color: #E6E6E6;
width:250px;
}
th[class=first]:before {
content: "";
position: absolute;
width: 1px;
height: 252px;
/*这里需要自己调整，根据td的宽度和高度*/
top: 0;
left: 0;
background-color: #d1d1d1;
display: block;
transform: rotate(-81deg);
/*这里需要自己调整，根据线的位置*/
transform-origin: top;
}
.LP_table td {
border-bottom: 1px solid #d1d1d1;
border-right: 1px solid #d1d1d1;
text-align: center;
padding: 5px;
min-width: 250px;
}
.LP_table .el-button--primary {
padding: 5px;
}
.Lp_role {
position: absolute;
top: 15px;
left: 30px;
}
.Lp_company {
position: absolute;
right: 30px;
top: 5px;
}
</style>
<template>
<div>
<div class="query-box">
<ul>
<li>
<input type='button' class="normalBtn" @click="AddItem()" value="新增"></input>
</li>
</ul>
</div>
<div class="LM_mainDiv">
<!--保存-->
<table border="0" cellspacing="0" cellpadding="0" class="LP_table" v-loading="this.loading">
<tr>
<th class="first">
<span class="Lp_role">角色</span>
<span class="Lp_company">公司</span>
</th>
<template v-for="item in BranchList">
<th>
{{item.BName}}
</th>
</template>
<th>
操作
</th>
</tr>
<tr v-for="(item,index) in PageData">
<td>
<el-select :placeholder="$t('pub.pleaseSel')" class="w150" v-model="item.RoleId">
<el-option label="不限" :value="0"></el-option>
<el-option v-for="item in RoleList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
</el-select>
</td>
<template v-for="subItem in item.DetailExtList">
<td>
<el-input class="w80" placeholder="金額" v-model="subItem.LessMoney"></el-input>
<el-input class="w80" placeholder="百分比" v-model="subItem.LessPercent"></el-input>
</td>
</template>
<td>
<input type='button' class="normalBtn" @click="SaveLessPrice(item)" value="保存"></input>
<input type='button' class="normalBtn" @click="RemoveItem(item,index)" value="删除"></input>
</td>
</tr>
</table>
</div>
</div>
</template>
<script>
export default {
data() {
return {
//分公司列表
BranchList: [],
qMsg: {
PageIndex: 1,
PageSize: 100
},
PageData: [],
//角色列表
RoleList: [],
loading:false
};
},
methods: {
AddItem() {
var obj = {
Id: 0,
RoleId: 0,
DetailExtList: [],
};
this.BranchList.forEach(item => {
obj.DetailExtList.push({
Id: 0,
ManagerId: 0,
RB_Branch_Id: item.Id,
LessMoney: 0,
LessPercent: 0
});
});
if (this.PageData == null) {
this.PageData = [];
}
this.PageData.push(obj);
},
//保存少价管理
SaveLessPrice(item) {
this.apipost(
"lessprice_post_Set", item,
res => {
if (res.data.resultCode == 1) {
this.Success("操作成功!");
this.GetList();
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
//获取列表
GetList() {
this.loading = true;
this.apipost(
"lessprice_get_GetPageList", this.qMsg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.BranchList = res.data.data.branchList;
this.PageData = res.data.data.DataList.pageData;
}
},
err => {}
);
},
//获取列表
GetRoleList() {
this.apipost(
"admin_get_RoleGetList", {},
res => {
if (res.data.resultCode == 1) {
this.RoleList = res.data.data;
}
},
err => {}
);
},
//获取列表
RemoveItem(item, index) {
var that = this;
this.Confirm("是否删除此少价信息?", function () {
if (item.Id > 0) {
that.apipost(
"lessprice_post_Remove", {
ID: item.Id
},
res => {
if (res.data.resultCode == 1) {
that.Success("操作成功!");
that.GetList();
} else {
that.Error(res.data.message);
}
},
err => {}
);
} else {
that.PageData.splice(index, 1);
}
});
},
},
mounted() {
this.GetRoleList();
this.GetList();
},
};
</script>
src/plug/index.js
View file @ 364d09f4
......@@ -116,12 +116,12 @@ export default {
let domainUrl = '';
let locationName = window.location.hostname;
// domainUrl = "http://192.168.2.214:8082"; //214主域名
domainUrl = "http://192.168.2.88"; //王悦主域名
// domainUrl = "http://192.168.2.88"; //王悦主域名
// domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.16:8083"; //刘东主域名
// domainUrl = "http://192.168.2.16:8083"; //王悦主域名
// domainUrl = "http://127.0.0.1"; //214主域名
// domainUrl = "http://192.168.2.65:8025"; //吴春主域名
// domainUrl = "http://192.168.2.106:8082"; //罗超主域名
domainUrl = "http://192.168.2.106:8082"; //罗超主域名
if (locationName.indexOf('oytour')!==-1) {
domainUrl = "https://reborn.oytour.com";
}else if (locationName.indexOf('viitto')!==-1) {
......@@ -525,7 +525,6 @@ export default {
//价钱格式化，三位数逗号分隔，保留两位小数 duanjun
Vue.prototype.moneyFormat = function (value) {
if(!value) return ('0.00')
let nStr = Number(value).toFixed(2)
nStr += '';
let x = nStr.split('.');
......
src/router/config.js
View file @ 364d09f4
......@@ -248,6 +248,22 @@ export default {
title: '新增付款对象'
},
},
{
path: '/CommissionManagement', //提成管理
name: 'CommissionManagement',
component: resolve => require(['@/components/administrative/CommissionManagement'], resolve),
meta: {
title: '提成管理'
},
},
{
path: '/CommissionDetail', //提成详情
name: 'CommissionDetail',
component: resolve => require(['@/components/administrative/CommissionDetail'], resolve),
meta: {
title: '提成详情'
},
},
{
path: '/leaderManagement', //领队导游管理
name: 'leaderManagement',
......@@ -2003,7 +2019,14 @@ export default {
meta: {
title: '账户类型'
},
}, { //财务 现金日报表
},{ //少价管理
path: '/LessPriceManagement',
name: 'LessPriceManagement',
component: resolve => require(['@/components/systemManagement/LessPriceManagement'], resolve),
meta: {
title: '少价管理'
}
},{ //财务 现金日报表
path: '/CashReport',
name: 'CashReport',
component: resolve => require(['@/components/FinancialModule/CashReport'], resolve),
......@@ -2257,7 +2280,7 @@ export default {
name: 'EasyReport',
component: resolve => require(['@/components/FinancialModule/ReportForm/EasyReport'], resolve),
meta: {
title: '联运收入'
title: '简易报表'
},
}, { // 销售 制作广告
path: '/advert',
......
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