Skip to content

S
SuperMan
Commit 8bfc1337 authored by Mac's avatar Mac
Browse files
Options

修改國內op制單的參數

parent c5a1f879
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 33 deletions
src/components/FinancialModule/domestic/OPsalesCommission.vue
View file @ 8bfc1337
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<ul class="opUl"> <ul class="opUl">
<li> <li>
<em>出团公司</em> <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 label="不限" :value="-1"></el-option>
<el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName" <el-option v-for="(item,index) in BranchList" :key="item.index" :label="item.BName"
:value="item.Id"></el-option> :value="item.Id"></el-option>
...@@ -63,11 +63,11 @@ ...@@ -63,11 +63,11 @@
</td> </td>
<td>{{item.BranchCommission}}</td> <td>{{item.BranchCommission}}</td>
<td> <td>
<span v-for="(x,y) in item.FinanceIdList" > <span v-for="(x,y) in item.FinanceIdList">
<span style="cursor: pointer;text-decoration: underline;" @click='gofinancialdetail(x)'> <span style="cursor: pointer;text-decoration: underline;" @click='gofinancialdetail(x)'>
{{x}} {{x}}
</span> </span>
{{item.FinanceIdList.length == y+1 ?'':'、'}} {{item.FinanceIdList.length == y+1 ?'':'、'}}
</span> </span>
</td> </td>
<td> <td>
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
icon="iconfont icon-chakan" circle></el-button> icon="iconfont icon-chakan" circle></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="cMaker==true" class="item" effect="dark" content="制单" placement="top"> <el-tooltip v-if="cMaker==true" class="item" effect="dark" content="制单" placement="top">
<el-button @click="YijianZD(item)" type="danger" class="CM_look" v-if="cMaker==true" <el-button @click="YijianZD(item)" type="danger" class="CM_look" v-if="cMaker==true"
icon="iconfont icon-mui-icon-add" circle></el-button> icon="iconfont icon-mui-icon-add" circle></el-button>
</el-tooltip> </el-tooltip>
...@@ -105,12 +105,12 @@ ...@@ -105,12 +105,12 @@
export default { export default {
data() { data() {
return { return {
Month: moment().format("YYYY-MM"), Month: moment().subtract(1, 'months').format("YYYY-MM"),
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
Periods: 0, Periods: 0,
OutBranchId:-1, OutBranchId: -1,
}, },
loading: false, loading: false,
//数据源 //数据源
...@@ -118,8 +118,8 @@ ...@@ -118,8 +118,8 @@
total: 0, total: 0,
btnShow: false, btnShow: false,
btnLoading: false, btnLoading: false,
BranchList:[], BranchList: [],
cMaker:false,//是否可以制单 cMaker: false,//是否可以制单
} }
}, },
mounted() { mounted() {
...@@ -137,8 +137,8 @@ ...@@ -137,8 +137,8 @@
}, },
methods: { methods: {
//初始化公司 //初始化公司
getCompanyList() { getCompanyList() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
var RB_Group_id = userInfo.RB_Group_id; var RB_Group_id = userInfo.RB_Group_id;
let msg = { let msg = {
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
err => { } err => { }
); );
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
...@@ -216,24 +216,28 @@ ...@@ -216,24 +216,28 @@
); );
}, },
YijianZD(item) { YijianZD(item) {
let Money let Money
if(this.msg.OutBranchId>-1){ if (this.msg.OutBranchId > -1) {
if(item.BranchCommission>0){ if (item.BranchCommission > 0) {
Money=item.BranchCommission Money = item.BranchCommission
}else{ } else {
this.Error("公司提成为0,不能制单!") this.Error("公司提成为0,不能制单!")
return; return;
} }
}else{ } else {
Money=item.SumPrice Money = item.SumPrice
} }
let obj = { let obj = {
CostType: 112, CostType: 112,
Money: Money, Money: Money,
CurrencyId: 1, // CurrencyId: 1,
XSTC: 1, // XSTC: 1,
OtherType:48, OtherType: 48,
ReFinanceId:item.Id ReFinanceId: item.Id,
SelectState: true,
OrderSource: 8,
OrderID: 0,
} }
let query = { let query = {
blank: "y", blank: "y",
...@@ -242,27 +246,27 @@ ...@@ -242,27 +246,27 @@
IsUploadPic: 1, IsUploadPic: 1,
orderObj: JSON.stringify(obj) orderObj: JSON.stringify(obj)
} }
if(this.msg.OutBranchId>0){ if (this.msg.OutBranchId > -1) {
query.id = 30 query.id = 31
query.Name = "分公司销售提成单" query.Name = "分公司销售提成单"
}else{ } else {
query.id = 28 query.id = 29
query.Name = "总部销售提成单" query.Name = "总部销售提成单"
} }
this.$router.push({ this.$router.push({
path: "/addFinancialDocuments", path: "/addFinancialDocuments",
query query
}); });
}, },
gofinancialdetail(id){ gofinancialdetail(id) {
this.$router.push({ this.$router.push({
name: 'FinancialDocumentsDetail', name: 'FinancialDocumentsDetail',
query: { query: {
id: id, id: id,
blank: 'y', blank: 'y',
tab: '单据详情' tab: '单据详情'
} }
}) })
} }
......
src/components/FinancialModule/domesticCommission.vue
View file @ 8bfc1337
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
export default { export default {
data() { data() {
return { return {
Month: moment().format("YYYY-MM"), Month: moment().subtract(1,'months').format("YYYY-MM"),
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 20, pageSize: 20,
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
IsUploadPic: 1, IsUploadPic: 1,
orderObj: JSON.stringify(obj) orderObj: JSON.stringify(obj)
} }
if(this.msg.OutBranchId>0){ if(this.msg.OutBranchId>-1){
query.id = 30 query.id = 30
query.Name = "分公司销售提成单" query.Name = "分公司销售提成单"
}else{ }else{
......
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