Skip to content

S
SuperMan
Commit 17c38bdb authored by youjie's avatar youjie
Browse files
Options

no message

parents 9780906a 2232bb71
Hide whitespace changes
Inline Side-by-side
Showing with 255 additions and 21 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 17c38bdb
......@@ -2634,6 +2634,7 @@ else if (Type==2) {
query: {
PeriodsId: this.GetDetail.ReFinanceId,
EmpIds: this.GetDetail.RelevanceFrId,
EmpBranchId : this.GetDetail.RB_Branch_Id,
blank: 'y',
tab: this.$t('FinanDetail.qsxq')
}
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ 17c38bdb
......@@ -231,6 +231,7 @@
"Type":Type,
"commissionObj":JSON.stringify(this.commissionObj),
'path':this.$route.query.path,
'companyID':this.$route.query.companyID,
blank:'y',
tab:'新增付款单'
}
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ 17c38bdb
......@@ -1879,6 +1879,7 @@
query: {
PeriodsId: this.GetDetail.ReFinanceId,
EmpIds: this.GetDetail.RelevanceFrId,
EmpBranchId : this.GetDetail.RB_Branch_Id,
blank: 'y',
tab: this.$t('FinanDetail.qsxq')
}
......
src/components/FinancialModule/ImpressionTicketing/ImpressionTicketCommission.vue
View file @ 17c38bdb
......@@ -32,7 +32,19 @@
<div class="flexOne domesticCommission">
<div>
<ul class="opUl">
<li>
<em>提成归属公司</em>
<el-select filterable v-model='msg.EmBranchId'
@change='handleCurrentChange(1)'>
<el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select>
</li>
<li>
<em>选择月份</em>
<el-date-picker v-model="Month" value-format="yyyy-MM" type="month" placeholder="选择月">
......@@ -50,6 +62,7 @@
<th>期数</th>
<th>总追加工资</th>
<th>总提成</th>
<th>归属公司提成</th>
<th>总年终</th>
<th>{{$t('hotel.hotel_Order')}}</th>
<th>操作信息</th>
......@@ -62,6 +75,7 @@
</td>
<td>{{item.SumCommission?item.SumCommission:'-'}}</td>
<td>{{item.BranchCommission?item.BranchCommission:'-'}}</td>
<td>{{item.SumBonus?item.SumBonus:'-'}}</td>
<td>
<template v-if="item.FrIdList.length>0">
......@@ -178,10 +192,16 @@
msg: {
pageIndex: 1,
pageSize: 20,
EmBranchId :-1
},
loading: false,
//数据源
dataList: [],
companyList: [],
getCompanyMsg:{
RB_Group_Id:'0',
Status:'0',
},
total: 0,
btnShow: false,
btnLoading: false,
......@@ -199,13 +219,22 @@
mounted() {
let userInfo = this.getLocalStorage();
let ActionMenuCode = userInfo.ActionMenuCode;
this.msg.OutBranchId = userInfo.RB_Branch_id
//this.msg.OutBranchId = userInfo.RB_Branch_id
if (ActionMenuCode.indexOf('F_DCommissionSend') != -1) {
this.btnShow = true;
}
this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID
this.getCompany()
this.getList()
},
methods: {
getCompany(){
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.companyList=res.data.data;
}else{}
},err=>{})
},
// 是否已发放
checkSelectable (row){
return row.IsGiveOut != 1
......@@ -358,6 +387,8 @@
blank: "y",
tab: "新增付款单据",
Type: 2,
searchTitle: '提成',
companyID: this.msg.EmBranchId,
commissionObj: JSON.stringify(this.BillMakingMsg)
}
this.$router.push({
......@@ -381,6 +412,12 @@
},
// 点击制单
YijianZD(item,type) {
if(type==1){
if(this.msg.EmBranchId==-1){
this.Error("请选择提成归属公司！");
return;
}
}
this.outerVisible = true
this.GetCommissionSendEmployeeList(item,type)
},
......@@ -390,7 +427,8 @@
this.BillMakingMsg.Type = type
let msg = {
PeroidsId: this.BillMakingMsg.PeroidsId,
Type: this.BillMakingMsg.Type
Type: this.BillMakingMsg.Type,
EmBranchId: this.msg.EmBranchId
}
this.BillMakingLoading = true
this.crmapipost(
......
src/components/FinancialModule/ImpressionTicketing/ImpressionTicketDetails.vue
View file @ 17c38bdb
......@@ -28,6 +28,19 @@
<div class="flexOne domesticCommissiondetails">
<div style="min-height: 70px;">
<ul class="opUl">
<li>
<em>提成归属公司</em>
<el-select filterable v-model='msg.EmpBranchId'
@change='handleCurrentChange(1)'>
<el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select>
</li>
<li>
<em>订单类型</em>
<el-select v-model="msg.OrderType" class="w200 HworkInput"
......@@ -103,9 +116,14 @@
<table v-loading="loading" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"
style="margin-top: 10px;">
<tr>
<th>{{$t('salesModule.Type')}}</th>
<!-- <th>公司</th> -->
<th>部门</th>
<th>提成归属公司</th>
<th>类型</th>
<th>员工部门</th>
<th>岗位</th>
<th>姓名</th>
<th>订单号</th>
......@@ -131,6 +149,7 @@
<!-- <th>{{$t('system.table_operation')}}</th> -->
</tr>
<tr v-for="item in dataList">
<td>{{item.EmBranchName}}</td>
<td>{{item.EmpType==1?'销售':item.EmpType==2?'引流':'-'}}</td>
<td style="font-size: 12px;">{{item.BranchName}}
<p>{{item.DeptName}}</p>
......@@ -212,11 +231,17 @@
EmpType: '-1',
OrderId:'',
OrderType: -1,
Way: 0
Way: 0,
EmpBranchId :-1
},
loading: false,
//数据源
dataList: [],
companyList: [],
getCompanyMsg:{
RB_Group_Id:'0',
Status:'0',
},
total: 0,
btnShow: false,
PeroidsList:[],
......@@ -242,6 +267,7 @@
this.msg.PeriodsId = this.$route.query.PeriodsId?Number(this.$route.query.PeriodsId):-1
this.msg.EmpType = this.$route.query.EmpType?this.$route.query.EmpType:'-1'
this.msg.EmpId = this.$route.query.EmpId?this.$route.query.EmpId:-1
this.msg.EmpBranchId = this.$route.query.EmpBranchId !=null && this.$route.query.EmpBranchId>=0?this.$route.query.EmpBranchId:-1
// 判断是否销售
if (ActionMenuCode.indexOf('S_CheckBranchOrder') != -1) {
this.S_CheckBranchOrder = true
......@@ -256,9 +282,18 @@
}else{
this.disabled = true;
}
this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID
this.getCompany()
this.GetOrderTypeEnumList()
},
methods: {
getCompany(){
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.companyList=res.data.data;
}else{}
},err=>{})
},
GetCommissionOrder(msg){
this.crmapipost("/api/Commission/GetCommissionOrderDetialStat", msg, (res) => {
if (res.data.resultCode == 1) {
......
src/components/FinancialModule/ImpressionTicketing/ImpressionTicketUserDetails.vue
View file @ 17c38bdb
......@@ -126,6 +126,19 @@
<div class="flexOne domesticCommissionUser">
<div>
<ul class="opUl">
<li>
<em>提成归属公司</em>
<el-select filterable v-model='msg.EmBranchId'
@change='handleCurrentChange(1)'>
<el-option label="不限" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select>
</li>
<li>
<em>类型</em>
<el-select v-model="msg.EmpType" size="mini" @change="handleCurrentChange(1)" filterable>
......@@ -213,7 +226,8 @@
<span
:class="item.WageReId?'cursor-p':''">{{item.WageType==1?'新员工比例':item.WageType==2?'上季度定档':'-'}}</span>
</td>
<td>{{item.Commission?item.Commission:'-'}}</td>
<!-- <td>{{item.Commission?item.Commission:'-'}}</td> -->
<td>{{item.BranchCommission?item.BranchCommission:'-'}}</td>
<td>{{item.LimitCommission != 0?item.LimitCommission:'-'}}</td>
<!-- <td>{{item.CommissionRate}}%</td> -->
<td>{{item.EmName!='微途'&&item.BonusMoney?item.BonusMoney:'-'}}</td>
......@@ -266,11 +280,17 @@
EmpId: -1,
PeriodsId: -1,
EmpType: '-1',
Way: '-1'
Way: '-1',
EmBranchId: -1
},
loading: false,
//数据源
dataList: [],
companyList: [],
getCompanyMsg:{
RB_Group_Id:'0',
Status:'0',
},
total: 0,
disabled: true,
PeroidsList:[],
......@@ -295,11 +315,21 @@
if (this.$route.query && this.$route.query.EmpIds) {
this.msg.EmpIds = this.$route.query.EmpIds
}
this.msg.EmBranchId = this.$route.query.EmpBranchId !=null && this.$route.query.EmpBranchId>=0?Number(this.$route.query.EmpBranchId):-1
this.getCompanyMsg.RB_Group_Id=userInfo.RB_Group_id; //集团ID
this.getCompany()
this.getList()
this.getEmployee()//人员
this.GetCommissionPeroidsList()//期数
},
methods: {
getCompany(){
this.apipost('admin_get_BranchGetList',this.getCompanyMsg,res=>{
if(res.data.resultCode==1){
this.companyList=res.data.data;
}else{}
},err=>{})
},
clickUrl(item,type,Way){
if(type==2){//线索
this.clueManagement(item)
......
src/components/FinancialModule/MonthlyCostStatement/index.vue
View file @ 17c38bdb
......@@ -86,17 +86,39 @@
</el-col>
<el-col :span="4">
<el-form-item :label="$t('fnc.fkduixiang')+'：'">
<el-select
v-model="msg.ClientID" class="w150"
filterable
remote
reserve-keyword
:placeholder="$t('pub.PleaseKeyWords')"
:remote-method="GetClientAccountListByKeyWord"
>
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientAccountList'
v-model="msg.ClientID" class="w150">
</el-select>
</el-form-item>
<el-form-item label="汇款人：">
<el-input placeholder="" class="" v-model="msg.RemitterName" ></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('fnc.dxleixing')">
<el-select filterable v-model='msg.ClientType'
@change="ClaerClientAccountList(),msg.ClientID=''" class="">
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientTypeList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('fnc.fkduixiang')">
<el-select
v-model="msg.ClientID" class=""
filterable
remote
reserve-keyword
:placeholder="$t('pub.PleaseKeyWords')"
:remote-method="GetClientAccountListByKeyWord"
>
<el-option value="" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientAccountList'
:label='`${item.AccountAlias}(${item.AccountHolder}/${item.CardNum})`'
:value='item.ID'
:key='item.ID'>
......@@ -107,9 +129,20 @@
</span>
</div>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="排序：">
<el-select filterable v-model='msg.Sort' >
<el-option key="-1" value="-1" label="不限"></el-option>
<el-option key="0" value="0" label="团期"></el-option>
<el-option key="1" value="1" label="汇款日期"></el-option>
<el-option key="2" value="2" label="单号"></el-option>
<el-option key="3" value="3" label="交易流水号"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('fnc.jine')+'：'">
<div style="display: flex;flex-direction: row;flex-wrap: nowrap;">
......@@ -145,6 +178,7 @@
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('system.table_rank')+'：'">
<el-select filterable v-model='msg.Sort'>
......@@ -156,6 +190,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('fnc.mbleixing')+'：'">
<el-select v-model="msg.TemplateIds" filterable >
......@@ -182,15 +217,42 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('fnc.ddbianhao')+'：'">
<el-input v-model="msg.OrderID"></el-input>
</el-form-item>
<el-form-item label="订单类型">
<el-select filterable v-model='msg.OtherType' class="">
<el-option key="0" value="0" label="不限"></el-option>
<el-option key="63" value="63" label="团队"></el-option>
<el-option key="61" value="61" label="酒店"></el-option>
<el-option key="66" value="66" label="门票"></el-option>
<el-option key="67" value="67" label="车辆"></el-option>
<el-option key="62" value="62" label="签证"></el-option>
<el-option key="5" value="5" label="日本车行"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="订单编号：">
<el-input v-model="msg.ReFinanceId"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item :label="$t('MonthCost.MonthCost_bzcx')+'：'">
<el-input v-model="msg.Remark"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="车行客户：">
<el-select filterable v-model='msg.JapanCarCustomerId' >
<el-option :value="0" label="不限"></el-option>
<el-option v-for="item in JapanCarCustomerList" :key="item.Id" :value="item.Id" :label="item.CustomerName"></el-option>
</el-select>
</el-form-item>
</el-col>
</template>
</el-row>
</el-form>
......@@ -337,6 +399,37 @@
<template v-else>
<p class="_TCIDAndTCNUMList">{{$t('pub.noMsg')}}</p>
</template>
<template v-if="scope.row.OtherType>0&&scope.row.ReFinanceIds!='0'&&scope.row.ReFinanceIds">
<p v-if="scope.row.OtherType==66">
<span >门票订单号</span>
<span>{{scope.row.ReFinanceIds}}</span>
</p>
<p v-else-if="scope.row.OtherType==67">
<span >车辆订单号</span>
<span>{{scope.row.ReFinanceIds}}</span>
</p>
<p v-else-if="scope.row.OtherType==61">
<span >酒店订单号</span>
<span>{{scope.row.ReFinanceIds}}</span>
</p>
<p v-else-if="scope.row.OtherType==80">
<span >印象车行订单号</span>
<span>{{scope.row.ReFinanceIds}}</span>
</p>
</template>
<template v-else-if="scope.row.OrderSource>0&&scope.row.OrderID>0">
<p v-if="scope.row.OrderSource==8">
<span>团队订单号</span>
<span>{{scope.row.OrderID}}</span>
</p>
<p v-else-if="scope.row.OrderSource==10">
<span >签证订单号</span>
<span>{{scope.row.OrderID}}</span>
</p>
</template>
</template>
</el-table-column>
<el-table-column
......@@ -476,6 +569,7 @@ export default {
sTradeDate:'',
eTradeDate:'',
ClientType:'0',
JapanCarCustomerId:0,
RemitterName:'',
ClientID:'',
sMoney:'',
......@@ -487,6 +581,8 @@ export default {
TradeWay:'',
Type:'-1',
AccountType:'',
ReFinanceId:0,
OtherType:'0',
QEndDate:'',
QStartDate:'',
UpdateBy:'',
......@@ -543,6 +639,7 @@ export default {
ChineseStr:'',
DepartIDs:'',
heightQueryBox:false,
JapanCarCustomerList:[],
}
},
created(){
......@@ -580,6 +677,7 @@ export default {
}
},
mounted(){
let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id= this.employeeMsg.GroupId = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.DepartIDs = userInfo.RB_Department_Id;
......@@ -597,10 +695,21 @@ export default {
this.FinancialFlowTemplate_post_GetStatusList();
this.getPageList();
this.AccountType_post_GetList();
this.GetJapanCarCustomerList();
var that = this;
},
methods:{
GetJapanCarCustomerList() { // 获取对象类型
this.apipost('JapanCar_get_GetJapanCarCustomerList', {}, res => {
if (res.data.resultCode == 1) {
console.log("JapanCarCustomerList",this.JapanCarCustomerList);
this.JapanCarCustomerList = res.data.data;
}
}, err => {})
},
ClaerClientAccountList(){
this.ClientAccountList=[];
},
handleClose(rows){
if (rows) {
rows.forEach(row => {
......@@ -661,7 +770,8 @@ export default {
if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
if(!this.msg.TCID)this.msg.TCID=0;
if(!this.msg.OrderID)this.msg.OrderID=0;
if(!this.msg.ReFinanceId)this.msg.ReFinanceId=0;
if(!this.msg.OtherType)this.msg.OtherType=0;
if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0;
if(!this.msg.Conditon)this.msg.Conditon=1;
......@@ -805,7 +915,6 @@ export default {
}
},
getAccountList(i,t){ //收款账户
let accountList = [];
if(t==1){ // 银行
......
src/components/FinancialModule/RecPayQuery.vue
View file @ 17c38bdb
......@@ -188,12 +188,14 @@
<el-input v-model="msg.OrderID"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('fnc.jine')+'：'">
<el-input v-model="msg.sMoney" class="w64d5" @keyup.native="checkPrice(msg,'sMoney')"></el-input>-
<el-input v-model="msg.eMoney" @keyup.native="checkPrice(msg,'eMoney')" class="w64d5"></el-input>
</el-form-item>
</el-col>
<!-- 发票标识 -->
<el-col :span="4">
<el-form-item label="发票标识：">
......@@ -204,6 +206,22 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="金额：">
<el-switch
v-model="msg.QMoneyType"
active-text="原币"
active-value="1"
active-color="#13ce66"
inactive-color="#ff4949"
inactive-text="本位币"
inactive-value="0">
</el-switch>
<el-input v-model="msg.sMoney" class="w64d5" @keyup.native="checkPrice(msg,'sMoney')"></el-input>-
<el-input v-model="msg.eMoney" @keyup.native="checkPrice(msg,'eMoney')" class="w64d5"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="金蝶状态：">
<el-select v-model='msg.KingdeeMark'>
......@@ -891,6 +909,7 @@
ClientID: '',
sMoney: '',
eMoney: '',
QMoneyType:0,
CurrencyId: '0',
CostTypeID: '',
Conditon: '',
......
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