Skip to content

S
SuperMan
Commit 01f9825a authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

修改部分代码@

parent a3b99a22
Show whitespace changes
Inline Side-by-side
Showing with 106 additions and 59 deletions
src/assets/common/lang/zh-demo.js 0 → 100644
View file @ 01f9825a
export const obj = {
ceshi: '测试啊？？？？123'
}
export default obj;
\ No newline at end of file
src/assets/common/lang/zh.js
View file @ 01f9825a
/**
* Created by Administrator on 2018/4/17.
*/
import zhDemo from './zh-demo'
export const demo = zhDemo
export const pub={
addBtn:'新增',
saveBtn:'保存',
......
src/components/FinancialModule/BasicDocuments.vue
View file @ 01f9825a
......@@ -1606,7 +1606,11 @@ export default {
},err=>{})
},
ReturnBack(){
if ( this.GetDetail.Type===7) {
this.$router.push({name:'FinancialAccounting',query:{}});
} else {
this.$router.push({name:'FinancialDocuments',query:{"returnCode":this.returnCode,"pageIndex":this.pageIndex}});
}
},
deleteImg(i){ // 删除
this.uploadImgList.splice(i,1)
......
src/components/FinancialModule/FinancialAccounting.vue
View file @ 01f9825a
......@@ -103,19 +103,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="制单日期">
<el-date-picker
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4">
<el-form-item :label="$t('admin.admin_status')">
<el-select v-model="msg.Status" filterable>
......@@ -128,6 +115,31 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="挂账对象">
<el-select v-model="msg.ClientType" filterable>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in ClientTypeList'
:label='item.Name'
:value='item.ID'
:key='item.ID'>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="制单日期">
<el-date-picker
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
range-separator="至">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="page_FinancialAccounting_list">
......@@ -224,7 +236,8 @@ export default {
Status: '-1',
sTradeDate: '',
eTradeDate: '',
EmployeeId:0
EmployeeId:0,
ClientType: 0,
},
getCompanyMsg:{ // 公司
RB_Group_Id:'0',
......@@ -255,7 +268,8 @@ export default {
LogLoading: true,
EmId:0,
total: 0,
currentPage: 0
currentPage: 0,
ClientTypeList: [],
}
},
created(){
......@@ -374,12 +388,20 @@ export default {
}
}, err => {})
},
financeinfo_post_GetClientTypeList: function() { // 获取对象类型
this.apipost('financeinfo_post_GetClientTypeList',{}, res => {
if(res.data.resultCode == 1) {
this.ClientTypeList = res.data.data;
}
}, err => {})
},
},
mounted(){
this.getCompanyList()
this.getDepartment()
this.GetStatusList()
this.getEmployee()
this.financeinfo_post_GetClientTypeList()
}
}
</script>
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 01f9825a
......@@ -1194,7 +1194,9 @@ export default {
let num = (x.Number*x.UnitPrice)*x.Rate;
num = num.toFixed(2);
x.bTotalPrice = num;
console.log(x.Money, x.Money.toFixed(2))
x.Money = x.Money.toFixed(2);
x.yTotalPriceTo = this.$commonUtils.addCommas(x.yTotalPrice.toFixed(2));
x.bTotalPriceTo = this.$commonUtils.addCommas(num);
x.OriginalMoney = x.OriginalMoney.toFixed(2);
......
src/components/FinancialModule/addFinancialGZDocuments.vue
View file @ 01f9825a
......@@ -410,9 +410,9 @@
<td height="26px"></td>
</tr>
<tr>
<td>{{$t('fnc.sfjine')}}<br/><span class="_font_size12">{{$t('fnc.daxie')}}</span></td>
<td>挂账总金额<br/><span class="_font_size12">{{$t('fnc.daxie')}}</span></td>
<td colspan="4">{{chinaAllPrice}}</td>
<td>{{$t('fnc.sfjine')}}<br/><span class="_font_size12">{{$t('fnc.xiaoxie')}}</span></td>
<td>挂账总金额<br/><span class="_font_size12">{{$t('fnc.xiaoxie')}}</span></td>
<td colspan="4">{{allPriceTo}}</td>
</tr>
<!-- <tr>
......@@ -554,7 +554,7 @@
</el-select>
</div>
</div>
<button class="normalBtn" v-if="GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0" @click="AddFinancial(1)">{{$t('fnc.zancun')}}</button>
<!-- <button class="normalBtn" v-if="GetDetail.Status==0||GetDetail.Status==3||msg.FrID==0" @click="AddFinancial(1)">{{$t('fnc.zancun')}}</button> -->
<button class="normalBtn" @click="AddFinancial()">{{$t('fnc.tijiao')}}</button>
<button class="hollowFixedBtn" @click="AuditOrRefund()">{{$t('pub.returnBack')}}</button>
</div>
......@@ -981,7 +981,11 @@ export default {
}
let allPrice = 0
this.msg.detailList.forEach(x=>{
allPrice = allPrice+parseFloat(x.bTotalPrice);
if (x.HangingAccountsType === 1) {
allPrice = allPrice+parseFloat(x.bTotalPrice)
} else {
allPrice = allPrice-parseFloat(x.bTotalPrice)
}
})
this.allPrice = allPrice;
this.allPriceTo =this.$commonUtils.addCommas(this.allPrice.toFixed(2))
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 01f9825a
......@@ -61,16 +61,16 @@
<span v-if='index==list.BusList.length-1'>送机</span>
</td>
<td>
{{item.CostPrice}}
{{moneyFormat(item.CostPrice)}}
</td>
<td>
{{item.HighSpeedPrice}}
{{moneyFormat(item.HighSpeedPrice)}}
</td>
<td>
{{item.StopPrice}}
{{moneyFormat(item.StopPrice)}}
</td>
<td>
{{Number(item.CostPrice)+Number(item.HighSpeedPrice)+Number(item.StopPrice)}}
{{moneyFormat(Number(item.CostPrice)+Number(item.HighSpeedPrice)+Number(item.StopPrice))}}
</td>
<td v-if='index==0' :rowspan='list.BusList.length'>
{{busTotalPrice(list.BusList)}}
......@@ -89,7 +89,7 @@
<tr>
<td>总金额</td>
<td colspan="12">
{{TotalNav.reimburseTotalPrice.SelfPayingExpendTotalPrice}}
{{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingExpendTotalPrice)}}
</td>
</tr>
</tbody>
......@@ -162,7 +162,7 @@
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList">
<p v-for="childItem in subItem.OrderDetailsList">
{{childItem.UnitPrice}}
{{moneyFormat(childItem.UnitPrice)}}
</p>
</div>
</div>
......@@ -171,7 +171,7 @@
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList">
<p v-for="childItem in subItem.OrderDetailsList">
{{childItem.UnitPrice*(childItem.HouseGuestNum-childItem.HotelDiscount)}}
{{moneyFormat(childItem.UnitPrice*(childItem.HouseGuestNum-childItem.HotelDiscount))}}
</p>
</div>
</div>
......@@ -205,7 +205,7 @@
<tr>
<td>总金额</td>
<td colspan="12">
{{TotalNav.reimburseTotalPrice.ExpendTotalPrice}}
{{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
</td>
</tr>
</tbody>
......@@ -255,14 +255,14 @@
<td>
<div v-for="subItem in item.DiningSummaryList">
<p v-for="childItem in subItem.DiningPriceList">
{{childItem.PeoplePrice}}
{{moneyFormat(childItem.PeoplePrice)}}
</p>
</div>
</td>
<td>
<div v-for="subItem in item.DiningSummaryList">
<p v-for="childItem in subItem.DiningPriceList">
{{(childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice}}
{{moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice)}}
</p>
</div>
</td>
......@@ -285,7 +285,7 @@
<tr>
<td>总金额</td>
<td colspan="10">
{{TotalNav.reimburseTotalPrice.IncomeTotalPrice}}
{{moneyFormat(TotalNav.reimburseTotalPrice.IncomeTotalPrice)}}
</td>
</tr>
</tbody>
......@@ -334,14 +334,14 @@
<td>
<div v-for="subItem in item.ScenicStatisticsList">
<p v-for="o in subItem.TicketPriceList">
{{o.PeoplePrice}}
{{moneyFormat(o.PeoplePrice)}}
</p>
</div>
</td>
<td>
<div v-for="subItem in item.ScenicStatisticsList">
<p v-for="o in subItem.TicketPriceList">
{{(o.UsePeopleNum-o.Discount)*o.PeoplePrice}}
{{moneyFormat((o.UsePeopleNum-o.Discount)*o.PeoplePrice)}}
</p>
</div>
</td>
......@@ -367,20 +367,28 @@
<tr>
<td>总金额</td>
<td colspan="10">
{{TotalNav.reimburseTotalPrice.OtherTotalPrice}}
{{moneyFormat(TotalNav.reimburseTotalPrice.OtherTotalPrice)}}
</td>
</tr>
</tbody>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
<th>预付合计</th>
<th>团号</th>
<th>实际领款</th>
<th>操作</th>
</tr>
<tr v-for='(item, index) in nav' >
<td rowspan="2" width="180" v-if="index===0">总金额： {{TotalNav.reimburseTotalPrice.PlanPrice * 0.98}}</td>
<td rowspan="2" width="180" v-if="index===0">总金额： {{moneyFormat(TotalNav.reimburseTotalPrice.PlanPrice * 0.98)}}</td>
<td>{{item.TCNUMS}}</td>
<td>
<span v-if="item.LeaderGetPrice>0">{{item.LeaderGetPrice}}</span>
<span v-if="item.LeaderGetPrice>0">{{moneyFormat(item.LeaderGetPrice)}}</span>
<el-input v-else class="w300" type="number" v-model="LeaderGetPrice"></el-input>
</td>
<td width="80" class="_zhidan" @click="goZhiDan(item)">制单</td>
<td width="80" class="_zhidan">
<input type="button" v-if="isUpdate=='true'" value="制单" class="normalBtn" @click="goZhiDan(item)" />
</td>
</tr>
</table>
<!-- <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
......@@ -573,9 +581,9 @@
</tbody>
</table> -->
<p class="alcenter">
<!-- <p class="alcenter">
<input type="button" v-if="isUpdate=='true'" value="保存" class="normalBtn" @click="saveData()" />
</p>
</p> -->
<div v-if='picIsShow' class="viewBigPicLayer">
<i class="el-icon-circle-close-outline clolseViewBigPicLayer" @click="picIsShow=false,picObj=[]"></i>
<el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click">
......@@ -720,35 +728,35 @@
obj.forEach(item=>{
totalPrice+=Number(item.CostPrice)+Number(item.HighSpeedPrice)+Number(item.StopPrice)
})
return totalPrice
return this.moneyFormat(totalPrice)
},
hotelTotalPrice(obj){
let totalPrice=0
obj.forEach(x=>{
totalPrice+=x.UnitPrice*(x.HouseGuestNum-x.HotelDiscount)*(1-x.RebateRatio/100)
})
return totalPrice
return this.moneyFormat(totalPrice)
},
diningTotalPrice(obj){
let totalPrice=0
obj.forEach(x=>{
totalPrice+=x.PeoplePrice*(x.PeopleNum-x.Discount)*(1-x.DiscountPrice/100)
})
return totalPrice
return this.moneyFormat(totalPrice)
},
scenicTotalPrice(obj){
let totalPrice=0
obj.forEach(x=>{
totalPrice+=x.PeoplePrice*(x.UsePeopleNum-x.Discount)*(1-x.DiscountPrice/100)
})
return totalPrice
return this.moneyFormat(totalPrice)
},
otherTotalPrice(obj){
let totalPrice=0
obj.forEach(item=>{
totalPrice+=item.TotalNum*item.UnitPrice*(1-item.Rebate/100)
})
return totalPrice
return this.moneyFormat(totalPrice)
},
saveData() {
this.apipost('dmcstatistics_post_SetOtherOrderList', this.list.OtherOrderReportList, res => {
......
src/components/leaderPay2.vue
View file @ 01f9825a
......@@ -138,7 +138,7 @@
<span v-if='index==dataList.BusList.length-1'>送机</span> -->
</td>
<td>
{{item.TotalPrice}} {{item.CurrencyStr}}
{{moneyFormat(item.TotalPrice)}} {{item.CurrencyStr}}
</td>
<td>
{{item.Remarks}}
......@@ -195,39 +195,39 @@
</tr>
<tr v-show="totalList.PlanTotalPrice>0">
<td>领取团款</td>
<td>{{totalList.PlanTotalPrice}}</td>
<td>{{moneyFormat(totalList.PlanTotalPrice)}}</td>
</tr>
<tr v-show="totalList.SelfPayingExpendTotalPrice>0">
<td>自费支出</td>
<td>{{totalList.SelfPayingExpendTotalPrice}}</td>
<td>{{moneyFormat(totalList.SelfPayingExpendTotalPrice)}}</td>
</tr>
<tr v-show="totalList.SelfPayingIncomeTotalPrice>0">
<td>自费收入</td>
<td>{{totalList.SelfPayingIncomeTotalPrice}}</td>
<td>{{moneyFormat(totalList.SelfPayingIncomeTotalPrice)}}</td>
</tr>
<tr v-show="totalList.IncomeTotalPrice>0">
<td>消费收入</td>
<td>{{totalList.IncomeTotalPrice}}</td>
<td>{{moneyFormat(totalList.IncomeTotalPrice)}}</td>
</tr>
<tr v-show="(totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)>0">
<td>其他费用</td>
<td>{{totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice}}</td>
<td>{{moneyFormat(totalList.ExpendTotalPrice-totalScenicPrice-totalTrafficPrice-totalDinnerPrice-totalHotelPrice)}}</td>
</tr>
<tr v-show="totalScenicPrice>0">
<td>景点门票</td>
<td>{{totalScenicPrice}}</td>
<td>{{moneyFormat(totalScenicPrice)}}</td>
</tr>
<tr v-show="totalTrafficPrice>0">
<td>交通</td>
<td>{{totalTrafficPrice}}</td>
<td>{{moneyFormat(totalTrafficPrice)}}</td>
</tr>
<tr v-show="totalDinnerPrice>0">
<td>餐饮</td>
<td>{{totalDinnerPrice}}</td>
<td>{{moneyFormat(totalDinnerPrice)}}</td>
</tr>
<tr v-show="totalHotelPrice>0">
<td>酒店</td>
<td>{{totalHotelPrice}}</td>
<td>{{moneyFormat(totalHotelPrice)}}</td>
</tr>
</table>
<table border="0" cellspacing='1' class="leaderPayTable" v-if="TotalPriceData.length>0">
......@@ -239,11 +239,11 @@
<th>领队退款</th>
</tr>
<tr v-for="item in TotalPriceData" v-if="item.PlanPrice > 0 || item.PlanTotalPrice > 0 || item.ExpendTotalPrice > 0">
<td>{{item.CurrencyStr}}</td>
<td>{{item.PlanPrice}}</td>
<td>{{item.PlanTotalPrice}}</td>
<td>{{item.ExpendTotalPrice}}</td>
<td>{{item.PlanTotalPrice - item.ExpendTotalPrice}}</td>
<td>{{moneyFormat(item.CurrencyStr)}}</td>
<td>{{moneyFormat(item.PlanPrice)}}</td>
<td>{{moneyFormat(item.PlanTotalPrice)}}</td>
<td>{{moneyFormat(item.ExpendTotalPrice)}}</td>
<td>{{moneyFormat(item.PlanTotalPrice - item.ExpendTotalPrice)}}</td>
</tr>
</table>
<template v-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==1">
......
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