Skip to content

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

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

parents 2e0f8565 eb8e9e7d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 805 additions and 231 deletions
src/components/FinancialModule/DataAnalysis/components/platfromIncome.vue 0 → 100644
View file @ c8c51abd
<template>
<div style="margin-bottom: 20px; ">
<div style="display: flex;align-items: center;">
<h3 class="text-center" style="margin-bottom: 5px;">{{$t('objFill.v101.FinancialModule.gongstj')}}</h3>
</div>
<el-table
:data="BranchAnalysisData"
style="width: 100%;"
class="LineAnalysisDataBJ">
<el-table-column
prop="BName"
label="公司"
min-width="120" align="center">
<template slot-scope="scope">
{{scope.row.BName}}
</template>
</el-table-column>
<el-table-column
prop="Money"
label="总收款"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.Money}}
</template>
</el-table-column>
<el-table-column
prop="AgoMoney"
label="平台收款"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.AgoMoney}}
</template>
</el-table-column>
<el-table-column
prop="Rate"
label="平台占比"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.Rate}}%
</template>
</el-table-column>
<el-table-column
prop="InvoiceMoney"
label="银行收款"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.InvoiceMoney}}
</template>
</el-table-column>
<el-table-column
prop="sMoney"
label="银行占比"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.sMoney}}%
</template>
</el-table-column>
<el-table-column
prop="WBMoney"
label="支付宝收款"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.WBMoney}}
</template>
</el-table-column>
<el-table-column
prop="fmrMoney"
label="支付宝占比"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.fmrMoney}}%
</template>
</el-table-column>
<el-table-column
prop="MatchMoney"
label="现金收款"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.MatchMoney}}
</template>
</el-table-column>
<el-table-column
prop="eMoney"
label="现金占比"
min-width="120" align="center" sortable>
<template slot-scope="scope">
{{scope.row.eMoney}}%
</template>
</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 @ c8c51abd
......@@ -7,6 +7,7 @@
<el-tab-pane v-if="PermissionState!=2&&PermissionState!=4" :label="$t('objFill.v101.FinancialModule.gouwuyjqk')" name="4"></el-tab-pane>
<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-tabs>
<div class="query-box">
<el-form class="_info_box clearfix" label-width="90px">
......@@ -93,7 +94,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">
<el-col :span="4" v-if="activeName!=4 && activeName!=3 && activeName!=7">
<el-form-item :label="$t('advmanager.v_line')">
<el-select filterable v-model="msg.LineId" @change="getStatement"
clearable>
......@@ -148,7 +149,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="2" v-if="activeName!=3 && activeName!=5">
<el-col :span="2" v-if="activeName!=3 && activeName!=5 && activeName!=7">
<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>
......@@ -160,7 +161,7 @@
<button class="hollowFixedBtn" @click="getStatement">
{{ $t("pub.searchBtn") }}
</button>
<button v-if="activeName!=4 && activeName!=5" class="normalBtn" @click="exportExcel">
<button v-if="activeName!=4 && activeName!=5 && activeName!=7" class="normalBtn" @click="exportExcel">
{{$t('visa.v_daochu')}}
</button>
<button v-if="activeName==4" class="normalBtn" @click="exportExcel2">
......@@ -169,6 +170,9 @@
<button v-if="activeName==5" class="normalBtn" @click="exportExcel3">
{{$t('visa.v_daochu')}}
</button>
<button v-if="activeName==7" class="normalBtn" @click="exportExcel4">
{{$t('visa.v_daochu')}}
</button>
</li>
</ul>
</div>
......@@ -179,6 +183,7 @@
<ShoppingCommission v-if="activeName=='4'" :StatisticalData="StatisticalData"></ShoppingCommission>
<PrerealContrast v-if="activeName=='5'" :StatisticalData="StatisticalData"></PrerealContrast>
<Cashflows v-if="activeName=='6'" :StatisticalData="StatisticalData"></Cashflows>
<PlatfromIncomes v-if="activeName=='7'" :StatisticalData="StatisticalData"></PlatfromIncomes>
</div>
</div>
</template>
......@@ -188,12 +193,13 @@ import moment from 'moment';
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 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,Packets,ShoppingCommission,PrerealContrast,StartYMDateLimit},
components: {Lines,Corporations,Cashflows,PlatfromIncomes,Packets,ShoppingCommission,PrerealContrast,StartYMDateLimit},
data() {
return {
coinGetShow: false,
......@@ -355,6 +361,9 @@ export default {
if(this.activeName=='6'){
url = 'financestatistics_post_GetCashFlowAnalysisStat'
}
if(this.activeName=='7'){
url = 'financestatistics_post_GetPlatformIncomeAnalysisStat'
}
this.loading = true
this.apipost(
url,
......@@ -448,6 +457,13 @@ export default {
}
this.GetLocalFile("financestatistics_post_GetExpectedCostAnalysisStatToExcel", msg, '预实对比'+ this.$commonUtils.getCurrentDate() + ".xls");
},
exportExcel4(){//导出报表
let msg = {
EmployeeId: this.getLocalStorage().EmployeeId,
...this.msg
}
this.GetLocalFile("financestatistics_post_GetPlatformIncomeAnalysisStatToExcel", msg, '平台收入占比'+ this.$commonUtils.getCurrentDate() + ".xls");
},
getQueryData() {
//获取公司列表
this.apipost(
......
src/components/FinancialModule/ReportForm/MemberRebateCost.vue 0 → 100644
View file @ c8c51abd
This diff is collapsed.
src/components/FinancialModule/TradeCommission/TicketDetails.vue
View file @ c8c51abd
......@@ -58,7 +58,7 @@
<li>
<em>{{$t('system.query_company')}}</em>
<el-select filterable v-model='msg.RB_Branch_Id'
@change='getDepartment();handleCurrentChange(1)' :disabled="disabled">
@change='getDepartment();handleCurrentChange(1)'>
<el-option :label="$t('pub.unlimitedSel')" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in companyList"
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ c8c51abd
......@@ -2437,6 +2437,7 @@
if(!this.msg.detailList || this.msg.detailList.length<=0){return;}
if(this.msg.TradeDate==''){return;}
if(!(this.msg.BankList[0].Type==1 || (this.msg.BankList[0].Type==2 && this.msg.BankList[0].AccountId==92))){return;}
if(this.msg.BankList[0].Type==1 && (this.msg.BankList[0].AccountId==7||this.msg.BankList[0].AccountId==134||this.msg.BankList[0].AccountId==156)){return;}
//验证日期 必须大于 上线的那一天 -------------------------------------------- 注意调整
const currentDate = new Date(this.msg.TradeDate);
const limitDate = new Date('2025-03-31');
......
src/components/TravelContractConfirm.vue
View file @ c8c51abd
This diff is collapsed.
src/components/TravelContractDetail.vue
View file @ c8c51abd
......@@ -888,7 +888,7 @@
</p>
<p>2.{{$t('objFill.yifaxiang')}}<span>{{dataList.court}}</span>{{$t('objFill.renmingfyqs')}}。</p>
<h3>第二十七条 其他约定事项</h3>
<p>未尽事宜，经旅游者和出境社双方协商一致，可以列入补充条款。（如合同空间不够，可以另附纸张 ， 由双方签字或者盖章确认。）</p>
<p style="color:red;font-weight:bold;">未尽事宜，经旅游者和出境社双方协商一致，可以列入补充条款。（如合同空间不够，可以另附纸张 ， 由双方签字或者盖章确认。）</p>
<!-- <p>本人已阅读了本合同所有条款 ， 乙方（旅行社） 已就合同条款对本人进行了真实、准确、完整的说明 ，本人已完全了解合同条款的内容及含义，本人对以下约定基于确认：</p>
<p>1、本人同意本合同条款包括行程中有关自愿购物活动以及自愿参加另付费旅游项目的说明 。</p>
<p>2、健康承诺书：本人悉知自身身体适宜此次旅行，并承诺在旅游过程中 ，如本人未按贵社要求如实告知相关健康情况 ，本人承担因此而产生的全部后果 ，并承担给乙方造成损失的赔偿责任 。本人自愿放弃 不适宜本人身体状况参加的相应景点或相应活动。若因本人坚持参加所产生的全部后果均由本人自行承；本人在出行时会携带自身常用药品 ，如有身体不适必须第一时间告知随团导游或领队 ，并及时到当地医院做检查 ，如因个人原因耽误病情 ，一切后果均由本人自行承担 。</p>
......@@ -896,7 +896,7 @@
<p>4、本人充分了解附件3的内容，并承诺会将附件3《行前说明会告知书》载明的注意事项详细转告给其他每一位参团旅游者，并强调其重要性</p>
<p>5、本人因自身过错 ，造成的一切其他损失由本人承担 。</p>
<p>6、签约委托授权书：本人已征得其余全体委托人同意作为本次旅游出行签约代表（全体委托人名单详见游客名单） ，全体委托人享受本合同约定的权利 ，履行本合同约定的义务 ，受托人在旅游合同及其附件上的签字全体委托人均予以认可 。本人作为此次出行的签约代表 ， 已就此承诺告知了全体委托人及其直系亲属并得到他们的同意 。 如其他游客不予认可本合同或者本人未取得授权、未告知本合 同及相关告知书内容的 ， 由本人承担相应责任 。</p> -->
<div class="userDiv">
<div class="userDiv" style="color:red;font-weight:bold;">
<p v-html="dataList.otherMatter"></p>
</div>
<h3>第二十八条 管辖</h3>
......
src/components/TravelContractNew.vue
View file @ c8c51abd
......@@ -1044,9 +1044,7 @@
</tr>
<tr>
<td colspan="5" class="TC_LASTTD" contenteditable="true">
<div style="color: red" v-if="CtObj.CType!=3">
注：用房全程酒店均为二人一间，如您的订单产生单房，在未补单房差的情况下，我社将尽量安排您与其它客人拼房或是与同行者入住三人房，不可选择房型。敬请配合，服从调配。
</div>
<template v-if="CtObj.TeamType == 2">
<div>
{{$t('pub.pubRemark')}}：<br />
......
src/components/TravelContractView.vue
View file @ c8c51abd
This diff is collapsed.
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ c8c51abd
......@@ -3336,7 +3336,7 @@
{{ $t("ground.shezhissje") }}
</div>
<div @click="ZhuiJiaTuanKuan(item.OrderId)" v-if="RBBranchId == 0|| RBBranchId==1218">
<div @click="ZhuiJiaTuanKuan(item.OrderId)" v-if="RBBranchId == 0|| RBBranchId==1218 || RBBranchId==1253">
{{ $t("ground.zjiatk") }}
</div>
<div @click="importNameOrder(item.OrderId)">
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ c8c51abd
......@@ -119,14 +119,14 @@
<div class="TC-MyList">
<div class="query-box">
<!--v-if="queryCommonData.IsParentCompany==1"-->
<div class="TC_companyList" v-show="IsShowAllBranch()">
<div class="TC_companyList" v-show="IsShowAllBranch() &&CurrentUserInfo.RB_Branch_id!=1257">
<span :class="{ TC_checked: queryCommonData.checkCompanyAll }"
@click="getCompanyCheckAll()">{{ $t("advmanager.v_all") }}</span>
<span v-for="(item, bindex) in queryCommonData.BranchList" :class="{ TC_checked: item.isShow }"
@click="getCompanyCheck(item)" :key="bindex">{{ item.BName }}</span>
</div>
<ul>
<li>
<li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span>
<em>{{ $t("system.table_ssLine") }}</em>
<el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
......@@ -137,7 +137,7 @@
</el-select>
</span>
</li>
<li>
<li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span>
<em>{{ $t("Operation.Op_Country") }}/{{ $t("system.query_dest") }}</em>
<el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
......@@ -148,7 +148,7 @@
</el-select>
</span>
</li>
<li>
<li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span>
<em>{{ $t("active.ad_xlmc") }}</em>
<el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
......@@ -815,7 +815,8 @@
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
@SetShouPeiShu="SetShouPeiShu(item.TCID, item.ShouPeiStatus)" @success="getControlList()"></commonHotelInfo>
@SetShouPeiShu="SetShouPeiShu(item.TCID, item.ShouPeiStatus)" @success="getControlList()">
</commonHotelInfo>
<span slot="reference"
style="cursor: pointer; text-decoration: underline">{{ $t("salesModule.HotelOrder") }}
<font style="color: #e95252; text-decoration: none">
......@@ -2248,7 +2249,7 @@
showCaozuoTime: true, //操作时间
caiwu: true, //显示财务单据
colspanLength: 6, //跨行
showChange:true,//显示可变更酒店
showChange: true, //显示可变更酒店
},
//更新可售机票数量
updateAirticketObj: {
......@@ -2792,7 +2793,6 @@
(err) => {}
);
},
//新获取列表数据
getControlList() {
var msg = JSON.parse(JSON.stringify(this.queryMsg));
......@@ -3582,7 +3582,6 @@
});
this.getControlList();
},
SetPrice(value) {
if (value == null) {
return 0.0;
......@@ -3901,12 +3900,11 @@
this.getCountryCity();
},
created() {
let userinfo = this.getLocalStorage();
this.CurrentUserInfo = this.getLocalStorage();
//默认显示联运
this.queryMsg.IsShowUnion = -1;
let userInfo = this.getLocalStorage();
// 团提成权限
let ActionMenuCode = userinfo.ActionMenuCode;
let ActionMenuCode = this.CurrentUserInfo.ActionMenuCode;
if (ActionMenuCode.indexOf("isCommissionDetails") != -1) {
this.isCommissionDetails = true;
}
......@@ -3914,8 +3912,6 @@
if (ActionMenuCode.indexOf("SaleB2COrWeChat") != -1) {
this.SaleB2COrWeChatStatus = false;
}
this.CurrentUserInfo = userInfo;
if (this.$route.query.TCID) {
this.queryMsg.TCID = this.$route.query.TCID;
}
......@@ -3954,13 +3950,17 @@
this.queryMsg.StartGroupDate = nowDate;
}
if (this.CurrentUserInfo.RB_Group_id == 2) {
if (
if (this.CurrentUserInfo.RB_Branch_id == 1257) {
this.queryMsg.LineId = 1;
this.queryMsg.PlaceID = 12;
} else if (
this.queryCommonData.IsParentCompany != 1 &&
this.CurrentUserInfo.RB_Branch_id != 49 &&
this.CurrentUserInfo.RB_Branch_id != 1249 &&
this.CurrentUserInfo.RB_Branch_id != 1252 &&
this.CurrentUserInfo.RB_Branch_id != 1216 &&
this.CurrentUserInfo.RB_Branch_id != 1253
this.CurrentUserInfo.RB_Branch_id != 1253 &&
this.CurrentUserInfo.RB_Branch_id != 1257
) {
this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
}
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ c8c51abd
......@@ -78,14 +78,14 @@
<div class="TC_Content TC-MyList">
<div class="query-box">
<!--v-if="queryCommonData.IsParentCompany==1"-->
<div class="TC_companyList">
<div class="TC_companyList" v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span :class="{'TC_checked':queryCommonData.checkCompanyAll}"
@click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span>
<span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}"
@click="getCompanyCheck(item)" :key="bindex">{{item.BName}}</span>
</div>
<ul>
<li>
<li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span>
<em>{{$t('system.table_ssLine')}}</em>
<el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
......@@ -96,7 +96,7 @@
</el-select>
</span>
</li>
<li>
<li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
<el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
......@@ -107,7 +107,7 @@
</el-select>
</span>
</li>
<li>
<li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span>
<em>{{$t('active.ad_xlmc')}}</em>
<el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
......@@ -552,7 +552,8 @@
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)" @success="getControlList"></commonHotelInfo>
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)" @success="getControlList">
</commonHotelInfo>
<span slot="reference"
style="cursor:pointer;text-decoration:underline;">{{$t('salesModule.HotelOrder')}}
<font style="color:#e95252;text-decoration:none;">
......@@ -2787,9 +2788,13 @@
myDate.getDate();
this.queryMsg.StartGroupDate = nowDate;
}
if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id != 1224 &&
if (userInfo.RB_Branch_id == 1257) {
this.queryMsg.LineId = 1;
this.queryMsg.PlaceID = 12;
} else if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id !=
1224 &&
userInfo.RB_Branch_id != 1249 && userInfo.RB_Branch_id != 1252 && userInfo.RB_Branch_id != 1253 && userInfo
.RB_Branch_id != 1216) {
.RB_Branch_id != 1216 && userInfo.RB_Branch_id != 1257) {
this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
}
//默认查询全部团队状态
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ c8c51abd
......@@ -87,14 +87,14 @@
<div class="TC_Content">
<div class=" TC-MyList">
<div class="query-box">
<div class="TC_companyList" v-show="IsShowAllBranch()">
<div class="TC_companyList" v-show="IsShowAllBranch()&&CurrentUserInfo.RB_Branch_id!=1257">
<span :class="{'TC_checked':queryCommonData.checkCompanyAll}"
@click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span>
<span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}"
@click="getCompanyCheck(item)">{{item.BName}}</span>
</div>
<ul>
<li>
<li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span>
<em>{{$t('system.table_ssLine')}}</em>
<el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
......@@ -105,7 +105,7 @@
</el-select>
</span>
</li>
<li>
<li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
<el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
......@@ -116,7 +116,7 @@
</el-select>
</span>
</li>
<li>
<li v-if="CurrentUserInfo.RB_Branch_id!=1257">
<span>
<em>{{$t('active.ad_xlmc')}}</em>
<el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
......@@ -187,7 +187,6 @@
<el-input maxlength="50" v-model="queryMsg.DayNum" @keyup.native="checkInteger(queryMsg,'DayNum')"
class="w150" :placeholder="$t('pub.pleaseImport')"></el-input>
</div>
<div>
<span>{{$t('visa.v_lycity')}}</span>
<el-select class="w150" filterable v-model="queryMsg.UnionCityId"
......@@ -2476,9 +2475,13 @@
this.queryMsg.StartGroupDate = nowDate
}
if (this.queryCommonData.IsParentCompany != 1) {
if (this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1245 && this.CurrentUserInfo
if (this.CurrentUserInfo.RB_Branch_id == 1257) {
this.queryMsg.LineId = 177;
this.queryMsg.PlaceID = 525;
} else if (this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1245 && this
.CurrentUserInfo
.RB_Branch_id != 1249 && this.CurrentUserInfo.RB_Branch_id != 1252 && this.CurrentUserInfo.RB_Branch_id !=
1253) {
1253 && this.CurrentUserInfo.RB_Branch_id != 1257) {
this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id)
}
}
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ c8c51abd
......@@ -197,8 +197,14 @@
<template v-for="(item,index) in outItem.PriceCommonList">
<tr :key="index">
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
{{outItem.NewCombinationNum}}
<el-tooltip class="item" effect="dark" content="地接操作" placement="top-start" v-if="item.LineId==14 ">
<el-tooltip v-if="item.IsSetOut==1" class="item" effect="dark" content="已取消发团" placement="top-start">
<font style="color:red">
{{outItem.NewCombinationNum}}
</font>
</el-tooltip>
<font v-else>{{outItem.NewCombinationNum}}</font>
<el-tooltip class="item" effect="dark" content="地接操作" placement="top-start"
v-if="item.LineId==14&&item.IsSetOut==0">
<el-popover placement="bottom" width="300" trigger="click" v-model="item.isShowPop">
<table class="dmcSetTable">
<tr>
......@@ -707,7 +713,7 @@
caiwu: true, //操作时间
showCaozuoTime: true, //操作时间
colspanLength: 6, //跨行
showSureHotel:true,
showSureHotel: true,
},
pickerBeginDateBefore: {
disabledDate: time => {
......
src/components/platformModule/cityManagement.vue
View file @ c8c51abd
......@@ -255,7 +255,7 @@
</el-form-item>
</li>
<li v-if="disProvince">
<el-form-item :label="$t('oobjFill.suosushengfen')" prop="ProvinceID">
<el-form-item :label="$t('objFill.suosushengfen')" prop="ProvinceID">
<el-select v-model="addMsg.ProvinceID" clearable class="w150" filterable
@change="getProvinceList(addMsg.ProvinceID,2)" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value='0'></el-option>
......
src/components/scenicSpot/scenicSpotSalesBoard.vue
View file @ c8c51abd
......@@ -205,7 +205,7 @@
<span>
<em>{{$t('commonPickUp.Pick_attractions')}}</em>
<el-select v-model="msg.CouponsIdList" :placeholder="$t('pub.pleaseSel')" multiple collapse-tags filterable
@change="getMultipleChoice" @clear="getMultipleChoice">
:remote-method="getSecnicData" remote reserve-keyword>
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in ScenicList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
......@@ -264,7 +264,8 @@
<div>
<p v-for="(item,subIndex) in dayItem.dayValue" :key="`d_`+index+`s_`+subIndex" style="padding-bottom:10px;">
<el-tooltip class="item" effect="dark"
:content="`地接团号:`+item.BookGroup+`,公司团号:`+item.TCNUM+`(`+item.TCID+`),总机位:`+item.TotalSeatNum" placement="top">
:content="`地接团号:`+item.BookGroup+`,公司团号:`+item.TCNUM+`(`+item.TCID+`),总机位:`+item.TotalSeatNum"
placement="top">
<span class="text_underLine">
{{item.TicketName}}（{{item.TicketNum}}）
</span>
......@@ -283,9 +284,7 @@
msg: {
Year: 0,
Month: 0,
CouponsId: 0,
CouponsIdList: [],
CouponsIds: '',
QStatus: 0,
loading: false,
uid: 0,
......@@ -303,27 +302,6 @@
};
},
methods: {
// 多选
getMultipleChoice() {
this.msg.CouponsId = 0;
if (this.msg.CouponsIdList.length > 1) {
if (this.msg.CouponsIdList.at(-1) == 0) {
this.msg.CouponsIdList = [0]
} else if (this.msg.CouponsIdList.at(-1) != 0) {
this.msg.CouponsIdList.forEach((x, index) => {
if (x == 0) {
this.msg.CouponsIdList.splice(index, 1)
}
})
}
this.msg.CouponsId = 0;
this.msg.CouponsIds = this.msg.CouponsIdList.join(',')
}
if (this.msg.CouponsIdList.length == 1) {
this.msg.CouponsId = this.msg.CouponsIdList[0]
this.msg.CouponsIds = ''
}
},
stockColor: function (type) {
if (type === 1) {
return 'hasStock_1'
......@@ -412,43 +390,37 @@
);
},
//获取酒店列表
GetScenicList() {
getSecnicData(keyWords) {
this.ScenicList = [];
var postMsg = {
QCountrys: "",
IsFree: 1,
Name: "",
};
if (keyWords && keyWords != '') {
postMsg.Name = keyWords;
}
if (this.userInfo.RB_Group_id == 2) {
postMsg.QCountrys = "651";
}
console.log("getSecnicData", postMsg);
this.apipost(
"ticketcoupons_post_GetList", postMsg,
res => {
if (res.data.resultCode == 1) {
this.ScenicList = res.data.data;
}
},
err => {}
}
);
},
//下载餐厅统计
DownLoadDinnerSalesBoard() {
if (this.msg.CouponsId <= 0 && !this.msg.CouponsIds) {
this.Info(this.$t('sm.qxzjingdian'));
return;
}
let url = "";
//单门票下载
if (this.msg.CouponsId > 0) {
url = 'ticketcouponsorder_post_DownLoadScenicMonthStatistics'
}
//多门票下载
else {
url = 'ticketcouponsorder_post_DownLoadScenicMonthStatisticsNew'
}
let cmdStr = "";
cmdStr = 'ticketcouponsorder_post_DownLoadScenicMonthStatisticsNew'
this.msg.loading = true;
this.msg.uid = this.userInfo.EmployeeId;
let fileName = "门票下载" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile(url, this.msg, fileName,
this.GetLocalFile(cmdStr, this.msg, fileName,
res => {
this.msg.loading = false;
});
......@@ -463,7 +435,7 @@
this.msg.Year = this.currentYear;
this.msg.Month = this.currentDay;
this.GetScenicList();
this.getSecnicData();
this.initCalendar();
this.GetHoltelInventory();
}
......
src/router/config.js
View file @ c8c51abd
......@@ -4816,7 +4816,14 @@ export default {
title: '团队营收统计'
},
},
{ //财务 报表 团队营收统计
path: '/MemberRebateCost',
name: 'MemberRebateCost',
component: resolve => require(['@/components/FinancialModule/ReportForm/MemberRebateCost'], resolve),
meta: {
title: '会员返利明细'
},
},
{ //财务 报表 年度排名统计
path: '/AnnualRanking',
name: 'AnnualRanking',
......
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