Skip to content

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

1

parent 6854d350
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 16 deletions
src/components/FinancialModule/HandDispensingFee/list.vue
View file @ c9d851b0
......@@ -42,7 +42,11 @@
<td><span v-if="childItem.Type==1">房</span>
<span v-if="childItem.Type==2">餐</span>
<span v-if="childItem.Type==3">车</span>
<span v-if="childItem.Type==4">门票</span></td>
<span v-if="childItem.Type==4">门票</span>
<span v-if="childItem.Type==5">房费送客手数料</span>
<span v-if="childItem.Type==6">餐费送客手数料</span>
<span v-if="childItem.Type==7">门票送客手数料</span>
</td>
<td>{{childItem.Unit_Price}}</td>
<td>{{childItem.CostTypeName}}</td>
<td>{{childItem.FlowZName}}</td>
......@@ -229,6 +233,7 @@
:value="item.Id"></el-option>
</el-select>
</el-form-item>
<div>
<!-- <el-button style="margin-left: 15px;padding: 6px;" type="danger" size="mini" class="el-icon-delete" circle
v-if="addMsg.DetailList.length>1" @click="addMsg.DetailList.splice(y,1)">
......@@ -379,6 +384,9 @@
{Name:'餐',Id:2,disabled:false},
{Name:'车',Id:3,disabled:false},
{Name:'门票',Id:4,disabled:false},
{Name:'房费送客手数料',Id:5,disabled:false},
{Name:'餐费送客手数料',Id:6,disabled:false},
{Name:'门票送客手数料',Id:7,disabled:false},
], //类型
ClientAccountList: [], //付款对象
showVisible: false, //弹窗的显示
......@@ -647,8 +655,11 @@
getEdit(row,type) { //修改
let data = JSON.parse(JSON.stringify(row))
this.addMsg = data
console.log("data",data);
if(type==1){
this.addMsg.DetailList.forEach(item=>{
item.Unit_Price = Number(item.Unit_Price)
})
this.addMsg.ClientIdList = data.ClientIds.split(',').map(Number)
......@@ -726,7 +737,7 @@
addDetailList() { //新增类型
// let isdisabled = false
// let isdisabledXHS = false
for(let i = 2;i<5;i++){
for(let i = 2;i<8;i++){
let obj = {
Type: i,
Unit_Price: null,
......@@ -751,6 +762,8 @@
ClientIdList:this.addMsg.ClientIdList,
ClientIds:this.addMsg.ClientIds,
DetailList:this.addMsg.DetailList,
BranchId:this.addMsg.BranchId,
CurrencyId:this.addMsg.CurrencyId,
}
this.submitLoading = true
this.apipost(
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ c9d851b0
......@@ -826,12 +826,15 @@
<span v-if="x.Type==2">餐</span>
<span v-if="x.Type==3">车</span>
<span v-if="x.Type==4">门票</span>
<span v-if="x.Type==5">房费送客手数料</span>
<span v-if="x.Type==6">餐费送客手数料</span>
<span v-if="x.Type==7">门票送客手数料</span>
</td>
<td>
<el-input v-model="x.Num" type="Number" class="w80 _border_b_1"></el-input>
<el-input v-model="x.Num" type="Number" class="w80 _border_b_1" :disabled="x.Type>4?true:false"></el-input>
</td>
<td>
<el-input v-model="x.Unit_Price" type="Number" @keyup.native="checkInteger(x,'Number')"
<el-input v-model="x.Unit_Price" type="Number" :disabled="x.Type>4?true:false" @keyup.native="checkInteger(x,'Number')"
class="w80 _border_b_1"></el-input>
</td>
<td>{{x.Num*x.Unit_Price}}</td>
......@@ -1114,7 +1117,10 @@
Name: '门票',
Id: 4,
disabled: false
},
},
{Name:'房费送客手数料',Id:5,disabled:false},
{Name:'餐费送客手数料',Id:6,disabled:false},
{Name:'门票送客手数料',Id:7,disabled:false},
], //类型
isHandFee: false,
is_HandFee: true, //是否开启
......@@ -1175,6 +1181,7 @@
},
// 是否开启手配费
getHandFee() {
if (this.is_HandFee) {
this.chooseHandFee()
} else {
......@@ -1184,12 +1191,14 @@
},
// 获取当前手配费选项
chooseHandFee() {
console.log("我进来啦1",this.HandFeeDetail );
console.log("我进来啦2", this.msg.detailList );
if (!this.is_HandFee) return
if (this.msg.detailList.length > 0) {
let HandFeeObj = this.HandFeeList.map(item => {
if (item.BranchId == this.HandFee.BranchId) return item
})
this.HandFeeDetail = HandFeeObj[0]
this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach(x => {
x.show = false
......@@ -1199,6 +1208,7 @@
let numToCE = 0
let numToMEN = 0
let states = true
let companyID= this.$route.query.companyID;
this.msg.detailList.forEach((x, index) => {
let obj = x
if (x.CostTypeName.indexOf('房') != -1 ||
......@@ -1206,22 +1216,49 @@
x.CostTypeName.indexOf('车') != -1 ||
x.CostTypeName.indexOf('门票') != -1) {
this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach((y, indexs) => {
if (x.CostTypeName.indexOf('房') != -1 && y.Type == 1) {
if (x.CostTypeName.indexOf('房') != -1&&x.CostTypeName.indexOf('房费送客手数料') == -1 && y.Type == 1&&companyID!=1220) {
y.show = true, numToFANG += Number(obj.Number)//, y.Num = numToFANG
}
if (x.CostTypeName.indexOf('餐') != -1 && y.Type == 2) {
if (x.CostTypeName.indexOf('餐') != -1&&x.CostTypeName.indexOf('餐费送客手数料') == -1 && y.Type == 2&&companyID!=1220) {
y.show = true, numToCAN += Number(obj.Number)//, y.Num = numToCAN
}
if (x.CostTypeName.indexOf('车') != -1 && y.Type == 3) {
if (x.CostTypeName.indexOf('车') != -1 && y.Type == 3&&companyID!=1220) {
y.show = true, numToCE += Number(obj.Number)//, y.Num = numToCE
}
if (x.CostTypeName.indexOf('门票') != -1 && y.Type == 4) {
if (x.CostTypeName.indexOf('门票') != -1&&x.CostTypeName.indexOf('门票送客手数料') == -1 && y.Type == 4&&companyID!=1220) {
y.show = true, numToMEN += Number(obj.Number)//, y.Num = numToMEN
}
if (x.CostTypeName.indexOf('房费送客手数料') != -1 && y.Type == 5) {
if(x.UnitPriceTo<0){ y.Unit_Price=x.UnitPriceTo*-1}
else{
y.Unit_Price=x.UnitPriceTo
}
y.Num=x.Number
y.show = true, numToMEN += Number(obj.Number)//, y.Num = numToMEN
}
if (x.CostTypeName.indexOf('餐费送客手数料') != -1 && y.Type == 6) {
y.Num=x.Number
if(x.UnitPriceTo<0){ y.Unit_Price=x.UnitPriceTo*-1}
else{
y.Unit_Price=x.UnitPriceTo
}
y.show = true, numToMEN += Number(obj.Number)//, y.Num = numToMEN
}
if (x.CostTypeName.indexOf('门票送客手数料') != -1 && y.Type == 7) {
y.Num=x.Number
if(x.UnitPriceTo<0){ y.Unit_Price=x.UnitPriceTo*-1}
else{
y.Unit_Price=x.UnitPriceTo
}
y.show = true, numToMEN += Number(obj.Number)//, y.Num = numToMEN
}
states = false
})
}
})
console.log("我进来啦3",this.HandFeeDetail );
if (states) {
this.msg.detailList.forEach((x, index) => {
this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach((y, indexs) => {
......@@ -2318,10 +2355,10 @@
}, err => {})
},
admin_get_DepartmentGetList(Bid, T) {
if (this.msg.RB_Branch_Id == 1220) {
this.is_HandFee = false
this.isHandFee = false
} else {
// if (this.msg.RB_Branch_Id == 1220) { update by:W 2023-10-16
// this.is_HandFee = false
// this.isHandFee = false
// } else {
if (this.$route.query.id == 245 ||
this.$route.query.id == 246 ||
this.$route.query.id == 247 ||
......@@ -2333,14 +2370,14 @@
this.msg.TemplateId == 246 ||
this.msg.TemplateId == 247 ||
this.msg.TemplateId == 248 ||
this.msg.TemplateId == 267) && this.msg.HandFeeFrId == 0 && this.msg.RB_Branch_Id != 1220) {
this.msg.TemplateId == 267) && this.msg.HandFeeFrId == 0 ) {//&& this.msg.RB_Branch_Id != 1220 update by:W 2023-10-16
this.is_HandFee = true
this.isHandFee = true
} else {
this.is_HandFee = false
this.isHandFee = false
}
}
//}
if (Bid >= 0) {
let isShow = true
this.companyList.forEach(item => {
......
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