Skip to content

S
SuperMan
Commit 5041f3e3 authored by youjie's avatar youjie
Browse files
Options

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

parents aad1769a e29604f0
Show whitespace changes
Inline Side-by-side
Showing with 605 additions and 260 deletions
src/components/FinancialModule/DataAnalysis/components/waitpay.vue 0 → 100644
View file @ 5041f3e3
<template>
<div style="margin-bottom: 20px; ">
<el-table
:data="BranchAnalysisData"
style="width: 100%;"
class="LineAnalysisDataBJ">
<el-table-column
prop="Name"
label="类目"
min-width="120" align="center">
<template slot-scope="scope">
{{scope.row.Name}}
</template>
</el-table-column>
<el-table-column
prop="CurrencyName"
label="币种"
min-width="120" align="center">
<template slot-scope="scope">
{{scope.row.CurrencyName}}
</template>
</el-table-column>
<el-table-column
prop="TotalMoney"
label="金额"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.TotalMoney}}
</template>
</el-table-column>
<el-table-column align="center" label="团队">
<el-table-column
prop="CurrentMoney"
label="账期(月内)"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.CurrentMoney}}
</template>
</el-table-column>
<el-table-column
prop="AgoOneMoney"
label="账期(一个月)"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.AgoOneMoney}}
</template>
</el-table-column>
<el-table-column
prop="AgoTwoMoney"
label="账期(两个月)"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.AgoTwoMoney}}
</template>
</el-table-column>
<el-table-column
prop="AgoThreeMoney"
label="账期(两个月以上)"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.AgoThreeMoney}}
</template>
</el-table-column>
</el-table-column>
<el-table-column align="center" label="非团队">
<el-table-column
prop="NCurrentMoney"
label="账期(月内)"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.NCurrentMoney}}
</template>
</el-table-column>
<el-table-column
prop="NAgoOneMoney"
label="账期(一个月)"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.NAgoOneMoney}}
</template>
</el-table-column>
<el-table-column
prop="NAgoTwoMoney"
label="账期(两个月)"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.NAgoTwoMoney}}
</template>
</el-table-column>
<el-table-column
prop="NAgoThreeMoney"
label="账期(两个月以上)"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.NAgoThreeMoney}}
</template>
</el-table-column>
</el-table-column>
</el-table>
</div>
</template>
<script>
export default {
props:['StatisticalData'],
data() {
return {
MonthList: [],//月份列表
BranchAnalysisData: [],
}
},
mounted() {
},
methods: {
},
watch: {
StatisticalData:{
handler(n,o){
this.MonthList = n.MonthList//月份列表
this.BranchAnalysisData = n.BranchAnalysisData
},
deep: true,
immediate: false,
}
},
}
</script>
<style scoped>
/deep/.LineAnalysisDataBJ tr td:nth-child(1n){
background: #F5F7FA;
}
/deep/.LineAnalysisDataBJ tr td:nth-child(2n){
background: #fff;
}
/deep/.LineAnalysisDataBJ tr th{
background: #F5F7FA;
}
/deep/.el-table.LineAnalysisDataBJ tr:first-child th:first-child{
background: #F5F7FA;
}
/deep/.el-table.LineAnalysisDataBJ tr:nth-child(2) th:nth-child(1n){
/* background: #fff; */
}
/deep/.el-table.LineAnalysisDataBJ tr:nth-child(2) th:nth-child(2n){
background: #F5F7FA;
}
/deep/.el-table.LineAnalysisDataBJ tr:first-child th{
background: #fff;
}
/deep/.el-table.LineAnalysisDataBJ2 tr:first-child th:nth-child(1n){
background: #F5F7FA;
}
/deep/.el-table.LineAnalysisDataBJ2 tr:first-child th:nth-child(2n){
background: #fff;
}
/deep/.el-table.LineAnalysisDataBJ tr th{
height: 20px;
line-height: 20px;
padding: 5px 0;
}
/deep/.el-table.LineAnalysisDataBJ2 tr th{
height: 20px;
line-height: 20px;
padding: 5px 0;
}
/deep/.el-table.LineAnalysisDataBJ tr td{
height: 20px;
line-height: 20px;
padding: 5px 0;
}
/deep/.el-table.LineAnalysisDataBJ2 tr td{
height: 20px;
line-height: 20px;
padding: 5px 0;
}
.corporatioBox{
display: flex;
flex-direction: row;
margin-bottom: 10px;
margin-left: 15px;
}
.corporatioBox div{
/* display: flex;
flex-direction: column; */
background: #fff;
padding: 5px 10px;
margin-right: 10px;
}
.corporatioBox div span:first-child{
text-align: left;
font-size: 14px;
}
.corporatioBox div span:last-child{
color: red;
margin-left: 10px;
}
</style>
src/components/FinancialModule/DataAnalysis/index.vue
View file @ 5041f3e3
......@@ -8,6 +8,7 @@
<el-tab-pane v-if="PermissionState!=3" :label="$t('objFill.v101.FinancialModule.yushiduibiqk')" name="5"></el-tab-pane>
<!-- <el-tab-pane v-if="PermissionState!=3" :label="$t('objFill.v101.FinancialModule.cashqk')" name="6"></el-tab-pane> -->
<el-tab-pane v-if="PermissionState!=3&&PermissionState!=4" label="平台收款占比" name="7"></el-tab-pane>
<el-tab-pane v-if="PermissionState!=3&&PermissionState!=4" label="待付款情况" name="8"></el-tab-pane>
</el-tabs>
<div class="query-box">
<el-form class="_info_box clearfix" label-width="90px">
......@@ -94,7 +95,7 @@
<el-input v-model="shopMsg.MaoLiRate" type="number" @change="getMaoLiRate"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-if="activeName!=4 && activeName!=3 && activeName!=7">
<el-col :span="4" v-if="activeName!=4 && activeName!=3 && activeName!=7&& activeName!=8">
<el-form-item :label="$t('advmanager.v_line')">
<el-select filterable v-model="msg.LineId" @change="getStatement"
clearable>
......@@ -111,7 +112,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" v-if="activeName!=8">
<el-form-item :label="$t('pub.date')">
<!-- <el-date-picker
size="small"
......@@ -149,7 +150,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="2" v-if="activeName!=3 && activeName!=5 && activeName!=7">
<el-col :span="2" v-if="activeName!=3 && activeName!=5 && activeName!=7&& activeName!=8">
<el-form-item :label="$t('objFill.v101.FinancialModule.jiduhuiz')">
<el-checkbox v-model="msg.LossType" true-label="1" false-label="0" @change="getStatement"></el-checkbox>
</el-form-item>
......@@ -161,7 +162,7 @@
<button class="hollowFixedBtn" @click="getStatement">
{{ $t("pub.searchBtn") }}
</button>
<button v-if="activeName!=4 && activeName!=5 && activeName!=7" class="normalBtn" @click="exportExcel">
<button v-if="activeName!=4 && activeName!=5 && activeName!=7&& activeName!=8" class="normalBtn" @click="exportExcel">
{{$t('visa.v_daochu')}}
</button>
<button v-if="activeName==4" class="normalBtn" @click="exportExcel2">
......@@ -173,6 +174,9 @@
<button v-if="activeName==7" class="normalBtn" @click="exportExcel4">
{{$t('visa.v_daochu')}}
</button>
<button v-if="activeName==8" class="normalBtn" @click="exportExcel4">
{{$t('visa.v_daochu')}}
</button>
</li>
</ul>
</div>
......@@ -184,6 +188,7 @@
<PrerealContrast v-if="activeName=='5'" :StatisticalData="StatisticalData"></PrerealContrast>
<Cashflows v-if="activeName=='6'" :StatisticalData="StatisticalData"></Cashflows>
<PlatfromIncomes v-if="activeName=='7'" :StatisticalData="StatisticalData"></PlatfromIncomes>
<WaitPays v-if="activeName=='8'" :StatisticalData="StatisticalData"></WaitPays>
</div>
</div>
</template>
......@@ -194,12 +199,13 @@ import Lines from "./components/line.vue";
import Corporations from "./components/corporation.vue";
import Cashflows from "./components/cashflow.vue";
import PlatfromIncomes from "./components/platfromIncome.vue";
import WaitPays from "./components/waitpay.vue";
import Packets from "./components/packet.vue";
import ShoppingCommission from "./components/ShoppingCommission.vue";
import PrerealContrast from "./components/PrerealContrast.vue";
import StartYMDateLimit from '../../public/StartYMDateLimit.vue';
export default {
components: {Lines,Corporations,Cashflows,PlatfromIncomes,Packets,ShoppingCommission,PrerealContrast,StartYMDateLimit},
components: {Lines,Corporations,Cashflows,PlatfromIncomes,WaitPays,Packets,ShoppingCommission,PrerealContrast,StartYMDateLimit},
data() {
return {
coinGetShow: false,
......@@ -364,6 +370,9 @@ export default {
if(this.activeName=='7'){
url = 'financestatistics_post_GetPlatformIncomeAnalysisStat'
}
if(this.activeName=='8'){
url = 'financestatistics_post_GetWiatPayAnalysisStat'
}
this.loading = true
this.apipost(
url,
......
src/components/SalesModule/enrollTotal.vue
View file @ 5041f3e3
......@@ -349,14 +349,7 @@
<i class="iconfont icon-tiaozheng" style="font-size: 22px; color: #297bef"></i></el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%; text-decoration: underline; cursor: pointer"
:title="item.alName" @click="
goUrlX(
'产品查询',
item.isOneDay === 1 ? 'productQueryOne' : 'productQuery',
item.tcid,
item.tcnum
)
">
:title="item.alName" @click="gotoProduct(item)">
{{ item.tcnum }}
</p>
<p class="fz12 over_ellipsis" style="width: 100%">
......@@ -1125,6 +1118,21 @@
(err) => {}
);
},
gotoProduct(item) {
var path = "productQuery";
if (item.teamType == 2) {
path = "productQueryOne";
} else if (item.teamType == 4) {
path = "priceGroup";
} else {
path = "productQuery";
}
var ntcnum = item.tcnum;
if (ntcnum && ntcnum.indexOf('（') > -1) {
ntcnum = ntcnum.substring(0, ntcnum.indexOf('（'));
}
this.goUrlX('产品查询', path, item.tcid, ntcnum)
},
goUrlX(name, path, id, tcmun) {
this.$router.push({
name: path,
......@@ -1349,7 +1357,7 @@
this.msg.CEndDate = this.$route.query.CEndDate
if (this.$route.query.discount) this.msg.IsUseCoupon = this.$route.query.discount
}
if (this.$route.query.BranchId &&this.$route.query.BranchId >= -1) {
if (this.$route.query.BranchId && this.$route.query.BranchId >= -1) {
this.msg.BranchId = Number(this.$route.query.BranchId);
}
if (this.$route.query.isNormal) this.msg.isNormal = this.$route.query.isNormal
......
src/components/SalesModule/groupTourOrder.vue
View file @ 5041f3e3
......@@ -764,9 +764,11 @@
width: 200px;
}
.el-input-group__append, .el-input-group__prepend {
.el-input-group__append,
.el-input-group__prepend {
padding: 0 5px !important;
}
</style>
<template>
<div class="flexOne groupts" style="min-width: 1200px">
......@@ -935,7 +937,8 @@
</el-col>
<el-col :span="4" v-if="addMsg.IsLessPrice ==1 && this.addMsg.GroupType ==1">
<el-form-item label="少价/人" prop="LessAvgPrice">
<el-input type="Number" v-model="addMsg.LessAvgPrice" @change="ValidateLess2"><template slot="append">最高{{LessNAvgPrice}}/人</template></el-input>
<el-input type="Number" v-model="addMsg.LessAvgPrice" @change="ValidateLess2"><template
slot="append">最高{{LessNAvgPrice}}/人</template></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
......@@ -1097,7 +1100,8 @@
</el-col>
<el-col :span="4" v-if="addMsg.IsLessPrice ==1 && this.addMsg.GroupType ==1">
<el-form-item :label="$t('objFill.v101.shaojiazonge')" prop="LessPrice">
<el-input type="Number" v-model="addMsg.LessPrice" @change="ValidateLess"><template slot="append">最高少价{{LessNPrice}}</template></el-input>
<el-input type="Number" v-model="addMsg.LessPrice" @change="ValidateLess"><template
slot="append">最高少价{{LessNPrice}}</template></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
......@@ -1198,7 +1202,8 @@
</el-col>
<el-col :span="4" v-show="addMsg.GroupType == '2'">
<el-form-item :label="$t('ground.bjd')" prop="QuotationUrl">
<div style="margin-bottom: 10px; width: 32%" v-loading="uploadLloading" :element-loading-text="$t('objFill.pingminscz')">
<div style="margin-bottom: 10px; width: 32%" v-loading="uploadLloading"
:element-loading-text="$t('objFill.pingminscz')">
<el-upload ref="my-upload" class="upload-demo" :http-request="uploadFileBtnFJ" :multiple="true"
:show-file-list="true" :on-preview="previewFileFJ" :on-remove="removeFileFJ" :limit="1"
:file-list="fileFujianList" action>
......@@ -1380,10 +1385,11 @@
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="SetGender()" />
</span>
</p>
<el-form :model="subGenderInfo" :inline="true" ref="subGenderInfo" label-position="right" :rules="subGenderInfo" label-width="80px">
<el-form :model="subGenderInfo" :inline="true" ref="subGenderInfo" label-position="right" :rules="subGenderInfo"
label-width="80px">
<!-- <el-row :gutter="20">
<el-col :span="12"> -->
<el-form-item :label="$t('hotel.order_Number')" >
<el-form-item :label="$t('hotel.order_Number')">
{{subGenderInfo.OrderId}}
</el-form-item>
<el-form-item :label="$t('salesModule.SingleFM')" style="margin-left: 58px">
......@@ -1435,10 +1441,11 @@
<span><em>{{ $t("scen.sc_ftTime") }}</em>
<!-- <el-date-picker v-model="msg.QStartDate" @change="dataDui2()" class="w150" value-format="yyyy-MM-dd"
type="date"></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="msg.QStartDate" :EndGroupDate="msg.QEndDate" @change="(date)=> {msg.QStartDate = date,dataDui2()}"></DateLimit>
<DateLimit :clearable="false" :StartGroupDate="msg.QStartDate" :EndGroupDate="msg.QEndDate"
@change="(date)=> {msg.QStartDate = date,dataDui2()}"></DateLimit>
-
<el-date-picker v-model="msg.QEndDate" @change="dataDui2()" class="w150" value-format="yyyy-MM-dd"
type="date":picker-options="pickerBeginDateAfter"></el-date-picker>
type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
</span>
</li>
<li style="line-height: 30px; padding-left: 30px">
......@@ -1694,7 +1701,8 @@
<td rowspan="3" style="position: relative;">
<span class="TC_neibu"
style="float: inherit;margin-left: 5px;margin-right: 5px;position: absolute;top: 10px;left:3px"
v-if="item.standardCurrencyName" :class="{'TCneibu':item.standardCurrencyName=='人民币','TCb2b':item.standardCurrencyName=='日元',
v-if="item.standardCurrencyName"
:class="{'TCneibu':item.standardCurrencyName=='人民币','TCb2b':item.standardCurrencyName=='日元',
'TCb2c':item.standardCurrencyName=='新台币','AppPlat':item.standardCurrencyName=='',
'otherPlat':item.standardCurrencyName=='',}">{{item.standardCurrencyName}}{{$t('objFill.jiesuan')}}</span>
<p v-if="item.isChargeLossOrders == 1" style="color: red">
......@@ -1725,9 +1733,7 @@
<i class="iconfont icon-tiaozheng" style="font-size: 22px; color: #297bef"></i></el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%; text-decoration: underline; cursor: pointer"
:title="item.alName" @click="
goUrlX('产品查询', 'productQuery', item.tcid, item.tcnum)
">
:title="item.alName" @click="gotoProduct(item)">
{{ item.tcnum }}
</p>
......@@ -2096,7 +2102,8 @@
<span v-else>{{ $t("salesModule.LossReceipt") }}</span>
</div>
<div v-if="item.orderState == '1' || item.orderState == '2'|| item.orderState == '3'" @click="getOrderGender(item)">
<div v-if="item.orderState == '1' || item.orderState == '2'|| item.orderState == '3'"
@click="getOrderGender(item)">
{{$t("pub.updateMsg")+$t("salesModule.SingleFM")}}
</div>
<!-- item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0) -->
......@@ -2212,7 +2219,8 @@
<span style="display: block">{{ $t("salesModule.RoomInfo")
}}<span v-if="item.oneSex > 0"
style="color: #e95252">（{{ item.oneSex == 1 ?$t('objFill.dannan') : $t('objFill.dannv') }}）</span><span
v-if="item.chirdNoNeedBedNum > 0" style="color: #e95252">（{{$t('Operation.Op_childNobed')}}{{ item.chirdNoNeedBedNum }}{{$t('hotel.hotel_people')}}
v-if="item.chirdNoNeedBedNum > 0"
style="color: #e95252">（{{$t('Operation.Op_childNobed')}}{{ item.chirdNoNeedBedNum }}{{$t('hotel.hotel_people')}}
）</span>：{{ item.orderGuestHouseStr }}</span>
......@@ -2307,13 +2315,15 @@
</div>
</div>
</div>
<p v-if="item.unionRemark" style="color: red;font-size:10px;margin-top:5px;">{{$t('objFill.liangyunbeizhu')}}：{{ item.unionRemark }}
<p v-if="item.unionRemark" style="color: red;font-size:10px;margin-top:5px;">
{{$t('objFill.liangyunbeizhu')}}：{{ item.unionRemark }}
</p>
<template v-if="item.orderGuestFlightList&&item.orderGuestFlightList.length>0">
<template v-for="(uItem,uIndex) in item.orderGuestFlightList">
<div :key="uIndex+20000">
{{uItem.guestNames}} {{$t('salesModule.FlighInfo')}}：
<span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【{{$t('visa.v_zanding')}}】</span>
<span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
v-else>【{{$t('visa.v_zanding')}}】</span>
<!-- <a v-if="uItem.ticketUnionId&&uItem.ticketUnionId>0" @click="toTrip(item,uItem.ticketUnionId,uItem.GuestIds)"
style="cursor:pointer;text-decoration:underline;color:green;">
{{ $t("Operation.Op_teamNotice") }}({{ item.outNotice == 1 ? "OK" : $t('visa.v_zanding')}})
......@@ -2356,8 +2366,10 @@
</template>
<template v-else>
<span class="font-color-red" v-if="item.orderspecialofferState === -1">{{$t('visa.v_jujue')}}</span>
<span class="font-color-org" v-if="item.orderspecialofferState === 0">{{$t('objFill.shengpizhong')}}</span>
<span class="font-color-green" v-if="item.orderspecialofferState === 1">{{$t('visa.v_tongguo')}}</span>
<span class="font-color-org"
v-if="item.orderspecialofferState === 0">{{$t('objFill.shengpizhong')}}</span>
<span class="font-color-green"
v-if="item.orderspecialofferState === 1">{{$t('visa.v_tongguo')}}</span>
</template>
</div>
<div class="font-color-red" v-if="item.orderspecialofferId !== 0">
......@@ -2431,7 +2443,8 @@
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
<el-dialog custom-class="w450" :title="$t('Operation.Op_tripDownLoad')" :visible.sync="travelControlTripLayerShow" center>
<el-dialog custom-class="w450" :title="$t('Operation.Op_tripDownLoad')" :visible.sync="travelControlTripLayerShow"
center>
<tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="2">
</tripDownLoadCommon>
</el-dialog>
......@@ -2504,7 +2517,8 @@
<updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
</div>
<a id="groupTourOrder_DownLoad" target="_blank" style="display: none">1{{ $t("salesModule.DontDel") }}</a>
<el-dialog :title="$t('objFill.xuanzhelk')" width="400px" :visible.sync="ShenQingPhotoShow" center :before-close="closeChangeMachie">
<el-dialog :title="$t('objFill.xuanzhelk')" width="400px" :visible.sync="ShenQingPhotoShow" center
:before-close="closeChangeMachie">
<div>
<label><input type="checkbox" v-model="SQcheckdAll" />{{
$t("system.table_chekAll")
......@@ -2696,9 +2710,9 @@
CommissionShareMoney: "0",
OneSex: 0,
QuotationUrl: "", //单团附件
LessPrice:"0",
LessAvgPrice:"0",
IsLessPrice:"0"
LessPrice: "0",
LessAvgPrice: "0",
IsLessPrice: "0"
},
uploadLloading: false,
fileFujianList: [],
......@@ -2890,9 +2904,9 @@
F_Finance_Create: false, //制单权限
F_ContractManagement: false, //合同权限
userInfo: {},
LessRule:[],
LessNPrice:0,
LessNAvgPrice:0
LessRule: [],
LessNPrice: 0,
LessNAvgPrice: 0
};
},
components: {
......@@ -2925,6 +2939,19 @@
},
},
methods: {
gotoProduct(item) {
var path = "productQuery";
if (item.teamType == 4) {
path = "priceGroup";
} else {
path = "productQuery";
}
var ntcnum = item.tcnum;
if (ntcnum && ntcnum.indexOf('（') > -1) {
ntcnum = ntcnum.substring(0, ntcnum.indexOf('（'));
}
this.goUrlX('产品查询', path, item.tcid, ntcnum)
},
showMore(item, index) {
if (this.isShow === index) {
this.isShow = ''
......@@ -3478,7 +3505,7 @@
);
})
.catch(() => {
this.$message.info(this.$t('pub.cancelBtn')+'！');
this.$message.info(this.$t('pub.cancelBtn') + '！');
});
},
getUnionTravelPrice(obj, type) {
......@@ -3745,9 +3772,9 @@
this.addObj.OpSetLossMoney = x.OpSetLossMoney;
this.addMsg = x;
this.LessNPrice = this.addMsg.LessMaxPrice;//先初始化 最高少价
this.LessNPrice = this.addMsg.LessMaxPrice; //先初始化 最高少价
this.LessNAvgPrice = this.addMsg.LessMaxAvgPrice;
if(this.addMsg.IsLessPrice==1){
if (this.addMsg.IsLessPrice == 1) {
this.getLessRuleList();
}
if (x.QuotationUrl) {
......@@ -4230,24 +4257,33 @@
Number(this.addMsg.OldPeopleNum));
//ld 2025-01-22 少价管理
if(this.addMsg.IsLessPrice ==1 && this.addMsg.GroupType ==1 && (this.addMsg.CustomerType=='1' ||this.addMsg.CustomerType=='2') && this.addMsg.LineId>0 && this.LessRule && this.LessRule.length>0){
if (this.addMsg.IsLessPrice == 1 && this.addMsg.GroupType == 1 && (this.addMsg.CustomerType == '1' || this
.addMsg.CustomerType == '2') && this.addMsg.LineId > 0 && this.LessRule && this.LessRule.length > 0) {
let LessNum = (Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum));
let LessSlinge =0;
let LessSlinge = 0;
// 首先抓取 人数对应的 少价金额
this.LessRule.forEach((ritem) => {
if(ritem.LineIdList.includes(this.addMsg.LineId)){
if (ritem.LineIdList.includes(this.addMsg.LineId)) {
// 使用这个规则
ritem.RuleList.forEach((qitem)=>{
if(qitem.StartValue<=LessNum){LessSlinge= Number(qitem.Rate);}
ritem.RuleList.forEach((qitem) => {
if (qitem.StartValue <= LessNum) {
LessSlinge = Number(qitem.Rate);
}
});
}
});
this.LessNAvgPrice = LessSlinge;
this.LessNPrice = LessSlinge * LessNum;
if(this.LessNPrice==0){this.addMsg.LessPrice=0; this.addMsg.LessAvgPrice=0;}
if(this.addMsg.LessAvgPrice>this.LessNAvgPrice){this.addMsg.LessAvgPrice=this.LessNAvgPrice; this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;}
if (this.LessNPrice == 0) {
this.addMsg.LessPrice = 0;
this.addMsg.LessAvgPrice = 0;
}
if (this.addMsg.LessAvgPrice > this.LessNAvgPrice) {
this.addMsg.LessAvgPrice = this.LessNAvgPrice;
this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;
}
}
this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice;
} else {
......@@ -4318,24 +4354,33 @@
Number(this.addMsg.OldPeopleNum));
//ld 2025-01-22 少价管理
if(this.addMsg.IsLessPrice ==1 && this.addMsg.GroupType ==1 && (this.addMsg.CustomerType=='1' ||this.addMsg.CustomerType=='2') && this.addMsg.LineId>0 && this.LessRule && this.LessRule.length>0){
if (this.addMsg.IsLessPrice == 1 && this.addMsg.GroupType == 1 && (this.addMsg.CustomerType == '1' || this
.addMsg.CustomerType == '2') && this.addMsg.LineId > 0 && this.LessRule && this.LessRule.length > 0) {
let LessNum = (Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum));
let LessSlinge =0;
let LessSlinge = 0;
// 首先抓取 人数对应的 少价金额
this.LessRule.forEach((ritem) => {
if(ritem.LineIdList.includes(this.addMsg.LineId)){
if (ritem.LineIdList.includes(this.addMsg.LineId)) {
// 使用这个规则
ritem.RuleList.forEach((qitem)=>{
if(qitem.StartValue<=LessNum){LessSlinge= Number(qitem.Rate);}
ritem.RuleList.forEach((qitem) => {
if (qitem.StartValue <= LessNum) {
LessSlinge = Number(qitem.Rate);
}
});
}
});
this.LessNAvgPrice = LessSlinge;
this.LessNPrice = LessSlinge * LessNum;
if(this.LessNPrice==0){this.addMsg.LessPrice=0; this.addMsg.LessAvgPrice=0;}
if(this.addMsg.LessAvgPrice>this.LessNAvgPrice){this.addMsg.LessAvgPrice=this.LessNAvgPrice; this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;}
if (this.LessNPrice == 0) {
this.addMsg.LessPrice = 0;
this.addMsg.LessAvgPrice = 0;
}
if (this.addMsg.LessAvgPrice > this.LessNAvgPrice) {
this.addMsg.LessAvgPrice = this.LessNAvgPrice;
this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;
}
}
this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice;
}
......@@ -4907,13 +4952,13 @@
},
SetGender() {
this.apipost(
"sellorder_post_SetOrderGender",this.subGenderInfo,
"sellorder_post_SetOrderGender", this.subGenderInfo,
(res) => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
this.closeGenderDiv();
}else{
} else {
this.$message.error(res.data.message);
}
},
......@@ -5109,13 +5154,15 @@
let LessNum = (Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum));
let LessSlinge =0;
let LessSlinge = 0;
// 首先抓取 人数对应的 少价金额
this.LessRule.forEach((ritem) => {
if(ritem.LineIdList.includes(this.addMsg.LineId)){
if (ritem.LineIdList.includes(this.addMsg.LineId)) {
// 使用这个规则
ritem.RuleList.forEach((qitem)=>{
if(qitem.StartValue<=LessNum){LessSlinge= Number(qitem.Rate);}
ritem.RuleList.forEach((qitem) => {
if (qitem.StartValue <= LessNum) {
LessSlinge = Number(qitem.Rate);
}
});
}
});
......@@ -5125,25 +5172,27 @@
(err) => {}
);
},
ValidateLess(){
if(this.addMsg.LessPrice>this.LessNPrice){
this.addMsg.LessPrice =this.LessNPrice;
ValidateLess() {
if (this.addMsg.LessPrice > this.LessNPrice) {
this.addMsg.LessPrice = this.LessNPrice;
}
if(this.addMsg.LessPrice>=0){
if (this.addMsg.LessPrice >= 0) {
let LessNum = (Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum));
if(LessNum==0){this.addMsg.LessAvgPrice=0;}else{
if (LessNum == 0) {
this.addMsg.LessAvgPrice = 0;
} else {
this.addMsg.LessAvgPrice = this.moneyFormatN(this.addMsg.LessPrice / LessNum);
}
}
this.getTotalPrice();
},
ValidateLess2(){
if(this.addMsg.LessAvgPrice>this.LessNAvgPrice){
this.addMsg.LessAvgPrice =this.LessNAvgPrice;
ValidateLess2() {
if (this.addMsg.LessAvgPrice > this.LessNAvgPrice) {
this.addMsg.LessAvgPrice = this.LessNAvgPrice;
}
if(this.addMsg.LessAvgPrice>=0){
if (this.addMsg.LessAvgPrice >= 0) {
let LessNum = (Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum));
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 5041f3e3
......@@ -1061,9 +1061,11 @@
border: 1px solid #e5e5e5;
}
.el-input-group__append, .el-input-group__prepend {
.el-input-group__append,
.el-input-group__prepend {
padding: 0 5px !important;
}
</style>
<template>
......@@ -1468,7 +1470,8 @@
</el-col>
<el-col :span="4" v-if="addMsg.IsLessPrice ==1 && this.addMsg.GroupType ==1">
<el-form-item label="少价/人" prop="LessAvgPrice">
<el-input type="Number" v-model="addMsg.LessAvgPrice" @change="ValidateLess2"><template slot="append">最高{{LessNAvgPrice}}/人</template></el-input>
<el-input type="Number" v-model="addMsg.LessAvgPrice" @change="ValidateLess2"><template
slot="append">最高{{LessNAvgPrice}}/人</template></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
......@@ -1618,7 +1621,8 @@
</el-col>
<el-col :span="4" v-if="addMsg.IsLessPrice ==1 && this.addMsg.GroupType ==1">
<el-form-item :label="$t('objFill.v101.shaojiazonge')" prop="LessPrice">
<el-input type="Number" v-model="addMsg.LessPrice" @change="ValidateLess"><template slot="append">最高少价{{LessNPrice}}</template></el-input>
<el-input type="Number" v-model="addMsg.LessPrice" @change="ValidateLess"><template
slot="append">最高少价{{LessNPrice}}</template></el-input>
</el-form-item>
</el-col>
<el-col :span="4" v-show="addMsg.CustomerType == 1 || addMsg.CustomerType == 2">
......@@ -2029,7 +2033,8 @@
<td>{{ moneyFormatN(item.ZaiTuMoney) }}</td>
<td>{{ moneyFormatN(item.CashReceiptsMoney) }}</td>
<td>
<span :class="{color_red_order: item.DueInMoney && item.DueInMoney > 0, }">{{ moneyFormatN(item.DueInMoney) }}</span>
<span
:class="{color_red_order: item.DueInMoney && item.DueInMoney > 0, }">{{ moneyFormatN(item.DueInMoney) }}</span>
</td>
<td class="fz12">
<span :class="{ 'RL-redType': item.statsstr == '候补' }">{{item.statsstr}}</span>
......@@ -2505,7 +2510,8 @@
</tr>
</table>
</div>
<span style="cursor: pointer; color: #e95252" slot="reference">{{ moneyFormatN(childItem.DiscountMoney) }}</span>
<span style="cursor: pointer; color: #e95252"
slot="reference">{{ moneyFormatN(childItem.DiscountMoney) }}</span>
</el-popover>
</td>
<td class="nowrap">{{ moneyFormatN(childItem.RedEnvelopeMoney) }}</td>
......@@ -3336,7 +3342,8 @@
{{ $t("ground.shezhissje") }}
</div>
<div @click="ZhuiJiaTuanKuan(item.OrderId)" v-if="RBBranchId == 0|| RBBranchId==1218 || RBBranchId==1253">
<div @click="ZhuiJiaTuanKuan(item.OrderId)"
v-if="RBBranchId == 0|| RBBranchId==1218 || RBBranchId==1253">
{{ $t("ground.zjiatk") }}
</div>
<div @click="importNameOrder(item.OrderId)">
......@@ -4128,9 +4135,9 @@
QuotationUrl: "", //单团附件
LuggageNum: "",
IsOneDay: 0,
LessPrice:"0",
LessAvgPrice:"0",
IsLessPrice:"0"
LessPrice: "0",
LessAvgPrice: "0",
IsLessPrice: "0"
},
uploadLloading: false,
fileFujianList: [],
......@@ -4425,9 +4432,9 @@
ConfigId: "",
OfferId: "",
},
LessRule:[],
LessNPrice:0,
LessNAvgPrice:0
LessRule: [],
LessNPrice: 0,
LessNAvgPrice: 0
};
},
components: {
......@@ -4779,9 +4786,9 @@
this.addObj = res.data.data.modelPrice;
let x = res.data.data.model;
this.addMsg = x;
this.LessNPrice = this.addMsg.LessMaxPrice;//先初始化 最高少价
this.LessNPrice = this.addMsg.LessMaxPrice; //先初始化 最高少价
this.LessNAvgPrice = this.addMsg.LessMaxAvgPrice;
if(this.addMsg.IsLessPrice==1){
if (this.addMsg.IsLessPrice == 1) {
this.getLessRuleList();
}
if (x.QuotationUrl) {
......@@ -5100,12 +5107,14 @@
//跳转到团控列表
gotoTCList(item) {
var path = "TravelControlList";
if (item.TeamType == 0) {
path = "TravelControlList";
} else if (item.TeamType == 1) {
if (item.TeamType == 1) {
path = "TravelControlListSale";
} else if (item.TeamType == 2) {
path = "oneDayTrip";
} else if (item.TeamType == 4) {
path = "TravelTeam";
} else {
path = "TravelControlList";
}
this.$router.push({
name: path,
......@@ -5593,24 +5602,33 @@
Number(this.addMsg.OldPeopleNum));
//ld 2025-01-22 少价管理
if(this.addMsg.IsLessPrice ==1 && this.addMsg.GroupType ==1 && (this.addMsg.CustomerType=='1' ||this.addMsg.CustomerType=='2') && this.addMsg.LineId>0 && this.LessRule && this.LessRule.length>0){
if (this.addMsg.IsLessPrice == 1 && this.addMsg.GroupType == 1 && (this.addMsg.CustomerType == '1' || this
.addMsg.CustomerType == '2') && this.addMsg.LineId > 0 && this.LessRule && this.LessRule.length > 0) {
let LessNum = (Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum));
let LessSlinge =0;
let LessSlinge = 0;
// 首先抓取 人数对应的 少价金额
this.LessRule.forEach((ritem) => {
if(ritem.LineIdList.includes(this.addMsg.LineId)){
if (ritem.LineIdList.includes(this.addMsg.LineId)) {
// 使用这个规则
ritem.RuleList.forEach((qitem)=>{
if(qitem.StartValue<=LessNum){LessSlinge= Number(qitem.Rate);}
ritem.RuleList.forEach((qitem) => {
if (qitem.StartValue <= LessNum) {
LessSlinge = Number(qitem.Rate);
}
});
}
});
this.LessNAvgPrice = LessSlinge;
this.LessNPrice = LessSlinge * LessNum;
if(this.LessNPrice==0){this.addMsg.LessPrice=0; this.addMsg.LessAvgPrice=0;}
if(this.addMsg.LessAvgPrice>this.LessNAvgPrice){this.addMsg.LessAvgPrice=this.LessNAvgPrice; this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;}
if (this.LessNPrice == 0) {
this.addMsg.LessPrice = 0;
this.addMsg.LessAvgPrice = 0;
}
if (this.addMsg.LessAvgPrice > this.LessNAvgPrice) {
this.addMsg.LessAvgPrice = this.LessNAvgPrice;
this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;
}
}
this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice;
} else {
......@@ -5682,24 +5700,33 @@
Number(this.addMsg.OldPeopleNum));
//ld 2025-01-22 少价管理
if(this.addMsg.IsLessPrice ==1 && this.addMsg.GroupType ==1 && (this.addMsg.CustomerType=='1' ||this.addMsg.CustomerType=='2') && this.addMsg.LineId>0 && this.LessRule && this.LessRule.length>0){
if (this.addMsg.IsLessPrice == 1 && this.addMsg.GroupType == 1 && (this.addMsg.CustomerType == '1' || this
.addMsg.CustomerType == '2') && this.addMsg.LineId > 0 && this.LessRule && this.LessRule.length > 0) {
let LessNum = (Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum));
let LessSlinge =0;
let LessSlinge = 0;
// 首先抓取 人数对应的 少价金额
this.LessRule.forEach((ritem) => {
if(ritem.LineIdList.includes(this.addMsg.LineId)){
if (ritem.LineIdList.includes(this.addMsg.LineId)) {
// 使用这个规则
ritem.RuleList.forEach((qitem)=>{
if(qitem.StartValue<=LessNum){LessSlinge= Number(qitem.Rate);}
ritem.RuleList.forEach((qitem) => {
if (qitem.StartValue <= LessNum) {
LessSlinge = Number(qitem.Rate);
}
});
}
});
this.LessNAvgPrice = LessSlinge;
this.LessNPrice = LessSlinge * LessNum;
if(this.LessNPrice==0){this.addMsg.LessPrice=0; this.addMsg.LessAvgPrice=0;}
if(this.addMsg.LessAvgPrice>this.LessNAvgPrice){this.addMsg.LessAvgPrice=this.LessNAvgPrice; this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;}
if (this.LessNPrice == 0) {
this.addMsg.LessPrice = 0;
this.addMsg.LessAvgPrice = 0;
}
if (this.addMsg.LessAvgPrice > this.LessNAvgPrice) {
this.addMsg.LessAvgPrice = this.LessNAvgPrice;
this.addMsg.LessPrice = this.addMsg.LessAvgPrice * LessNum;
}
}
this.addMsg.PreferPrice = this.addMsg.PreferPrice - this.addMsg.LessPrice;
}
......@@ -7025,13 +7052,15 @@
let LessNum = (Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum));
let LessSlinge =0;
let LessSlinge = 0;
// 首先抓取 人数对应的 少价金额
this.LessRule.forEach((ritem) => {
if(ritem.LineIdList.includes(this.addMsg.LineId)){
if (ritem.LineIdList.includes(this.addMsg.LineId)) {
// 使用这个规则
ritem.RuleList.forEach((qitem)=>{
if(qitem.StartValue<=LessNum){LessSlinge= Number(qitem.Rate);}
ritem.RuleList.forEach((qitem) => {
if (qitem.StartValue <= LessNum) {
LessSlinge = Number(qitem.Rate);
}
});
}
});
......@@ -7041,25 +7070,27 @@
(err) => {}
);
},
ValidateLess(){
if(this.addMsg.LessPrice>this.LessNPrice){
this.addMsg.LessPrice =this.LessNPrice;
ValidateLess() {
if (this.addMsg.LessPrice > this.LessNPrice) {
this.addMsg.LessPrice = this.LessNPrice;
}
if(this.addMsg.LessPrice>=0){
if (this.addMsg.LessPrice >= 0) {
let LessNum = (Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum));
if(LessNum==0){this.addMsg.LessAvgPrice=0;}else{
if (LessNum == 0) {
this.addMsg.LessAvgPrice = 0;
} else {
this.addMsg.LessAvgPrice = this.moneyFormatN(this.addMsg.LessPrice / LessNum);
}
}
this.getTotalPrice();
},
ValidateLess2(){
if(this.addMsg.LessAvgPrice>this.LessNAvgPrice){
this.addMsg.LessAvgPrice =this.LessNAvgPrice;
ValidateLess2() {
if (this.addMsg.LessAvgPrice > this.LessNAvgPrice) {
this.addMsg.LessAvgPrice = this.LessNAvgPrice;
}
if(this.addMsg.LessAvgPrice>=0){
if (this.addMsg.LessAvgPrice >= 0) {
let LessNum = (Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum));
......@@ -7140,4 +7171,5 @@
},
},
};
</script>
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ 5041f3e3
......@@ -749,11 +749,21 @@
},
//跳转到团控列表
goToTravelList(item) {
var path = "TravelControlList";
if (item.teamType == 1) {
this.goUrlX('团控列表', 'TravelControlListSale', item.tcid, item.tcnum);
path = "TravelControlListSale";
} else if (item.teamType == 2) {
path = "oneDayTrip";
} else if (item.teamType == 4) {
path = "TravelTeam";
} else {
this.goUrlX('团控列表', 'TravelControlList', item.tcid, item.tcnum);
path = "TravelControlList";
}
var ntcnum = item.tcnum;
if (ntcnum && ntcnum.indexOf('（') > -1) {
ntcnum = ntcnum.substring(0, ntcnum.indexOf('（'));
}
this.goUrlX('团控列表', path, item.tcid, ntcnum);
},
goUrlHappy(item) {
this.$router.push({
......
src/components/TravelManager/TravelTeam/priceGroup.vue
View file @ 5041f3e3
......@@ -562,7 +562,7 @@
<li>
<span>
<em>{{ $t("visa.v_tuanhao") }}</em>
<el-input v-model="msg.TCID" class="w150" clearable></el-input>
<el-input v-model="msg.TCNUM" class="w150" clearable></el-input>
</span>
</li>
<li>
......@@ -1006,7 +1006,7 @@
msg: {
pageIndex: 1,
pageSize: 10,
TCID: "",
TCNUM: "",
StartTime: "",
EndTime: "",
},
......@@ -1099,6 +1099,13 @@
this.currentPage = 1;
},
},
created() {
if (this.$route.query) {
if (this.$route.query.tcmun) {
this.msg.TCNUM = this.$route.query.tcmun;
}
}
},
mounted() {
let StartDate = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
this.msg.StartTime = StartDate
......
src/components/TravelManager/TravelTeam/travelTeamList.vue
View file @ 5041f3e3
......@@ -100,6 +100,13 @@
@keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
<li>
<span>
<em>{{ $t("visa.v_tuanhao") }}</em>
<el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150"
@keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')" clearable></el-input>
</span>
</li>
<li>
<span>
<em>{{$t('scen.sc_ftTime')}}</em>
......@@ -123,16 +130,16 @@
@keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li> -->
<li>
<!-- <li>
<span>
<em>{{$t('objFill.v101.hezuohuoban')}}:</em>
<el-input maxlength="50" v-model="queryMsg.QCustomerName" class="permiss-input w150" clearable
@keyup.native.enter="resetQuery" :placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
</li> -->
<li>
<span>
<em>{{$t('sm.chufadi')}}:</em>
<em>{{$t('sm.chufadi')}}</em>
<el-input v-model="queryMsg.StartAddress" class="permiss-input w150" clearable
@keyup.native.enter="resetQuery" :placeholder="$t('objFill.qingshurcfddian')"></el-input>
</span>
......@@ -517,6 +524,9 @@
<el-dropdown-item @click.native="gotoPay(item)">
{{$t('objFill.v101.baojijiesuan')}}
</el-dropdown-item>
<el-dropdown-item @click.native="goTeamBalance(item.TCID, item.OutBranchId)">
{{ $t("Operation.Op_shouzhiDetail") }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -571,6 +581,7 @@
QFlightNum: "", //航班号
QCustomerName: "", //合作伙伴名称
StartAddress: "", //出发地
TCNUM: "", //团队编号
},
queryDataObj: {
LineList: [], //线路列表
......@@ -663,6 +674,18 @@
);
})
},
goTeamBalance(id, OutBranchId) {
this.$router.push({
name: "TeamBalancePayment",
query: {
id: id,
OutBranchId: OutBranchId,
IsHaveAuth: true,
blank: "y",
tab: "团队收支明细",
},
});
},
//跳转到报名清单
gotoPay(item) {
this.OpenNewPage('/TravelPay', {
......@@ -753,6 +776,11 @@
created() {
this.CurrentUserInfo = this.getLocalStorage();
this.getLineList();
if (this.$route.query) {
if (this.$route.query.tcmun) {
this.queryMsg.TCNUM = this.$route.query.tcmun;
}
}
}
};
......
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