Skip to content

S
SuperMan
Commit 8d75d3d5 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 89ce3a4a e9e2182f
Hide whitespace changes
Inline Side-by-side
Showing with 301 additions and 141 deletions
src/assets/common/lang/zhCN/fill.js
View file @ 8d75d3d5
......@@ -8176,6 +8176,11 @@ export const obj = {
yinhangshouru: '银行收入',
yinhangzhichu: '银行支出',
liushui: '流水',
liushukemu: '流水科目',
qingxuanzlskm: '请选择流水科目',
yongtu: '用途',
danjusr: '单据收入',
danjuzc: '单据支出',
}
//#endregion
}
......
src/components/FinancialModule/BankStatementReconciliation/index.vue
View file @ 8d75d3d5
......@@ -91,6 +91,13 @@
/deep/.page_CompanyAccDetail .el-table .el-table__cell {
padding: 0 12px!important;
}
.BalanceBox{
}
.BalanceBox.active{
color: #33B3FF;
cursor: pointer;
}
</style>
<template>
......@@ -131,20 +138,21 @@
<input v-if="SubjectTypeList&&SubjectTypeList.length>0" type="button" class="normalBtn" :value="$t('objFill.v103.xinzenliushuiu')" @click="addBankStatement"/>
<input type="button" class="hollowFixedBtn" :value="$t('objFill.v101.FinancialModule.xinzengkem')" @click="isShowAdd=true"/>
<input type="button" class="normalBtn" :value="$t('objFill.duizhnagkm')+$t('ground.liebiao')" @click="isShow=true"/>
<input type="button" class="hollowFixedBtn" :value="$t('visa.v_daochu')" @click="Export()"/>
</li>
</ul>
</div>
<div class="cm_content">
<el-table :data="SubjectList"
style="width: 100%;max-height: 600px;"
style="width: 100%;" height="600"
v-loading="loadingTable"
:span-method="objectSpanMethod">
<el-table-column prop="Name" label="" width="150" fixed="left" align="center">
<template #header>
<div class="headeBox">
<div>{{titleStart}}{{titleStart!=titleEnd?'-'+titleEnd:''}}月</div>
<div>期初余额</div>
<div>用途</div>
<div>{{titleStart}}{{titleStart!=titleEnd?'-'+titleEnd:''}}{{ $t('ground.yuefen') }}</div>
<div>{{ $t('objFill.v103.qichuyue') }}</div>
<div>{{ $t('objFill.v103.yongtu') }}</div>
</div>
</template>
</el-table-column>
......@@ -156,14 +164,14 @@
<div style="cursor: pointer;" @click="getTimeObj(item)">{{ String(item.StartDate) }} <i style="color: #33B3FF" class="el-icon-edit"></i> </div>
</template>
<el-table-column :label="String(item.StartBalance)" align="center">
<el-table-column prop="Income" label="银行收入" width="120" align="center">
<el-table-column prop="Income" :label="$t('objFill.v103.yinhangshouru')" width="120" align="center">
<template slot-scope="scope">
<template v-if="scope.row.SubjectId!=-6">
<div v-if="scope.row.SubjectId!=-6">
{{ scope.row.BalanceList[index].Income }}
</template>
</div>
<template v-else>
<el-image v-if="scope.row.BalanceList[index].Image"
style="width: 20px; height: 20px;margin-top: 10px;"
style="width: 20px; height: 20px;"
:src="scope.row.BalanceList[index].Image"
:preview-src-list="[scope.row.BalanceList[index].Image]"
show-progress
......@@ -172,25 +180,29 @@
</template>
</template>
</el-table-column>
<el-table-column prop="FinanceIncome" label="单据收入" width="120" align="center">
<el-table-column prop="FinanceIncome" :label="$t('objFill.v103.danjusr')" width="120" align="center">
<template slot-scope="scope">
<template v-if="scope.row.SubjectId!=-6">
<div v-if="scope.row.SubjectId!=-6" @click="goUrl(scope.row,scope.row.BalanceList[index],1)"
class="BalanceBox"
:class="[scope.row.BalanceList[index].FinanceIncome?'active':'']">
{{ scope.row.BalanceList[index].FinanceIncome }}
</template>
</div>
</template>
</el-table-column>
<el-table-column prop="Expenses" label="银行支出" width="120" align="center">
<el-table-column prop="Expenses" :label="$t('objFill.v103.yinhangzhichu')" width="120" align="center">
<template slot-scope="scope">
<template v-if="scope.row.SubjectId!=-6">
<div v-if="scope.row.SubjectId!=-6">
{{ scope.row.BalanceList[index].Expenses }}
</template>
</div>
</template>
</el-table-column>
<el-table-column prop="FinanceExpenses" label="单据支出" width="120" align="center">
<el-table-column prop="FinanceExpenses" :label="$t('objFill.v103.danjuzc')" width="120" align="center">
<template slot-scope="scope">
<template v-if="scope.row.SubjectId!=-6">
<div v-if="scope.row.SubjectId!=-6" @click="goUrl(scope.row,scope.row.BalanceList[index],2)"
class="BalanceBox"
:class="[scope.row.BalanceList[index].FinanceExpenses?'active':'']">
{{ scope.row.BalanceList[index].FinanceExpenses }}
</template>
</div>
</template>
</el-table-column>
</el-table-column>
......@@ -250,14 +262,14 @@ export default {
Income:0,// 银行收入
Expenses:0,//银行支出
},
SubjectTypeList:[]
SubjectTypeList:[],
}
},
created(){
// let mon1= this.getBeforeDate(1, new Date().Format("yyyy-MM-dd"));
// let mon2= this.getBeforeDate(7, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
let mon1= this.getBeforeDate(12, new Date().Format("yyyy-MM-dd"));
let mon2= this.getBeforeDate(16, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
let mon1= this.getBeforeDate(1, new Date().Format("yyyy-MM-dd"));
let mon2= this.getBeforeDate(7, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
// let mon1= this.getBeforeDate(12, new Date().Format("yyyy-MM-dd"));
// let mon2= this.getBeforeDate(16, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
this.titleStart = mon2.slice(5,7)>9?mon2.slice(5,7):mon2.slice(6,7)
this.titleEnd = mon1.slice(5,7)>9?mon1.slice(5,7):mon1.slice(6,7)
this.productionDate=[mon2,mon1];
......@@ -267,6 +279,24 @@ export default {
this.getList();
},
methods:{
goUrl(row,item){
this.$router.push({
name: "AccountStatementDetail",
query: {
ID: this.msg.BankId,
TypeId: 3,
sTradeDate: item.StartDate,
eTradeDate: item.StartDate,
SubjectId: row.StartBalance,
blank: 'y'
}
})
},
Export(){
let msg=this.msg;
var fileName = this.$t('objFill.duizhnagkm') + ".xls";
this.GetLocalFile("Financial_post_DownLoadBankBalance", msg, fileName);
},
changeDataBan(){
this.isShowBankSta = false
this.getList();
......
src/components/FinancialModule/ConsolidationOfAccounts/index.vue
View file @ 8d75d3d5
......@@ -551,7 +551,7 @@
</tr>
<tr v-if="BillType===2">
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="6">
<td colspan="2">
<el-date-picker
class="width100b"
v-model="addMsg.TradeDate"
......@@ -560,14 +560,27 @@
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
<td>{{$t('objFill.v103.liushukemu')}}</td>
<td colspan="3">
<el-select class="width100b" v-model="addMsg.BankSubjectId"
filterable
:placeholder="$t('objFill.v103.qingxuanzlskm')">
<el-option
v-for="item in SubjectTypeList"
:key="item.Id"
:label="item.Name"
:value="item.Id"
/>
</el-select>
</td>
</tr>
<tr v-if="BillType===1">
<td>{{$t('fnc.huikuanren')}}</td>
<td colspan="2">
<td colspan="1">
<el-input v-model="addMsg.RemitterName" type="text" class=" _border_b_1"></el-input>
</td>
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="3">
<td colspan="1">
<el-date-picker
class="width100b"
v-model="addMsg.TradeDate"
......@@ -576,6 +589,19 @@
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
<td>{{$t('objFill.v103.liushukemu')}}</td>
<td colspan="2">
<el-select class="width100b" v-model="addMsg.BankSubjectId"
filterable
:placeholder="$t('objFill.v103.qingxuanzlskm')">
<el-option
v-for="item in SubjectTypeList"
:key="item.Id"
:label="item.Name"
:value="item.Id"
/>
</el-select>
</td>
</tr>
</table>
<el-form label-width="110px">
......@@ -703,7 +729,8 @@
RemitterName:'',
TradeDate:'',
BankList:[],
vorcherInos:[]
vorcherInos:[],
BankSubjectId: '',
},
AccListT:[],
accountListT:[],
......@@ -724,6 +751,7 @@
saveMsg:[],
TradeDate:'',
initialIndex: 0,
SubjectTypeList: [],
}
},
created(){
......@@ -743,7 +771,7 @@
}
},
mounted(){
this.getSubjectList()
let userInfo=this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
......@@ -754,6 +782,13 @@
this.AccountType_post_GetList();
},
methods:{
getSubjectList(){
this.apipost("Financial_post_GetBankSubjectList", {}, res => {
if (res.data.resultCode === 1) {
this.SubjectTypeList = res.data.data;
}
}, null)
},
showUpLoadFile(i) { // 预览上传文件
if (i.Content.substring(i.Content.lastIndexOf('.') + 1, i.Content.length).toUpperCase() == 'PDF') {
this.previewPDF(i.Content)
......@@ -1046,6 +1081,7 @@
RemitterName:'',
TradeDate:'',
BankList:[],
BankSubjectId: '',
}
},
clearAccBank(){ // 选择账户类型清空数据
......
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 8d75d3d5
......@@ -385,7 +385,7 @@
</tr>
<tr v-if="BillType===2">
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="4">
<td colspan="1">
<el-date-picker
class="width100b"
v-model="addMsg.TradeDate"
......@@ -395,17 +395,30 @@
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
<td colspan="3">
<td>{{$t('objFill.v103.liushukemu')}}</td>
<td colspan="2">
<el-select class="width100b" v-model="addMsg.BankSubjectId"
filterable
:placeholder="$t('objFill.v103.qingxuanzlskm')">
<el-option
v-for="item in SubjectTypeList"
:key="item.Id"
:label="item.Name"
:value="item.Id"
/>
</el-select>
</td>
<td colspan="2">
<el-checkbox v-model="addMsg.IsAdvanceFinance" true-label="1" false-label="0">包含预付</el-checkbox>
</td>
</tr>
<tr v-if="BillType===1">
<td>{{$t('fnc.huikuanren')}}</td>
<td colspan="2">
<td colspan="1">
<el-input v-model="addMsg.RemitterName" type="text" class=" _border_b_1"></el-input>
</td>
<td>{{$t('fnc.jiaoyiriqi')}}</td>
<td colspan="3">
<td colspan="1">
<el-date-picker
class="width100b"
v-model="addMsg.TradeDate"
......@@ -414,6 +427,19 @@
:placeholder="$t('admin.admin_choDate')">
</el-date-picker>
</td>
<td>{{$t('objFill.v103.liushukemu')}}</td>
<td colspan="2">
<el-select class="width100b" v-model="addMsg.BankSubjectId"
filterable
:placeholder="$t('objFill.v103.qingxuanzlskm')">
<el-option
v-for="item in SubjectTypeList"
:key="item.Id"
:label="item.Name"
:value="item.Id"
/>
</el-select>
</td>
</tr>
</table>
<el-form label-width="110px">
......@@ -552,7 +578,8 @@ export default {
TradeDate:'',
BankList:[],
vorcherInos:[],
IsAdvanceFinance:'0'
IsAdvanceFinance:'0',
BankSubjectId: '',
},
AccListT:[],
accountListT:[],
......@@ -573,6 +600,7 @@ export default {
saveMsg:[],
TradeDate:'',
initialIndex: 0,
SubjectTypeList: [],
}
},
created(){
......@@ -581,6 +609,7 @@ export default {
// this.productionDateByTC = [StartDate, EndDate]
// this.msg.QStartDate = this.productionDateByTC[0];
// this.msg.QEndDate = this.productionDateByTC[1];
this.getSubjectList()
this.userInfo = this.getLocalStorage();
if(this.$route.query.DayReport && this.$route.query.DayReport=='1'){
......@@ -611,10 +640,18 @@ export default {
})
this.bankaccount_post_GetList();
this.getList();
}
},
methods:{
getSubjectList(){
this.apipost("Financial_post_GetBankSubjectList", {}, res => {
if (res.data.resultCode === 1) {
this.SubjectTypeList = res.data.data;
}
}, null)
},
//选择付款对象出现全选框
getClientId(id){
if(id>0||this.AccountId>0){
......@@ -827,7 +864,8 @@ export default {
TradeDate:'',
BankList:[],
vorcherInos:[],
IsAdvanceFinance:'0'
IsAdvanceFinance:'0',
BankSubjectId: '',
}
},
Calculation(i,index){ // 计算价格
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 8d75d3d5
......@@ -1065,15 +1065,17 @@
.el-input-group__prepend {
padding: 0 5px !important;
}
.SimulateDrop-box {
width: 210px;
min-height: 34px;
position: relative;
padding: 5px 21px 5px 6px;
float: left;
/* margin: 4px 0 0 10px; */
border: 1px solid #d1d1d1;
}
.SimulateDrop-box {
width: 210px;
min-height: 34px;
position: relative;
padding: 5px 21px 5px 6px;
float: left;
/* margin: 4px 0 0 10px; */
border: 1px solid #d1d1d1;
}
.SD_flight {
display: inline-block;
height: 24px;
......@@ -1082,12 +1084,14 @@
line-height: 22px;
background-color: #f0f2f5;
}
.SimulaDrop {
.SimulaDrop {
position: absolute;
top: 3px;
right: 10px;
color: #c0c4cc;
}
._TravelPricePopover .jiDiv {
width: 750px;
max-height: 400px;
......@@ -1127,6 +1131,7 @@
._TravelPricePopover table td._d_name {
background-color: #ededed;
}
</style>
<template>
......@@ -1729,40 +1734,42 @@
<el-input v-model="addMsg.FSeatNum" @input="getNumber()"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('salesModule.ScenicRefund')">
<el-popover popper-class="_TravelPricePopover" trigger="click">
<div>
<div class="ScenicDiv">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<!-- <td class="_color_666">{{$t('fnc.xuanze')}}</td> -->
<td class="_color_666">{{$t('visaT.jdname')}}</td>
<td class="_color_666">{{$t('fnc.tkjine')}}</td>
<td class="_color_666">{{$t('fnc.qxrenshu')}}</td>
</tr>
<tr v-for="item in ScenicRefundList">
<td>
{{item.CouponsName}}
</td>
<td>
-￥{{item.RefundMoney}}
</td>
<td>
<el-input class="w80" type="Number" :max='addMsg.GuestNum' v-model="item.Number" @keyup.native="initScenic()"></el-input>
<!-- -->
</td>
</tr>
</table>
</div>
</div>
<div slot="reference" class="SimulateDrop-box">
<span class="SD_flight" v-for="subItem in addMsg.ScenicList">{{subItem.ScenicName}}*{{subItem.Number}}</span>
<i class="iconfont icon-arrow-down SimulaDrop"></i>
</div>
</el-popover>
</el-form-item>
<el-col :span="4">
<el-form-item :label="$t('salesModule.ScenicRefund')">
<el-popover popper-class="_TravelPricePopover" trigger="click">
<div>
<div class="ScenicDiv">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<!-- <td class="_color_666">{{$t('fnc.xuanze')}}</td> -->
<td class="_color_666">{{$t('visaT.jdname')}}</td>
<td class="_color_666">{{$t('fnc.tkjine')}}</td>
<td class="_color_666">{{$t('fnc.qxrenshu')}}</td>
</tr>
<tr v-for="item in ScenicRefundList">
<td>
{{item.CouponsName}}
</td>
<td>
-￥{{item.RefundMoney}}
</td>
<td>
<el-input class="w80" type="Number" :max='addMsg.GuestNum' v-model="item.Number"
@keyup.native="initScenic()"></el-input>
<!-- -->
</td>
</tr>
</table>
</div>
</div>
<div slot="reference" class="SimulateDrop-box">
<span class="SD_flight"
v-for="subItem in addMsg.ScenicList">{{subItem.ScenicName}}*{{subItem.Number}}</span>
<i class="iconfont icon-arrow-down SimulaDrop"></i>
</div>
</el-popover>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
......@@ -2668,8 +2675,7 @@
</td>
<td class="RL-BTNlist" rowspan="2">
<el-button-group v-if="isShow === true">
<el-tooltip class="item"
effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start">
<el-button type="primary" style="background-color: #00c6ff !important;border-color: #00c6ff;"
icon="iconfont icon-bianji-smal" @click="getDetail(childItem)"></el-button>
</el-tooltip>
......@@ -2906,14 +2912,17 @@
</span>
</div>
</div>
<div v-if="childItem.OrderBackScenicList!=null&&childItem.OrderBackScenicList.length>0 " style="width: 101%;border-top: 1px solid #cccccc;margin-top: 5px">
<span style="color:red;margin-top: 10px;display: inline-block">{{$t('ground.tuiJingdian')}}：</span>
<span v-for="childItems in childItem.OrderBackScenicList" >
<span style="color:green;">{{ childItems.CouponsName }}</span>退票<span style="color:red;">{{childItems.Number}}</span>人：<span style="color: blue">{{childItems.GuestNameList}}</span>
&nbsp;&nbsp; &nbsp;&nbsp;
</span>
<div v-if="childItem.OrderBackScenicList!=null&&childItem.OrderBackScenicList.length>0 "
style="width: 101%;border-top: 1px solid #cccccc;margin-top: 5px">
<span style="color:red;margin-top: 10px;display: inline-block">{{$t('ground.tuiJingdian')}}：</span>
<span v-for="childItems in childItem.OrderBackScenicList">
<span style="color:green;">{{ childItems.CouponsName }}</span>退票<span
style="color:red;">{{childItems.Number}}</span>人：<span
style="color: blue">{{childItems.GuestNameList}}</span>
&nbsp;&nbsp; &nbsp;&nbsp;
</span>
</div>
</div>
</td>
</tr>
<tr>
......@@ -4259,7 +4268,7 @@
SafeNum: "0",
AirticketNum: "0",
ScenicRefundArr: [],
ScenicList:[],//2025-07-14 add bY:W
ScenicList: [], //2025-07-14 add bY:W
GoCityTime: "",
BackCityTime: "",
CommissionSharePeople: "-1",
......@@ -5425,36 +5434,35 @@
changeSelect: function () {
this.$forceUpdate();
},
//初始化景点
//初始化景点
initScenic() {
this.addMsg.ScenicList = [];
var totalGuest=(Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))
var totalGuest = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))
this.ScenicRefundList.forEach(x => {
if (/^\d+$/.test(x.Number)&&x.Number>0&&x.Number<=totalGuest) {
if (/^\d+$/.test(x.Number) && x.Number > 0 && x.Number <= totalGuest) {
this.addMsg.ScenicList.push(x);
}
else{
x.Number=0;
} else {
x.Number = 0;
}
})
this.getTotalPrice();
this.getTotalPrice();
this.getTicheng();
},
ScenicRefundMethods() {
ScenicRefundMethods() {
if (this.addMsg.ScenicRefundArr.length == 0) {
this.ScenicRefundMoney = 0;
} else {
this.ScenicRefundMoney = 0;
this.addMsg.ScenicRefundArr.forEach((x) => {
var index=this.ScenicRefundList.findIndex(item=>item.Id===x.Id);
console.log(index,"x",x);
if(index!=-1){
var nowModel=this.ScenicRefundList[index];
nowModel.Number=x.Number;
}
var index = this.ScenicRefundList.findIndex(item => item.Id === x.Id);
console.log(index, "x", x);
if (index != -1) {
var nowModel = this.ScenicRefundList[index];
nowModel.Number = x.Number;
}
});
this.$forceUpdate()
this.$forceUpdate()
}
this.initScenic();
},
......@@ -5487,7 +5495,7 @@
msg,
(res) => {
if (res.data.resultCode == 1) {
this.ScenicRefundList = res.data.data;
this.ScenicRefundList = res.data.data;
this.ScenicRefundList.forEach((item) => {
item["ScenicName"] =
item.CouponsName + " -￥" + this.moneyFormat(item.RefundMoney);
......@@ -5498,7 +5506,7 @@
(err) => {}
);
},
getScenicRefund_V1(TCID, OrderId) {
getScenicRefund_V1(TCID, OrderId) {
this.OrderId = OrderId;
let msg = {
TCID: TCID,
......@@ -5791,17 +5799,18 @@
dandijie =
this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
}
//退景点费用
var refundScenicPrice =0;
if(this.addMsg.ScenicList!=null&&this.addMsg.ScenicList.length>0){
var totalGuest=(Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))
this.addMsg.ScenicList.forEach(item => {
if(totalGuest>=item.Number){
refundScenicPrice+=item.Number*item.RefundMoney;}
});
}
this.addMsg.PreferPrice =
this.OpSetLossMoney +
//退景点费用
var refundScenicPrice = 0;
if (this.addMsg.ScenicList != null && this.addMsg.ScenicList.length > 0) {
var totalGuest = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg
.OldPeopleNum))
this.addMsg.ScenicList.forEach(item => {
if (totalGuest >= item.Number) {
refundScenicPrice += item.Number * item.RefundMoney;
}
});
}
var tempPrice = this.OpSetLossMoney +
dandijie +
lianyun +
chengren +
......@@ -5810,11 +5819,13 @@
laoren +
zafeiqianzhen +
danfang +
ertongbed -refundScenicPrice;
// this.ScenicRefundMoney *
// (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) +
// Number(this.addMsg.OldPeopleNum));
ertongbed - refundScenicPrice
this.addMsg.PreferPrice = tempPrice.toFixed(2);
// this.ScenicRefundMoney *
// (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) +
// Number(this.addMsg.OldPeopleNum));
//ld 2025-01-22 少价管理
if (this.addMsg.IsLessPrice == 1 && this.addMsg.GroupType == 1 && (this.addMsg.CustomerType == '1' || this
......@@ -5898,17 +5909,18 @@
dandijie =
this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
}
//退景点费用
var refundScenicPrice =0;
if(this.addMsg.ScenicList!=null&&this.addMsg.ScenicList.length>0){
var totalGuest=(Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg.OldPeopleNum))
this.addMsg.ScenicList.forEach(item => {
if(totalGuest>=item.Number){
refundScenicPrice+=item.Number*item.RefundMoney;}
});
}
this.addMsg.PreferPrice =
this.OpSetLossMoney +
//退景点费用
var refundScenicPrice = 0;
if (this.addMsg.ScenicList != null && this.addMsg.ScenicList.length > 0) {
var totalGuest = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) + Number(this.addMsg
.OldPeopleNum))
this.addMsg.ScenicList.forEach(item => {
if (totalGuest >= item.Number) {
refundScenicPrice += item.Number * item.RefundMoney;
}
});
}
var tempPrice = this.OpSetLossMoney +
dandijie +
lianyun +
chengren +
......@@ -5917,11 +5929,8 @@
laoren +
zafeiqianzhen +
danfang +
ertongbed -refundScenicPrice;
// this.ScenicRefundMoney *
// (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) +
// Number(this.addMsg.OldPeopleNum));
ertongbed - refundScenicPrice;
this.addMsg.PreferPrice = tempPrice.toFixed(2);
//ld 2025-01-22 少价管理
if (this.addMsg.IsLessPrice == 1 && this.addMsg.GroupType == 1 && (this.addMsg.CustomerType == '1' || this
......@@ -6112,7 +6121,7 @@
this.addMsg.CostType = "";
this.addMsg.PlatformOrder = "";
this.ddlyList = [];
this.addMsg.ScenicList=[];
this.addMsg.ScenicList = [];
this.addMsg.Remarks = "";
this.addMsg.MinOrderPrice = "";
this.addMsg.LuggageNum = "";
......
src/components/administrative/templateStatic.vue
View file @ 8d75d3d5
......@@ -33,14 +33,45 @@
</ul>
</div>
<div style="width: 100%; overflow: auto;">
<el-table :data="tableData" style="width: 100%;" height="650" border v-loading="loading">
<el-table :data="tableData" style="width: 100%;" max-height="650" border v-loading="loading"
header-cell-class-name="tempStatic-header-center" cell-class-name="tempStatic-cell-center">
<el-table-column prop="CreateByName" label="上传人" width="200">
</el-table-column>
<el-table-column prop="CreateTime" label="上传时间">
</el-table-column>
<el-table-column prop="TripCount" label="行程模版数量">
<template slot-scope="scope">
<template v-if="scope.row.TripCount>0">
<el-popover placement="top-start" title="详情" width="200" trigger="hover">
<template v-if="scope.row.TripList&&scope.row.TripList.length>0">
<template v-for="(subItem,subIndex) in scope.row.TripList">
{{subItem.LineName}}({{subItem.LineTemplateCount}})
</template>
</template>
<div slot="reference" style="color:blue;cursor:pointer;"> {{scope.row.TripCount}}</div>
</el-popover>
</template>
<template v-else>
{{scope.row.TripCount}}
</template>
</template>
</el-table-column>
<el-table-column prop="AdCount" label="广告模版数量">
<template slot-scope="scope">
<template v-if="scope.row.AdCount>0">
<el-popover placement="top-start" title="详情" width="200" trigger="hover">
<template v-if="scope.row.AdList&&scope.row.AdList.length>0">
<template v-for="(subItem,subIndex) in scope.row.AdList">
{{subItem.LineName}}({{subItem.LineTemplateCount}})
</template>
</template>
<div slot="reference" style="color:green;cursor:pointer;"> {{scope.row.AdCount}}</div>
</el-popover>
</template>
<template v-else>
{{scope.row.AdCount}}
</template>
</template>
</el-table-column>
<el-table-column prop="TotalCount" label="上传总数量">
</el-table-column>
......@@ -72,6 +103,7 @@
QCreateBy: '',
QStartDate: '',
QEndDate: '',
QLineId: "",
},
getCompanyMsg: {
RB_Group_Id: '0',
......@@ -90,7 +122,7 @@
//Excel下载
downLoadTemplateStatic() {
this.loading = true;
let fileName = "模板统计下载"+ this.$commonUtils.getCurrentDate() + ".xls";
let fileName = "模板统计下载" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("template_post_GetDownloadTemplateStatic", this.msg, fileName,
res => {
this.loading = false;
......@@ -129,7 +161,7 @@
let _date = myDate.getDate() > 9 ? myDate.getDate() : '0' + myDate.getDate();
this.msg.QStartDate = _year + '-' + _month + '-' + '01';
this.msg.QEndDate = _year + '-' + _month + '-' + _date;
//this.msg.QStartDate = "2025-06-01";
this.msg.QStartDate = "2025-05-01";
},
mounted() {
let userInfo = this.getLocalStorage();
......@@ -141,3 +173,13 @@
}
</script>
<style lang="less" scoped>
.tempStatic-header-center {
text-align: center;
}
.tempStatic-cell-center {
text-align: center;
}
</style>
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