Commit 408523b0 authored by youjie's avatar youjie

no message

parent 652124b2
...@@ -4,20 +4,20 @@ ...@@ -4,20 +4,20 @@
position: relative; position: relative;
top: 1px; top: 1px;
} }
.opUl li { .opUl li {
display: inline-block; display: inline-block;
margin: 10px 15px 10px 0; margin: 10px 15px 10px 0;
} }
.domesticCommissiondetails .opUl li input { .domesticCommissiondetails .opUl li input {
height: 34px !important; height: 34px !important;
} }
.domesticCommissiondetails .singeRowTable tr td { .domesticCommissiondetails .singeRowTable tr td {
padding: 8px 5px; padding: 8px 5px;
} }
.domesticCommissiondetails .hoverSpan span:hover { .domesticCommissiondetails .hoverSpan span:hover {
cursor: pointer; cursor: pointer;
text-decoration: underline; text-decoration: underline;
...@@ -75,10 +75,10 @@ ...@@ -75,10 +75,10 @@
</div> </div>
<div style="display: flex;align-items: center;height: 50px;justify-content: space-between;"> <div style="display: flex;align-items: center;height: 50px;justify-content: space-between;">
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
</div> </div>
<input type="button" class="normalBtn" value="导出" @click="exportExcel"> <input type="button" class="normalBtn" value="导出" @click="exportExcel">
</div> </div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0" <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"
style="margin-top: 10px;"> style="margin-top: 10px;">
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<th>年终比例</th> <th>年终比例</th>
<th>期数</th> <th>期数</th>
<th width='300'>备注</th> <th width='300'>备注</th>
<!-- <th>操作</th> --> <!-- <th>操作</th> -->
</tr> </tr>
<tr v-for="item in dataList"> <tr v-for="item in dataList">
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
<td>{{item.EmName}}</td> <td>{{item.EmName}}</td>
<td><span class="cursor-p" @click="clickUrl(item,1)">{{item.OrderId}}</span></td> <td><span class="cursor-p" @click="clickUrl(item,1)">{{item.OrderId}}</span></td>
<td>{{item.OrderTypeName}}</td> <td>{{item.OrderTypeName}}</td>
<td style="font-size: 12px;">{{item.TCNUM?item.TCNUM:'-'}} <td style="font-size: 12px;" :style="{'cursor':item.TCID?'pointer':''}" @click="item.TCID?goTravel(item.TCID):''">{{item.TCNUM?item.TCNUM:'-'}}
<p v-if="item.OutBranchName">{{item.OutBranchName?item.OutBranchName:'-'}}</p> <p v-if="item.OutBranchName">{{item.OutBranchName?item.OutBranchName:'-'}}</p>
</td> </td>
<td>{{item.LineName?item.LineName:'-'}}</td> <td>{{item.LineName?item.LineName:'-'}}</td>
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
<template v-else>-</template> <template v-else>-</template>
</td> </td>
<td>{{item.Way==1?'销售额':'利润比'}}</td> <td>{{item.Way==1?'销售额':'利润比'}}</td>
<td>{{item.OrderProfit?item.OrderProfit:'-'}}</td> <td>{{item.OrderProfit?item.OrderProfit:'-'}}</td>
<td>{{item.YCommission?item.YCommission:'-'}}</td> <td>{{item.YCommission?item.YCommission:'-'}}</td>
<td>{{item.Commission?item.Commission:'-'}}</td> <td>{{item.Commission?item.Commission:'-'}}</td>
...@@ -159,12 +159,12 @@ ...@@ -159,12 +159,12 @@
<inAccordanceWith v-if="objNew" :msgNew="objNew"></inAccordanceWith> <inAccordanceWith v-if="objNew" :msgNew="objNew"></inAccordanceWith>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp; <button class="hollowFixedBtn" @click="outerVisible = false">取消</button> &nbsp;
<button class="normalBtn" type="primary" @click="outerVisible = false">确定</button> <button class="normalBtn" type="primary" @click="outerVisible = false">确定</button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import inAccordanceWith from "./inAccordanceWithDialog" import inAccordanceWith from "./inAccordanceWithDialog"
import moment from "moment" import moment from "moment"
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
}, },
clickUrl(item,type){ clickUrl(item,type){
if(type==2){//线索 if(type==2){//线索
}else{ }else{
this.OrderStatistics(item) this.OrderStatistics(item)
} }
...@@ -292,8 +292,8 @@ ...@@ -292,8 +292,8 @@
err => {} err => {}
); );
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
...@@ -329,13 +329,22 @@ ...@@ -329,13 +329,22 @@
} }
); );
}, },
goTravel(TCID) { //跳转到团队列表
this.$router.push({
path: 'TeamBalancePayment',//TravelControlList
query: {
id: TCID,
blank: 'y',
tab: '团队收支'//团控列表
}
});
},
exportExcel() { //导出 exportExcel() { //导出
var fileName = "印象票务提成人员表.xls"; var fileName = "印象票务提成人员表.xls";
this.crmGetLocalFile("/api/Commission/GetCommissionOrderDetialToExcel", this.msg, fileName); this.crmGetLocalFile("/api/Commission/GetCommissionOrderDetialToExcel", this.msg, fileName);
} }
} }
} }
</script> </script>
\ No newline at end of file
...@@ -372,11 +372,11 @@ ...@@ -372,11 +372,11 @@
}, },
goTravel(TCID) { //跳转到团队列表 goTravel(TCID) { //跳转到团队列表
this.$router.push({ this.$router.push({
path: 'TravelControlList', path: 'TeamBalancePayment',//TravelControlList
query: { query: {
TCID: TCID, id: TCID,
blank: 'y', blank: 'y',
tab: '团控列表' tab: '团队收支'//团控列表
} }
}); });
} }
......
...@@ -321,20 +321,28 @@ ...@@ -321,20 +321,28 @@
},err=>{}) },err=>{})
}, },
goTuanDetails(row) { goTuanDetails(row) {
let name = '' this.$router.push({
if (row.IsOneDayOrder == 1) { path: 'TeamBalancePayment',//TravelControlList
name = 'groupTourOrderByTuanOne' query: {
} else { id: row.TCID,
name = 'groupTourOrderByTuan' blank: 'y',
} tab: '团队收支'//团控列表
this.$router.push({ }
name: name, });
query: { // let name = ''
id: row.TCID, // if (row.IsOneDayOrder == 1) {
tcmun: row.TCNUM, // name = 'groupTourOrderByTuanOne'
blank: "y", // } else {
} // name = 'groupTourOrderByTuan'
}); // }
// this.$router.push({
// name: name,
// query: {
// id: row.TCID,
// tcmun: row.TCNUM,
// blank: "y",
// }
// });
}, },
clickUrl(row,type){ clickUrl(row,type){
let data = [{ let data = [{
......
...@@ -4,26 +4,26 @@ ...@@ -4,26 +4,26 @@
position: relative; position: relative;
top: 1px; top: 1px;
} }
.opUl li { .opUl li {
display: inline-block; display: inline-block;
margin: 10px 15px 10px 0; margin: 10px 15px 10px 0;
} }
.domesticCommissiondetails .opUl li input { .domesticCommissiondetails .opUl li input {
height: 34px !important; height: 34px !important;
} }
.domesticCommissiondetails .singeRowTable tr td { .domesticCommissiondetails .singeRowTable tr td {
padding: 8px 5px; padding: 8px 5px;
} }
.domesticCommissiondetails .hoverSpan span:hover { .domesticCommissiondetails .hoverSpan span:hover {
cursor: pointer; cursor: pointer;
text-decoration: underline; text-decoration: underline;
color: red; color: red;
} }
</style> </style>
<template> <template>
<div class="flexOne domesticCommissiondetails"> <div class="flexOne domesticCommissiondetails">
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</el-option> </el-option>
</el-select> </el-select>
</li> </li>
<!-- <li> <!-- <li>
<em>订单号</em> <em>订单号</em>
<el-input maxlength="50" v-model="msg.OrderId" class="permiss-input w200" <el-input maxlength="50" v-model="msg.OrderId" class="permiss-input w200"
...@@ -80,9 +80,9 @@ ...@@ -80,9 +80,9 @@
<el-input maxlength="50" v-model="msg.TCNUM" class="permiss-input w200" <el-input maxlength="50" v-model="msg.TCNUM" class="permiss-input w200"
@keyup.native.enter="handleCurrentChange(1)" :placeholder="$t('pub.pleaseImport')"></el-input> @keyup.native.enter="handleCurrentChange(1)" :placeholder="$t('pub.pleaseImport')"></el-input>
</li> </li>
</ul> </ul>
</div> </div>
<!-- <li> <!-- <li>
...@@ -94,12 +94,12 @@ ...@@ -94,12 +94,12 @@
<span style="margin-left: 15px;">总人数:{{TotalNum}}</span> <span style="margin-left: 15px;">总人数:{{TotalNum}}</span>
</div> </div>
<input type="button" class="normalBtn" value="导出" @click="exportExcel"> <input type="button" class="normalBtn" value="导出" @click="exportExcel">
</div> </div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0" <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"
style="margin-top: 10px;"> style="margin-top: 10px;">
<tr> <tr>
<th>公司</th> <th>公司</th>
<th>部门</th> <th>部门</th>
<th>销售</th> <th>销售</th>
...@@ -108,14 +108,14 @@ ...@@ -108,14 +108,14 @@
<!-- <th>订单号</th> --> <!-- <th>订单号</th> -->
<th>人数</th> <th>人数</th>
<th>提成</th> <th>提成</th>
<th>期数</th> <th>期数</th>
<th width='400'>备注</th> <th width='400'>备注</th>
<!-- <th>操作</th> --> <!-- <th>操作</th> -->
</tr> </tr>
<tr v-for="item in dataList"> <tr v-for="item in dataList">
<td>{{item.BranchName}}</td> <td>{{item.BranchName}}</td>
<td>{{item.DeptName}}</td> <td>{{item.DeptName}}</td>
<td>{{item.UserName}}</td> <td>{{item.UserName}}</td>
...@@ -124,24 +124,24 @@ ...@@ -124,24 +124,24 @@
<span style="cursor: pointer;text-decoration: underline;" @click="goTravel(item.TCID)"> <span style="cursor: pointer;text-decoration: underline;" @click="goTravel(item.TCID)">
{{item.TCNUM}}({{item.TCID}}) {{item.TCNUM}}({{item.TCID}})
</span> </span>
</td> </td>
<td>{{item.TCProfit}}</td> <td>{{item.TCProfit}}</td>
<td>{{item.PeopleCount}}</td> <td>{{item.PeopleCount}}</td>
<td>{{item.CommissionMoney}}</td> <td>{{item.CommissionMoney}}</td>
<td>{{item.Periods}}</td> <td>{{item.Periods}}</td>
<td>{{item.Description}}</td> <td>{{item.Description}}</td>
<!-- <td> <!-- <td>
<el-tooltip class="item" effect="dark" content="查看" placement="top"> <el-tooltip class="item" effect="dark" content="查看" placement="top">
<el-button type="primary" class="CM_look" @click="goUrl('OPCommissionDetail',item.ID)" <el-button type="primary" class="CM_look" @click="goUrl('OPCommissionDetail',item.ID)"
icon="iconfont icon-chakan" circle></el-button> icon="iconfont icon-chakan" circle></el-button>
</el-tooltip> </el-tooltip>
</td> --> </td> -->
</tr> </tr>
<tr v-if="dataList.length==0"> <tr v-if="dataList.length==0">
...@@ -152,10 +152,10 @@ ...@@ -152,10 +152,10 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'> layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination> </el-pagination>
</div> </div>
</template> </template>
<script> <script>
import moment from "moment" import moment from "moment"
export default { export default {
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
TotalMoney: 0, TotalMoney: 0,
TotalNum: 0, TotalNum: 0,
disabled: true disabled: true
} }
}, },
mounted() { mounted() {
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
if (this.$route.query.TCNUM) { if (this.$route.query.TCNUM) {
this.msg.TCNUM = this.$route.query.TCNUM this.msg.TCNUM = this.$route.query.TCNUM
} }
if (this.$route.query.RB_Department_Id && this.$route.query.RB_Department_Id > 0) { if (this.$route.query.RB_Department_Id && this.$route.query.RB_Department_Id > 0) {
this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id) this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id)
} }
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.BranchList = res.data.data; this.BranchList = res.data.data;
} }
}, },
err => {} err => {}
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
if (this.PeriodsList && this.PeriodsList.length > 0) { if (this.PeriodsList && this.PeriodsList.length > 0) {
// this.msg.Periods = Number(this.PeriodsList[0].Id) // this.msg.Periods = Number(this.PeriodsList[0].Id)
} }
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -298,8 +298,8 @@ ...@@ -298,8 +298,8 @@
null null
); );
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
...@@ -342,7 +342,7 @@ ...@@ -342,7 +342,7 @@
let msg = JSON.parse(JSON.stringify(this.msg)) let msg = JSON.parse(JSON.stringify(this.msg))
if (msg.OrderId == '') { if (msg.OrderId == '') {
msg.OrderId = 0 msg.OrderId = 0
} }
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
msg.EmployeeIdUser = userInfo.EmployeeId msg.EmployeeIdUser = userInfo.EmployeeId
...@@ -351,17 +351,16 @@ ...@@ -351,17 +351,16 @@
}, },
goTravel(TCID) { //跳转到团队列表 goTravel(TCID) { //跳转到团队列表
this.$router.push({ this.$router.push({
path: 'TravelControlList', path: 'TeamBalancePayment',//TravelControlList
query: { query: {
TCID: TCID, id: TCID,
blank: 'y', blank: 'y',
tab: '团控列表' tab: '团队收支'//团控列表
} }
}); });
} }
} }
} }
</script> </script>
\ No newline at end of file
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
icon="iconfont icon-chakan" circle></el-button> icon="iconfont icon-chakan" circle></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="cMaker==true" class="item" effect="dark" content="制单" placement="top"> <el-tooltip v-if="cMaker==true" class="item" effect="dark" content="制单" placement="top">
<el-button @click="YijianZD(item)" type="danger" class="CM_look" v-if="cMaker==true" <el-button @click="YijianZD(item)" type="danger" class="CM_look" v-if="cMaker==true"
icon="iconfont icon-mui-icon-add" circle></el-button> icon="iconfont icon-mui-icon-add" circle></el-button>
</el-tooltip> </el-tooltip>
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.PeriodsList = res.data.data; this.PeriodsList = res.data.data;
// if(this.PeriodsList && this.PeriodsList.length>0){ // if(this.PeriodsList && this.PeriodsList.length>0){
// this.msg.Periods = Number(this.PeriodsList[0].Id) // this.msg.Periods = Number(this.PeriodsList[0].Id)
// } // }
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
); );
}, },
YijianZD(item) { YijianZD(item) {
let Money let Money
if(this.msg.OutBranchId>-1){ if(this.msg.OutBranchId>-1){
if(item.BranchCommission>0){ if(item.BranchCommission>0){
Money=item.BranchCommission Money=item.BranchCommission
...@@ -270,7 +270,7 @@ ...@@ -270,7 +270,7 @@
query.id = 28 query.id = 28
query.Name = "总部销售提成单" query.Name = "总部销售提成单"
} }
this.$router.push({ this.$router.push({
path: "/addFinancialDocuments", path: "/addFinancialDocuments",
query query
...@@ -291,4 +291,4 @@ ...@@ -291,4 +291,4 @@
} }
} }
</script> </script>
\ No newline at end of file
...@@ -345,11 +345,11 @@ ...@@ -345,11 +345,11 @@
}, },
goTravel(TCID) { //跳转到团队列表 goTravel(TCID) { //跳转到团队列表
this.$router.push({ this.$router.push({
path: 'TravelControlList', path: 'TeamBalancePayment',//TravelControlList
query: { query: {
TCID: TCID, id: TCID,
blank: 'y', blank: 'y',
tab: '团控列表' tab: '团队收支'//团控列表
} }
}); });
} }
......
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