Skip to content

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

权限修改

parent fc005aad
Show whitespace changes
Inline Side-by-side
Showing with 402 additions and 411 deletions
src/assets/utils/AuthCode.js
View file @ a0338912
......@@ -10,5 +10,6 @@ var AuthCode = {
EditQuotation:"EditQuotation",//报价单修改权限
SupperOrderEdit:"SupperOrderEdit",//获取总经理副总经理超级修改权限
LookOrder:"LookOrder",//出纳查看订单权限
LookAllTeam:"LookAllTeam",//查看所有团控
};
export default AuthCode;
\ No newline at end of file
src/components/FinancialModule/OPRules.vue
View file @ a0338912
<template>
<div class="Feedback OPRules">
<ul style="overflow: initial!important">
......@@ -6,7 +5,7 @@
<span>
<em>公司</em>
</span>
<el-select filterable v-model="obj.BranchId" >
<el-select filterable v-model="obj.BranchId">
<el-option label="不限" :value='-1'></el-option>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option>
......@@ -16,29 +15,20 @@
<span>
<em>线路</em>
</span>
<el-select filterable v-model="obj.LineId" >
<el-select filterable v-model="obj.LineId">
<el-option label="不限" :value='0'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
</li>
<li>
<input
type="button"
class="hollowFixedBtn"
value="查询"
@click="getList()"
>
<input
type="button"
class="hollowFixedBtn"
value="新增"
@click="addRule"
>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()">
<input type="button" class="hollowFixedBtn" value="新增" @click="addRule">
</li>
<li style="float:right;color:red;font-weight:700">{{tips}}</li>
</ul>
<table style="margin-bottom:30px" class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<table style="margin-bottom:30px" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"
v-loading="loading">
<tr>
<th>公司名称</th>
<th style="width:20%">线路名称</th>
......@@ -79,16 +69,12 @@
<el-button @click="SetRules(item)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
<el-button @click="Delete(item)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button>
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="16" align="center">暂无数据</td>
</tr>
</table>
<el-dialog
title="提成规则"
:visible.sync="ruleVisible"
width="800px">
<el-dialog title="提成规则" :visible.sync="ruleVisible" width="800px">
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="公司" prop="BranchId">
<el-select filterable v-model="form.BranchId" @change='linkageDepartment()'>
......@@ -99,24 +85,28 @@
<el-form-item label="部门">
<el-select filterable v-model="form.DepartmentId" @change='getDepart(form.DepartmentId)'>
<el-option label='全部' :value='-1'></el-option>
<el-option v-for="item in departmentList" :label="item.DepartmentName"
:value="item.DepartmentID" :key="item.DepartmentID"></el-option>
<el-option v-for="item in departmentList" :label="item.DepartmentName" :value="item.DepartmentID"
:key="item.DepartmentID"></el-option>
</el-select>
</el-form-item>
<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 v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="目的地" prop="LineIdList">
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.PlaceIdList">
<el-option v-for="item in PlaceList" :label='item.PlaceName' :value='item.PlaceID' :key='item.PlaceID'></el-option>
<el-option v-for="item in PlaceList" :label='item.PlaceName' :value='item.PlaceID' :key='item.PlaceID'>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="系列">
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.LtIdList" >
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'></el-option>
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.LtIdList">
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="描述">
......@@ -124,44 +114,44 @@
</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 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 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 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 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-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 label="助理金额" prop="InternMoney">
<el-input class="w220" @keyup.native="checkInteger(form,'InternMoney')" v-model="form.InternMoney"></el-input>
</el-form-item>
<el-form-item v-show="stateShow" label="分负责人金额">
<el-input class="w220" @keyup.native="checkInteger(form,'FManagerMoney')" v-model="form.FManagerMoney"></el-input>
<el-input class="w220" @keyup.native="checkInteger(form,'FManagerMoney')" v-model="form.FManagerMoney">
</el-input>
</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-input class="w220" @keyup.native="checkInteger(form,'FInternMoney')" v-model="form.FInternMoney">
</el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="ruleVisible = false">取 消</el-button>
......@@ -172,86 +162,103 @@
</template>
<script>
import moment from "moment"
import { constants } from 'fs';
export default {
import moment from "moment"
import {
constants
} from 'fs';
export default {
name: 'Feedback',
data (){
return{
obj:{
BranchId:-1,
LineId:0,
data() {
return {
obj: {
BranchId: -1,
LineId: 0,
},
dataList:[],
loading:false,
dateList:[],
LineList:[],
companyList:[],
ruleVisible:false,
form:{
BranchId:"",
DepartmentId:-1,
Description:"",
EmployeeIdList:[],
LineIdList:[],
PlaceIdList:[],
LtIdList:[],
dataList: [],
loading: false,
dateList: [],
LineList: [],
companyList: [],
ruleVisible: false,
form: {
BranchId: "",
DepartmentId: -1,
Description: "",
EmployeeIdList: [],
LineIdList: [],
PlaceIdList: [],
LtIdList: [],
InternMoney:'',
ManagerMoney:'',
XKEmployeeIdList:[],
ZLEmployeeName:[],
FZLEmployeeIdList:[],
FManagerMoney:0,
FInternMoney:0,
InternMoney: '',
ManagerMoney: '',
XKEmployeeIdList: [],
ZLEmployeeName: [],
FZLEmployeeIdList: [],
FManagerMoney: 0,
FInternMoney: 0,
},
departmentMsg: {
RB_Group_Id: '0',
RB_Branch_Id:'-1',
Status:'0',
ParentId:'-1',
Tier:'0',
RB_Branch_Id: '-1',
Status: '0',
ParentId: '-1',
Tier: '0',
},
LineTeamList:[],
EmployeeList:[],
rules:{
BranchId: [
{ required: true, message: '请选择公司', trigger: 'change' }
],
XKEmployeeIdList:[
{ required: true, message: '请选择线控', trigger: 'change' }
],
ZLEmployeeIdList:[
{ required: true, message: '请选择助理', trigger: 'change' }
],
EmployeeIdList: [
{ required: true, message: '请选择参与人员', trigger: 'change' }
],
LineIdList: [
{ required: true, message: '请选择线路', trigger: 'change' }
],
ManagerMoney: [{ required: true, message:"请输入负责人金额", trigger: "blur" }],
InternMoney: [{ required: true, message: "请输入助理金额", trigger: "blur" }],
LineTeamList: [],
EmployeeList: [],
rules: {
BranchId: [{
required: true,
message: '请选择公司',
trigger: 'change'
}],
XKEmployeeIdList: [{
required: true,
message: '请选择线控',
trigger: 'change'
}],
ZLEmployeeIdList: [{
required: true,
message: '请选择助理',
trigger: 'change'
}],
EmployeeIdList: [{
required: true,
message: '请选择参与人员',
trigger: 'change'
}],
LineIdList: [{
required: true,
message: '请选择线路',
trigger: 'change'
}],
ManagerMoney: [{
required: true,
message: "请输入负责人金额",
trigger: "blur"
}],
InternMoney: [{
required: true,
message: "请输入助理金额",
trigger: "blur"
}],
},
departmentList:[],
stateShow:true,
tips:'',
PlaceList:[],
PlaceShow:false,
departmentList: [],
stateShow: true,
tips: '',
PlaceList: [],
PlaceShow: false,
}
},
created(){
},
mounted(){
created() {},
mounted() {
this.getCompany();
this.getLineList();
this.getList();
this.getEmployeeList();
this.getDepartment();
},
methods:{
methods: {
Delete(item) {
this.$confirm("是否删除? 删除后不可恢复", "提示", {
confirmButtonText: "确定",
......@@ -259,86 +266,63 @@ export default {
type: "warning"
})
.then(() => {
this.apipost('sellcommission_DelOPCommissionRule', {RuleId:item.Id}, res => {
this.apipost('sellcommission_DelOPCommissionRule', {
RuleId: item.Id
}, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.getList()
}else{
} else {
this.Error(res.data.message)
}
})
})
.catch(() => {});
},
addRule(){
this.PlaceShow=false;
this.ruleVisible=true;
this.form={
BranchId:"",
Description:"",
EmployeeIdList:[],
LineIdList:[],
PlaceIdList:[],
LtIdList:[],
InternMoney:'',
ManagerMoney:'',
XKEmployeeIdList:[],
ZLEmployeeIdList:[],
FZLEmployeeIdList:[],
FManagerMoney:0,
FInternMoney:0,
addRule() {
this.PlaceShow = false;
this.ruleVisible = true;
this.form = {
BranchId: "",
Description: "",
EmployeeIdList: [],
LineIdList: [],
PlaceIdList: [],
LtIdList: [],
InternMoney: '',
ManagerMoney: '',
XKEmployeeIdList: [],
ZLEmployeeIdList: [],
FZLEmployeeIdList: [],
FManagerMoney: 0,
FInternMoney: 0,
}
},
SetRules(item){
this.ruleVisible=true;
this.form={
Id:item.Id,
BranchId:item.BranchId,
Description:item.Description,
EmployeeIdList:item.EmployeeIdList,
LineIdList:item.LineIdList,
PlaceIdList:item.PlaceIdList,
LtIdList:item.LtIdList,
InternMoney:item.InternMoney,
ManagerMoney:item.ManagerMoney,
DepartmentId:item.DepartmentId,
XKEmployeeIdList:item.XKEmployeeIdList,
ZLEmployeeIdList:item.ZLEmployeeIdList,
FZLEmployeeIdList:item.FZLEmployeeIdList,
FManagerMoney:item.FManagerMoney,
FInternMoney:item.FInternMoney,
SetRules(item) {
this.ruleVisible = true;
this.form = {
Id: item.Id,
BranchId: item.BranchId,
Description: item.Description,
EmployeeIdList: item.EmployeeIdList,
LineIdList: item.LineIdList,
PlaceIdList: item.PlaceIdList,
LtIdList: item.LtIdList,
InternMoney: item.InternMoney,
ManagerMoney: item.ManagerMoney,
DepartmentId: item.DepartmentId,
XKEmployeeIdList: item.XKEmployeeIdList,
ZLEmployeeIdList: item.ZLEmployeeIdList,
FZLEmployeeIdList: item.FZLEmployeeIdList,
FManagerMoney: item.FManagerMoney,
FInternMoney: item.FInternMoney,
}
this.form.LtIdList=item.LtIdList;
this.PlaceShow=true;
this.departmentMsg.RB_Branch_Id=item.BranchId;
this.form.LtIdList = item.LtIdList;
this.PlaceShow = true;
this.departmentMsg.RB_Branch_Id = item.BranchId;
this.getLineTeamList();
},
RulesOk(formName){
// if(this.form.EmployeeIdList.length==0){
// 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.FManagerMoney==0){
// this.Error("请填写分负责人金额！")
// return;
// }
// if(this.form.FInternMoney==0){
// this.Error("请填写分助理金额！")
// return;
// }
// }
RulesOk(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost(
......@@ -346,24 +330,19 @@ export default {
res => {
if (res.data.resultCode == 1) {
this.getList();
this.ruleVisible=false;
this.ruleVisible = false;
this.Success(res.data.message)
}else{
} else {
this.Error(res.data.message)
}
},
err => {
}
err => {}
)
} else {
}
});
},
getEmployeeList () {
getEmployeeList() {
let userInfo = this.getLocalStorage()
let msg = {
GroupId: userInfo.RB_Group_id,
......@@ -379,27 +358,26 @@ export default {
this.EmployeeList = res.data.data
}
},
err => {
}
err => {}
)
},
//获取系列列表
getLineTeamList() {
this.PlaceList =[];
this.LineTeamList=[];
if(this.form.LineIdList.indexOf(-1)!=-1){
this.form.LineIdList=[-1];
this.PlaceList = [];
this.LineTeamList = [];
if (this.form.LineIdList.indexOf(-1) != -1) {
this.form.LineIdList = [-1];
this.form.PlaceIdList = [];
this.form.LtIdList=[];
this.form.LtIdList = [];
return;
}
if(this.form.LineIdList.length>1){
if (this.form.LineIdList.length > 1) {
this.form.PlaceList = [];
this.form.LtIdList=[];
this.form.LtIdList = [];
return;
}
if(this.form.LineIdList.indexOf(-1)==-1 && this.form.LineIdList.length==1){
let id= this.form.LineIdList[0];
if (this.form.LineIdList.indexOf(-1) == -1 && this.form.LineIdList.length == 1) {
let id = this.form.LineIdList[0];
this.getLinePlaceList(id);
}
let msg = {
......@@ -413,8 +391,8 @@ export default {
},
//获取目的地
getLinePlaceList(id) {
if(!this.PlaceShow){
this.form.PlaceList=[];
if (!this.PlaceShow) {
this.form.PlaceList = [];
}
let msg = {
lineID: id,
......@@ -439,7 +417,7 @@ export default {
res => {
if (res.data.resultCode == 1) {
this.companyList = res.data.data;
}else{
} else {
this.Error(res.data.message);
}
},
......@@ -447,66 +425,67 @@ export default {
)
},
getLineList() {
this.apipost("line_post_GetAllList_V2", {LineDirection: 0}, res => {
this.apipost("line_post_GetAllList_V2", {
LineDirection: 0
}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
}
});
},
linkageDepartment(val){
this.departmentMsg.RB_Branch_Id=this.form.BranchId;
// this.departmentList=[];
this.form.DepartmentId=-1;
// 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;
linkageDepartment(val) {
this.departmentMsg.RB_Branch_Id = this.form.BranchId;
this.form.DepartmentId = -1;
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){
this.form.DepartmentId= id;
getDepart(id) {
this.form.DepartmentId = id;
this.$forceUpdate();
},
getDepartment() {
this.apipost('admin_get_DepartmentGetList', this.departmentMsg, res => {
if(res.data.resultCode == 1) {
if (res.data.resultCode == 1) {
this.departmentList = res.data.data;
}
}, err => {})
},
getList(){
this.loading=true;
getList() {
this.loading = true;
this.apipost("sellcommission_GetOPCommissionRuleList", this.obj, res => {
this.loading=false;
this.loading = false;
if (res.data.resultCode == 1) {
this.tips= res.data.data.msg;
this.tips = res.data.data.msg;
this.dataList = res.data.data.list;
}
});
},
}
}
}
</script>
<style>
.OPRules .el-form-item{
.OPRules .el-form-item {
display: inline-block;
}
.Feedback ul>li{
}
.Feedback ul>li {
display: inline-block;
font-size: 12px;
color: #666;
margin: 20px 30px 0px 0;
}
.Feedback .singeRowTable{
}
.Feedback .singeRowTable {
margin-top: 20px;
}
}
</style>
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ a0338912
......@@ -626,6 +626,7 @@
export default {
data () {
return {
LookAllTeam:false,//查看所有团控
//查询数据列表
queryCommonData: {
//线路列表
......@@ -1446,6 +1447,15 @@
}
})
},
//查看所有团控
GetLookAllTeamAuth() {
var actionCode = this.$AuthCode.LookAllTeam;
this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.LookAllTeam = true;
}
});
},
},
filters: {
formatStartDate (value) {
......@@ -1478,6 +1488,7 @@
this.getCountryCity()
},
created () {
this.GetLookAllTeamAuth();
this.checkAllTeam();
//默认显示联运
this.queryMsg.IsShowUnion = -1;
......@@ -1509,7 +1520,7 @@
if (!this.$route.query.tcmun) {
this.queryMsg.StartGroupDate = nowDate
}
if (this.queryCommonData.IsParentCompany != 1&& this.CurrentUserInfo.RB_Branch_id != 49) {
if (this.queryCommonData.IsParentCompany != 1&& this.LookAllTeam) {
this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id)
}
this.getControlList()
......
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