Skip to content

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

页面修改

parent 53912d91
Show whitespace changes
Inline Side-by-side
Showing with 719 additions and 694 deletions
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 88a972ad
......@@ -1437,7 +1437,6 @@
break
}
}
// console.log(this.msg.detailList,'this.msg.detailList')
let price = 0
if(obj.SettlementType==1){
if(this.msg.detailList && this.msg.detailList.length>0){
......@@ -1447,14 +1446,11 @@
}
})
}
// console.log(price,obj.Commission,'obj.Commission')
this.msg.OriginalFee = Math.round((price * obj.Commission) ) / 100;
}else{
this.msg.OriginalFee = 0
this.msg.Fee = 0
}
},
Calculation(t, i) { // 计算原币 本位币
let numberC = 0;
......
src/components/FinancialModule/domesticCommissionRule.vue
View file @ 88a972ad
......@@ -14,8 +14,8 @@
<em>线路</em>
<el-select v-model="msg.LineId" size="mini" @change="handleCurrentChange(1)">
<el-option label="请选择" :value="0"></el-option>
<el-option v-for="(item,index) in LineList" :key="item.index" :label="item.LineName"
:value="item.LineID"></el-option>
<el-option v-for="(item,index) in LineList" :key="item.index" :label="item.LineName" :value="item.LineID">
</el-option>
</el-select>
</span>
</li>
......@@ -56,22 +56,17 @@
<span v-if="childItem.Type == 1">{{childItem.Money}}元/人</span>
<span v-if="childItem.Type == 2">
<div>利润比{{childItem.ProfitRate}}%</div>
<div>利润<=0时 {{childItem.ProfitRate}}元/人</div>
</span>
</td>
<td v-if="childIndex==0" :rowspan="subItem.TempTypeList.length">{{subItem.UpdateBy}}</td>
<div>利润<=0时 {{childItem.ProfitRate}}元/人 </div> </span> </td> <td v-if="childIndex==0"
:rowspan="subItem.TempTypeList.length">{{subItem.UpdateBy}}</td>
<td v-if="childIndex==0" :rowspan="subItem.TempTypeList.length">{{subItem.UpdateDate}}</td>
<td v-if="childIndex==0" :rowspan="subItem.TempTypeList.length">
<el-button-group size='mini'>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')"
placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" icon="el-icon-edit"
@click="isShowDIv = true,divTitle='修改提成规则',getEdit(subItem)">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')"
placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" icon="el-icon-delete" @click="DeleteRules(subItem.Id)">
</el-button>
</el-tooltip>
......@@ -87,9 +82,8 @@
<tfoot>
<tr>
<td colspan="8">
<el-pagination background @current-change="handleCurrentChange"
:current-page.sync="msg.pageIndex" layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize" :total="total">
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination>
</td>
</tr>
......@@ -105,8 +99,8 @@
</el-form-item>
<el-form-item label="线路" prop="LineshortIds">
<el-select v-model="addMsg.LineshortIds" multiple style="width: 100%;">
<el-option v-for="(item,index) in LineList" :key="index" :label="item.LineName"
:value="item.LineID"></el-option>
<el-option v-for="(item,index) in LineList" :key="index" :label="item.LineName" :value="item.LineID">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="提成比例表">
......@@ -116,16 +110,15 @@
<!-- <span style="line-height: 34px;">团队类型：</span> -->
<el-form-item :prop="'TempTypeList.'+ y +'.Id'" :rules="productGroupRules.Id" label="团队类型">
<el-select v-model="x.Id" style="width: 300px;"
@change="selectdis($event, y),gettdName(x.Id,y)" clearable>
<el-option v-for="item in TeamListArr" :key="item.Id" :label="item.Name"
:disabled="item.disabled" :value="item.Id"></el-option>
<el-select v-model="x.Id" style="width: 300px;" @change="selectdis($event, y),gettdName(x.Id,y)"
clearable>
<el-option v-for="item in TeamListArr" :key="item.Id" :label="item.Name" :disabled="item.disabled"
:value="item.Id"></el-option>
</el-select>
</el-form-item>
<el-button style="margin-left: 15px;" type="danger" size="mini" class="el-icon-delete"
circle v-if="addMsg.TempTypeList.length>1"
@click="addMsg.TempTypeList.splice(y,1),selectdis()">
<el-button style="margin-left: 15px;" type="danger" size="mini" class="el-icon-delete" circle
v-if="addMsg.TempTypeList.length>1" @click="addMsg.TempTypeList.splice(y,1),selectdis()">
</el-button>
</div>
......@@ -141,8 +134,8 @@
</div>
<div style="display: flex;align-items: center;margin-top: 10px;">
<el-form-item v-if="x.Type==1" :prop="'TempTypeList.'+ y +'.Money'"
:rules="productGroupRules.Money" label="人头金额">
<el-form-item v-if="x.Type==1" :prop="'TempTypeList.'+ y +'.Money'" :rules="productGroupRules.Money"
label="人头金额">
<el-input style="width: 200px;" type="Number" v-model="x.Money"
@keyup.native="checkPrice(x,'Money',true)"><template slot="append">元/人</template>
</el-input>
......@@ -156,8 +149,8 @@
<!-- <span style="margin-left: 15px;" >利润小于等于0：</span>
-->
</el-form-item>
<el-form-item v-if="x.Type==2" :prop="'TempTypeList.'+ y +'.Money'"
:rules="productGroupRules.Money" label="利润<=0时">
<el-form-item v-if="x.Type==2" :prop="'TempTypeList.'+ y +'.Money'" :rules="productGroupRules.Money"
label="利润<=0时">
<el-input style="width: 170px;" type="Number" v-model="x.Money"
@keyup.native="checkPrice(x,'Money',true)"><template slot="append">元/人</template>
</el-input>
......@@ -186,7 +179,19 @@
</template>
<script>
import Vue from "vue";
const addobj = { Id: 0, RuleName: '', LineIds: '', LineshortIds: [], TempTypeList: [{ Id: '', Name: '', Type: '1', Money: '0', ProfitRate: '0' }] }
const addobj = {
Id: 0,
RuleName: '',
LineIds: '',
LineshortIds: [],
TempTypeList: [{
Id: '',
Name: '',
Type: '1',
Money: '0',
ProfitRate: '0'
}]
}
export default {
data() {
var checkVariable = (rule, value, callback) => {
......@@ -210,9 +215,9 @@
loading: false, //加载层
DataList: [],
total: 0,
TeamListArr: [],//团队类型
LineList: [],//线路
ruleVisible: false,//弹窗的显示
TeamListArr: [], //团队类型
LineList: [], //线路
ruleVisible: false, //弹窗的显示
addMsg: Object.assign({}, addobj),
rules: {
RuleName: [{
......@@ -231,15 +236,21 @@
},
productGroupRules: {
Id: [
{ required: true, message: '请选择团队类型', trigger: 'change' }
],
Money: [
{ required: true, message: '不能为空', trigger: 'change' }
],
ProfitRate: [
{ required: true, message: '不能为空', trigger: 'change' }
],
Id: [{
required: true,
message: '请选择团队类型',
trigger: 'change'
}],
Money: [{
required: true,
message: '不能为空',
trigger: 'change'
}],
ProfitRate: [{
required: true,
message: '不能为空',
trigger: 'change'
}],
}
};
},
......@@ -266,10 +277,10 @@
this.total = res.data.data.count;
}
},
err => { }
err => {}
);
},
selectdis(val, index) {//团队类型下拉了不能再次选择
selectdis(val, index) { //团队类型下拉了不能再次选择
this.TeamListArr.forEach((x, y) => {
let ishow = false;
this.addMsg.TempTypeList.map((j, ji) => {
......@@ -285,7 +296,7 @@
});
});
},
gettdName(id, index) {//获取团队类型名称
gettdName(id, index) { //获取团队类型名称
this.TeamListArr.map(x => {
if (x.Id == id) {
this.addMsg.TempTypeList[index].Name = x.Name;
......@@ -304,7 +315,7 @@
}
);
},
getTeamList() {//获取团队类型的列表
getTeamList() { //获取团队类型的列表
this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
if (res.data.resultCode == 1) {
this.TeamListArr = res.data.data;
......@@ -315,10 +326,10 @@
this.Error(res.data.message);
}
},
err => { }
err => {}
);
},
getEdit(row) {//修改规则
getEdit(row) { //修改规则
let data = JSON.parse(JSON.stringify(row))
this.addMsg = Object.assign({}, addobj)
this.addMsg.Id = data.Id;
......@@ -334,7 +345,7 @@
},
DeleteRules(ID) {//删除规则
DeleteRules(ID) { //删除规则
this.$confirm("是否删除? ", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
......@@ -352,15 +363,33 @@
}
})
})
.catch(() => { });
.catch(() => {});
},
addNew() {//新增
this.addMsg = { Id: 0, RuleName: '', LineIds: '', LineshortIds: [], TempTypeList: [{ Id: '', Name: '', Type: '1', Money: '0', ProfitRate: '0' }] }
addNew() { //新增
this.addMsg = {
Id: 0,
RuleName: '',
LineIds: '',
LineshortIds: [],
TempTypeList: [{
Id: '',
Name: '',
Type: '1',
Money: '0',
ProfitRate: '0'
}]
}
this.selectdis()
this.ruleVisible = true;
},
addTempTypeList() {//新增类型
let obj = { Id: '', Name: '', Type: '1', Money: "0", ProfitRate: "0" }
addTempTypeList() { //新增类型
let obj = {
Id: '',
Name: '',
Type: '1',
Money: "0",
ProfitRate: "0"
}
this.addMsg.TempTypeList.push(obj)
},
RulesOk(formName) {
......@@ -368,8 +397,6 @@
if (valid) {
let LineshortIds = JSON.parse(JSON.stringify(this.addMsg.LineshortIds))
this.addMsg.LineIds = LineshortIds.join(',')
console.log(this.addMsg)
this.apipost(
'sellcommission_SetGNCommissionRule', this.addMsg,
res => {
......@@ -382,7 +409,7 @@
this.Error(res.data.message)
}
},
err => { }
err => {}
)
}
});
......@@ -393,12 +420,14 @@
}
};
</script>
<style>
/* .rule-box .el-select__tags{
top: 100%;
} */
.domesticCommissionRule .query-box input{
.domesticCommissionRule .query-box input {
height: 34px !important;
}
</style>
src/components/FinancialModule/domesticCommissiondetails.vue
View file @ 88a972ad
......@@ -9,7 +9,8 @@
display: inline-block;
margin: 10px 15px 10px 0;
}
.domesticCommissiondetails .opUl li input{
.domesticCommissiondetails .opUl li input {
height: 34px !important;
}
......@@ -22,32 +23,34 @@
text-decoration: underline;
color: red;
}
</style>
<template>
<div class="flexOne domesticCommissiondetails">
<div style="min-height: 70px;">
<ul class="opUl" >
<ul class="opUl">
<li>
<em>期数</em>
<el-select v-model="msg.PeriodId" size="mini" @change="handleCurrentChange(1)">
<el-option label="不限" :value="0"></el-option>
<el-option v-for="(item,index) in PeriodsList" :key="item.index" :label="item.Name" :value="item.Id"></el-option>
<el-option v-for="(item,index) in PeriodsList" :key="item.index" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</li>
<li>
<em>出团公司</em>
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)" >
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)">
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
:value="item.Id"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" :value="item.Id">
</el-option>
</el-select>
</li>
<li>
<em>公司</em>
<el-select v-model="msg.RB_Branch_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
:value="item.Id"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" :value="item.Id">
</el-option>
</el-select>
</li>
<li>
......@@ -62,8 +65,8 @@
<em>人员</em>
<el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
<el-option label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name"
:value="item.empId"></el-option>
<el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name" :value="item.empId">
</el-option>
</el-select>
</li>
......@@ -93,7 +96,8 @@
<input type="button" class="normalBtn" value="导出" @click="exportExcel">
</div>
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0" style="margin-top: 10px;">
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"
style="margin-top: 10px;">
<tr>
<th>公司</th>
......@@ -116,7 +120,7 @@
<td>{{item.BranchName}}</td>
<td>{{item.DeptName}}</td>
<td>{{item.UserName}}</td>
<td >
<td>
<div>{{item.OutBranchName}}</div>
<span style="cursor: pointer;text-decoration: underline;" @click="goTravel(item.TCID)">
{{item.TCNUM}}({{item.TCID}})
......@@ -168,9 +172,9 @@
UserId: -1,
RB_Branch_Id: -1,
RB_Department_Id: -1,
OrderId:'',
TCNUM:'',
OutBranchId:-1
OrderId: '',
TCNUM: '',
OutBranchId: -1
},
loading: false,
//数据源
......@@ -180,42 +184,41 @@
PeriodsList: [],
BranchList: [],
searchList: [],
departMentList:[],
TotalMoney:0,
TotalNum:0,
disabled:true
departMentList: [],
TotalMoney: 0,
TotalNum: 0,
disabled: true
}
},
mounted() {
let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode;
console.log(this.$route.query,'this.$route.query')
if (this.$route.query ) {//不大于0的话用默认值
if(this.$route.query.PeriodId && this.$route.query.PeriodId>0){
if (this.$route.query) { //不大于0的话用默认值
if (this.$route.query.PeriodId && this.$route.query.PeriodId > 0) {
this.msg.PeriodId = Number(this.$route.query.PeriodId)
}
if(this.$route.query.UserId && this.$route.query.UserId>0){
this.msg.UserId =Number(this.$route.query.UserId)
if (this.$route.query.UserId && this.$route.query.UserId > 0) {
this.msg.UserId = Number(this.$route.query.UserId)
}
if(this.$route.query.RB_Branch_Id){
if (this.$route.query.RB_Branch_Id) {
this.msg.RB_Branch_Id = Number(this.$route.query.RB_Branch_Id)
}
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)
}
}
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) {//是否有看所有人的权限
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) { //是否有看所有人的权限
this.disabled = false;
}else{
} else {
this.disabled = true;
this.msg.UserId = Number(userInfo.EmployeeId)
}
this.getList();
this.getqishilist()
this.getCompanyList()//获取公司
this.getEmployee()//人员
this.getDerpartMent()//部门
this.getCompanyList() //获取公司
this.getEmployee() //人员
this.getDerpartMent() //部门
},
methods: {
getDerpartMent() {
......@@ -226,12 +229,12 @@
res => {
if (res.data.resultCode == 1) {
this.departMentList = res.data.data;
} else { }
} else {}
},
err => { }
err => {}
);
},
getEmployee() {//所有人员下拉
getEmployee() { //所有人员下拉
let employeeMsg = {
RB_Group_id: "0",
RB_Branch_id: "-1",
......@@ -246,7 +249,7 @@
this.searchList = res.data.data;
}
},
err => { }
err => {}
);
},
//初始化公司
......@@ -267,13 +270,12 @@
}
},
err => { }
err => {}
);
},
getqishilist() {
this.apipost(
"sellcommission_GetGNCommissionPeriodsList",
{},
"sellcommission_GetGNCommissionPeriodsList", {},
res => {
if (res.data.resultCode == 1) {
this.PeriodsList = res.data.data;
......@@ -307,7 +309,7 @@
//获取数据
getList() {
let msg = JSON.parse(JSON.stringify(this.msg))
if(msg.OrderId==''){
if (msg.OrderId == '') {
msg.OrderId = 0
}
this.loading = true;
......@@ -317,8 +319,8 @@
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.TotalMoney = res.data.data.TotalMoney?res.data.data.TotalMoney:0
this.TotalNum = res.data.data.TotalNum?res.data.data.TotalNum:0
this.TotalMoney = res.data.data.TotalMoney ? res.data.data.TotalMoney : 0
this.TotalNum = res.data.data.TotalNum ? res.data.data.TotalNum : 0
this.dataList = res.data.data.pmodel.pageData;
this.total = res.data.data.pmodel.count;
} else {
......@@ -328,9 +330,9 @@
null
);
},
exportExcel(){//导出
exportExcel() { //导出
let msg = JSON.parse(JSON.stringify(this.msg))
if(msg.OrderId==''){
if (msg.OrderId == '') {
msg.OrderId = 0
}
......@@ -339,7 +341,7 @@
var fileName = "国内提成明细.xls";
this.GetLocalFile("sellcommission_post_GetGNCommissionSingleDetailsListToExcel", msg, fileName);
},
goTravel(TCID){//跳转到团队列表
goTravel(TCID) { //跳转到团队列表
this.$router.push({
path: 'TravelControlList',
query: {
......@@ -352,4 +354,5 @@
}
}
</script>
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 88a972ad
......@@ -1398,7 +1398,6 @@
this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
if (res.data.resultCode == 1) {
this.TeamListArr = res.data.data;
console.log("this.TeamListArr", this.TeamListArr);
} else {
this.Error(res.data.message);
}
......
src/components/UeEditor.vue
View file @ 88a972ad
......@@ -93,7 +93,7 @@
},
},
created() {
this.ViewDomain = this.domainManager().ViewFileUrl;
this.ViewDomain = this.domainManager().ViittoFileUrl;
},
mounted() {
this.loadUe();
......
src/components/appAttachment.vue
View file @ 88a972ad
......@@ -127,13 +127,11 @@
newArr.push(files.file);
var that=this;
this.UploadSelfFileT('Attachment', newArr, res => {
console.log("res", res);
if (res.data.StatusCode == 1) {
this.chooseFileArray.push({
fileName: res.data.FileName,
fileUrl: that.domainManager().ViittoFileUrl + res.data.FilePath
})
console.log(" this.chooseFileArray", this.chooseFileArray);
this.$emit("selected", this.chooseFileArray);
this.chooseFileArray = [];
}
......
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