Skip to content

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

页面修改

parent 53912d91
Hide 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 @@ ...@@ -1437,7 +1437,6 @@
break break
} }
} }
// console.log(this.msg.detailList,'this.msg.detailList')
let price = 0 let price = 0
if(obj.SettlementType==1){ if(obj.SettlementType==1){
if(this.msg.detailList && this.msg.detailList.length>0){ if(this.msg.detailList && this.msg.detailList.length>0){
...@@ -1447,14 +1446,11 @@ ...@@ -1447,14 +1446,11 @@
} }
}) })
} }
// console.log(price,obj.Commission,'obj.Commission')
this.msg.OriginalFee = Math.round((price * obj.Commission) ) / 100; this.msg.OriginalFee = Math.round((price * obj.Commission) ) / 100;
}else{ }else{
this.msg.OriginalFee = 0 this.msg.OriginalFee = 0
this.msg.Fee = 0 this.msg.Fee = 0
} }
}, },
Calculation(t, i) { // 计算原币 本位币 Calculation(t, i) { // 计算原币 本位币
let numberC = 0; let numberC = 0;
......
src/components/FinancialModule/domesticCommissionRule.vue
View file @ 88a972ad
<template> <template>
<div class="domesticCommissionRule"> <div class="domesticCommissionRule">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
<span> <span>
<em>规则名称</em> <em>规则名称</em>
<el-input type="text" v-model="msg.RuleName" @keyup.native.enter="handleCurrentChange(1)"> <el-input type="text" v-model="msg.RuleName" @keyup.native.enter="handleCurrentChange(1)">
</el-input> </el-input>
</span> </span>
</li> </li>
<li> <li>
<span style="display: flex;align-items: center;"> <span style="display: flex;align-items: center;">
<em>线路</em> <em>线路</em>
<el-select v-model="msg.LineId" size="mini" @change="handleCurrentChange(1)"> <el-select v-model="msg.LineId" size="mini" @change="handleCurrentChange(1)">
<el-option label="请选择" :value="0"></el-option> <el-option label="请选择" :value="0"></el-option>
<el-option v-for="(item,index) in LineList" :key="item.index" :label="item.LineName" <el-option v-for="(item,index) in LineList" :key="item.index" :label="item.LineName" :value="item.LineID">
:value="item.LineID"></el-option> </el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<input type="button" class="normalBtn" value="新增" @click="addNew"> <input type="button" class="normalBtn" value="新增" @click="addNew">
</li> </li>
</ul> </ul>
</div> </div>
<div class="commonContent"> <div class="commonContent">
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<thead> <thead>
<tr> <tr>
<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>操作</th>
</tr> </tr>
</thead> </thead>
<template v-for="(subItem,subIndex) in DataList"> <template v-for="(subItem,subIndex) in DataList">
<tr v-for="(childItem,childIndex) in subItem.TempTypeList"> <tr v-for="(childItem,childIndex) in subItem.TempTypeList">
<td v-if="childIndex==0" :rowspan="subItem.TempTypeList.length">{{subItem.RuleName}}</td> <td v-if="childIndex==0" :rowspan="subItem.TempTypeList.length">{{subItem.RuleName}}</td>
<td v-if="childIndex==0" :rowspan="subItem.TempTypeList.length"> <td v-if="childIndex==0" :rowspan="subItem.TempTypeList.length">
<span v-for="(x,y) in subItem.LineNameList" <span v-for="(x,y) in subItem.LineNameList"
:key="y+'1'">{{x}}{{subItem.LineNameList.length==y+1?'':'、'}}</span> :key="y+'1'">{{x}}{{subItem.LineNameList.length==y+1?'':'、'}}</span>
</td> </td>
<td>{{childItem.Name}}</td> <td>{{childItem.Name}}</td>
<td> <td>
<span v-if="childItem.Type == 1">人头</span> <span v-if="childItem.Type == 1">人头</span>
<span v-if="childItem.Type == 2">利润比例</span> <span v-if="childItem.Type == 2">利润比例</span>
</td> </td>
<td> <td>
<span v-if="childItem.Type == 1">{{childItem.Money}}元/人</span> <span v-if="childItem.Type == 1">{{childItem.Money}}元/人</span>
<span v-if="childItem.Type == 2"> <span v-if="childItem.Type == 2">
<div>利润比{{childItem.ProfitRate}}%</div> <div>利润比{{childItem.ProfitRate}}%</div>
<div>利润<=0时 {{childItem.ProfitRate}}元/人</div> <div>利润<=0时 {{childItem.ProfitRate}}元/人 </div> </span> </td> <td v-if="childIndex==0"
:rowspan="subItem.TempTypeList.length">{{subItem.UpdateBy}}</td>
</span> <td v-if="childIndex==0" :rowspan="subItem.TempTypeList.length">{{subItem.UpdateDate}}</td>
</td> <td v-if="childIndex==0" :rowspan="subItem.TempTypeList.length">
<td v-if="childIndex==0" :rowspan="subItem.TempTypeList.length">{{subItem.UpdateBy}}</td> <el-button-group size='mini'>
<td v-if="childIndex==0" :rowspan="subItem.TempTypeList.length">{{subItem.UpdateDate}}</td> <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<td v-if="childIndex==0" :rowspan="subItem.TempTypeList.length"> <el-button type="primary" icon="el-icon-edit"
<el-button-group size='mini'> @click="isShowDIv = true,divTitle='修改提成规则',getEdit(subItem)">
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" </el-button>
placement="top-start"> </el-tooltip>
<el-button type="primary" icon="el-icon-edit" <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
@click="isShowDIv = true,divTitle='修改提成规则',getEdit(subItem)"> <el-button type="danger" icon="el-icon-delete" @click="DeleteRules(subItem.Id)">
</el-button> </el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" </el-button-group>
placement="top-start"> </td>
<el-button type="danger" icon="el-icon-delete" @click="DeleteRules(subItem.Id)">
</el-button>
</el-tooltip>
</el-button-group>
</td>
</tr> </tr>
</template> </template>
<tr v-if="DataList.length==0"> <tr v-if="DataList.length==0">
<td colspan="8" align="center">暂无数据</td> <td colspan="8" align="center">暂无数据</td>
</tr> </tr>
<tfoot> <tfoot>
<tr> <tr>
<td colspan="8"> <td colspan="8">
<el-pagination background @current-change="handleCurrentChange" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
:current-page.sync="msg.pageIndex" layout="total,prev, pager, next, jumper" layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
:page-size="msg.pageSize" :total="total"> </el-pagination>
</el-pagination> </td>
</td> </tr>
</tr> </tfoot>
</tfoot>
</table> </table>
</div> </div>
<el-dialog title="国内提成规则" :visible.sync="ruleVisible" width="800px"> <el-dialog title="国内提成规则" :visible.sync="ruleVisible" width="800px">
<el-form ref="addMsg" :model="addMsg" :rules="rules" label-width="110px"> <el-form ref="addMsg" :model="addMsg" :rules="rules" label-width="110px">
<el-form-item label="规则名称" prop="RuleName"> <el-form-item label="规则名称" prop="RuleName">
<el-input type="text" v-model="addMsg.RuleName"></el-input> <el-input type="text" v-model="addMsg.RuleName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="线路" prop="LineshortIds"> <el-form-item label="线路" prop="LineshortIds">
<el-select v-model="addMsg.LineshortIds" multiple style="width: 100%;"> <el-select v-model="addMsg.LineshortIds" multiple style="width: 100%;">
<el-option v-for="(item,index) in LineList" :key="index" :label="item.LineName" <el-option v-for="(item,index) in LineList" :key="index" :label="item.LineName" :value="item.LineID">
:value="item.LineID"></el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="提成比例表"> <el-form-item label="提成比例表">
<div style="width: 100%;border-bottom: 1px solid #e2e2e2;padding-bottom: 10px;margin-top: 10px;" <div style="width: 100%;border-bottom: 1px solid #e2e2e2;padding-bottom: 10px;margin-top: 10px;"
v-for="(x,y) in addMsg.TempTypeList" :key='y'> v-for="(x,y) in addMsg.TempTypeList" :key='y'>
<div style="display: flex;align-items: center;"> <div style="display: flex;align-items: center;">
<!-- <span style="line-height: 34px;">团队类型：</span> --> <!-- <span style="line-height: 34px;">团队类型：</span> -->
<el-form-item :prop="'TempTypeList.'+ y +'.Id'" :rules="productGroupRules.Id" label="团队类型"> <el-form-item :prop="'TempTypeList.'+ y +'.Id'" :rules="productGroupRules.Id" label="团队类型">
<el-select v-model="x.Id" style="width: 300px;" <el-select v-model="x.Id" style="width: 300px;" @change="selectdis($event, y),gettdName(x.Id,y)"
@change="selectdis($event, y),gettdName(x.Id,y)" clearable> clearable>
<el-option v-for="item in TeamListArr" :key="item.Id" :label="item.Name" <el-option v-for="item in TeamListArr" :key="item.Id" :label="item.Name" :disabled="item.disabled"
:disabled="item.disabled" :value="item.Id"></el-option> :value="item.Id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-button style="margin-left: 15px;" type="danger" size="mini" class="el-icon-delete" <el-button style="margin-left: 15px;" type="danger" size="mini" class="el-icon-delete" circle
circle v-if="addMsg.TempTypeList.length>1" v-if="addMsg.TempTypeList.length>1" @click="addMsg.TempTypeList.splice(y,1),selectdis()">
@click="addMsg.TempTypeList.splice(y,1),selectdis()"> </el-button>
</el-button>
</div> </div>
<div style="display: flex;align-items: center;margin-top: 10px;"> <div style="display: flex;align-items: center;margin-top: 10px;">
<!-- <span>类型：</span> --> <!-- <span>类型：</span> -->
<el-form-item label="类型"> <el-form-item label="类型">
<el-radio v-model="x.Type" label="1">人头</el-radio> <el-radio v-model="x.Type" label="1">人头</el-radio>
<el-radio v-model="x.Type" label="2" style="margin-right: 20px;">利润比列</el-radio> <el-radio v-model="x.Type" label="2" style="margin-right: 20px;">利润比列</el-radio>
</el-form-item> </el-form-item>
</div> </div>
<div style="display: flex;align-items: center;margin-top: 10px;"> <div style="display: flex;align-items: center;margin-top: 10px;">
<el-form-item v-if="x.Type==1" :prop="'TempTypeList.'+ y +'.Money'" <el-form-item v-if="x.Type==1" :prop="'TempTypeList.'+ y +'.Money'" :rules="productGroupRules.Money"
:rules="productGroupRules.Money" label="人头金额"> label="人头金额">
<el-input style="width: 200px;" type="Number" v-model="x.Money" <el-input style="width: 200px;" type="Number" v-model="x.Money"
@keyup.native="checkPrice(x,'Money',true)"><template slot="append">元/人</template> @keyup.native="checkPrice(x,'Money',true)"><template slot="append">元/人</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="x.Type==2" :prop="'TempTypeList.'+ y +'.ProfitRate'" <el-form-item v-if="x.Type==2" :prop="'TempTypeList.'+ y +'.ProfitRate'"
:rules="productGroupRules.ProfitRate" label="利润比例"> :rules="productGroupRules.ProfitRate" label="利润比例">
<el-input style="width: 170px;" type="Number" v-model="x.ProfitRate" <el-input style="width: 170px;" type="Number" v-model="x.ProfitRate"
@keyup.native="checkPrice(x,'ProfitRate',true)"> @keyup.native="checkPrice(x,'ProfitRate',true)">
<template slot="append">%</template> <template slot="append">%</template>
</el-input> </el-input>
<!-- <span style="margin-left: 15px;" >利润小于等于0：</span> <!-- <span style="margin-left: 15px;" >利润小于等于0：</span>
--> -->
</el-form-item> </el-form-item>
<el-form-item v-if="x.Type==2" :prop="'TempTypeList.'+ y +'.Money'" <el-form-item v-if="x.Type==2" :prop="'TempTypeList.'+ y +'.Money'" :rules="productGroupRules.Money"
:rules="productGroupRules.Money" label="利润<=0时"> label="利润<=0时">
<el-input style="width: 170px;" type="Number" v-model="x.Money" <el-input style="width: 170px;" type="Number" v-model="x.Money"
@keyup.native="checkPrice(x,'Money',true)"><template slot="append">元/人</template> @keyup.native="checkPrice(x,'Money',true)"><template slot="append">元/人</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<!-- <span v-if="x.Type==1">人头金额：</span> <!-- <span v-if="x.Type==1">人头金额：</span>
<span v-if="x.Type==2">利润比例：</span> <span v-if="x.Type==2">利润比例：</span>
--> -->
</div> </div>
</div> </div>
<el-button v-if="TeamListArr.length>addMsg.TempTypeList.length" size="mini" type="primary" <el-button v-if="TeamListArr.length>addMsg.TempTypeList.length" size="mini" type="primary"
class="el-icon-circle-plus-outline" circle @click="addTempTypeList"></el-button> class="el-icon-circle-plus-outline" circle @click="addTempTypeList"></el-button>
</el-form-item> </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>
<el-button size="small" type="danger" @click="RulesOk('addMsg')">确 定</el-button> <el-button size="small" type="danger" @click="RulesOk('addMsg')">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import Vue from "vue"; import Vue from "vue";
const addobj = { Id: 0, RuleName: '', LineIds: '', LineshortIds: [], TempTypeList: [{ Id: '', Name: '', Type: '1', Money: '0', ProfitRate: '0' }] } const addobj = {
export default { Id: 0,
data() { RuleName: '',
var checkVariable = (rule, value, callback) => { LineIds: '',
if (value == null || value.length == 0) { LineshortIds: [],
return callback(new Error("提成比列不能为空")); TempTypeList: [{
} Id: '',
let a = parseFloat(value); Name: '',
if (isNaN(a)) { Type: '1',
callback(new Error("提成比例必须是整数")); Money: '0',
} else { ProfitRate: '0'
callback(); }]
} }
}; export default {
return { data() {
msg: { var checkVariable = (rule, value, callback) => {
pageIndex: 1, if (value == null || value.length == 0) {
pageSize: 10, return callback(new Error("提成比列不能为空"));
RuleName: '', }
LineId: 0, let a = parseFloat(value);
}, if (isNaN(a)) {
loading: false, //加载层 callback(new Error("提成比例必须是整数"));
DataList: [], } else {
total: 0, callback();
TeamListArr: [],//团队类型 }
LineList: [],//线路 };
ruleVisible: false,//弹窗的显示 return {
addMsg: Object.assign({}, addobj), msg: {
rules: { pageIndex: 1,
RuleName: [{ pageSize: 10,
required: true, RuleName: '',
message: '请输入规则名称', LineId: 0,
trigger: 'change' },
}], loading: false, //加载层
LineshortIds: [{ DataList: [],
total: 0,
TeamListArr: [], //团队类型
LineList: [], //线路
ruleVisible: false, //弹窗的显示
addMsg: Object.assign({}, addobj),
rules: {
RuleName: [{
required: true,
message: '请输入规则名称',
trigger: 'change'
}],
LineshortIds: [{
type: 'array', type: 'array',
required: true, required: true,
message: '请选择路线', message: '请选择路线',
trigger: 'change' trigger: 'change'
}], }],
},
productGroupRules: {
Id: [
{ required: true, message: '请选择团队类型', trigger: 'change' }
],
Money: [
{ required: true, message: '不能为空', trigger: 'change' }
],
ProfitRate: [
{ required: true, message: '不能为空', trigger: 'change' }
],
}
};
},
created() {
this.getList()
this.getTeamList()
this.getLineList()
}, },
methods: { productGroupRules: {
handleCurrentChange(val) { Id: [{
//翻页功能按钮 required: true,
this.msg.pageIndex = val; message: '请选择团队类型',
this.getList(); trigger: 'change'
}, }],
getList() { Money: [{
this.loading = true; required: true,
this.apipost( message: '不能为空',
"sellcommission_GetGNCommissionRuleList", trigger: 'change'
this.msg, }],
res => { ProfitRate: [{
this.loading = false; required: true,
if (res.data.resultCode == 1) { message: '不能为空',
this.DataList = res.data.data.pageData; trigger: 'change'
this.total = res.data.data.count; }],
} }
}, };
err => { } },
); created() {
}, this.getList()
selectdis(val, index) {//团队类型下拉了不能再次选择 this.getTeamList()
this.TeamListArr.forEach((x, y) => { this.getLineList()
let ishow = false; },
this.addMsg.TempTypeList.map((j, ji) => { methods: {
if (ishow == false) { handleCurrentChange(val) {
if (x.Id == j.Id) { //翻页功能按钮
x.disabled = true; this.msg.pageIndex = val;
ishow = true; this.getList();
return; },
} else { getList() {
x.disabled = false; this.loading = true;
} this.apipost(
} "sellcommission_GetGNCommissionRuleList",
}); this.msg,
}); res => {
}, this.loading = false;
gettdName(id, index) {//获取团队类型名称 if (res.data.resultCode == 1) {
this.TeamListArr.map(x => { this.DataList = res.data.data.pageData;
if (x.Id == id) { this.total = res.data.data.count;
this.addMsg.TempTypeList[index].Name = x.Name; }
return false },
} err => {}
}) );
}, },
//获取线路列表 selectdis(val, index) { //团队类型下拉了不能再次选择
getLineList() { this.TeamListArr.forEach((x, y) => {
this.apipost( let ishow = false;
"line_post_GetAllList", {}, this.addMsg.TempTypeList.map((j, ji) => {
res => { if (ishow == false) {
if (res.data.resultCode == 1) { if (x.Id == j.Id) {
this.LineList = res.data.data; x.disabled = true;
} ishow = true;
} return;
); } else {
}, x.disabled = false;
getTeamList() {//获取团队类型的列表 }
this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => { }
if (res.data.resultCode == 1) { });
this.TeamListArr = res.data.data; });
this.TeamListArr.forEach(x => { },
x.disabled = false gettdName(id, index) { //获取团队类型名称
}) this.TeamListArr.map(x => {
} else { if (x.Id == id) {
this.Error(res.data.message); this.addMsg.TempTypeList[index].Name = x.Name;
} return false
}, }
err => { } })
); },
}, //获取线路列表
getEdit(row) {//修改规则 getLineList() {
let data = JSON.parse(JSON.stringify(row)) this.apipost(
this.addMsg = Object.assign({}, addobj) "line_post_GetAllList", {},
this.addMsg.Id = data.Id; res => {
this.addMsg.RuleName = data.RuleName; if (res.data.resultCode == 1) {
this.addMsg.LineIds = data.LineIds; this.LineList = res.data.data;
this.addMsg.LineshortIds = data.LineIds.split(',').map(Number); }
this.addMsg.TempTypeList = data.TempTypeList; }
this.addMsg.TempTypeList.forEach(x => { );
x.Type = x.Type.toString() },
}) getTeamList() { //获取团队类型的列表
this.selectdis() this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
this.ruleVisible = true; if (res.data.resultCode == 1) {
this.TeamListArr = res.data.data;
this.TeamListArr.forEach(x => {
x.disabled = false
})
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
getEdit(row) { //修改规则
let data = JSON.parse(JSON.stringify(row))
this.addMsg = Object.assign({}, addobj)
this.addMsg.Id = data.Id;
this.addMsg.RuleName = data.RuleName;
this.addMsg.LineIds = data.LineIds;
this.addMsg.LineshortIds = data.LineIds.split(',').map(Number);
this.addMsg.TempTypeList = data.TempTypeList;
this.addMsg.TempTypeList.forEach(x => {
x.Type = x.Type.toString()
})
this.selectdis()
this.ruleVisible = true;
}, },
DeleteRules(ID) {//删除规则 DeleteRules(ID) { //删除规则
this.$confirm("是否删除? ", "提示", { this.$confirm("是否删除? ", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning" type: "warning"
}) })
.then(() => { .then(() => {
this.apipost('sellcommission_DelGNCommissionRule', { this.apipost('sellcommission_DelGNCommissionRule', {
RuleId: ID RuleId: ID
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message) this.Success(res.data.message)
this.getList() this.getList()
} else { } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
}) })
}) })
.catch(() => { }); .catch(() => {});
}, },
addNew() {//新增 addNew() { //新增
this.addMsg = { Id: 0, RuleName: '', LineIds: '', LineshortIds: [], TempTypeList: [{ Id: '', Name: '', Type: '1', Money: '0', ProfitRate: '0' }] } this.addMsg = {
this.selectdis() Id: 0,
this.ruleVisible = true; RuleName: '',
}, LineIds: '',
addTempTypeList() {//新增类型 LineshortIds: [],
let obj = { Id: '', Name: '', Type: '1', Money: "0", ProfitRate: "0" } TempTypeList: [{
this.addMsg.TempTypeList.push(obj) Id: '',
}, Name: '',
RulesOk(formName) { Type: '1',
this.$refs[formName].validate((valid) => { Money: '0',
if (valid) { ProfitRate: '0'
let LineshortIds = JSON.parse(JSON.stringify(this.addMsg.LineshortIds)) }]
this.addMsg.LineIds = LineshortIds.join(',') }
console.log(this.addMsg) this.selectdis()
this.ruleVisible = true;
},
addTempTypeList() { //新增类型
let obj = {
Id: '',
Name: '',
Type: '1',
Money: "0",
ProfitRate: "0"
}
this.addMsg.TempTypeList.push(obj)
},
RulesOk(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
let LineshortIds = JSON.parse(JSON.stringify(this.addMsg.LineshortIds))
this.addMsg.LineIds = LineshortIds.join(',')
this.apipost(
'sellcommission_SetGNCommissionRule', this.addMsg,
res => {
if (res.data.resultCode == 1) {
this.getList();
this.ruleVisible = false;
this.Success(res.data.message)
this.apipost( } else {
'sellcommission_SetGNCommissionRule', this.addMsg, this.Error(res.data.message)
res => { }
if (res.data.resultCode == 1) { },
this.getList(); err => {}
this.ruleVisible = false; )
this.Success(res.data.message) }
});
},
} else { },
this.Error(res.data.message) mounted() {
}
},
err => { }
)
}
});
},
}, }
mounted() { };
}
};
</script> </script>
<style> <style>
/* .rule-box .el-select__tags{ /* .rule-box .el-select__tags{
top: 100%; top: 100%;
} */ } */
.domesticCommissionRule .query-box input{ .domesticCommissionRule .query-box input {
height: 34px !important; height: 34px !important;
} }
</style>
\ No newline at end of file </style>
src/components/FinancialModule/domesticCommissiondetails.vue
View file @ 88a972ad
<style> <style>
.CM_look { .CM_look {
padding: 4px !important; padding: 4px !important;
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{
height: 34px !important;
}
.domesticCommissiondetails .singeRowTable tr td { .domesticCommissiondetails .opUl li input {
padding: 8px 5px; height: 34px !important;
} }
.domesticCommissiondetails .singeRowTable tr td {
padding: 8px 5px;
}
.domesticCommissiondetails .hoverSpan span:hover {
cursor: pointer;
text-decoration: underline;
color: red;
}
.domesticCommissiondetails .hoverSpan span:hover {
cursor: pointer;
text-decoration: underline;
color: red;
}
</style> </style>
<template> <template>
<div class="flexOne domesticCommissiondetails"> <div class="flexOne domesticCommissiondetails">
<div style="min-height: 70px;"> <div style="min-height: 70px;">
<ul class="opUl" > <ul class="opUl">
<li> <li>
<em>期数</em> <em>期数</em>
<el-select v-model="msg.PeriodId" size="mini" @change="handleCurrentChange(1)"> <el-select v-model="msg.PeriodId" size="mini" @change="handleCurrentChange(1)">
<el-option label="不限" :value="0"></el-option> <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-select> </el-option>
</li> </el-select>
<li> </li>
<em>出团公司</em> <li>
<el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)" > <em>出团公司</em>
<el-option label="不限" :value="-1"></el-option> <el-select v-model="msg.OutBranchId" size="mini" @change="handleCurrentChange(1)">
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" <el-option label="不限" :value="-1"></el-option>
:value="item.Id"></el-option> <el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" :value="item.Id">
</el-select> </el-option>
</li> </el-select>
<li> </li>
<em>公司</em> <li>
<el-select v-model="msg.RB_Branch_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'> <em>公司</em>
<el-option label="不限" :value="-1"></el-option> <el-select v-model="msg.RB_Branch_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" <el-option label="不限" :value="-1"></el-option>
:value="item.Id"></el-option> <el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" :value="item.Id">
</el-select> </el-option>
</li> </el-select>
<li> </li>
<em>部门</em> <li>
<el-select v-model="msg.RB_Department_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'> <em>部门</em>
<el-option label="不限" :value="-1"></el-option> <el-select v-model="msg.RB_Department_Id" size="mini" @change="handleCurrentChange(1)" :disabled='disabled'>
<el-option v-for="(item,index) in departMentList" :key="item.index" :label="item.DepartmentName" <el-option label="不限" :value="-1"></el-option>
:value="item.DepartmentID"></el-option> <el-option v-for="(item,index) in departMentList" :key="item.index" :label="item.DepartmentName"
</el-select> :value="item.DepartmentID"></el-option>
</li> </el-select>
<li> </li>
<em>人员</em> <li>
<el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'> <em>人员</em>
<el-option label="不限" :value="-1"></el-option> <el-select v-model="msg.UserId" size="mini" @change="handleCurrentChange(1)" filterable :disabled='disabled'>
<el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name" <el-option label="不限" :value="-1"></el-option>
:value="item.empId"></el-option> <el-option v-for="(item,index) in searchList" :key="item.index" :label="item.name" :value="item.empId">
</el-select> </el-option>
</li> </el-select>
</li>
<li>
<em>订单号</em> <li>
<el-input maxlength="50" v-model="msg.OrderId" class="permiss-input w200" <em>订单号</em>
@keyup.native.enter="handleCurrentChange(1)" :placeholder="$t('pub.pleaseImport')"></el-input> <el-input maxlength="50" v-model="msg.OrderId" class="permiss-input w200"
</li> @keyup.native.enter="handleCurrentChange(1)" :placeholder="$t('pub.pleaseImport')"></el-input>
<li> </li>
<em>团号</em> <li>
<el-input maxlength="50" v-model="msg.TCNUM" class="permiss-input w200" <em>团号</em>
@keyup.native.enter="handleCurrentChange(1)" :placeholder="$t('pub.pleaseImport')"></el-input> <el-input maxlength="50" v-model="msg.TCNUM" class="permiss-input w200"
</li> @keyup.native.enter="handleCurrentChange(1)" :placeholder="$t('pub.pleaseImport')"></el-input>
</li>
</ul> </ul>
</div> </div>
<!-- <li> <!-- <li>
<input type="button" class="normalBtn" value="导出" @click="exportExcel"> <input type="button" class="normalBtn" value="导出" @click="exportExcel">
</li> --> </li> -->
<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;">
<span>总金额：{{TotalMoney}}元</span> <span>总金额：{{TotalMoney}}元</span>
<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" style="margin-top: 10px;"> <table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"
<tr> style="margin-top: 10px;">
<tr>
<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>额外扣除</th> <th>额外奖励</th>
<th>最终发放</th> <th>额外扣除</th>
<th>期数</th> <th>最终发放</th>
<th width='400'>备注</th> <th>期数</th>
<th width='400'>备注</th>
<!-- <th>操作</th> -->
</tr>
<tr v-for="item in dataList">
<td>{{item.BranchName}}</td>
<td>{{item.DeptName}}</td>
<td>{{item.UserName}}</td>
<td>
<div>{{item.OutBranchName}}</div>
<span style="cursor: pointer;text-decoration: underline;" @click="goTravel(item.TCID)">
{{item.TCNUM}}({{item.TCID}})
</span>
<!-- <th>操作</th> --> </td>
</tr> <td>{{item.OrderId}}</td>
<tr v-for="item in dataList"> <td>{{item.PeopleCount}}</td>
<td>{{item.CommissionMoney}}</td>
<td>{{item.BranchName}}</td> <td>{{item.OtherMoney}}</td>
<td>{{item.DeptName}}</td> <td>{{item.BackMoney}}</td>
<td>{{item.UserName}}</td> <td>{{item.RealityCommissionMoney}}</td>
<td > <td>{{item.Periods}}</td>
<div>{{item.OutBranchName}}</div> <td>{{item.Description}}</td>
<span style="cursor: pointer;text-decoration: underline;" @click="goTravel(item.TCID)">
{{item.TCNUM}}({{item.TCID}})
</span>
</td>
<td>{{item.OrderId}}</td>
<td>{{item.PeopleCount}}</td>
<td>{{item.CommissionMoney}}</td>
<td>{{item.OtherMoney}}</td>
<td>{{item.BackMoney}}</td>
<td>{{item.RealityCommissionMoney}}</td>
<td>{{item.Periods}}</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)"
...@@ -142,214 +146,213 @@ ...@@ -142,214 +146,213 @@
</td> --> </td> -->
</tr> </tr>
<tr v-if="dataList.length==0"> <tr v-if="dataList.length==0">
<td style="text-align:center" colspan="12">暂无数据</td> <td style="text-align:center" colspan="12">暂无数据</td>
</tr> </tr>
</table> </table>
<!-- 分页 --> <!-- 分页 -->
<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 {
data() { data() {
return { return {
Month: moment().format("YYYY-MM"), Month: moment().format("YYYY-MM"),
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
PeriodId: 0, PeriodId: 0,
UserId: -1, UserId: -1,
RB_Branch_Id: -1, RB_Branch_Id: -1,
RB_Department_Id: -1, RB_Department_Id: -1,
OrderId:'', OrderId: '',
TCNUM:'', TCNUM: '',
OutBranchId:-1 OutBranchId: -1
},
loading: false,
//数据源
dataList: [],
total: 0,
btnShow: false,
PeriodsList: [],
BranchList: [],
searchList: [],
departMentList:[],
TotalMoney:0,
TotalNum:0,
disabled:true
}
}, },
mounted() { loading: false,
let userInfo = this.getLocalStorage(); //数据源
let ActionMenuCode = userInfo.ActionMenuCode; dataList: [],
console.log(this.$route.query,'this.$route.query') total: 0,
if (this.$route.query ) {//不大于0的话用默认值 btnShow: false,
if(this.$route.query.PeriodId && this.$route.query.PeriodId>0){ PeriodsList: [],
this.msg.PeriodId = Number(this.$route.query.PeriodId) BranchList: [],
} searchList: [],
if(this.$route.query.UserId && this.$route.query.UserId>0){ departMentList: [],
this.msg.UserId =Number(this.$route.query.UserId) TotalMoney: 0,
} TotalNum: 0,
if(this.$route.query.RB_Branch_Id){ disabled: true
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){ },
this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id) mounted() {
} let userInfo = this.getLocalStorage();
} let ActionMenuCode = userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) {//是否有看所有人的权限 if (this.$route.query) { //不大于0的话用默认值
this.disabled = false; if (this.$route.query.PeriodId && this.$route.query.PeriodId > 0) {
}else{ this.msg.PeriodId = Number(this.$route.query.PeriodId)
this.disabled = true; }
this.msg.UserId = Number(userInfo.EmployeeId) 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) {
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) {
this.msg.RB_Department_Id = Number(this.$route.query.RB_Department_Id)
}
}
if (ActionMenuCode.indexOf('home_CommissionSeeAll') != -1) { //是否有看所有人的权限
this.disabled = false;
} else {
this.disabled = true;
this.msg.UserId = Number(userInfo.EmployeeId)
}
this.getList();
this.getqishilist()
this.getCompanyList() //获取公司
this.getEmployee() //人员
this.getDerpartMent() //部门
},
methods: {
getDerpartMent() {
//获取部门
this.apipost(
"admin_get_DepartmentGetList",
this.getDepartmentMsg,
res => {
if (res.data.resultCode == 1) {
this.departMentList = res.data.data;
} else {}
},
err => {}
);
},
getEmployee() { //所有人员下拉
let employeeMsg = {
RB_Group_id: "0",
RB_Branch_id: "-1",
departmentId: "0",
IsLeave: "-1"
}
this.apipost(
"app_get_company_employee",
employeeMsg,
res => {
if (res.data.resultCode == 1) {
this.searchList = res.data.data;
} }
this.getList(); },
this.getqishilist() err => {}
this.getCompanyList()//获取公司 );
this.getEmployee()//人员 },
this.getDerpartMent()//部门 //初始化公司
}, getCompanyList() {
methods: { let userInfo = this.getLocalStorage();
getDerpartMent() { var RB_Group_id = userInfo.RB_Group_id;
//获取部门 let msg = {
this.apipost( Status: 0,
"admin_get_DepartmentGetList", is_show: 0,
this.getDepartmentMsg, RB_Group_Id: RB_Group_id
res => { };
if (res.data.resultCode == 1) { this.apipost(
this.departMentList = res.data.data; "admin_get_BranchGetList",
} else { } msg,
}, res => {
err => { } if (res.data.resultCode == 1) {
); this.BranchList = res.data.data;
},
getEmployee() {//所有人员下拉
let employeeMsg = {
RB_Group_id: "0",
RB_Branch_id: "-1",
departmentId: "0",
IsLeave: "-1"
}
this.apipost(
"app_get_company_employee",
employeeMsg,
res => {
if (res.data.resultCode == 1) {
this.searchList = res.data.data;
}
},
err => { }
);
},
//初始化公司
getCompanyList() {
let userInfo = this.getLocalStorage();
var RB_Group_id = userInfo.RB_Group_id;
let msg = {
Status: 0,
is_show: 0,
RB_Group_Id: RB_Group_id
};
this.apipost(
"admin_get_BranchGetList",
msg,
res => {
if (res.data.resultCode == 1) {
this.BranchList = res.data.data;
} }
}, },
err => { } err => {}
); );
}, },
getqishilist() { getqishilist() {
this.apipost( this.apipost(
"sellcommission_GetGNCommissionPeriodsList", "sellcommission_GetGNCommissionPeriodsList", {},
{}, res => {
res => { 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) }
}
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
null null
); );
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
}, },
goUrl(path, id) { goUrl(path, id) {
this.$router.push({ this.$router.push({
path: path, path: path,
query: { query: {
PeriodsId: id, PeriodsId: id,
blank: 'y', blank: 'y',
tab: '期数详情' tab: '期数详情'
} }
}); });
}, },
//获取数据 //获取数据
getList() { getList() {
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
} }
this.loading = true; this.loading = true;
this.apipost( this.apipost(
"sellcommission_GetGNCommissionSingleDetailsList", "sellcommission_GetGNCommissionSingleDetailsList",
msg, msg,
res => { res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.TotalMoney = res.data.data.TotalMoney?res.data.data.TotalMoney:0 this.TotalMoney = res.data.data.TotalMoney ? res.data.data.TotalMoney : 0
this.TotalNum = res.data.data.TotalNum?res.data.data.TotalNum:0 this.TotalNum = res.data.data.TotalNum ? res.data.data.TotalNum : 0
this.dataList = res.data.data.pmodel.pageData; this.dataList = res.data.data.pmodel.pageData;
this.total = res.data.data.pmodel.count; this.total = res.data.data.pmodel.count;
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
}
},
null
);
},
exportExcel(){//导出
let msg = JSON.parse(JSON.stringify(this.msg))
if(msg.OrderId==''){
msg.OrderId = 0
}
let userInfo = this.getLocalStorage();
msg.EmployeeIdUser = userInfo.EmployeeId
var fileName = "国内提成明细.xls";
this.GetLocalFile("sellcommission_post_GetGNCommissionSingleDetailsListToExcel", msg, fileName);
},
goTravel(TCID){//跳转到团队列表
this.$router.push({
path: 'TravelControlList',
query: {
TCID: TCID,
blank: 'y',
tab: '团控列表'
}
});
} }
},
null
);
},
exportExcel() { //导出
let msg = JSON.parse(JSON.stringify(this.msg))
if (msg.OrderId == '') {
msg.OrderId = 0
} }
let userInfo = this.getLocalStorage();
msg.EmployeeIdUser = userInfo.EmployeeId
var fileName = "国内提成明细.xls";
this.GetLocalFile("sellcommission_post_GetGNCommissionSingleDetailsListToExcel", msg, fileName);
},
goTravel(TCID) { //跳转到团队列表
this.$router.push({
path: 'TravelControlList',
query: {
TCID: TCID,
blank: 'y',
tab: '团控列表'
}
});
}
} }
</script> }
\ No newline at end of file
</script>
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 88a972ad
...@@ -1398,7 +1398,6 @@ ...@@ -1398,7 +1398,6 @@
this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => { this.apipost("travel_get_GetTravelPriceTeamTypeList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.TeamListArr = res.data.data; this.TeamListArr = res.data.data;
console.log("this.TeamListArr", this.TeamListArr);
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/UeEditor.vue
View file @ 88a972ad
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
}, },
}, },
created() { created() {
this.ViewDomain = this.domainManager().ViewFileUrl; this.ViewDomain = this.domainManager().ViittoFileUrl;
}, },
mounted() { mounted() {
this.loadUe(); this.loadUe();
......
src/components/appAttachment.vue
View file @ 88a972ad
...@@ -127,13 +127,11 @@ ...@@ -127,13 +127,11 @@
newArr.push(files.file); newArr.push(files.file);
var that=this; var that=this;
this.UploadSelfFileT('Attachment', newArr, res => { this.UploadSelfFileT('Attachment', newArr, res => {
console.log("res", res);
if (res.data.StatusCode == 1) { if (res.data.StatusCode == 1) {
this.chooseFileArray.push({ this.chooseFileArray.push({
fileName: res.data.FileName, fileName: res.data.FileName,
fileUrl: that.domainManager().ViittoFileUrl + res.data.FilePath fileUrl: that.domainManager().ViittoFileUrl + res.data.FilePath
}) })
console.log(" this.chooseFileArray", this.chooseFileArray);
this.$emit("selected", this.chooseFileArray); this.$emit("selected", this.chooseFileArray);
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