Skip to content

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

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

parents a473b474 33e3d402
Hide whitespace changes
Inline Side-by-side
Showing with 198 additions and 93 deletions
src/components/FinancialModule/FinancialSubmodule/DjieMergeBillModule.vue
View file @ c5321730
...@@ -352,7 +352,7 @@ ...@@ -352,7 +352,7 @@
}) })
this.moneyObj = { this.moneyObj = {
benAllMoney: Math.round(benAllMoney * 100) / 100, benAllMoney: Math.round(benAllMoney * 100) / 100,
OriginalMoney: OriginalMoney, OriginalMoney: Math.round(OriginalMoney * 100) / 100,
} }
data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Merge.Money) data.ChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Merge.Money)
data.WBChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Merge.WBMoney) data.WBChineseMoney = this.$commonUtils.changeMoneyToChinese(data.Merge.WBMoney)
...@@ -362,7 +362,6 @@ ...@@ -362,7 +362,6 @@
this.GetDetail = data; this.GetDetail = data;
this.loading=false this.loading=false
this.$set(this.$data,"GetDetail",data); this.$set(this.$data,"GetDetail",data);
console.log(this.GetDetail)
} }
}, err => {}) }, err => {})
}, },
......
src/components/FinancialModule/OPRules.vue
View file @ c5321730
<template> <template>
<div class="Feedback"> <div class="Feedback OPRules">
<ul style="overflow: initial!important"> <ul style="overflow: initial!important">
<li> <li>
<span> <span>
...@@ -36,17 +36,22 @@ ...@@ -36,17 +36,22 @@
@click="addRule" @click="addRule"
> >
</li> </li>
<li style="float:right;color:red;font-weight:700">{{tips}}</li>
</ul> </ul>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th>公司名称</th> <th>公司名称</th>
<th style="width:20%">线路名称</th>
<th>线路名称</th>
<th>系列名称</th> <th>系列名称</th>
<th>参与人员</th> <th>线控</th>
<th>助理</th>
<th>分负责OP</th>
<th>分助理</th>
<th>部门</th> <th>部门</th>
<th>负责人金额</th> <th>负责人金额</th>
<th>助理金额</th> <th>助理金额</th>
<th>分负责人金额</th>
<th>分助理金额</th>
<th>描述</th> <th>描述</th>
<th>操作时间</th> <th>操作时间</th>
<th>操作人</th> <th>操作人</th>
...@@ -54,13 +59,17 @@ ...@@ -54,13 +59,17 @@
</tr> </tr>
<tr v-for="(item,i) in dataList" :key="i"> <tr v-for="(item,i) in dataList" :key="i">
<td>{{item.BranchName}}</td> <td>{{item.BranchName}}</td>
<td>{{item.LineName}}</td> <td>{{item.LineName}}</td>
<td>{{item.LtName}}</td> <td>{{item.LtName}}</td>
<td>{{item.XKEmployeeName}}</td>
<td>{{item.ZLEmployeeName}}</td>
<td>{{item.EmployeeName}}</td> <td>{{item.EmployeeName}}</td>
<td>{{item.FZLEmployeeName}}</td>
<td>{{item.DepartmentName}}</td> <td>{{item.DepartmentName}}</td>
<td>{{item.ManagerMoney}}</td> <td>{{item.ManagerMoney}}</td>
<td>{{item.InternMoney}}</td> <td>{{item.InternMoney}}</td>
<td>{{item.FManagerMoney}}</td>
<td>{{item.FInternMoney}}</td>
<td>{{item.Description}}</td> <td>{{item.Description}}</td>
<td>{{item.UpdateDate}}</td> <td>{{item.UpdateDate}}</td>
<td>{{item.UpdateBy}}</td> <td>{{item.UpdateBy}}</td>
...@@ -71,27 +80,20 @@ ...@@ -71,27 +80,20 @@
</tr> </tr>
<tr v-if="dataList.length==0"> <tr v-if="dataList.length==0">
<td colspan="12" align="center">暂无数据</td> <td colspan="16" align="center">暂无数据</td>
</tr> </tr>
</table> </table>
<el-dialog <el-dialog
title="提成规则" title="提成规则"
:visible.sync="ruleVisible" :visible.sync="ruleVisible"
width="400px"> width="800px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="公司" prop="BranchId"> <el-form-item label="公司" prop="BranchId">
<el-select filterable v-model="form.BranchId" @change='linkageDepartment()'> <el-select filterable v-model="form.BranchId" @change='linkageDepartment()'>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'> <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="参与人员">
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.EmployeeIdList" >
<el-option label='全部' :value='-1'></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName"
:value="item.EmployeeId" :key="item.EmployeeId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="部门"> <el-form-item label="部门">
<el-select filterable v-model="form.DepartmentId" @change='getDepart(form.DepartmentId)'> <el-select filterable v-model="form.DepartmentId" @change='getDepart(form.DepartmentId)'>
<el-option label='全部' :value='-1'></el-option> <el-option label='全部' :value='-1'></el-option>
...@@ -99,7 +101,6 @@ ...@@ -99,7 +101,6 @@
:value="item.DepartmentID" :key="item.DepartmentID"></el-option> :value="item.DepartmentID" :key="item.DepartmentID"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="线路" prop="LineIdList"> <el-form-item label="线路" prop="LineIdList">
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.LineIdList" @change="getLineTeamList"> <el-select class="multiple_input" filterable multiple collapse-tags v-model="form.LineIdList" @change="getLineTeamList">
<el-option label='全线' :value='-1' :key='-1'></el-option> <el-option label='全线' :value='-1' :key='-1'></el-option>
...@@ -111,15 +112,48 @@ ...@@ -111,15 +112,48 @@
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'></el-option> <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="描述">
<el-input class="w220" v-model="form.Description"></el-input>
</el-form-item>
<el-form-item label="线控" prop="XKEmployeeIdList">
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.XKEmployeeIdList" >
<el-option v-for="item in EmployeeList" :label="item.EmName"
:value="item.EmployeeId" :key="item.EmployeeId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="助理" prop="ZLEmployeeIdList">
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.ZLEmployeeIdList" >
<el-option v-for="item in EmployeeList" :label="item.EmName"
:value="item.EmployeeId" :key="item.EmployeeId"></el-option>
</el-select>
</el-form-item>
<el-form-item v-show="stateShow" label="分负责OP">
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.EmployeeIdList" >
<el-option v-for="item in EmployeeList" :label="item.EmName"
:value="item.EmployeeId" :key="item.EmployeeId"></el-option>
</el-select>
</el-form-item>
<el-form-item v-show="stateShow" label="分助理">
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.FZLEmployeeIdList" >
<el-option v-for="item in EmployeeList" :label="item.EmName"
:value="item.EmployeeId" :key="item.EmployeeId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="负责人金额" prop="ManagerMoney"> <el-form-item label="负责人金额" prop="ManagerMoney">
<el-input class="w220" @keyup.native="checkInteger(form,'ManagerMoney')" v-model="form.ManagerMoney"></el-input> <el-input class="w220" @keyup.native="checkInteger(form,'ManagerMoney')" v-model="form.ManagerMoney"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="助理金额" prop="InternMoney"> <el-form-item label="助理金额" prop="InternMoney">
<el-input class="w220" @keyup.native="checkInteger(form,'InternMoney')" v-model="form.InternMoney"></el-input> <el-input class="w220" @keyup.native="checkInteger(form,'InternMoney')" v-model="form.InternMoney"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="描述"> <el-form-item v-show="stateShow" label="分负责人金额">
<el-input class="w220" v-model="form.Description"></el-input> <el-input class="w220" @keyup.native="checkInteger(form,'FManagerMoney')" v-model="form.FManagerMoney"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="stateShow" label="分助理金额">
<el-input class="w220" @keyup.native="checkInteger(form,'FInternMoney')" v-model="form.FInternMoney"></el-input>
</el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" @click="ruleVisible = false">取 消</el-button> <el-button size="small" @click="ruleVisible = false">取 消</el-button>
...@@ -153,8 +187,14 @@ export default { ...@@ -153,8 +187,14 @@ export default {
EmployeeIdList:[], EmployeeIdList:[],
LineIdList:[], LineIdList:[],
LtIdList:[], LtIdList:[],
InternMoney:'', InternMoney:'',
ManagerMoney:'', ManagerMoney:'',
XKEmployeeIdList:[],
ZLEmployeeName:[],
FZLEmployeeIdList:[],
FManagerMoney:0,
FInternMoney:0,
}, },
departmentMsg: { departmentMsg: {
RB_Group_Id: '0', RB_Group_Id: '0',
...@@ -169,16 +209,24 @@ export default { ...@@ -169,16 +209,24 @@ export default {
BranchId: [ BranchId: [
{ required: true, message: '请选择公司', trigger: 'change' } { required: true, message: '请选择公司', trigger: 'change' }
], ],
XKEmployeeIdList:[
{ required: true, message: '请选择线控', trigger: 'change' }
],
ZLEmployeeIdList:[
{ required: true, message: '请选择助理', trigger: 'change' }
],
EmployeeIdList: [ EmployeeIdList: [
{ required: true, message: '请选择参与人员', trigger: 'change' } { required: true, message: '请选择参与人员', trigger: 'change' }
], ],
LineIdList: [ LineIdList: [
{ required: true, message: '请选择线路', trigger: 'change' } { required: true, message: '请选择线路', trigger: 'change' }
], ],
ManagerMoney: [{ required: true, message: this.$t('rule.qsrjxmingcheng'), trigger: "blur" }], ManagerMoney: [{ required: true, message:"请输入负责人金额", trigger: "blur" }],
InternMoney: [{ required: true, message: this.$t('rule.qsrjxmingcheng'), trigger: "blur" }], InternMoney: [{ required: true, message: "请输入助理金额", trigger: "blur" }],
}, },
departmentList:[] departmentList:[],
stateShow:true,
tips:'',
} }
}, },
created(){ created(){
...@@ -220,6 +268,11 @@ export default { ...@@ -220,6 +268,11 @@ export default {
LtIdList:[], LtIdList:[],
InternMoney:'', InternMoney:'',
ManagerMoney:'', ManagerMoney:'',
XKEmployeeIdList:[],
ZLEmployeeIdList:[],
FZLEmployeeIdList:[],
FManagerMoney:0,
FInternMoney:0,
} }
}, },
SetRules(item){ SetRules(item){
...@@ -233,15 +286,39 @@ export default { ...@@ -233,15 +286,39 @@ export default {
LtIdList:item.LtIdList, LtIdList:item.LtIdList,
InternMoney:item.InternMoney, InternMoney:item.InternMoney,
ManagerMoney:item.ManagerMoney, ManagerMoney:item.ManagerMoney,
DepartmentId:item.DepartmentId DepartmentId:item.DepartmentId,
XKEmployeeIdList:item.XKEmployeeIdList,
ZLEmployeeIdList:item.ZLEmployeeIdList,
FZLEmployeeIdList:item.FZLEmployeeIdList,
FManagerMoney:item.FManagerMoney,
FInternMoney:item.FInternMoney,
} }
this.departmentMsg.RB_Branch_Id=item.BranchId; this.departmentMsg.RB_Branch_Id=item.BranchId;
this.getDepartment(); this.getDepartment();
this.getLineTeamList(); this.getLineTeamList();
}, },
RulesOk(formName){ RulesOk(formName){
if(this.form.EmployeeIdList.length==0){ // if(this.form.EmployeeIdList.length==0){
this.form.EmployeeIdList.push(-1) // this.form.EmployeeIdList.push(-1)
// }
// 公司选择成都
if(this.departmentMsg.RB_Branch_Id!=0){
if(this.form.EmployeeIdList.length==0){
this.Error("请选择分负责OP！")
return;
}
if(this.form.FZLEmployeeIdList.length==0){
this.Error("请选择分助理！")
return;
}
if(this.form.FInternMoney==0){
this.Error("请填写分负责人金额！")
return;
}
if(this.form.FManagerMoney==0){
this.Error("请填写分助理金额！")
return;
}
} }
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
...@@ -336,11 +413,22 @@ export default { ...@@ -336,11 +413,22 @@ export default {
}); });
}, },
linkageDepartment(){ linkageDepartment(val){
this.departmentMsg.RB_Branch_Id=this.form.BranchId; this.departmentMsg.RB_Branch_Id=this.form.BranchId;
this.departmentList=[]; this.departmentList=[];
this.form.DepartmentId=-1; this.form.DepartmentId=-1;
this.getDepartment(); this.getDepartment();
if(this.departmentMsg.RB_Branch_Id==0){
this.stateShow=false;
this.form.EmployeeIdList=[];
this.form.FZLEmployeeIdList=[];
this.form.FManagerMoney=0;
this.form.FInternMoney=0;
}
else{
this.stateShow=true;
}
}, },
getDepart(id){ getDepart(id){
this.form.DepartmentId= id; this.form.DepartmentId= id;
...@@ -358,7 +446,8 @@ export default { ...@@ -358,7 +446,8 @@ export default {
this.apipost("sellcommission_GetOPCommissionRuleList", this.obj, res => { this.apipost("sellcommission_GetOPCommissionRuleList", this.obj, res => {
this.loading=false; this.loading=false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data; this.tips= res.data.data.msg;
this.dataList = res.data.data.list;
} }
}); });
}, },
...@@ -367,6 +456,9 @@ export default { ...@@ -367,6 +456,9 @@ export default {
</script> </script>
<style> <style>
.OPRules .el-form-item{
display: inline-block;
}
.Feedback ul>li{ .Feedback ul>li{
display: inline-block; display: inline-block;
font-size: 12px; font-size: 12px;
......
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @ c5321730
...@@ -882,17 +882,12 @@ export default { ...@@ -882,17 +882,12 @@ export default {
that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,blank:'y',tab:"营收报表"} }) that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,blank:'y',tab:"营收报表"} })
} }
}else{ }else{
console.log("rowIndex",rowIndex)
console.log("column",column)
console.log("year",this.year)
console.log("rowData",rowData);
if(rowData.ZhaiYao=="员工提成"){ if(rowData.ZhaiYao=="员工提成"){
if(Number(this.year)==2019){ if(Number(this.year)==2019){
if(column.title=="七月" || column.title=="八月" || column.title=="九月" || column.title=="十月" || column.title=="十一月" || column.title=="十二月"){ if(column.title=="七月" || column.title=="八月" || column.title=="九月" || column.title=="十月" || column.title=="十一月" || column.title=="十二月"){
let CostIds=""; let CostIds="";
CostIds=rowData.CostIds.replace('112,', ''); CostIds=rowData.CostIds.replace('112,', '');
console.log("CostIds",CostIds)
that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,CostIds) that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,CostIds)
} }
else{ else{
......
src/components/TravelManager/TravelList/PassengerFeedback.vue
View file @ c5321730
<template> <template>
<div class="Feedback"> <div class="Feedback">
<ul style="overflow: initial!important"> <div class="query-box">
<ul>
<li> <li>
<span> <span>
<em>线路</em> <em>团号</em>
</span> <el-input v-model="msg.TCNUM"></el-input>
<el-select filterable v-model="obj.LineID" value-key="LineID" @change="getLineTeamList"> </span>
<el-option label="不限" :value='{LineName:"不限",LineID:0}'></el-option> </li>
<el-option v-for="item in LineList" :label='item.LineName' :value='item' :key='item.LineID'></el-option> <li>
</el-select> <span>
</li> <em>线路</em>
<li> </span>
<span> <el-select filterable v-model="obj.LineID" value-key="LineID" @change="getLineTeamList">
<em>系列</em> <el-option label="不限" :value='{LineName:"不限",LineID:0}'></el-option>
</span> <el-option v-for="item in LineList" :label='item.LineName' :value='item' :key='item.LineID'></el-option>
<el-select filterable v-model="obj.LineteamId" value-key="LtID" @change="getLineLtID">
<el-option label="不限" :value='{LtName:"不限",LtID:0}'></el-option>
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item' :key='item.LtID'>
</el-option>
</el-select>
</li>
<li>
<span>
<em>只看有评分</em>
</span>
<el-select filterable class='multiple_input' v-model='msg.isScore' :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value="0"></el-option>
<el-option label="是" :value="1"></el-option>
<el-option label="否" :value="-1"></el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<span> <span>
<em>发团时间</em> <em>系列</em>
</span> </span>
<el-date-picker <el-select filterable v-model="obj.LineteamId" value-key="LtID" @change="getLineLtID">
value-format="yyyy-MM-dd" <el-option label="不限" :value='{LtName:"不限",LtID:0}'></el-option>
:picker-options="pickerDisabled" <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item' :key='item.LtID'>
size="small" </el-option>
v-model="dateList" </el-select>
type="daterange" </li>
range-separator="至" <li>
start-placeholder="开始日期" <span>
end-placeholder="结束日期"> <em>只看有评分</em>
</el-date-picker> </span>
</li> <el-select filterable class='multiple_input' v-model='msg.isScore' :placeholder="$t('pub.pleaseSel')">
<li> <el-option label="不限" :value="0"></el-option>
<input <el-option label="是" :value="1"></el-option>
type="button" <el-option label="否" :value="-1"></el-option>
class="hollowFixedBtn" </el-select>
value="查询" </li>
@click="resetPageIndex(),getList()" <li>
> <span>
<input type="button" @click="goUrl" class="normalBtn" value="旅客反馈分析"/> <em>发团时间</em>
</li> </span>
</ul> <el-date-picker
value-format="yyyy-MM-dd"
:picker-options="pickerDisabled"
size="small"
v-model="dateList"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</li>
<li>
<input
type="button"
class="hollowFixedBtn"
value="查询"
@click="resetPageIndex(),getList()"
>
<input type="button" @click="goUrl" class="normalBtn" value="旅客反馈分析"/>
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr> <tr>
<th>发团日期</th> <th>发团日期</th>
...@@ -119,6 +126,7 @@ export default { ...@@ -119,6 +126,7 @@ export default {
msg:{ msg:{
pageSize:10, pageSize:10,
pageIndex:1, pageIndex:1,
TCNUM: '',
lineID:0, lineID:0,
LineteamId:0, LineteamId:0,
reStartDate:'', reStartDate:'',
......
src/components/administrative/Survey.vue
View file @ c5321730
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<tr v-for="(item,i) in dataList" :key="i"> <tr v-for="(item,i) in dataList" :key="i">
<td>{{item.start}}</td> <td>{{item.start}}</td>
<!-- <td>{{item.orderId}}</td> --> <!-- <td>{{item.orderId}}</td> -->
<td>{{item.tCNUM}}</td> <td @click='goUrl("RegistrationList", item.tcid,"报名清单")' class="go_regis">{{item.tCNUM}}</td>
<td>{{item.number}}</td> <td>{{item.number}}</td>
<td> <td>
<span v-if="fields.length>0"> <span v-if="fields.length>0">
...@@ -235,6 +235,16 @@ export default { ...@@ -235,6 +235,16 @@ export default {
this.GetSurveyShowList(); this.GetSurveyShowList();
}, },
methods:{ methods:{
goUrl(path, id, name) {
this.$router.push({
name: path,
query: {
id: id,
blank: 'y',
tab: name
}
})
},
getOrderID(id){ getOrderID(id){
this.ppList.map(x=>{ this.ppList.map(x=>{
if (id === x.GuestId){ if (id === x.GuestId){
...@@ -317,9 +327,6 @@ export default { ...@@ -317,9 +327,6 @@ export default {
chaKan(item){ chaKan(item){
this.$router.push({ name:'NewSurvey',query:{"TCID":item.tcid, "OrderId": item.orderId,blank: 'y'} }) this.$router.push({ name:'NewSurvey',query:{"TCID":item.tcid, "OrderId": item.orderId,blank: 'y'} })
}, },
goUrl(){
this.$router.push({ name:'FeedbackChart',query:{"msg":JSON.stringify(this.msg),blank: 'y'} })
},
getLineList() { getLineList() {
this.apipost("line_post_GetAllList_V2", {LineDirection: 0}, res => { this.apipost("line_post_GetAllList_V2", {LineDirection: 0}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -503,4 +510,8 @@ export default { ...@@ -503,4 +510,8 @@ export default {
.NewSurveyList #table td._name,.NewSurveyList .qianming label{ .NewSurveyList #table td._name,.NewSurveyList .qianming label{
color: #5d5d5d; color: #5d5d5d;
} }
.go_regis{
text-decoration: underline;
cursor: pointer;
}
</style> </style>
src/components/index.vue
View file @ c5321730
...@@ -1704,7 +1704,7 @@ export default { ...@@ -1704,7 +1704,7 @@ export default {
{ LogId: s.ID }, { LogId: s.ID },
r => { r => {
if (s.Link) { if (s.Link) {
this.goUrl(s.Link + '&MsgUrl=1'); this.goUrl(s.Link);
} }
this.IM_bodyIsShow = false; this.IM_bodyIsShow = false;
this.refreshSysNoteDate(); this.refreshSysNoteDate();
......
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