Skip to content

S
SuperMan
Commit 02303c1b authored by 罗超's avatar 罗超
Browse files
Options

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

parents 73830133 3065a5d7
Hide whitespace changes
Inline Side-by-side
Showing with 346 additions and 56 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 02303c1b
......@@ -1735,6 +1735,9 @@ class="w135 _border_b_1">
</el-option>
</el-select>
</div>
<div style="display: flex;flex-grow: 1;" v-if="GetDetail.AuditNumber!=''">
<span style="font-size: 24px;">{{GetDetail.AuditNumber}}</span>
</div>
</div>
</div>
<div v-if="GetDetail.Type === 1" style="display: flex;align-items: center;margin-top:15px;">
......@@ -3757,6 +3760,7 @@ else if (Type==2) {
})
this.AuditOrRefundMsg.FdIdList = idList
}
this.AuditOrRefundMsg.AuditNumber = this.GetDetail.AuditNumber;
this.apipost('Financial_post_AuditOrRefund', this.AuditOrRefundMsg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
......
src/components/FinancialModule/MonthlyCostStatement/vouchernumber.vue 0 → 100644
View file @ 02303c1b
<style scoped>
/deep/.el-table th.el-table__cell {
background-color: #E6E6E6;
}
</style>
<template>
<div class="page_fnDm page_RecPayQuery" @keyup.enter="resetPageIndex()">
<div class="query-box" style="margin-bottom: 0px;">
<el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding:15px 20px 0 0;">
<el-col :span="4">
<el-form-item label="审核人">
<el-select filterable v-model='msg.CreateBy' class="">
<el-option :value="0" :label="$t('system.ph_buxian')"></el-option>
<el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="审核日期">
<el-date-picker class="h34" v-model="missionDate" @change="timeAdd(4)" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<ul class="clearfix">
<li class="hight_query">
<button class="hollowFixedBtn" @click="resetPageIndex()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>
</li>
</ul>
</div>
<div class="_fnDm_content" v-loading='loading'>
<el-table ref="multipleTable" :data="DataList" tooltip-effect="dark" style="width: 100%" row-key="FrID">
<el-table-column :label="$t('fnc.danhao')" width="100">
<template slot-scope="scope">
<span v-if="scope.row.Type==2" style="cursor: pointer;color: #00C6FF;"
@click="openDetails(scope.row.FrID)">{{ scope.row.FrID }}</span>
<span v-else style="cursor: pointer;color: red;"
@click="openDetails(scope.row.FrID)">{{ scope.row.FrID }}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="公司别" width="100">
<template slot-scope="scope">
{{scope.row.RB_BranchName}}
</template>
</el-table-column>
<el-table-column prop="name" label="凭证编号" width="260">
<template slot-scope="scope">
{{scope.row.AuditNum}}
</template>
</el-table-column>
<el-table-column prop="" :label="$t('fnc.feiyongleixing')" show-overflow-tooltip width="140">
<template slot-scope="scope">
<span style="background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;">{{scope.row.CostTypeIdStr}}</span></br>
</template>
</el-table-column>
<el-table-column prop="" :label="$t('fnc.fkduixiang')" show-overflow-tooltip width="320">
<template slot-scope="scope">
<span>{{scope.row.RemitterName}}</span>
</template>
</el-table-column>
<el-table-column prop="" :label="$t('fnc.jiaoyiriqi')" show-overflow-tooltip>
<template slot-scope="scope">
<div>{{scope.row.TradeDate}}</div>
</template>
</el-table-column>
<el-table-column prop="" :label="$t('objFill.originalamount')" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.WBMoney}}/{{scope.row.CurrencyName}}
</template>
</el-table-column>
<el-table-column prop="" label="本位币" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.Money}}
</template>
</el-table-column>
<el-table-column prop="" label="状态" show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.StatusName}}
</template>
</el-table-column>
<el-table-column prop="" :label="$t('fnc.zdrenyuan')" show-overflow-tooltip>
<template slot-scope="scope">
<div>{{scope.row.CreateBy}}</div>
<div>{{scope.row.CreateDate}}</div>
</template>
</el-table-column>
</el-table>
<div style="padding-bottom:15px">
<el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChanges"
layout="total,sizes,prev, pager, next, jumper" :page-sizes="[8,20,50,70,100,200]" :page-size="msg.pageSize"
:current-page.sync="currentPage" :total='total'>
</el-pagination>
</div>
</div>
</div>
</template>
<script>
import Vue from 'vue'
export default {
data() {
return {
msg: {
pageIndex: 1,
pageSize: 8,
CreateBy: '',
QStartDate: '',
QEndDate: '',
EmployeeId: '',
},
DataList: [],
EmployeeList: [],
missionDate: [],
loading: false,
currentPage: 1,
total: 0,
employeeMsg: { // 员工
GroupId: '',
BranchId: -1,
DepartmentId: 0,
PostId: 0,
IsLeave: 0,
},
}
},
created() {
if (this.$route.query.pageIndex) {
this.msg.pageIndex = this.$route.query.pageIndex;
}
let sDate = this.FormartDate(new Date(this.getBeforeDate(1)));
let eDate = this.FormartDate(new Date(this.getBeforeDate(0)));
var now = new Date();
var firstDay = new Date(now.getFullYear(), now.getMonth(), 1)
sDate = this.FormartDate(firstDay);
this.missionDate = [sDate, eDate];
this.msg.QStartDate = sDate;
this.msg.QEndDate = eDate;
},
mounted() {
let userInfo = this.getLocalStorage();
this.msg.EmployeeId = userInfo.EmployeeId;
this.employeeMsg.GroupId = userInfo.RB_Group_id;
this.getPageList();
this.getEmployee();
},
methods: {
// 单据详情
openDetails(FrID) {
let query = {
id: FrID,
blank: "y",
};
this.$router.push({
path: "/FinancialDocumentsDetail",
query
});
},
handleSizeChange(val) {
this.msg.pageSize = val
this.msg.pageIndex = 1;
this.getPageList();
},
handleCurrentChanges(val) {
this.msg.pageIndex = val;
this.getPageList();
},
getPageList() { // 获取列表数据
this.loading = true;
if (!this.msg.CreateBy) this.msg.CreateBy = 0;
this.apipost('Financial_post_GetAccountVoucherNumberPageList', this.msg, res => {
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
if (this.total == 0) {
this.DataList = [];
} else {
this.DataList = res.data.data.pageData;
}
this.loading = false;
} else {
this.loading = false;
this.$message.error(res.data.message);
}
this.currentPage = parseInt(this.msg.pageIndex);
}, err => {})
},
method5: function () {
if (!this.msg.CreateBy) this.msg.CreateBy = 0;
let time = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
var fileName = `凭证编号${time}.xls`;
this.GetLocalFile("Financial_post_GetAccountVoucherNumberListToExcel", this.msg, fileName);
},
timeAdd(t) { // 日期格式
if (t == 1) { //制单日期
if (!this.productionDate) {
this.msg.sDate = '';
this.msg.eDate = '';
return
}
this.msg.sDate = this.productionDate[0];
this.msg.eDate = this.productionDate[1];
}
if (t == 4) { //交易日期
if (!this.missionDate) {
this.msg.QStartDate = '';
this.msg.QEndDate = '';
return
}
this.msg.QStartDate = this.missionDate[0];
this.msg.QEndDate = this.missionDate[1];
}
},
queryInfoInit() { // 初始化msg
let msg = {
pageIndex: this.msg.pageIndex,
pageSize: 6,
CreateBy: this.msg.FrID,
QStartDate: this.msg.QStartDate,
QEndDate: this.msg.QEndDate,
}
this.msg = msg;
},
handleCurrentChange(val) { //翻页
this.msg.pageIndex = val;
this.getPageList();
},
resetPageIndex() { // 重置页码
this.msg.pageIndex = 1;
this.currentPage = 1;
this.getPageList()
},
getEmployee() { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
}, err => {})
},
}
}
</script>
src/components/FinancialModule/components/ClientBankAccount.vue
View file @ 02303c1b
......@@ -221,6 +221,13 @@
</div>
</div>
</div>
<div class="OrderReceivablesAccount-center" v-if="GetDetail.AuditNumber!=''">
<div v-if="clientBankAccountData.AccountCreateTime" class="border-b">
</div>
<div>
<span>凭证编号：</span>{{GetDetail.AuditNumber}}
</div>
</div>
<div class="OrderReceivablesAccount-center" v-if="clientBankAccountData.JapanPayMark && clientBankAccountData.JapanPayMark.length>0">
<div v-if="clientBankAccountData.AccountCreateTime" class="border-b">
</div>
......
src/components/Restaurant/restaurantList.vue
View file @ 02303c1b
......@@ -386,9 +386,7 @@
<div class="btnList" style="text-align:center;">
<button v-if="IsEditDmcSource==1" @click="goSubInfo('restaurantInfoManage',item.ID)"
class="hotelBtn">{{$t('pub.updateMsg')}}</button>
<button @click="goUrl('RestaurantPackage',item.ID)" class="hotelBtn">{{$t('restaurant.res_package')}}</button>
<button @click="goSubInfo('restaurantInfoDetail',item.ID)" class="hotelBtn">{{$t('fnc.xiangqing')}}</button>
</div>
</div>
......
src/components/SalesModule/SalesFinancialDetail.vue
View file @ 02303c1b
......@@ -188,7 +188,8 @@
</td>
</tr>
</table>
<p class="sfd_tit clearfix">{{$t('fnc.fukuandan')}} <input type="button" v-if="(item.isOwn ? item.isOwn : item.IsOwn) ===1 && (item.orderState ? item.orderState : item.OrderState) !== '4' && (item.orderState ? item.orderState : item.OrderState) !== '3'" :value="$t('objFill.xingzengfk')" class="normalBtn" @click="addFinancialOrder(2)"></p>
<!-- <p class="sfd_tit clearfix">{{$t('fnc.fukuandan')}} <input type="button" v-if="(item.isOwn ? item.isOwn : item.IsOwn) ===1 && (item.orderState ? item.orderState : item.OrderState) !== '4' && (item.orderState ? item.orderState : item.OrderState) !== '3'" :value="$t('objFill.xingzengfk')" class="normalBtn" @click="addFinancialOrder(2)"></p> -->
<p class="sfd_tit clearfix">{{$t('fnc.fukuandan')}}</p>
<table border="0" cellspacing="1" cellpadding="0" class="teamRevenueExpenditureTable">
<tr>
<th width="100">{{$t('fnc.danhao')}}</th>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 02303c1b
......@@ -951,10 +951,10 @@
item.OldManChargePrice | priceFormat(item.OldManChargePrice)
}}</b>
</td>
<td class="TC_cusTitle">{{ $t("Operation.Op_visaPrice") }}</td>
<!-- <td class="TC_cusTitle">{{ $t("Operation.Op_visaPrice") }}</td>
<td>
<b>{{ item.VisaPrice | priceFormat(item.VisaPrice) }}</b>
</td>
</td> -->
</tr>
<tr>
<td class="TC_cusTitle">
......@@ -965,10 +965,10 @@
item.SingleRoomPrice | priceFormat(item.SingleRoomPrice)
}}</b>
</td>
<td class="TC_cusTitle">{{ $t("Operation.Op_insurance") }}</td>
<!-- <td class="TC_cusTitle">{{ $t("Operation.Op_insurance") }}</td>
<td>
<b>{{ item.SafeMoney | priceFormat(item.SafeMoney) }}</b>
</td>
</td> -->
<td class="TC_cusTitle">{{ $t("Operation.Op_zafei") }}</td>
<td colspan="3">
<b>{{ item.OtherPrice | priceFormat(item.OtherPrice) }}</b>
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 02303c1b
......@@ -596,9 +596,9 @@
<i class="iconfont icon-jiage"></i>{{$t('Operation.Op_PriceInfo')}}
</p>
<p class="travelprice">
{{$t('Operation.Op_tradePrice')}}：￥{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</p>
{{$t('Operation.Op_tradePrice')}}：￥{{item.B2BPrice|priceFormat(item.B2BPrice)}}</p>
<p class="travelprice">
{{$t('Operation.Op_directPrice')}}：￥{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</p>
{{$t('Operation.Op_directPrice')}}：￥{{item.B2CPrice|priceFormat(item.B2CPrice)}}</p>
<p>
<el-popover width="700" trigger="click" popper-class="TC_customerInfo">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
......@@ -606,12 +606,12 @@
<td rowspan="2" style="text-align:center" width="60">
<i>{{$t('Operation.Op_standard')}}</i>
</td>
<td class="TC_cusTitle">{{$t('Operation.Op_fellowMember')}}</td>
<td><b>{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</b></td>
<!-- <td class="TC_cusTitle">{{$t('Operation.Op_fellowMember')}}</td>
<td><b>{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</b></td> -->
<td class="TC_cusTitle">{{$t('Operation.Op_fellow')}}</td>
<td><b>{{item.B2BPrice|priceFormat(item.B2BPrice)}}</b></td>
<td class="TC_cusTitle">{{$t('Operation.Op_directMember')}}</td>
<td><b>{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</b></td>
<!-- <td class="TC_cusTitle">{{$t('Operation.Op_directMember')}}</td>
<td><b>{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</b></td> -->
<td class="TC_cusTitle">{{$t('Operation.Op_direct')}}</td>
<td><b>{{item.B2CPrice|priceFormat(item.B2CPrice)}}</b></td>
</tr>
......@@ -633,14 +633,14 @@
<td><b>{{item.BabyChargePrice|priceFormat(item.BabyChargePrice)}}</b></td>
<td class="TC_cusTitle">{{$t('Operation.Op_oldmanSurcharge')}}</td>
<td><b>{{item.OldManChargePrice|priceFormat(item.OldManChargePrice)}}</b></td>
<td class="TC_cusTitle">{{$t('Operation.Op_visaPrice')}}</td>
<td><b>{{item.VisaPrice|priceFormat(item.VisaPrice)}}</b></td>
<!-- <td class="TC_cusTitle">{{$t('Operation.Op_visaPrice')}}</td>
<td><b>{{item.VisaPrice|priceFormat(item.VisaPrice)}}</b></td> -->
</tr>
<tr>
<td class="TC_cusTitle">{{$t('Operation.Op_singleRoomcha')}}</td>
<td><b>{{item.SingleRoomPrice|priceFormat(item.SingleRoomPrice)}}</b></td>
<td class="TC_cusTitle">{{$t('Operation.Op_insurance')}}</td>
<td><b>{{item.SafeMoney|priceFormat(item.SafeMoney)}}</b></td>
<!-- <td class="TC_cusTitle">{{$t('Operation.Op_insurance')}}</td>
<td><b>{{item.SafeMoney|priceFormat(item.SafeMoney)}}</b></td> -->
<td class="TC_cusTitle">{{$t('Operation.Op_zafei')}}</td>
<td colspan="3"><b>{{item.OtherPrice|priceFormat(item.OtherPrice)}}</b></td>
</tr>
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 02303c1b
......@@ -550,28 +550,28 @@
<i class="iconfont icon-jiage"></i>{{$t('Operation.Op_PriceInfo')}}
</p>
<p class="travelprice">
{{$t('Operation.Op_tradePrice')}}：￥{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</p>
{{$t('Operation.Op_tradePrice')}}：￥{{item.B2BPrice|priceFormat(item.B2BPrice)}}</p>
<p class="travelprice">
{{$t('Operation.Op_directPrice')}}：￥{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</p>
{{$t('Operation.Op_directPrice')}}：￥{{item.B2CPrice|priceFormat(item.B2CPrice)}}</p>
<p>
<el-popover width="700" trigger="click" popper-class="TC_customerInfo">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td rowspan="3" style="text-align:center" width="60">
<!-- <td rowspan="3" style="text-align:center" width="60">
<i>{{$t('Operation.Op_standard')}}</i>
</td>
<td class="TC_cusTitle">{{$t('Operation.Op_fellowMember')}}</td>
<td>
<b>{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</b>
</td>
</td> -->
<td class="TC_cusTitle">{{$t('Operation.Op_fellow')}}</td>
<td>
<b>{{item.B2BPrice|priceFormat(item.B2BPrice)}}</b>
</td>
<td class="TC_cusTitle">{{$t('Operation.Op_directMember')}}</td>
<!-- <td class="TC_cusTitle">{{$t('Operation.Op_directMember')}}</td>
<td>
<b>{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</b>
</td>
</td> -->
<td class="TC_cusTitle">{{$t('Operation.Op_direct')}}</td>
<td>
<b>{{item.B2CPrice|priceFormat(item.B2CPrice)}}</b>
......@@ -607,20 +607,20 @@
<td>
<b>{{item.OldManChargePrice|priceFormat(item.OldManChargePrice)}}</b>
</td>
<td class="TC_cusTitle">{{$t('Operation.Op_visaPrice')}}</td>
<!-- <td class="TC_cusTitle">{{$t('Operation.Op_visaPrice')}}</td>
<td>
<b>{{item.VisaPrice|priceFormat(item.VisaPrice)}}</b>
</td>
</td> -->
</tr>
<tr>
<td class="TC_cusTitle">{{$t('Operation.Op_singleRoomcha')}}</td>
<td>
<b>{{item.SingleRoomPrice|priceFormat(item.SingleRoomPrice)}}</b>
</td>
<td class="TC_cusTitle">{{$t('Operation.Op_insurance')}}</td>
<!-- <td class="TC_cusTitle">{{$t('Operation.Op_insurance')}}</td>
<td>
<b>{{item.SafeMoney|priceFormat(item.SafeMoney)}}</b>
</td>
</td> -->
<td class="TC_cusTitle">{{$t('Operation.Op_zafei')}}</td>
<td colspan="3">
<b>{{item.OtherPrice|priceFormat(item.OtherPrice)}}</b>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 02303c1b
......@@ -561,24 +561,28 @@
<template slot="prepend">{{$t('Operation.Op_oldmanSurcharge')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含签证
<el-form-item prop="VisaPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.VisaPrice"
@keyup.native="checkPrice(priceData,'VisaPrice')">
<template slot="prepend">{{$t('Operation.Op_visaPrice')}}</template>
</el-input>
</el-form-item>
-->
<el-form-item prop="SingleRoomPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.SingleRoomPrice" @keyup.native="checkPrice(priceData,'SingleRoomPrice')">
<template slot="prepend">{{$t('Operation.Op_singleRoomcha')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含保险
<el-form-item prop="SafeMoney">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.SafeMoney"
@keyup.native="checkInteger(priceData,'SafeMoney')">
<template slot="prepend">{{$t('Operation.Op_insurance')}}</template>
</el-input>
</el-form-item>
-->
<el-form-item prop="OtherPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.OtherPrice"
@keyup.native="checkPrice(priceData,'OtherPrice')">
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ 02303c1b
......@@ -554,24 +554,28 @@
<template slot="prepend">{{$t('Operation.Op_oldmanSurcharge')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含签证
<el-form-item prop="VisaPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.VisaPrice"
@keyup.native="checkPrice(priceData,'VisaPrice')">
<template slot="prepend">{{$t('Operation.Op_visaPrice')}}</template>
</el-input>
</el-form-item>
-->
<el-form-item prop="SingleRoomPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.SingleRoomPrice" @keyup.native="checkPrice(priceData,'SingleRoomPrice')">
<template slot="prepend">{{$t('Operation.Op_singleRoomcha')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含保险
<el-form-item prop="SafeMoney">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.SafeMoney"
@keyup.native="checkInteger(priceData,'SafeMoney')">
<template slot="prepend">{{$t('Operation.Op_insurance')}}</template>
</el-input>
</el-form-item>
-->
<el-form-item prop="OtherPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.OtherPrice"
@keyup.native="checkPrice(priceData,'OtherPrice')">
......@@ -608,6 +612,7 @@
<template slot="prepend">{{$t('Operation.Op_childNobed')}}</template>
</el-input>
</el-form-item>
<el-form-item prop="BackVisaPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.BackVisaPrice" @keyup.native="checkInteger(priceData,'BackVisaPrice')">
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ 02303c1b
......@@ -509,24 +509,28 @@
<template slot="prepend">{{$t('Operation.Op_oldmanSurcharge')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含签证
<el-form-item prop="VisaPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.VisaPrice"
@keyup.native="checkPrice(priceData,'VisaPrice')">
<template slot="prepend">{{$t('Operation.Op_visaPrice')}}</template>
</el-input>
</el-form-item>
-->
<el-form-item prop="SingleRoomPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.SingleRoomPrice" @keyup.native="checkPrice(priceData,'SingleRoomPrice')">
<template slot="prepend">{{$t('Operation.Op_singleRoomcha')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含保险
<el-form-item prop="SafeMoney">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.SafeMoney"
@keyup.native="checkInteger(priceData,'SafeMoney')">
<template slot="prepend">{{$t('Operation.Op_insurance')}}</template>
</el-input>
</el-form-item>
-->
<el-form-item prop="OtherPrice">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.OtherPrice"
@keyup.native="checkPrice(priceData,'OtherPrice')">
......@@ -614,7 +618,8 @@
'otherPlat':standardCurrencyName=='',}">{{standardCurrencyName}}{{$t('objFill.jiesuan')}}</span>
</el-form-item>
<el-form-item prop="OutGroupType" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.zhutuanlx')}}</span>
<span class="TP_Sendprepend"
style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.zhutuanlx')}}</span>
<el-select class="w180" v-model="priceData.OutGroupType">
<el-option v-for="item in OutGroupTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
......@@ -761,7 +766,8 @@
</el-select>
</el-form-item>
<el-form-item style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}</span>
<span class="TP_Sendprepend"
style="margin:3px -1px 0 0">{{$t('objFill.v101.myOrdersAllType.baojiaddz')}}</span>
<el-upload class="upload-demo" style="display:inline-block;position:relative;top:-1px;left:3px;"
:http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<el-button size="small" type="primary">{{$t('objFill.shangchuan')}}</el-button>
......@@ -1652,7 +1658,8 @@
parseInt(this.priceData.FSeat);
if (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum) < Number(fitem.BindNum)) {
fitem.BindNum = 0;
this.Error(this.$t('objFill.v101.myOrdersAllType.zuiduoznbd') + (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum)) + this.$t('objFill.v101.myOrdersAllType.gejiwei'));
this.Error(this.$t('objFill.v101.myOrdersAllType.zuiduoznbd') + (Number(fitem.TicketNum) - Number(fitem
.OtherTeamUseNum)) + this.$t('objFill.v101.myOrdersAllType.gejiwei'));
}
this.selectFilghtList.forEach((x, index) => {
if (x.IsSelected) {
......@@ -1746,7 +1753,7 @@
if (type == 2) {
that.btnTongBu = that.$t('objFill.v101.myOrdersAllType.tongbujd');
} else {
that.btnText = that.$t('pub.saveBtn')+'...';
that.btnText = that.$t('pub.saveBtn') + '...';
}
});
},
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue
View file @ 02303c1b
......@@ -505,13 +505,14 @@
<template slot="prepend">{{$t('Operation.Op_singleRoomcha')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含签证
<el-form-item prop="VisaPrice" style="display:none">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.VisaPrice"
@keyup.native="checkPrice(priceData,'VisaPrice')">
<template slot="prepend">{{$t('Operation.Op_visaPrice')}}</template>
</el-input>
</el-form-item>
-->
</div>
</div>
<div class="clearfix">
......@@ -539,12 +540,14 @@
<template slot="prepend">{{$t('Operation.Op_oldmanSurcharge')}}</template>
</el-input>
</el-form-item>
<!-- 团费包含保险
<el-form-item prop="SafeMoney" :class="{'showOther':TeamType==3}">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.SafeMoney"
@keyup.native="checkInteger(priceData,'SafeMoney')">
<template slot="prepend">{{$t('Operation.Op_visaPrice')}}</template>
</el-input>
</el-form-item>
-->
<el-form-item prop="OtherPrice" :class="{'showOther':TeamType==3}">
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" v-model="priceData.OtherPrice"
@keyup.native="checkPrice(priceData,'OtherPrice')">
......
src/components/orderCommon/productOrderList.vue
View file @ 02303c1b
......@@ -623,10 +623,10 @@
</p>
<p style="color:#47bf8c;font-size:16px;font-weight:bold;margin: 5px 0;">
{{ $t("Operation.Op_tradePrice") }}:￥{{
item.B2BMemberPrice | priceFormat(item.B2BMemberPrice)
item.B2BPrice | priceFormat(item.B2BPrice)
}}<br />
{{ $t("Operation.Op_directPrice") }}:￥{{
item.B2CMemberPrice | priceFormat(item.B2CMemberPrice)
item.B2CPrice | priceFormat(item.B2CPrice)
}}
</p>
<p>
......@@ -639,52 +639,53 @@
</tr>
<tr>
<th v-if="pagesTitle=='跟团游产品'||pagesTitle=='当地游产品'">{{ $t("advmanager.v_type") }}</th>
<th>{{ $t("salesModule.HYTHJ") }}</th>
<th>{{ $t("salesModule.PTTHJ") }}</th>
<th>{{ $t("salesModule.ZKHYJ") }}</th>
<th colspan="2">{{ $t("salesModule.PTZKJ") }}</th>
<th>{{ $t("Operation.Op_tradePrice") }}</th>
<th colspan="5">{{ $t("Operation.Op_directPrice") }}</th>
<!-- <th>{{ $t("salesModule.ZKHYJ") }}</th> -->
<!-- <th colspan="2">{{ $t("salesModule.PTZKJ") }}</th> -->
</tr>
<tr>
<td v-if="pagesTitle=='跟团游产品'||pagesTitle=='当地游产品'">{{ $t("salesModule.Adult") }}</td>
<!--
<td>
{{
item.B2BMemberPrice | priceFormat(item.B2BMemberPrice)
}}
</td>
</td> -->
<td>{{ item.B2BPrice | priceFormat(item.B2BPrice) }}</td>
<td>
<!-- <td>
{{
item.B2CMemberPrice | priceFormat(item.B2CMemberPrice)
}}
</td>
<td colspan="2">{{ item.B2CPrice | priceFormat(item.B2CPrice) }}</td>
</td> -->
<td colspan="5">{{ item.B2CPrice | priceFormat(item.B2CPrice) }}</td>
</tr>
<template v-if="pagesTitle=='跟团游产品'||pagesTitle=='当地游产品'">
<tr>
<td>{{ $t("salesModule.ChildBed") }}</td>
<td>
<!-- <td>
{{
(item.B2BMemberPrice + item.ChildNeedPrice)
| priceFormat(
item.B2BMemberPrice + item.ChildNeedPrice
)
}}
</td>
</td> -->
<td>
{{
(item.B2BPrice + item.ChildNeedPrice)
| priceFormat(item.B2BPrice + item.ChildNeedPrice)
}}
</td>
<td>
<!-- <td>
{{
(item.B2CMemberPrice + item.ChildNeedPrice)
| priceFormat(
item.B2CMemberPrice + item.ChildNeedPrice
)
}}
</td>
<td colspan="2">
</td> -->
<td colspan="5">
{{
(item.B2CPrice + item.ChildNeedPrice)
| priceFormat(item.B2CPrice + item.ChildNeedPrice)
......@@ -693,29 +694,29 @@
</tr>
<tr>
<td>{{ $t("salesModule.ChildNoBed") }}</td>
<td>
<!-- <td>
{{
(item.B2BMemberPrice - item.ChildNoNeedPrice)
| priceFormat(
item.B2BMemberPrice - item.ChildNoNeedPrice
)
}}
</td>
<td>
</td> -->
<td >
{{
(item.B2BPrice - item.ChildNoNeedPrice)
| priceFormat(item.B2BPrice - item.ChildNoNeedPrice)
}}
</td>
<td>
<!-- <td>
{{
(item.B2CMemberPrice - item.ChildNoNeedPrice)
| priceFormat(
item.B2CMemberPrice - item.ChildNoNeedPrice
)
}}
</td>
<td colspan="2">
</td> -->
<td colspan="5">
{{
(item.B2CPrice - item.ChildNoNeedPrice)
| priceFormat(item.B2CPrice - item.ChildNoNeedPrice)
......@@ -752,7 +753,7 @@
<tr>
<th>{{ $t("Operation.Op_oldmanSurcharge") }}</th>
<th>{{ $t("Operation.Op_childSurcharge") }}</th>
<th>{{ $t("salesModule.VisaBack") }}</th>
<th>{{ $t("Operation.Op_visafeeBack") }}</th>
<th>{{ $t("Operation.Op_singleRoomcha") }}</th>
<th>{{ $t("Operation.Op_zafei") }}</th>
<th>{{$t('fnc.xiaofei')}}</th>
......@@ -771,9 +772,10 @@
}}
</td>
<td>
{{ item.VisaPrice | priceFormat(item.VisaPrice) }}（-{{
<!-- {{ item.VisaPrice | priceFormat(item.VisaPrice) }} -->
-{{
item.BackVisaPrice | priceFormat(item.BackVisaPrice)
}}）
}}
</td>
<td>
{{
......
src/router/config.js
View file @ 02303c1b
......@@ -4306,6 +4306,14 @@ export default {
title: '月结汇差查询'
},
},
{ //财务 会计凭证编号
path: '/VoucherNumber',
name: 'VoucherNumber',
component: resolve => require(['@/components/FinancialModule/MonthlyCostStatement/vouchernumber'], resolve),
meta: {
title: '凭证编号查询'
},
},
{ //财务 财务单据 帮收帮付公司
path: '/HelpBranch',
name: 'HelpBranch',
......
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