Skip to content

S
SuperMan
Commit 4ac0dcae authored by 吴春's avatar 吴春
Browse files
Options

领队报账界面优化

parent 17bb523d
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 15 deletions
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @ 4ac0dcae
......@@ -352,12 +352,14 @@
</el-form-item>
<el-form-item label="领队账户" v-if="LeaderAccountList && LeaderAccountList.length>0">
<el-select v-model="LeaderAccountId">
<el-option :value="0" :label="$t('system.ph_choice')"></el-option>
<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 :value="0" :label="$t('system.ph_choice')"></el-option>
<el-option v-for="(item,index) in GuideAccountList" :label="item.Name" :value="item.ID" :key="item.ID">
</el-option>
</el-select>
......@@ -762,6 +764,24 @@
that.Error("请选择至少一个佣金类型!");
return
}
if (this.FinanceTypes && this.FinanceTypes.length >0 &&(this.FinanceTypes.includes(0)||this.FinanceTypes.includes(1)||this.FinanceTypes.includes(2))) {
if(this.FinanceTypes.includes(0)||this.FinanceTypes.includes(1)){
if (that.LeaderAccountId==0) {
that.Error("请选择领队账号!");
return
}
}
if(this.FinanceTypes.includes(0)||this.FinanceTypes.includes(2)){
if (that.GuideAccountId==0) {
that.Error("请选择导游账号!");
return
}
}
}
if (this.FinanceTypes && this.FinanceTypes.length == 0) {
that.Error("请选择至少一个佣金类型!");
return
}
this.$confirm('是否生成财务单据？', this.$t('tips.tips'), {
confirmButtonText: `确定`,
cancelButtonText: `取消`,
......@@ -984,19 +1004,32 @@
data.forEach(x => {
let obj = {
ID: x.ID,
Name: x.AccountHolder + x.CardNum + `（${x.AccountAlias}）`,
Name: x.AccountHolder + x.CardNum + `（${x.AccountAlias}）`+(x.IsDefaultCommission==1?`{默认佣金账号}`:''),
IsDefaultCommission:x.IsDefaultCommission,
}
ClientAccountList.push(obj)
})
if (type == 1) {
this.LeaderAccountList = ClientAccountList;
if (ClientAccountList && ClientAccountList.length > 0) {
this.LeaderAccountId = ClientAccountList[0].ID;
for (let index = 0; index < ClientAccountList.length; index++) {
const item = ClientAccountList[index];
if (item.IsDefaultCommission==1) {
this.LeaderAccountId = ClientAccountList[index].ID;
break;
}
}
}
} else {
this.GuideAccountList = ClientAccountList;
if (ClientAccountList && ClientAccountList.length > 0) {
this.GuideAccountId = ClientAccountList[0].ID;
for (let index = 0; index < ClientAccountList.length; index++) {
const item = ClientAccountList[index];
if (item.IsDefaultCommission==1) {
this.GuideAccountId = ClientAccountList[index].ID;
break;
}
}
}
}
}
......
src/components/ShoppingStore/ShoppingReimbursement2.vue
View file @ 4ac0dcae
......@@ -223,6 +223,7 @@
</el-form-item>
<el-form-item label="领队账户" v-if="LeaderAccountList && LeaderAccountList.length>0">
<el-select v-model="LeaderAccountId">
<el-option :value="0" :label="$t('system.ph_choice')"></el-option>
<el-option
v-for="(item,index) in LeaderAccountList"
:label="item.Name" :value="item.ID" :key="item.ID"
......@@ -231,6 +232,7 @@
</el-form-item>
<el-form-item label="导游账户" v-if="GuideAccountList && GuideAccountList.length>0">
<el-select v-model="GuideAccountId">
<el-option :value="0" :label="$t('system.ph_choice')"></el-option>
<el-option
v-for="(item,index) in GuideAccountList"
:label="item.Name" :value="item.ID" :key="item.ID"
......@@ -429,6 +431,15 @@
//生成单据
CreateBill() {
var that = this;
if(this.FinanceTypes &&this.FinanceTypes==1&&that.LeaderAccountId==0){
that.Error("请选择领队账号!");
return
}
if(this.FinanceTypes &&this.FinanceTypes==2&&that.GuideAccountId==0){
that.Error("请选择导游账号!");
return
}
this.$confirm('是否生成财务单据？', this.$t('tips.tips'), {
confirmButtonText: `确定`,
cancelButtonText: `取消`,
......@@ -478,23 +489,47 @@
let data = res.data.data;
let ClientAccountList = [];
data.forEach(x => {
let obj = {
ID: x.ID,
Name: x.AccountHolder + x.CardNum +`（${x.AccountAlias}）`,
}
let obj = {
ID: x.ID,
Name: x.AccountHolder + x.CardNum + `（${x.AccountAlias}）`+(x.IsDefaultCommission==1?`{默认佣金账号}`:''),
IsDefaultCommission:x.IsDefaultCommission,
}
ClientAccountList.push(obj)
})
if(type==1){
this.LeaderAccountList = ClientAccountList;
if(ClientAccountList && ClientAccountList.length>0){
this.LeaderAccountId = ClientAccountList[0].ID;
if (type == 1) {
this.LeaderAccountList = ClientAccountList;
if (ClientAccountList && ClientAccountList.length > 0) {
for (let index = 0; index < ClientAccountList.length; index++) {
const item = ClientAccountList[index];
if (item.IsDefaultCommission==1) {
this.LeaderAccountId = ClientAccountList[index].ID;
break;
}
}else{
this.GuideAccountList = ClientAccountList;
if(ClientAccountList && ClientAccountList.length>0){
this.GuideAccountId = ClientAccountList[0].ID;
}
}
} else {
this.GuideAccountList = ClientAccountList;
if (ClientAccountList && ClientAccountList.length > 0) {
for (let index = 0; index < ClientAccountList.length; index++) {
const item = ClientAccountList[index];
if (item.IsDefaultCommission==1) {
this.GuideAccountId = ClientAccountList[index].ID;
break;
}
}
}
}
// 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 => {})
},
......
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