Skip to content

S
SuperMan
Commit 31225839 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent d362ccf3
Show whitespace changes
Inline Side-by-side
Showing with 122 additions and 103 deletions
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 31225839
......@@ -639,7 +639,8 @@
</td>
<td>
<el-select filterable v-model='detailList.CurrencyId' :placeholder="$t('rule.qxzbzhong')"
@change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1),Calculation(1)" class=" _border_b_1">
@change="getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1),Calculation(1)"
class=" _border_b_1">
<el-option v-for='item in coinGetList' :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
......@@ -689,6 +690,16 @@
<td height="26px"></td>
<td height="26px"></td>
</tr>
<tr>
<td height="26px"></td>
<td height="26px"></td>
<td height="26px"></td>
<td height="26px">原币合计</td>
<td height="26px">{{ybSumPrice}}</td>
<td height="26px"></td>
<td height="26px"></td>
<td height="26px"></td>
</tr>
<tr>
<td>{{$t('fnc.sfjine')}}<br /><span class="_font_size12">{{$t('fnc.daxie')}}</span></td>
<td colspan="3">{{chinaAllPrice}}</td>
......@@ -729,8 +740,7 @@
</p>
<p v-if="StoredCustomerList&&StoredCustomerList.length" style="margin-left: 15px;">预收抵用：<span>
<el-select clearable v-model='msg.DepositCustomerId' class="w135 _border_b_1"
@change="getSigningCustomerId(2)"
:disabled="isDepositCustomer">
@change="getSigningCustomerId(2)" :disabled="isDepositCustomer">
<el-option v-for='item in StoredCustomerList' :label='item.customerName' :value='item.customerId'
:key='item.customerId'>
</el-option>
......@@ -757,11 +767,10 @@
</div>
<!-- <p v-if="GetDetail.OrderSource==4&&GetDetail.SourceID>0" @click="jumpPage('FinancialOrder',GetDetail.SourceID,4)" class="_jump_page _font_bold">机票收支</p> -->
</template>
<el-tooltip content="配置手配费" placement="top"></el-tooltip>
<el-tooltip content="配置手配费" placement="top">
<el-switch v-if="isHandFee" v-model="is_HandFee" @change="getHandFee">
</el-switch>
</el-tooltip>
</div>
<template v-if="(isHandFee&&is_HandFee)||(is_HandFee&&this.GetDetail.Status==0)">
<div>
......@@ -895,8 +904,7 @@
下一步审核人：<span class="red">{{msg.AuditDescription}}</span></label>
<!-- $t('rule.qxzxybshren') -->
<el-select size="mini" style="width:300px" v-model="chosenPeople" multiple filterable remote
reserve-keyword placeholder="请输入下一步审核人，并选中" :remote-method="remoteMethod"
:loading="loadingPeople">
reserve-keyword placeholder="请输入下一步审核人，并选中" :remote-method="remoteMethod" :loading="loadingPeople">
<el-option v-for="item in peopleData" :key="item.empId" :label="`${item.name}`" :value="item.empId">
<span style="float: left; font-size: 12px">{{ item.name }}</span>
<span style="float: right; font-size: 12px; margin-right:20px;">{{ item.departmentName }}</span>
......@@ -943,8 +951,8 @@
isDepositCustomer: false,
ContractCustomer: null,
DepositCustomer: null,
CustomerIdList:[],
StoredCustomerList:[],
CustomerIdList: [],
StoredCustomerList: [],
yballPriceTo: 0, //原币合计
maxmoneyData: 0,
detailCurrDis: false,
......@@ -1016,6 +1024,7 @@
allPrice: 0,
allPriceTo: '',
allPriceTocalc: '',
ybSumPrice: '', //原币汇总
chinaAllPrice: this.$commonUtils.changeMoneyToChinese(this.allPrice),
DepartIDs: '0',
GetDetail: {},
......@@ -1096,7 +1105,7 @@
], //类型
isHandFee: false,
is_HandFee: true, //是否开启
HandlingChargeType:0,//月结制单 1转账手续费 2转账手续费差额
HandlingChargeType: 0, //月结制单 1转账手续费 2转账手续费差额
}
},
methods: {
......@@ -1200,11 +1209,11 @@
})
}
})
if(states){
if (states) {
this.msg.detailList.forEach((x, index) => {
this.HandFeeDetail && this.HandFeeDetail.DetailList.forEach((y, indexs) => {
let obj = x
if ( y.Type == 3) {
if (y.Type == 3) {
y.show = true, numToCE += Number(obj.Number), y.Num = numToCE
states = false
}
......@@ -1219,7 +1228,7 @@
},
//获取手配费所有配置
GetHandFeeList() {
if(!this.isHandFee||this.GetDetail.Status>0) return
if (!this.isHandFee || this.GetDetail.Status > 0) return
this.apipost(
"handfee_post_GetHandFeeList", {
BranchId: -1
......@@ -1448,18 +1457,18 @@
e.target.value = (e.target.value.match(/^\d*(\.?\d{0,1})/g)[0]) || null
},
AddFinancial(z) { //保存
if(this.describeList&&this.describeList.length>0){
if (this.describeList && this.describeList.length > 0) {
let num = 0
this.msg.detailList.forEach(x=>{
num+=Number(x.Number)
this.msg.detailList.forEach(x => {
num += Number(x.Number)
})
if(this.describeList.length!=num){
if (this.describeList.length != num) {
this.Error('费用总数量与旅客名单人数不符！')
return
}
}
for(let i=0;i<this.msg.detailList.length;i++){
if(!this.msg.detailList[i].CurrencyId){
for (let i = 0; i < this.msg.detailList.length; i++) {
if (!this.msg.detailList[i].CurrencyId) {
this.Error('请完善费用的相关信息')
return
}
......@@ -1490,7 +1499,7 @@
this.msg.HandFeeList.push(JSON.parse(JSON.stringify(obj)))
}
})
if(this.msg.HandFeeList.length==0){
if (this.msg.HandFeeList.length == 0) {
this.Error('暂无可配置的手配费项,请关闭手配费')
return
}
......@@ -1535,11 +1544,12 @@
this.msg.ReFinanceId2 = this.orderObj.ReFinanceId2 ? this.orderObj.ReFinanceId2 : 0;
this.msg.ReFinanceIds = this.orderObj.ReFinanceIds ? this.orderObj.ReFinanceIds : '';
this.msg.ECOrderList = this.orderObj.ECOrderList ? this.orderObj.ECOrderList : [];
this.msg.EduCommissionEmp = this.orderObj.EduCommissionEmp ? this.orderObj.EduCommissionEmp: null
this.msg.EduCommissionEmp = this.orderObj.EduCommissionEmp ? this.orderObj.EduCommissionEmp : null
this.msg.MatchFrId = this.orderObj.MatchFrId ? this.orderObj.MatchFrId : 0;
this.msg.StandardCurrencyName = this.orderObj.StandardCurrencyName?this.orderObj.StandardCurrencyName:''
this.msg.StandardCurrencyName = this.orderObj.StandardCurrencyName ? this.orderObj.StandardCurrencyName : ''
}
if(this.orderObj&&this.orderObj.OtherType&&this.orderObj.OtherType==75&&this.orderObj.ReFinances==''){
if (this.orderObj && this.orderObj.OtherType && this.orderObj.OtherType == 75 && this.orderObj.ReFinances ==
'') {
this.Error(`成本月结数据不能为空！`)
return
}
......@@ -1549,9 +1559,9 @@
let yballPrice = 0
let totalAmount
this.msg && this.msg.detailList && this.msg.detailList.forEach((item, i) => {
yballPrice += (Number(item.UnitPrice)*100)
yballPrice += (Number(item.UnitPrice) * 100)
})
this.yballPriceTo = yballPrice/100
this.yballPriceTo = yballPrice / 100
totalAmount = Math.round(this.orderObj.Money * 100) / 100
if (totalAmount != this.yballPriceTo) {
this.Error(`原币总金额需等于${this.orderObj.Money}！`)
......@@ -1562,7 +1572,7 @@
//验证总金额是否一致
if (this.commissionObj) {
let totalAmount
if(this.commissionObj){
if (this.commissionObj) {
this.msg.OtherType = this.commissionObj.OtherType ? this.commissionObj.OtherType : 0;
this.msg.ReFinanceId = this.commissionObj.PeroidsId ? this.commissionObj.PeroidsId : 0;
this.msg.RelevanceFrId = this.commissionObj.EmpIds ? this.commissionObj.EmpIds : 0;
......@@ -1689,7 +1699,7 @@
}
})
}).catch(() => {
if(this.orderObj&&(this.orderObj.EduCommissionEmp||this.orderObj.queryObj)){
if (this.orderObj && (this.orderObj.EduCommissionEmp || this.orderObj.queryObj)) {
location.reload()
this.$router.push({
name: 'leaderReimbursement',
......@@ -1698,7 +1708,7 @@
'blank': 'y',
}
});
}else{
} else {
this.$router.push({
name: 'FinancialDocuments',
query: {
......@@ -1723,7 +1733,8 @@
}, res => {
if (res.data.resultCode == 1) {
res.data.data.forEach(y => {
y.contentTips = y.AuditDescription + (y.AuditWay == "2" ? this.$t('fnc.huiqian') : this.$t('fnc.huoqian'))
y.contentTips = y.AuditDescription + (y.AuditWay == "2" ? this.$t('fnc.huiqian') : this.$t(
'fnc.huoqian'))
})
this.AuditListData.AuditList = res.data.data;
let data = JSON.parse(JSON.stringify(this.AuditListData.AuditList));
......@@ -1757,7 +1768,8 @@
} else {
this.msg.detailList.push(list);
}
let allPrice = 0
let allPrice = 0;
let ybsumprice = 0;
this.msg.detailList.forEach(x => {
this.coinGetList.forEach(y => {
if (y.ID == x.CurrencyId) {
......@@ -1765,9 +1777,14 @@
}
})
allPrice = allPrice + parseFloat(x.bTotalPrice);
//HK 2023-08-17新增
if (x.yTotalPrice) {
ybsumprice += Number(x.yTotalPrice);
}
})
this.$forceUpdate()
this.allPrice = allPrice;
this.ybSumPrice = ybsumprice.toFixed(x);
this.allPriceTo = this.$commonUtils.addCommas(Math.round(this.allPrice * 100) / 100)
this.allPriceTocalc = Math.round(this.allPrice * 100) / 100
this.chinaAllPrice = this.$commonUtils.changeMoneyToChinese(this.allPrice)
......@@ -2115,7 +2132,8 @@
}
if (this.orderObj && this.orderObj.companyIDList && this.orderObj.companyIDList.length > 0) {
this.msg.RB_Branch_Id = this.orderObj.companyIDList[0];
} else if(this.orderObj && (this.orderObj.RB_Branch_Id!=''&&this.orderObj.RB_Branch_Id!=null&&this.orderObj.RB_Branch_Id!=undefined)){
} else if (this.orderObj && (this.orderObj.RB_Branch_Id != '' && this.orderObj.RB_Branch_Id != null &&
this.orderObj.RB_Branch_Id != undefined)) {
this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id
} else if (this.$route.query.companyID) {
this.msg.RB_Branch_Id = parseInt(this.$route.query.companyID);
......@@ -2180,7 +2198,7 @@
this.msg.SourceID = this.orderObj.SourceID ? this.orderObj.SourceID : 0;
this.msg.CallType = this.orderObj.CallType ? this.orderObj.CallType : 0;
if(this.orderObj.OtherType==75) {
if (this.orderObj.OtherType == 75) {
let msgObj = {
ID: 0,
UnitPrice: '',
......@@ -2198,24 +2216,24 @@
show: false,
}
this.msg.detailList = []
if(this.orderObj.CostType){
if (this.orderObj.CostType) {
msgObj.UnitPrice = this.orderObj.Money
msgObj.UnitPriceTo = this.orderObj.Money
this.msg.detailList.push(JSON.parse(JSON.stringify(msgObj)))
}
if(this.orderObj.MoneyClosed){
if (this.orderObj.MoneyClosed) {
msgObj.UnitPrice = this.orderObj.MoneyClosed
msgObj.UnitPriceTo = this.orderObj.MoneyClosed
this.msg.detailList.push(JSON.parse(JSON.stringify(msgObj)))
}
if(this.orderObj.CostType2||this.orderObj.CostType3){
if(this.orderObj.CostType2){
if (this.orderObj.CostType2 || this.orderObj.CostType3) {
if (this.orderObj.CostType2) {
msgObj.CostTypeId = this.orderObj.CostType2
msgObj.UnitPrice = this.orderObj.HandlingChargeMoney
msgObj.UnitPriceTo = this.orderObj.HandlingChargeMoney
this.msg.detailList.push(JSON.parse(JSON.stringify(msgObj)))
}
if(this.orderObj.CostType3){
if (this.orderObj.CostType3) {
msgObj.CostTypeName = '转账手续费'
msgObj.CostTypeId = this.orderObj.CostType3
msgObj.UnitPrice = this.orderObj.balanceMoney
......@@ -2224,7 +2242,7 @@
}
}
}else{
} else {
this.detailList.CostTypeId = this.orderObj.CostType ? this.orderObj.CostType : '';
this.detailList.UnitPrice = this.orderObj.Money ? this.orderObj.Money : 0;
this.detailList.Number = this.orderObj.CostType ? 1 : 0
......@@ -2392,16 +2410,16 @@
if (x.Id == y) {
x.disabled = false;
if (num < 1 && !this.$route.query.edit) {
if(this.orderObj&&this.orderObj.RB_Branch_Id){
if (this.orderObj && this.orderObj.RB_Branch_Id) {
this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id
}else{
} else {
this.msg.RB_Branch_Id = x.Id
}
}
if (Id === x.Id && !this.$route.query.edit) {
if(this.orderObj&&this.orderObj.RB_Branch_Id){
if (this.orderObj && this.orderObj.RB_Branch_Id) {
this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id
}else{
} else {
this.msg.RB_Branch_Id = x.Id
}
}
......@@ -2596,9 +2614,10 @@
this.emplyeeName = userInfo.emName;
this.DepartIDs = this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
if(this.orderObj&&this.orderObj.RB_Branch_Id!=''&&this.orderObj.RB_Branch_Id!=null&&this.orderObj.RB_Branch_Id!=undefined){
if (this.orderObj && this.orderObj.RB_Branch_Id != '' && this.orderObj.RB_Branch_Id != null && this.orderObj
.RB_Branch_Id != undefined) {
this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = this.orderObj.RB_Branch_Id;
}else{
} else {
this.RB_Branch_id = this.departmentMsg.RB_Branch_Id = this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
}
this.companyMsg.RB_Group_Id = this.departmentMsg.RB_Group_Id = userInfo.RB_Group_id;
......
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