Skip to content

S
SuperMan
Commit 0ef778cd authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent ceb07d61
Show whitespace changes
Inline Side-by-side
Showing with 152 additions and 6 deletions
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @ 0ef778cd
......@@ -251,7 +251,7 @@
</div>
</td> -->
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
<p style="cursor: pointer;color:blue;" @click="GenerateDocuments(outItem)">
<p style="cursor: pointer;color:blue;" @click="GenerateDocuments(outItem,subItem.LeaderId,subItem.GuideId)">
{{$t('ground.scdanju')}}
</p>
<p style="cursor: pointer;color:blue;margin-top:5px;"
......@@ -334,6 +334,28 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="领队账户" v-if="LeaderAccountList && LeaderAccountList.length>0">
<el-select v-model="LeaderAccountId">
<el-option
v-for="(item,index) in LeaderAccountList"
:label="item.Name" :value="item.ID" :key="item.ID"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="导游账户" v-if="GuideAccountList && GuideAccountList.length>0">
<el-select v-model="GuideAccountId">
<el-option
v-for="(item,index) in GuideAccountList"
:label="item.Name" :value="item.ID" :key="item.ID"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="生成550手续费">
<el-select v-model="IsFee">
<el-option label="是" :value="1" :key="1"></el-option>
<el-option label="否" :value="2" :key="2"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn"
......@@ -359,6 +381,11 @@
FinanceTypes: [0],//佣金类型
loading: false,
PayType: 1, //付款方式
LeaderAccountId : 0,
GuideAccountId : 0,
LeaderAccountList : [],
GuideAccountList : [],
IsFee : 1,
msg: {
pageIndex: 1,
pageSize: 8,
......@@ -385,9 +412,20 @@
}
},
methods: {
GenerateDocuments(outItem){
GenerateDocuments(outItem,LeaderId,GuideId){
this.isShowFinaceDailog = true
this.CurrentOutItem = outItem
// 处理账户
this.LeaderAccountList = [];
this.LeaderAccountId=0;
this.GuideAccountList = [];
this.GuideAccountId=0;
if(LeaderId && LeaderId>0){
this.financeinfo_post_GetClientAccountList(LeaderId,1);
}
if(GuideId && GuideId>0){
this.financeinfo_post_GetClientAccountList(GuideId,2);
}
},
goCreateHandBill: function () {
let obj = {}
......@@ -562,7 +600,10 @@
TCIDs: that.CurrentOutItem.TCIDs,
PayType: that.PayType,
uid: that.getLocalStorage().EmployeeId,
FinanceType: this.FinanceTypes.join(',')
FinanceType: this.FinanceTypes.join(','),
LeaderAccountId : that.LeaderAccountId,
GuideAccountId : that.GuideAccountId,
IsFee : that.IsFee
};
that.loading = true;
that.apipost("dmcstatistics_post_CheckShopDetailsDMCRate", nMsg, res => {
......@@ -589,6 +630,38 @@
// });
},
financeinfo_post_GetClientAccountList(ObjID,type) { //获取付款 对象类型 新增用
let msg = {
ID: 0,
Type: 7,
ObjID: ObjID,
IsJapanRan: true
}
this.apipost('financeinfo_post_GetClientAccountList', msg, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
let ClientAccountList = [];
data.forEach(x => {
let obj = {
ID: x.ID,
Name: x.AccountHolder + x.CardNum +`（${x.AccountAlias}）`,
}
ClientAccountList.push(obj)
})
if(type==1){
this.LeaderAccountList = ClientAccountList;
if(ClientAccountList && ClientAccountList.length>0){
this.LeaderAccountId = ClientAccountList[0].ID;
}
}else{
this.GuideAccountList = ClientAccountList;
if(ClientAccountList && ClientAccountList.length>0){
this.GuideAccountId = ClientAccountList[0].ID;
}
}
}
}, err => {})
},
},
mounted() {
let myDate = new Date();
......
src/components/ShoppingStore/ShoppingReimbursement2.vue
View file @ 0ef778cd
......@@ -165,7 +165,7 @@
</td>
<td :rowspan="outItem.rowspanCount" v-if="index==0&&subIndex==0">
<div>
<p style="cursor: pointer;color:blue;" @click="GenerateDocuments(outItem)">
<p style="cursor: pointer;color:blue;" @click="GenerateDocuments(outItem,subItem.LeaderId,subItem.GuideId)">
{{$t('ground.scdanju')}}</p>
</div>
</td>
......@@ -221,6 +221,28 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="领队账户" v-if="LeaderAccountList && LeaderAccountList.length>0">
<el-select v-model="LeaderAccountId">
<el-option
v-for="(item,index) in LeaderAccountList"
:label="item.Name" :value="item.ID" :key="item.ID"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="导游账户" v-if="GuideAccountList && GuideAccountList.length>0">
<el-select v-model="GuideAccountId">
<el-option
v-for="(item,index) in GuideAccountList"
:label="item.Name" :value="item.ID" :key="item.ID"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="生成550手续费">
<el-select v-model="IsFee">
<el-option label="是" :value="1" :key="1"></el-option>
<el-option label="否" :value="2" :key="2"></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn"
......@@ -260,6 +282,11 @@
total: 0,
},
PayType: 1, //付款方式
LeaderAccountId : 0,
GuideAccountId : 0,
LeaderAccountList : [],
GuideAccountList : [],
IsFee : 1,
LineList: [],
LineTeamList: [],
shopDataList: [],
......@@ -270,9 +297,20 @@
}
},
methods: {
GenerateDocuments(outItem){
GenerateDocuments(outItem,LeaderId,GuideId){
this.isShowFinaceDailog = true
this.CurrentOutItem = outItem
// 处理账户
this.LeaderAccountList = [];
this.LeaderAccountId=0;
this.GuideAccountList = [];
this.GuideAccountId=0;
if(LeaderId && LeaderId>0){
this.financeinfo_post_GetClientAccountList(LeaderId,1);
}
if(GuideId && GuideId>0){
this.financeinfo_post_GetClientAccountList(GuideId,2);
}
},
goUrlFinancial: function (name, path, id ) {
this.$router.push({ name: path, query: { id: id, blank: 'y', tab: name} });
......@@ -400,7 +438,10 @@
TCIDs: that.CurrentOutItem.TCIDs,
PayType: that.PayType,
uid: that.getLocalStorage().EmployeeId,
FinanceType: this.FinanceTypes
FinanceType: this.FinanceTypes,
LeaderAccountId : that.LeaderAccountId,
GuideAccountId : that.GuideAccountId,
IsFee : that.IsFee
};
that.loading = true;
that.apipost("dmcstatistics_post_CheckShopDetailsDMCRate", nMsg, res => {
......@@ -425,6 +466,38 @@
}).catch(() => {})
},
financeinfo_post_GetClientAccountList(ObjID,type) { //获取付款 对象类型 新增用
let msg = {
ID: 0,
Type: 7,
ObjID: ObjID,
IsJapanRan: true
}
this.apipost('financeinfo_post_GetClientAccountList', msg, res => {
if (res.data.resultCode == 1) {
let data = res.data.data;
let ClientAccountList = [];
data.forEach(x => {
let obj = {
ID: x.ID,
Name: x.AccountHolder + x.CardNum +`（${x.AccountAlias}）`,
}
ClientAccountList.push(obj)
})
if(type==1){
this.LeaderAccountList = ClientAccountList;
if(ClientAccountList && ClientAccountList.length>0){
this.LeaderAccountId = ClientAccountList[0].ID;
}
}else{
this.GuideAccountList = ClientAccountList;
if(ClientAccountList && ClientAccountList.length>0){
this.GuideAccountId = ClientAccountList[0].ID;
}
}
}
}, err => {})
},
},
mounted() {
let myDate = new Date();
......
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