Skip to content

S
SuperMan
Commit e0f4c8c0 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents d3de418a 69622936
Expand all Show whitespace changes
Inline Side-by-side
Showing with 735 additions and 449 deletions
src/components/Hotel/HotelQueryList.vue
View file @ e0f4c8c0
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span> <span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span>
</div> </div>
<template v-if="isShow"> <template v-if="isShow">
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' height="500"> <el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' :height="tableHeight">
<el-table-column fixed label="酒店名称" min-width="180"> <el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.HotelId)"> <div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.HotelId)">
...@@ -265,6 +265,7 @@ ...@@ -265,6 +265,7 @@
//供应商 //供应商
Supplier: 0, Supplier: 0,
}, },
tableHeight: 0,
beforeCheck: { beforeCheck: {
disabledDate: time => { disabledDate: time => {
if (this.msg.StartDate) { if (this.msg.StartDate) {
...@@ -376,6 +377,16 @@ ...@@ -376,6 +377,16 @@
}); });
} }
}, },
com_onresize() {
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定，
var contentsHeight = document.body.clientHeight;
var h = contentsHeight - 50 - 180 - 50;
if (h < 110) {
return;
}
//设置table的行高
this.tableHeight = h;
},
getList() { getList() {
this.loading = true; this.loading = true;
if (this.msg.StartDate == null) { if (this.msg.StartDate == null) {
...@@ -592,7 +603,11 @@ ...@@ -592,7 +603,11 @@
this.GetHotelList(); this.GetHotelList();
this.getList(); this.getList();
this.GetHotelTipList(); this.GetHotelTipList();
}, this.com_onresize();
window.onresize = () => {
this.com_onresize();
}
}
}; };
</script> </script>
......
src/components/Hotel/roomReservationsDetails.vue
View file @ e0f4c8c0
...@@ -351,6 +351,7 @@ ...@@ -351,6 +351,7 @@
<el-option label='预付' :value='4'></el-option> <el-option label='预付' :value='4'></el-option>
<el-option label='预付款抵扣' :value='5'></el-option> <el-option label='预付款抵扣' :value='5'></el-option>
<el-option label='领队导游垫付' :value='10'></el-option> <el-option label='领队导游垫付' :value='10'></el-option>
<el-option label='刷卡' :value='11'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -371,6 +372,7 @@ ...@@ -371,6 +372,7 @@
<el-option label='预付款抵扣' :value='5'></el-option> <el-option label='预付款抵扣' :value='5'></el-option>
<el-option label='公司合团支付' :value='6'></el-option> <el-option label='公司合团支付' :value='6'></el-option>
<el-option label='领队导游垫付' :value='10'></el-option> <el-option label='领队导游垫付' :value='10'></el-option>
<el-option label='刷卡' :value='11'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -729,6 +731,11 @@ ...@@ -729,6 +731,11 @@
Name: subItem.NewHotelName, Name: subItem.NewHotelName,
ID: subItem.NewHotelId ID: subItem.NewHotelId
}); });
//默认成日元
if(subItem.CurrencyId==0)
{
subItem.CurrencyId=3;
}
this.calculationPrice(subItem); this.calculationPrice(subItem);
subItem.OrderDetailsList.forEach((x, index1) => { subItem.OrderDetailsList.forEach((x, index1) => {
x.HouseTypeCount = x.HouseTypeCount.toString(); x.HouseTypeCount = x.HouseTypeCount.toString();
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ e0f4c8c0
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
</td> </td>
<td style="white-space:nowrap; "> <td style="white-space:nowrap; ">
<span v-if="childItem.HouseType != 5"> <span v-if="childItem.HouseType != 5">
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}} {{subItem.PayStyle === 1||subItem.PayStyle === 11 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
</span> </span>
<span v-else> <span v-else>
{{subItem.PayStyle === 1 && subItem.DMCPayType == 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}} {{subItem.PayStyle === 1 && subItem.DMCPayType == 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
...@@ -302,6 +302,8 @@ ...@@ -302,6 +302,8 @@
<span v-else-if="subItem.PayStyle === 4">预付</span> <span v-else-if="subItem.PayStyle === 4">预付</span>
<span v-else-if="subItem.PayStyle === 5">预付款抵扣</span> <span v-else-if="subItem.PayStyle === 5">预付款抵扣</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span> <span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else-if="subItem.PayStyle === 9">月结</span>
<span v-else-if="subItem.PayStyle === 11">刷卡</span>
<span v-else></span> <span v-else></span>
</br> </br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span> <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
...@@ -317,6 +319,7 @@ ...@@ -317,6 +319,7 @@
<span v-else-if="subItem.DMCPayType === 5">预付款抵扣</span> <span v-else-if="subItem.DMCPayType === 5">预付款抵扣</span>
<span v-else-if="subItem.DMCPayType === 6">公司合团支付</span> <span v-else-if="subItem.DMCPayType === 6">公司合团支付</span>
<span v-else-if="subItem.DMCPayType === 9">月结</span> <span v-else-if="subItem.DMCPayType === 9">月结</span>
<span v-else-if="subItem.DMCPayType === 11">刷卡</span>
</br> </br>
<span v-show="subItem.DMCPayType==6">付款团号：{{subItem.PayTypeTCNUM}}</span> <span v-show="subItem.DMCPayType==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td> </td>
...@@ -351,7 +354,6 @@ ...@@ -351,7 +354,6 @@
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1"> <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span> {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
</span> </span>
<!-- {{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}} -->
</td> </td>
</tr> </tr>
</table> </table>
...@@ -400,7 +402,7 @@ ...@@ -400,7 +402,7 @@
</p> </p>
</td> </td>
<td> <td>
{{subItem.PayStyle === 1 ? moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}} {{subItem.PayStyle === 1||subItem.PayStyle === 11 ? moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
</td> </td>
<td> <td>
{{childItem.DiscountPrice}}% {{childItem.DiscountPrice}}%
...@@ -413,6 +415,7 @@ ...@@ -413,6 +415,7 @@
<span v-else-if="subItem.PayStyle === 2">公司结算</span> <span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 3">预付</span> <span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span> <span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else-if="subItem.PayStyle === 11">刷卡</span>
<span v-else></span> <span v-else></span>
</br> </br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span> <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
...@@ -432,7 +435,6 @@ ...@@ -432,7 +435,6 @@
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==2"> <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==2">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span> {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
</span> </span>
<!-- {{moneyFormat(TotalNav.reimburseTotalPrice.IncomeTotalPrice)}} -->
</td> </td>
</tr> </tr>
</table> </table>
...@@ -508,7 +510,6 @@ ...@@ -508,7 +510,6 @@
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==3"> <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==3">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span> {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
</span> </span>
<!-- {{moneyFormat(TotalNav.reimburseTotalPrice.OtherTotalPrice)}} -->
</td> </td>
</tr> </tr>
</table> </table>
...@@ -561,7 +562,7 @@ ...@@ -561,7 +562,7 @@
<span v-if="cur.CurrencyId>0"> ({{currencyTypeObj[cur.CurrencyId]}}) </span> <span v-if="cur.CurrencyId>0"> ({{currencyTypeObj[cur.CurrencyId]}}) </span>
</br></span> </br></span>
</td> </td>
<td style="padding: 5px 20px;" > <td style="padding: 5px 20px;">
<div style="margin:10px 0" v-for="cur in CurrencyListMoney"> <div style="margin:10px 0" v-for="cur in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS"> <template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
<p style="padding-left:20px;display:inline-block"> <p style="padding-left:20px;display:inline-block">
...@@ -578,11 +579,14 @@ ...@@ -578,11 +579,14 @@
</td> </td>
<td> <td>
<p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration" <p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration"
@click="goFncUrl('FinancialDocumentsDetail', subItem.FinanceId)" :style="{'color': subItem.Status == 3 ? 'red' : ''}"> @click="goFncUrl('FinancialDocumentsDetail', subItem.FinanceId)"
:style="{'color': subItem.Status == 3 ? 'red' : ''}">
{{subItem.FinanceId}}({{subItem.Status == 3 ? '驳回' : subItem.Status == 2 ? '通过' : '审核中'}})</span>&nbsp;&nbsp; {{subItem.FinanceId}}({{subItem.Status == 3 ? '驳回' : subItem.Status == 2 ? '通过' : '审核中'}})</span>&nbsp;&nbsp;
<span v-if="subItem.Status == 3" class="cursorpointer text-decoration" @click="goFncEditUrl('addFinancialDocuments', subItem.CurrencyId, subItem.FinanceId)" style="color: red;">重新发起</span>&nbsp;&nbsp;<span <span v-if="subItem.Status == 3" class="cursorpointer text-decoration"
class="cursorpointer text-decoration" @click="goFncUrl('Application', subItem.FinanceId)" @click="goFncEditUrl('addFinancialDocuments', subItem.CurrencyId, subItem.FinanceId)"
v-if="subItem.IsPublic === 4">申请书</span> &nbsp;&nbsp;<span class="cursorpointer text-decoration" style="color: red;">重新发起</span>&nbsp;&nbsp;<span class="cursorpointer text-decoration"
@click="goFncUrl('Application', subItem.FinanceId)" v-if="subItem.IsPublic === 4">申请书</span>
&nbsp;&nbsp;<span class="cursorpointer text-decoration"
@click="goFncUrl('DebitNote', subItem.FinanceId)">借支单</span></p> @click="goFncUrl('DebitNote', subItem.FinanceId)">借支单</span></p>
</td> </td>
<td width="80" class="_zhidan"> <td width="80" class="_zhidan">
...@@ -606,7 +610,8 @@ ...@@ -606,7 +610,8 @@
</th> </th>
<th :colspan="1" width="200"> <th :colspan="1" width="200">
<div v-for="item in nav" style="margin: 10px 0;"> <div v-for="item in nav" style="margin: 10px 0;">
<input type="button" :value="`${item.TCNUMS} 制单`" class="leader2Btn" @click="ZhuiJiaTuanKuan(item.OutBranchId)"> <input type="button" :value="`${item.TCNUMS} 制单`" class="leader2Btn"
@click="ZhuiJiaTuanKuan(item.OutBranchId)">
</div> </div>
</th> </th>
</tr> </tr>
...@@ -622,7 +627,7 @@ ...@@ -622,7 +627,7 @@
</tr> </tr>
<tr class="_item_list" v-for="(item,index) in zhuijiaList"> <tr class="_item_list" v-for="(item,index) in zhuijiaList">
<td class="Bill_par"> <td class="Bill_par">
<span @click="goFncUrl('FinancialDocumentsDetail', item.FrID)" class="text_d PingFangSC" >{{item.FrID}}</span> <span @click="goFncUrl('FinancialDocumentsDetail', item.FrID)" class="text_d PingFangSC">{{item.FrID}}</span>
</td> </td>
<td>{{item.BranchName}}</td> <td>{{item.BranchName}}</td>
<td><span class="_bg__" :class="item.Type==1 || item.Type==5?'_bg_green':'_bg_red'">{{item.TypeName}}</span> <td><span class="_bg__" :class="item.Type==1 || item.Type==5?'_bg_green':'_bg_red'">{{item.TypeName}}</span>
...@@ -649,10 +654,9 @@ ...@@ -649,10 +654,9 @@
</template> </template>
</td> </td>
<td> <td>
<p>{{item.Type==1 ? $t('fnc.yingshou') : $t('fnc.yingfu') }}：<span class="">{{moneyFormat(item.OriginalMoneyTotal)}}</span> <p>{{item.Type==1 ? $t('fnc.yingshou') : $t('fnc.yingfu') }}：<span
class="">{{moneyFormat(item.OriginalMoneyTotal)}}</span>
</p> </p>
<!-- <p>{{item.Type==1 ? $t('fnc.shishou') : $t('fnc.shifu') }}：<span
class="">{{moneyFormat(item.OriginalMoneyTotal)}}</span></p> -->
</td> </td>
<td> <td>
<template v-if='item.Type===1'> <template v-if='item.Type===1'>
...@@ -682,7 +686,6 @@ ...@@ -682,7 +686,6 @@
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
</div> </div>
</div> </div>
</template> </template>
...@@ -736,9 +739,9 @@ ...@@ -736,9 +739,9 @@
}, },
methods: { methods: {
// 20190815 新增领款单据重新生成自动带上计算后的金额 // 20190815 新增领款单据重新生成自动带上计算后的金额
goFncEditUrl(url, crId, frId){ goFncEditUrl(url, crId, frId) {
let obj = {} let obj = {}
this.CurrencyListMoney.map(x=>{ this.CurrencyListMoney.map(x => {
if (x.CurrencyId == crId) { if (x.CurrencyId == crId) {
obj = x obj = x
} }
...@@ -746,13 +749,13 @@ ...@@ -746,13 +749,13 @@
let price = obj.money * 0.95 let price = obj.money * 0.95
let calcPrice = 0 let calcPrice = 0
if (crId == 1) { //人民币 if (crId == 1) { //人民币
calcPrice = parseInt(price/1000) > 0 ? parseInt(price/1000) * 1000 : parseInt(price) calcPrice = parseInt(price / 1000) > 0 ? parseInt(price / 1000) * 1000 : parseInt(price)
} else { // 其他 } else { // 其他
calcPrice = parseInt(price/10000) > 0 ? parseInt(price/10000) * 10000 : parseInt(price) calcPrice = parseInt(price / 10000) > 0 ? parseInt(price / 10000) * 10000 : parseInt(price)
} }
this.$router.push({ this.$router.push({
name: url, name: url,
query:{ query: {
"FrID": frId, "FrID": frId,
"blank": 'y', "blank": 'y',
"edit": true, "edit": true,
...@@ -834,7 +837,8 @@ ...@@ -834,7 +837,8 @@
Obj: {}, Obj: {},
SourceID: 0, SourceID: 0,
TCIDList: TCIDARR, TCIDList: TCIDARR,
TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$routequery.id, TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this
.$routequery.id,
OtherType: 1 OtherType: 1
} }
this.$router.push({ this.$router.push({
...@@ -1021,7 +1025,7 @@ ...@@ -1021,7 +1025,7 @@
if (obj.TaxType == 2) { if (obj.TaxType == 2) {
coefficient = 1 + 0.08; coefficient = 1 + 0.08;
} }
if (obj.PayStyle === 1) { if (obj.PayStyle === 1 || obj.PayStyle === 11) {
if (index == 4 && obj.DMCPayType !== 1) { if (index == 4 && obj.DMCPayType !== 1) {
totalPrice += 0; totalPrice += 0;
} else { } else {
...@@ -1040,7 +1044,7 @@ ...@@ -1040,7 +1044,7 @@
obj.forEach(x => { obj.forEach(x => {
totalPrice += x.PeoplePrice * (x.PeopleNum - x.Discount) * (1 - x.DiscountPrice / 100) totalPrice += x.PeoplePrice * (x.PeopleNum - x.Discount) * (1 - x.DiscountPrice / 100)
}) })
if (sObj.PayStyle !== 1) { if (!(sObj.PayStyle == 1 || sObj.PayStyle == 11)) {
totalPrice = 0 totalPrice = 0
} }
return this.moneyFormat(totalPrice) return this.moneyFormat(totalPrice)
...@@ -1187,7 +1191,6 @@ ...@@ -1187,7 +1191,6 @@
this.apipost('dmcstatistics_post_GetNewPlanTotalPrice_V2', { this.apipost('dmcstatistics_post_GetNewPlanTotalPrice_V2', {
TCIDs: this.$route.query.id TCIDs: this.$route.query.id
}, res => { }, res => {
// console.log("111",res);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.TotalNav = res.data.data; this.TotalNav = res.data.data;
this.getNav(); this.getNav();
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ e0f4c8c0
...@@ -163,6 +163,7 @@ ...@@ -163,6 +163,7 @@
<el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option> <el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
<el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option> <el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option>
<el-option label='公司合团支付' :value='6'></el-option> <el-option label='公司合团支付' :value='6'></el-option>
<el-option label='刷卡' :value='11'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
......
src/components/SalesModule/groupTourOrder.vue
View file @ e0f4c8c0
...@@ -785,6 +785,9 @@ ...@@ -785,6 +785,9 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="addMsg.GroupType == '3'" label="是否用房" prop="GroupTypeNeedHouse">
<el-switch @change="$forceUpdate()" v-model="addMsg.GroupTypeNeedHouse" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="联系人" prop="ContactName" v-show='addMsg.CustomerType==3||addMsg.CustomerType==4'> <el-form-item label="联系人" prop="ContactName" v-show='addMsg.CustomerType==3||addMsg.CustomerType==4'>
...@@ -922,19 +925,19 @@ ...@@ -922,19 +925,19 @@
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'">
<el-form-item label="单房数量" prop="SingleRoomNum"> <el-form-item label="单房数量" prop="SingleRoomNum">
<el-input v-model='addMsg.SingleRoomNum' @keyup.native="checkInteger(addMsg,'SingleRoomNum')" <el-input v-model='addMsg.SingleRoomNum' @keyup.native="checkInteger(addMsg,'SingleRoomNum')"
@input='yzBigBed2();getTotalPrice()'></el-input> @input='yzBigBed2();getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'">
<el-form-item label="大床房" prop="BigRoomNum"> <el-form-item label="大床房" prop="BigRoomNum">
<el-input v-model='addMsg.BigRoomNum' @keyup.native="checkInteger(addMsg,'BigRoomNum')" <el-input v-model='addMsg.BigRoomNum' @keyup.native="checkInteger(addMsg,'BigRoomNum')"
@input='yzBigBed();getTotalPrice()'></el-input> @input='yzBigBed();getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'">
<el-form-item label="三人房" prop="TripleRoomNum"> <el-form-item label="三人房" prop="TripleRoomNum">
<el-input v-model='addMsg.TripleRoomNum' @keyup.native="checkInteger(addMsg,'TripleRoomNum')" <el-input v-model='addMsg.TripleRoomNum' @keyup.native="checkInteger(addMsg,'TripleRoomNum')"
@input='yzBigBed1();getTotalPrice()'></el-input> @input='yzBigBed1();getTotalPrice()'></el-input>
...@@ -966,7 +969,7 @@ ...@@ -966,7 +969,7 @@
@input='getTotalPrice()'></el-input> @input='getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'">
<el-form-item label="预计用房" prop="PredictRoomNum"> <el-form-item label="预计用房" prop="PredictRoomNum">
<el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input> <el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input>
</el-form-item> </el-form-item>
...@@ -2065,6 +2068,7 @@ ...@@ -2065,6 +2068,7 @@
Unit_PriceList: [], //成交单价下拉数据 Unit_PriceList: [], //成交单价下拉数据
LessMoney: 0, LessMoney: 0,
addMsg: { addMsg: {
GroupTypeNeedHouse: '0',
OrderForm: 1, OrderForm: 1,
OrderId: '0', OrderId: '0',
TCID: '0', TCID: '0',
...@@ -3002,7 +3006,7 @@ ...@@ -3002,7 +3006,7 @@
this.IsChildrenTour = x.IsChildrenTour this.IsChildrenTour = x.IsChildrenTour
this.IsBirdDiscount = x.IsBirdDiscount this.IsBirdDiscount = x.IsBirdDiscount
this.addMsg.Unit_Price = x.Unit_Price this.addMsg.Unit_Price = x.Unit_Price
this.addMsg.GroupTypeNeedHouse = String(x.GroupTypeNeedHouse)
this.stratPrice = res.data.data.modelPrice.GoAddPrice this.stratPrice = res.data.data.modelPrice.GoAddPrice
if(this.addMsg.GroupType == 4){ if(this.addMsg.GroupType == 4){
this.HightUnitPrice = '1' this.HightUnitPrice = '1'
...@@ -4149,9 +4153,10 @@ ...@@ -4149,9 +4153,10 @@
} }
this.addMsg.CustomerId = '0'
this.addMsg.CommissionShareMoney = '0' this.addMsg.CommissionShareMoney = '0'
} }
this.addMsg.GroupTypeNeedHouse = '0'
this.addMsg.CustomerId = '0'
this.Unit_PriceList=[]; this.Unit_PriceList=[];
}, },
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ e0f4c8c0
...@@ -913,6 +913,9 @@ ...@@ -913,6 +913,9 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="addMsg.GroupType == '3'" label="是否用房" prop="GroupTypeNeedHouse">
<el-switch @change="$forceUpdate()" v-model="addMsg.GroupTypeNeedHouse" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="联系人" prop="ContactName" v-show='addMsg.CustomerType==3||addMsg.CustomerType==4'> <el-form-item label="联系人" prop="ContactName" v-show='addMsg.CustomerType==3||addMsg.CustomerType==4'>
...@@ -1188,6 +1191,9 @@ ...@@ -1188,6 +1191,9 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="addMsg.GroupType == '3'" label="是否用房" prop="GroupTypeNeedHouse">
<el-switch @change="$forceUpdate()" v-model="addMsg.GroupTypeNeedHouse" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="联系人" prop="ContactName" v-show='addMsg.CustomerType==3||addMsg.CustomerType==4'> <el-form-item label="联系人" prop="ContactName" v-show='addMsg.CustomerType==3||addMsg.CustomerType==4'>
...@@ -1507,7 +1513,7 @@ ...@@ -1507,7 +1513,7 @@
</tr> </tr>
<tr v-for="item in ScenicRefundList"> <tr v-for="item in ScenicRefundList">
<td> <td>
<el-checkbox :checked="item.IsChecked" @change="getGOScenic(item)"></el-checkbox> <el-checkbox :checked="item.IsChecked" @change="getGOScenic(item),getGOScenictWO(),getTotalPrice()"></el-checkbox>
</td> </td>
<td> <td>
{{item.CouponsName}} {{item.CouponsName}}
...@@ -1516,12 +1522,11 @@ ...@@ -1516,12 +1522,11 @@
{{item.RefundMoney}} {{item.RefundMoney}}
</td> </td>
<td> <td>
<el-input class="w80" @keyup.native="checkInteger(item,'Number'),CheckNum(item)" @change="getGOScenictWO" <el-input class="w80" @keyup.native="checkInteger(item,'Number'),CheckNum(item),getTotalPrice()" @change="getGOScenictWO"
v-model="item.Number"></el-input> v-model="item.Number"></el-input>
</td> </td>
<td> <td>
<el-input class="w80" @keyup.native="checkPrice(item,'BackMoney')" @change="getGOScenictWO" {{item.BackMoney}}
v-model="item.BackMoney"></el-input>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -2805,6 +2810,7 @@ ...@@ -2805,6 +2810,7 @@
Unit_PriceList: [], //成交单价下拉数据 Unit_PriceList: [], //成交单价下拉数据
LessMoney: 0, LessMoney: 0,
addMsg: { addMsg: {
GroupTypeNeedHouse: '0',
OrderForm: '', OrderForm: '',
OrderId: "0", OrderId: "0",
TCID: "0", TCID: "0",
...@@ -3690,6 +3696,8 @@ ...@@ -3690,6 +3696,8 @@
this.Error('不能超过总人数'); this.Error('不能超过总人数');
item.Number=0; item.Number=0;
} }
//默认算好退款金额
item.BackMoney=item.Number*item.RefundMoney;
}, },
platformOrderMethods() { platformOrderMethods() {
if (this.addMsg.PlatformOrder == "") { if (this.addMsg.PlatformOrder == "") {
...@@ -3839,6 +3847,7 @@ ...@@ -3839,6 +3847,7 @@
this.isShowLayer = false; this.isShowLayer = false;
this.isShowLayer2 = true; this.isShowLayer2 = true;
} }
this.addMsg.GroupTypeNeedHouse = String(x.GroupTypeNeedHouse)
this.getKhmdList(this.addMsg.CustomerType, obj.lineId, this.addMsg.CreateBy, x.CustomerId); this.getKhmdList(this.addMsg.CustomerType, obj.lineId, this.addMsg.CreateBy, x.CustomerId);
this.getDdlyList(this.addMsg.CustomerType); this.getDdlyList(this.addMsg.CustomerType);
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this
...@@ -4306,7 +4315,13 @@ ...@@ -4306,7 +4315,13 @@
} else { } else {
this.addMsg.PreferPrice = Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price) + this.OpSetLossMoney; this.addMsg.PreferPrice = Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price) + this.OpSetLossMoney;
} }
if(this.ScenicRefundList.length>0&&this.ScenicRefundList!=null){
this.ScenicRefundList.forEach(x=>{
if(x.IsChecked){
this.addMsg.PreferPrice=this.addMsg.PreferPrice-x.BackMoney;
}
})
}
this.getTicheng(); this.getTicheng();
if (!t) { if (!t) {
this.getTypePrice2() this.getTypePrice2()
...@@ -5120,6 +5135,7 @@ ...@@ -5120,6 +5135,7 @@
this.addMsg.CustomerId = '0' this.addMsg.CustomerId = '0'
this.addMsg.CommissionShareMoney = '0' this.addMsg.CommissionShareMoney = '0'
} }
this.addMsg.GroupTypeNeedHouse = '0'
}, },
getTypePrice2() { getTypePrice2() {
......
src/components/SalesModule/productQuery.vue
View file @ e0f4c8c0
...@@ -181,7 +181,9 @@ ...@@ -181,7 +181,9 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="addMsg.GroupType == '3'" label="是否用房" prop="GroupTypeNeedHouse">
<el-switch v-model="addMsg.GroupTypeNeedHouse" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="联系人" prop="ContactName" v-if='addMsg.CustomerType==3||addMsg.CustomerType==4'> <el-form-item label="联系人" prop="ContactName" v-if='addMsg.CustomerType==3||addMsg.CustomerType==4'>
...@@ -316,17 +318,17 @@ ...@@ -316,17 +318,17 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'">
<el-form-item label="单房数量" prop="SingleRoomNum"> <el-form-item label="单房数量" prop="SingleRoomNum">
<el-input v-model='addMsg.SingleRoomNum' @keyup.native="checkInteger(addMsg,'SingleRoomNum')" @input='yzBigBed2();getTotalPrice();autoRemarks("SingleRoomNum","单房数量")'></el-input> <el-input v-model='addMsg.SingleRoomNum' @keyup.native="checkInteger(addMsg,'SingleRoomNum')" @input='yzBigBed2();getTotalPrice();autoRemarks("SingleRoomNum","单房数量")'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'">
<el-form-item label="大床房" prop="BigRoomNum"> <el-form-item label="大床房" prop="BigRoomNum">
<el-input v-model='addMsg.BigRoomNum' @keyup.native="checkInteger(addMsg,'BigRoomNum')" @input='yzBigBed();getTotalPrice();autoRemarks("BigRoomNum","大床房")'></el-input> <el-input v-model='addMsg.BigRoomNum' @keyup.native="checkInteger(addMsg,'BigRoomNum')" @input='yzBigBed();getTotalPrice();autoRemarks("BigRoomNum","大床房")'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'">
<el-form-item label="三人房" prop="TripleRoomNum"> <el-form-item label="三人房" prop="TripleRoomNum">
<el-input v-model='addMsg.TripleRoomNum' @keyup.native="checkInteger(addMsg,'TripleRoomNum')" @input='yzBigBed1();getTotalPrice();autoRemarks("TripleRoomNum","三人房")'></el-input> <el-input v-model='addMsg.TripleRoomNum' @keyup.native="checkInteger(addMsg,'TripleRoomNum')" @input='yzBigBed1();getTotalPrice();autoRemarks("TripleRoomNum","三人房")'></el-input>
</el-form-item> </el-form-item>
...@@ -349,7 +351,7 @@ ...@@ -349,7 +351,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4" v-if="addMsg.GroupTypeNeedHouse == '0'">
<el-form-item label="预计用房" prop="PredictRoomNum"> <el-form-item label="预计用房" prop="PredictRoomNum">
<el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input> <el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input>
</el-form-item> </el-form-item>
...@@ -955,6 +957,7 @@ ...@@ -955,6 +957,7 @@
Unit_PriceList:[],//成交单价下拉数据 Unit_PriceList:[],//成交单价下拉数据
LessMoney:0, LessMoney:0,
addMsg: { addMsg: {
GroupTypeNeedHouse: '0',
OrderId: '0', OrderId: '0',
OneSex: '0', OneSex: '0',
TCID: '0', TCID: '0',
...@@ -1198,6 +1201,7 @@ ...@@ -1198,6 +1201,7 @@
this.getHouseNo(); this.getHouseNo();
this.getTotalPrice() this.getTotalPrice()
} }
this.addMsg.GroupTypeNeedHouse = '0'
}, },
gettypechange(type){ gettypechange(type){
if(type=!2){ if(type=!2){
......
src/components/Supplier/HotelManagement.vue
View file @ e0f4c8c0
...@@ -224,59 +224,69 @@ ...@@ -224,59 +224,69 @@
<ul style="position:relative;"> <ul style="position:relative;">
<li> <li>
<span class="hotel_name"> <span class="hotel_name">
<em>{{$t('hotel.hotel_name')}}</em> <!-- 酒店名称 -->
<em>ホテル名</em>
<el-input maxlength="50" @keyup.native.enter="resetPageIndex(),selectResource()" v-model="msg.Name"></el-input> <el-input maxlength="50" @keyup.native.enter="resetPageIndex(),selectResource()" v-model="msg.Name"></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('system.quety_area')}}</em> <!-- 区域 -->
<em>面積</em>
<el-select v-model="msg.QCountry" clearable class="w150" filterable @change="getProvinceList(msg.QCountry,1)" <el-select v-model="msg.QCountry" clearable class="w150" filterable @change="getProvinceList(msg.QCountry,1)"
:placeholder="$t('hotel.hotel_country')"> :placeholder="$t('hotel.hotel_country')">
<el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in countryList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
<!-- 省 -->
<el-select v-model="msg.QProvince" class="w150" filterable @change="getProvinceList(msg.QProvince,2)" <el-select v-model="msg.QProvince" class="w150" filterable @change="getProvinceList(msg.QProvince,2)"
:placeholder="$t('hotel.hotel_province')"> placeholder="州">
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
<el-select v-model="msg.QCity" class="w150" filterable @change="getProvinceList(msg.QCity,3)" :placeholder="$t('hotel.hotel_city')"> <!-- 市 -->
<el-select v-model="msg.QCity" class="w150" filterable @change="getProvinceList(msg.QCity,3)" placeholder="市区町村">
<el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
<el-select v-model="msg.QDistrict" class="w150" filterable :placeholder="$t('hotel.hotel_area')"> <!-- 区 -->
<el-select v-model="msg.QDistrict" class="w150" filterable placeholder="地区">
<el-option v-for="item in district" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in district" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('hotel.hotel_status')}}</em> <!-- 状态 -->
<el-select v-model="msg.Status" class="w210" :placeholder="$t('pub.unlimitedSel')"> <em>都道府県</em>
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option> <el-select v-model="msg.Status" class="w210">
<el-option label="無制限" value="-1"></el-option>
<el-option v-for="item in status" :key="item.value" :label="item.label" :value="item.value"></el-option> <el-option v-for="item in status" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>酒店类型</em> <!-- 酒店类型 -->
<el-select v-model="msg.HotelType" class="w210" :placeholder="$t('pub.unlimitedSel')"> <em>ホテルのタイプ</em>
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option> <el-select v-model="msg.HotelType" class="w210">
<el-option label="無制限" value="-1"></el-option>
<el-option v-for="item in HotelTypeList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in HotelTypeList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>价格</em> <!-- 价格 -->
<el-select v-model="msg.HotelPirceType" class="w210" :placeholder="$t('pub.unlimitedSel')"> <em>価格</em>
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option> <el-select v-model="msg.HotelPirceType" class="w210">
<el-option label="無制限" value="-1"></el-option>
<el-option v-for="item in HotelPirceTypeList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in HotelPirceTypeList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li style="position:absolute;top:0;right:10px;"> <li style="position:absolute;top:0;right:10px;">
<button class="hollowFixedBtn" type="button" @click="resetPageIndex(),selectResource()">{{$t('pub.searchBtn')}}</button> <!-- 查询 -->
<button class="normalBtn" type="button" @click="goSubInfo('HotelInfo2')">{{$t('pub.addBtn')}}</button> <button class="hollowFixedBtn" type="button" @click="resetPageIndex(),selectResource()">問い合わせ</button>
<!-- 新增 -->
<button class="normalBtn" type="button" @click="goSubInfo('HotelInfo2')">新しい</button>
</li> </li>
</ul> </ul>
</div> </div>
......
src/components/Supplier/HotelQueryList.vue
View file @ e0f4c8c0
This diff is collapsed.
src/components/Supplier/HotelSalesBoard.vue
View file @ e0f4c8c0
...@@ -216,22 +216,24 @@ ...@@ -216,22 +216,24 @@
<ul style="position:relative;"> <ul style="position:relative;">
<li> <li>
<span> <span>
<em style="min-width:60px;">{{$t('system.quety_area')}}</em> <!-- 区域 -->
<em style="min-width:60px;">面積</em>
<el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)" <el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)"
:placeholder="$t('hotel.hotel_province')"> :placeholder="$t('hotel.hotel_province')">
<el-option :key="0" :value="0" label="请选择"></el-option> <el-option :key="0" :value="0" label="選択してください"></el-option>
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
<el-select v-model="msg.City" filterable :placeholder="$t('hotel.hotel_city')"> <el-select v-model="msg.City" filterable :placeholder="$t('hotel.hotel_city')">
<el-option :key="0" :value="0" label="请选择"></el-option> <el-option :key="0" :value="0" label="選択してください"></el-option>
<el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span><em style="min-width:60px;">{{$t('admin.admin_company')}}</em> <!-- 公司名称 -->
<el-select filterable v-model='msg.OutBranchId' :placeholder="$t('pub.unlimitedSel')"> <span><em style="min-width:60px;">会社名</em>
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option> <el-select filterable v-model='msg.OutBranchId' placeholder="選択してください">
<el-option label="無制限" :value='-1'></el-option>
<el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id"> <el-option v-for='item in companyList' :label='item.BName' :value='item.Id' :key="item.Id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -239,40 +241,49 @@ ...@@ -239,40 +241,49 @@
</li> </li>
<li> <li>
<span> <span>
<em style="min-width:60px;">酒店</em> <!-- 酒店 -->
<el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable> <em style="min-width:60px;">ホテル</em>
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option> <el-select v-model="msg.HotelId" placeholder="選択してください" filterable>
<el-option label="無制限" :value="defaultSelectValue"></el-option>
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li style="display:none;"> <li style="display:none;">
<span> <span>
<em>供应商</em> <em>仕入先</em>
<el-select v-model="msg.Supplier" placeholder="请选择"> <el-select v-model="msg.Supplier" placeholder="選択してください">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option> <el-option label="無制限" :value='0'></el-option>
<el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID"> <el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li style="position:absolute;right:10px;top:0;"> <li style="position:absolute;right:10px;top:0;">
<button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button> <!-- 查询 -->
<input type="button" class="normalBtn" value="下载" @click="DownLoadHotelSalesBoard()" /> <button class="normalBtn" type="button" @click="GetHoltelInventory()">問い合わせ</button>
<!-- 下载 -->
<input type="button" class="normalBtn" value="ダウンロードする" @click="DownLoadHotelSalesBoard()" />
</li> </li>
</ul> </ul>
</div> </div>
<div class="title"> <div class="title">
酒店统计 共 <!-- 酒店统计 共 -->
<span class="Owe_Room">{{TotalInventory}}</span> 间, 当前使用 ホテルの統計 合計
<span class="Owe_Room">{{UseInventory}}</span> 间,占比 <span class="Owe_Room">{{TotalInventory}}</span> 部屋, 現在の使用 <!-- 间, 当前使用 -->
<span class="Owe_Room">{{UseInventory}}</span> 部屋,割合 <!-- 间,占比-->
<span class="Owe_Room">{{((UseInventory/TotalInventory)*100).toFixed(2)}}</span> %. <span class="Owe_Room">{{((UseInventory/TotalInventory)*100).toFixed(2)}}</span> %.
&nbsp;&nbsp; &nbsp;&nbsp;
<span class="hasStock_1" style="padding:2px 4px;border-radius:5px">红日</span> <!-- 红日 -->
<span class="hasStock_2" style="padding:2px 4px;border-radius:5px">旺季</span> <span class="hasStock_1" style="padding:2px 4px;border-radius:5px">赤い日</span>
<span class="hasStock_3" style="padding:2px 4px;border-radius:5px">平季</span> <!-- 旺季 -->
<span class="hasStock_4" style="padding:2px 4px;border-radius:5px">淡季</span> <span class="hasStock_2" style="padding:2px 4px;border-radius:5px">ハイシーズン</span>
<span class="hasStock_5" style="padding:2px 4px;border-radius:5px">特别价</span> <!-- 平季 -->
<span class="hasStock_3" style="padding:2px 4px;border-radius:5px">フラットシーズン</span>
<!-- 淡季 -->
<span class="hasStock_4" style="padding:2px 4px;border-radius:5px">ローシーズン</span>
<!-- 特别价 -->
<span class="hasStock_5" style="padding:2px 4px;border-radius:5px">特別価格</span>
</div> </div>
<div class="month"> <div class="month">
<ul> <ul>
......
src/components/Supplier/HotelTotalStock.vue
View file @ e0f4c8c0
...@@ -335,21 +335,21 @@ ...@@ -335,21 +335,21 @@
<ul style="position:relative"> <ul style="position:relative">
<li> <li>
<span> <span>
<em style="min-width:60px;">{{$t('system.quety_area')}}</em> <em style="min-width:60px;">面積</em>
<el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)" <el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)"
:placeholder="$t('hotel.hotel_province')"> :placeholder="$t('hotel.hotel_province')">
<el-option :key="0" :value="0" label="请选择"></el-option> <el-option :key="0" :value="0" label="選択してください"></el-option>
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
<el-select v-model="msg.City" filterable :placeholder="$t('hotel.hotel_city')"> <el-select v-model="msg.City" filterable :placeholder="$t('hotel.hotel_city')">
<el-option :key="0" :value="0" label="请选择"></el-option> <el-option :key="0" :value="0" label="選択してください"></el-option>
<el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em style="min-width:60px;">酒店</em> <em style="min-width:60px;">ホテル</em>
<el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable> <el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
...@@ -358,8 +358,8 @@ ...@@ -358,8 +358,8 @@
</li> </li>
<li style="display:none;"> <li style="display:none;">
<span> <span>
<em style="min-width:60px;">供应商</em> <em style="min-width:60px;">仕入先</em>
<el-select v-model="msg.Supplier" placeholder="请选择"> <el-select v-model="msg.Supplier" placeholder="選択してください">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID"> <el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID">
</el-option> </el-option>
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
<li class='time'> <li class='time'>
<div class="block date"> <div class="block date">
<label class="demonstration">{{$t('pub.date')}}</label> <label class="demonstration">日付</label>
<el-date-picker v-model="msg.sDate" type="date" :placeholder="$t('admin.admin_choDate')" <el-date-picker v-model="msg.sDate" type="date" :placeholder="$t('admin.admin_choDate')"
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"> value-format="yyyy-MM-dd" :picker-options="pickerOptions1">
</el-date-picker> </el-date-picker>
...@@ -379,13 +379,13 @@ ...@@ -379,13 +379,13 @@
</div> </div>
</li> </li>
<li style="position:absolute;right:10px;top:0;"> <li style="position:absolute;right:10px;top:0;">
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" /> <input type="button" class="hollowFixedBtn" value="問い合わせ" @click="getList()" />
</li> </li>
</ul> </ul>
</div> </div>
<div class="hotelTS_box"> <div class="hotelTS_box">
<div class="noData" v-show="noData"> <div class="noData" v-show="noData">
{{$t('system.content_noData')}} データなし
</div> </div>
<ul class='clearfix' v-loading="loading"> <ul class='clearfix' v-loading="loading">
<li v-for="(item,index) in DataList"> <li v-for="(item,index) in DataList">
...@@ -395,7 +395,7 @@ ...@@ -395,7 +395,7 @@
<el-tooltip effect="dark" :content="item.Name" placement="top-start"> <el-tooltip effect="dark" :content="item.Name" placement="top-start">
<p>{{item.Name}}</p> <p>{{item.Name}}</p>
</el-tooltip> </el-tooltip>
<p><span class="HT_nowInventory">目前库存</span><span class='Remain_num'>{{item.RemainingInventory}}</span>/间 <p><span class="HT_nowInventory">現在の在庫</span><span class='Remain_num'>{{item.RemainingInventory}}</span>/部屋
</p> </p>
</div> </div>
</li> </li>
......
src/components/Supplier/roomQuery.vue
View file @ e0f4c8c0
This diff is collapsed.
src/components/Supplier/roomQuery2.vue
View file @ e0f4c8c0
...@@ -4,35 +4,49 @@ ...@@ -4,35 +4,49 @@
<ul style="position:relative;"> <ul style="position:relative;">
<li> <li>
<span> <span>
<em>月份</em> <!-- 月份 -->
<el-date-picker v-model="msg.QMonthStr" type="month" value-format="yyyy-MM" placeholder="选择月"> <em>月</em>
<el-date-picker v-model="msg.QMonthStr" type="month" value-format="yyyy-MM" placeholder="選択月">
</el-date-picker> </el-date-picker>
</span> </span>
</li> </li>
<li style="position:absolute;right:10px;top:0;"> <li style="position:absolute;right:10px;top:0;">
<input type="button" class="normalBtn" value="查询" @click="getList()" /> <!-- 查询 -->
<input type="button" class="normalBtn" value="下载" style="display:none;" @click="DownLoadHotel()" /> <input type="button" class="normalBtn" value="問い合わせ" @click="getList()" />
<!-- 下载 -->
<input type="button" class="normalBtn" value="ダウンロードする" style="display:none;" @click="DownLoadHotel()" />
</li> </li>
</ul> </ul>
</div> </div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle"> <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<div style="font-size:12px;padding:2px 4px 3px 20px;"> <div style="font-size:12px;padding:2px 4px 3px 20px;">
<div style="display:inline-block;color:red;display:none">注意事项:每次导出数据最好不要超过一个月。</div> <!-- 每次导出数据最好不要超过一个月 -->
<div class="rq_comSpan" style="display:inline-block;">颜色说明: <div style="display:inline-block;color:red;display:none">注意事項:データをエクスポートするたびに1か月を超えないことをお勧めします。</div>
<span class="rq_span1">新增团体</span><span class="rq_span2">取消团体</span> <!-- 颜色说明 -->
<span class="rq_span3">酒店提醒</span> <div class="rq_comSpan" style="display:inline-block;">色の説明:
<!-- 新增团体 --> <!-- 取消团体 --> <!-- 酒店提醒 -->
<span class="rq_span1">グループを追加</span><span class="rq_span2">グループをキャンセル</span>
<span class="rq_span3">ホテルリマインダー</span>
</div> </div>
</div><br /> </div><br />
<table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'> <table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'>
<tr> <tr>
<th width="100">订团号</th> <!-- 订团号 -->
<th width="100">公司团号</th> <th width="100">グループ番号</th>
<th width="100">航班</th> <!-- 公司团号 -->
<th width="120">机位总数</th> <th width="100">会社グループ番号</th>
<th width="100">当前人数</th> <!-- 航班 -->
<th width="100">导游</th> <th width="100">フライト</th>
<th width="100">领队</th> <!-- 机位总数 -->
<th width="150">酒店详情</th> <th width="120">総座席数</th>
<!-- 当前人数 -->
<th width="100">現在の番号</th>
<!-- 导游 -->
<th width="100">ガイド</th>
<!-- 领队 -->
<th width="100">リーダー</th>
<!-- 酒店详情 -->
<th width="150">ホテルの詳細</th>
</tr> </tr>
<tbody v-for="(item,index) in dataList"> <tbody v-for="(item,index) in dataList">
<tr> <tr>
...@@ -65,8 +79,10 @@ ...@@ -65,8 +79,10 @@
{{item.LeaderName}} <template v-if="item.LeaderTel">(电话: {{item.LeaderTel}})</template> {{item.LeaderName}} <template v-if="item.LeaderTel">(电话: {{item.LeaderTel}})</template>
</td> </td>
<td> <td>
<a class="hotelLink" slot="reference" @click="getHotelList(item.TCID,item.NewCombinationNum),hotelUseDetail=true">酒店使用情况</a> <!-- 酒店使用情况 -->
<a class="hotelLink" slot="reference" @click="getClickItem(item),dijieDialog=true">备注</a> <a class="hotelLink" slot="reference" @click="getHotelList(item.TCID,item.NewCombinationNum),hotelUseDetail=true">ホテル利用</a>
<!-- 备注 -->
<a class="hotelLink" slot="reference" @click="getClickItem(item),dijieDialog=true">備考</a>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -83,12 +99,14 @@ ...@@ -83,12 +99,14 @@
<span v-for="subItem in item.Numbers"></span> <span v-for="subItem in item.Numbers"></span>
</span> </span>
</div> </div>
<div><span class="rq_reSpan">注意事项</span> {{item.SupplierRemarks}}</div> <!-- 注意事项 -->
<div><span class="rq_reSpan">注意事項</span> {{item.SupplierRemarks}}</div>
</td> </td>
</tr> </tr>
<tr> <tr>
<!-- 对地接备注 -->
<td colspan="8" style="text-align:left;padding-left:5px;"> <td colspan="8" style="text-align:left;padding-left:5px;">
对地接备注： {{item.SupplierToDmcRemarks}} 地上での発言： {{item.SupplierToDmcRemarks}}
</td> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -103,21 +121,23 @@ ...@@ -103,21 +121,23 @@
<el-dialog custom-class='w1006' :title='"【"+NewCombinationNum+"】"+"酒店信息"' :visible.sync="hotelUseDetail" center> <el-dialog custom-class='w1006' :title='"【"+NewCombinationNum+"】"+"酒店信息"' :visible.sync="hotelUseDetail" center>
<table class="rq_HotelTable" v-loading="hotelLoading"> <table class="rq_HotelTable" v-loading="hotelLoading">
<tr> <tr>
<!-- 时间 -->
<th width="120"> <th width="120">
时间 時間
</th> </th>
<!-- 酒店 -->
<th width="150"> <th width="150">
酒店 ホテル
</th> </th>
<th width="300"> <th width="300">
价格 価格
</th> </th>
<th width="100"> <th width="100">
税入/税别 税入/税别
</th> </th>
<th width="100">提醒</th> <th width="100">リマインダー</th>
<th width="150">备注</th> <th width="150">備考</th>
<th width="50">日志</th> <th width="50">ログ</th>
</tr> </tr>
<template v-for="(subItem,subIndex) in HotelList"> <template v-for="(subItem,subIndex) in HotelList">
<tbody> <tbody>
......
src/components/SupplierIndex.vue
View file @ e0f4c8c0
...@@ -613,27 +613,37 @@ ...@@ -613,27 +613,37 @@
<div style="width: 100%;min-height:200px; overflow-x: auto;padding:0 20px; " class="HotelQueryList" <div style="width: 100%;min-height:200px; overflow-x: auto;padding:0 20px; " class="HotelQueryList"
v-loading="loading"> v-loading="loading">
<div style="margin:20px 0"> <div style="margin:20px 0">
<span style="color:#fff;background-color: #ff3737;padding:2px 4px;border-radius:5px">红日</span> <!-- 红日 -->
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">旺季</span> <span style="color:#fff;background-color: #ff3737;padding:2px 4px;border-radius:5px">赤い日</span>
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">平季</span> <!-- 旺季 -->
<span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">淡季</span> <span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">ハイシーズン</span>
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span> <!-- 平季 -->
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">フラットシーズン</span>
<!-- 淡季 -->
<span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">ローシーズン</span>
<!-- 特别价 -->
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特別価格</span>
</div> </div>
<template v-if="isShow"> <template v-if="isShow">
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' <el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading'
:height="tableHeight"> :height="tableHeight">
<el-table-column fixed label="酒店名称" min-width="180"> <!-- 酒店名称 -->
<el-table-column fixed label="ホテル名" min-width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
{{scope.row.HotelName}}</div> {{scope.row.HotelName}}</div>
<div>{{scope.row.TotalInventory}}</div> <div>{{scope.row.TotalInventory}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="价格&库存" fixed min-width="120"> <!-- 价格库存 -->
<el-table-column label="価格&在庫" fixed min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="Hotel_kong">价格</div> <!-- 价格 -->
<div class="Hotel_kong" style="min-width:60px;">总/用/剩</div> <div class="Hotel_kong">価格</div>
<div class="Hotel_kong">超定</div> <!-- 总/用/剩 -->
<div class="Hotel_kong" style="min-width:60px;">合計/使用する/残り</div>
<!-- 超定 -->
<div class="Hotel_kong">過剰決定</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-for='(item,index) in dataList[0].subList' :label="getDateList(item.DateStr)" <el-table-column v-for='(item,index) in dataList[0].subList' :label="getDateList(item.DateStr)"
...@@ -729,7 +739,8 @@ ...@@ -729,7 +739,8 @@
</tr> </tr>
</template> </template>
<tr v-else> <tr v-else>
<td colspan="5">暂无数据...</td> <!-- 暂无数据 -->
<td colspan="5">まだデータがありません...</td>
</tr> </tr>
</table> </table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
...@@ -741,10 +752,13 @@ ...@@ -741,10 +752,13 @@
<el-form> <el-form>
<table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable" style="width:100%;"> <table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable" style="width:100%;">
<tr> <tr>
<th width="50">编号</th> <!-- 编号 -->
<th width="50">数</th>
<th>内容</th> <th>内容</th>
<th width="70">操作人</th> <!-- 运营商 -->
<th width="140">操作时间</th> <th width="70">オペレーター</th>
<!-- 运营时间 -->
<th width="140">稼働時間</th>
</tr> </tr>
<template v-if="queryMsg.total>0"> <template v-if="queryMsg.total>0">
<tr v-for="(item,index) in HotelTipList"> <tr v-for="(item,index) in HotelTipList">
...@@ -757,7 +771,8 @@ ...@@ -757,7 +771,8 @@
</tr> </tr>
</template> </template>
<tr v-else> <tr v-else>
<td colspan="5">暂无数据...</td> <!-- 暂无数据 -->
<td colspan="5">まだデータがありません...</td>
</tr> </tr>
</table> </table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
...@@ -765,7 +780,8 @@ ...@@ -765,7 +780,8 @@
</el-pagination> </el-pagination>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="showHQinfo = false">关闭</button> <!-- 关闭 -->
<button class="hollowFixedBtn" @click="showHQinfo = false">閉じる</button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
......
src/components/SupplierLogin.vue
View file @ e0f4c8c0
...@@ -59,13 +59,13 @@ ...@@ -59,13 +59,13 @@
<div class="login_Title"> <div class="login_Title">
{{groupModel.GroupName?groupModel.GroupName:''}} {{groupModel.GroupName?groupModel.GroupName:''}}
</div> </div>
<div class="loginXI">供应商登录</div> <div class="loginXI">サプライヤーログイン</div>
</div> </div>
<div class="login-commonBotm T1"> <div class="login-commonBotm T1">
<i class="icon-login-name iconfont icon-user11"></i> <i class="icon-login-name iconfont icon-user11"></i>
<input class="input" @focus="name_bline=true" @blur="name_bline=false" maxlength="20" <input class="input" @focus="name_bline=true" @blur="name_bline=false" maxlength="20"
autocomplete="new-password" v-model="userInfo.name" style="background-color:transparent !important;" autocomplete="new-password" v-model="userInfo.name" style="background-color:transparent !important;"
type="text" :placeholder="$t('login.login_account')" @keyup.enter="doLogin" /> type="text" placeholder="アカウント番号を入力してください" @keyup.enter="doLogin" />
<div class="name_bline_left Supplier_Left_Line" :class="name_bline==true?'_bline_w':''"></div> <div class="name_bline_left Supplier_Left_Line" :class="name_bline==true?'_bline_w':''"></div>
<div class="name_bline_right Supplier_Right_Line" :class="name_bline==true?'_bline_w':''"></div> <div class="name_bline_right Supplier_Right_Line" :class="name_bline==true?'_bline_w':''"></div>
</div> </div>
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<i class="icon-login-password iconfont icon-mima"></i> <i class="icon-login-password iconfont icon-mima"></i>
<input class="input" @focus="pwd_bline=true" @blur="pwd_bline=false" maxlength="20" <input class="input" @focus="pwd_bline=true" @blur="pwd_bline=false" maxlength="20"
autocomplete="new-password" v-model="userInfo.password" style="background-color:transparent !important" autocomplete="new-password" v-model="userInfo.password" style="background-color:transparent !important"
type="password" :placeholder="$t('login.login_password')" @keyup.enter="doLogin" /> type="password" placeholder="パスワードを入力してください" @keyup.enter="doLogin" />
<div class="pwd_bline_left Supplier_Left_Line" :class="pwd_bline==true?'_bline_w':''"></div> <div class="pwd_bline_left Supplier_Left_Line" :class="pwd_bline==true?'_bline_w':''"></div>
<div class="pwd_bline_right Supplier_Right_Line" :class="pwd_bline==true?'_bline_w':''"></div> <div class="pwd_bline_right Supplier_Right_Line" :class="pwd_bline==true?'_bline_w':''"></div>
</div> </div>
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<div v-show="passwordIsShow"><img src="../assets/img/login-error-tips.png" />{{ passwordErrorMsg }}</div> <div v-show="passwordIsShow"><img src="../assets/img/login-error-tips.png" />{{ passwordErrorMsg }}</div>
</div> </div>
<button type="button" class="loginBtn" :class="{'loginIng':loginState==1}" :disabled="loginState==1" <button type="button" class="loginBtn" :class="{'loginIng':loginState==1}" :disabled="loginState==1"
@click="doLogin">{{loginState==1?'登录中...':'登录'}}</button> @click="doLogin">{{loginState==1?'ログイン...':'ログイン'}}</button>
</div> </div>
</form> </form>
</div> </div>
...@@ -213,11 +213,11 @@ ...@@ -213,11 +213,11 @@
doLogin() { doLogin() {
if (this.userInfo.name == "") { if (this.userInfo.name == "") {
this.nameIsShow = true; this.nameIsShow = true;
this.nameErrorMsg = "请输入用户名"; this.nameErrorMsg = "ユーザー名を入力してください";
return; return;
} else if (this.userInfo.password == "") { } else if (this.userInfo.password == "") {
this.passwordIsShow = true; this.passwordIsShow = true;
this.passwordErrorMsg = "请输入密码"; this.passwordErrorMsg = "パスワードを入力してください";
return; return;
} else { } else {
this.nameIsShow = false; this.nameIsShow = false;
......
src/components/leaderPay2.vue
View file @ e0f4c8c0
...@@ -351,6 +351,7 @@ input[type="number"] { ...@@ -351,6 +351,7 @@ input[type="number"] {
<span v-else-if="subItem.PayStyle === 2">公司结算</span> <span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 3">预付</span> <span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span> <span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else-if="subItem.PayStyle === 11">刷卡</span>
<span v-else></span> <span v-else></span>
</br> </br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span> <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
...@@ -431,6 +432,8 @@ input[type="number"] { ...@@ -431,6 +432,8 @@ input[type="number"] {
<span v-else-if="subItem.PayStyle === 4">预付</span> <span v-else-if="subItem.PayStyle === 4">预付</span>
<span v-else-if="subItem.PayStyle === 5">实物抵扣</span> <span v-else-if="subItem.PayStyle === 5">实物抵扣</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span> <span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else-if="subItem.PayStyle === 9">月结</span>
<span v-else-if="subItem.PayStyle === 11">刷卡</span>
<span v-else></span> <span v-else></span>
</br> </br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span> <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
...@@ -465,18 +468,10 @@ input[type="number"] { ...@@ -465,18 +468,10 @@ input[type="number"] {
<th>实付金额</th> <th>实付金额</th>
<th width="40">操作</th> <th width="40">操作</th>
</tr> </tr>
<tr v-show="totalList.SelfPayingExpendTotalPrice>0"> <tr v-if="list.otherList.length > 0" v-for="item in list.otherList">
<td>自费支出</td> <td>{{getOrderType(item.OrderType)}}</td>
<td>0</td> <td>0</td>
<td>{{moneyFormat(totalList.SelfPayingExpendTotalPrice)}}</td> <td>{{moneyFormat(item.TotalPrice)}}</td>
<td>
<!-- <span class="cursorpointer text-decoratio" @click="godetailAll('zifeizhiZ')">明细</span> -->
</td>
</tr>
<tr v-show="totalList.SelfPayingIncomeTotalPrice>0">
<td>自费收入</td>
<td>0</td>
<td>{{moneyFormat(totalList.SelfPayingIncomeTotalPrice)}}</td>
<td> <td>
<!-- <span class="cursorpointer text-decoratio" @click="godetailAll('zifeizhiS')">明细</span> --> <!-- <span class="cursorpointer text-decoratio" @click="godetailAll('zifeizhiS')">明细</span> -->
</td> </td>
...@@ -989,6 +984,14 @@ export default { ...@@ -989,6 +984,14 @@ export default {
}; };
}, },
methods: { methods: {
getOrderType(type){
// 1-其他订单，2-小费收入，3-团费小计，4-自费收入，5-自费支出
if (type == 1) return '其他订单'
else if (type == 2) return '小费收入'
else if (type == 3) return '团费小计'
else if (type == 4) return '自费收入'
else if (type == 5) return '自费支出'
},
getzhuijiaList(){ getzhuijiaList(){
this.apipost( this.apipost(
'Financial_post_GetTravelFinanceReplenishList', { 'Financial_post_GetTravelFinanceReplenishList', {
...@@ -1254,7 +1257,7 @@ export default { ...@@ -1254,7 +1257,7 @@ export default {
}, null) }, null)
}, },
goZhiDan: function(obj) { goZhiDan: function(obj) {
let id = [59,63]; let id = [59,63,78];
let TCIDARR = [obj.TCIDS]; let TCIDARR = [obj.TCIDS];
let orderObj = { let orderObj = {
OrderID: 0, OrderID: 0,
......
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