Skip to content

S
SuperMan
Commit 13147ce3 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 3cb2d466
Show whitespace changes
Inline Side-by-side
Showing with 207 additions and 225 deletions
src/components/FinancialModule/accDetail/AccountNewCollectingOrPay.vue
View file @ 13147ce3
...@@ -410,7 +410,7 @@ export default { ...@@ -410,7 +410,7 @@ export default {
}, err => {}) }, err => {})
}, },
addCheckbox(item){ addCheckbox(item){
console.log('11111:'+item.check)
}, },
GenerateDocuments() { GenerateDocuments() {
if(this.DataList.filter(citem => citem.check).length == 0) { if(this.DataList.filter(citem => citem.check).length == 0) {
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 13147ce3
...@@ -160,9 +160,6 @@ ...@@ -160,9 +160,6 @@
<th width="80">{{$t('ground.fanyongleixing')}}</th> <th width="80">{{$t('ground.fanyongleixing')}}</th>
<th width="80">{{$t('hotel.hotel_commission')}}</th> <th width="80">{{$t('hotel.hotel_commission')}}</th>
<th width="80">{{$t('ground.fanyongyjin')}}</th> <th width="80">{{$t('ground.fanyongyjin')}}</th>
<th width="80">{{$t('ground.rutangshui')}}</th>
<th width="80">{{$t('ground.chengshishui')}}</th>
<th width="80">{{$t('ground.tingchefei')}}</th>
<th width="100">{{$t('ground.jinezongji')}}</th> <th width="100">{{$t('ground.jinezongji')}}</th>
<th width="250">{{$t('ground.fukuanbzdth')}}</th> <th width="250">{{$t('ground.fukuanbzdth')}}</th>
<th width="80">{{$t('system.table_operation')}}</th> <th width="80">{{$t('system.table_operation')}}</th>
...@@ -421,18 +418,6 @@ ...@@ -421,18 +418,6 @@
</template> </template>
</template> </template>
</td> </td>
<!-- 入汤税 -->
<td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
{{subItem.InTangTax}}
</td>
<!-- 城市税 -->
<td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
{{subItem.CityTax}}
</td>
<!-- 停车费 -->
<td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
{{subItem.ParkFee}}
</td>
<!-- 金额总计 --> <!-- 金额总计 -->
<td v-if="childIndex==0" :rowspan="6" style="white-space:nowrap;"> <td v-if="childIndex==0" :rowspan="6" style="white-space:nowrap;">
{{subItem.TotalPrice}} {{subItem.TotalPrice}}
...@@ -511,7 +496,7 @@ ...@@ -511,7 +496,7 @@
<el-option :label="$t('ground.lingduidydf')" :value='10'></el-option> <el-option :label="$t('ground.lingduidydf')" :value='10'></el-option>
<el-option :label="$t('ground.shuaka')" :value='11'></el-option> <el-option :label="$t('ground.shuaka')" :value='11'></el-option>
<el-option :label="$t('objFill.zhuanzhang')" :value='14'></el-option> <el-option :label="$t('objFill.zhuanzhang')" :value='14'></el-option>
 <el-option :label="$t('ground.enterpriseAlipay')"  :value='15'></el-option> <el-option :label="$t('ground.enterpriseAlipay')" :value='15'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -581,7 +566,6 @@ ...@@ -581,7 +566,6 @@
<td> <td>
<el-select class='w135 sel' v-model='subItem.IsPay' :placeholder="$t('pub.pleaseSel')" <el-select class='w135 sel' v-model='subItem.IsPay' :placeholder="$t('pub.pleaseSel')"
:disabled="IsEditHotel==0?true:false"> :disabled="IsEditHotel==0?true:false">
<!-- <el-option :label="$t('pub.pleaseSel')" :value='0'></el-option> -->
<el-option :label="$t('pub.no')" :value='0'></el-option> <el-option :label="$t('pub.no')" :value='0'></el-option>
<el-option :label="$t('pub.yes')" :value='1'></el-option> <el-option :label="$t('pub.yes')" :value='1'></el-option>
</el-select> </el-select>
...@@ -649,7 +633,6 @@ ...@@ -649,7 +633,6 @@
<p>{{$t('active.ld_noData')}}</p> <p>{{$t('active.ld_noData')}}</p>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
...@@ -811,7 +794,6 @@ ...@@ -811,7 +794,6 @@
var useTime = oldData.CheckInDateStr; var useTime = oldData.CheckInDateStr;
var hotelId = ckedObj.ID; var hotelId = ckedObj.ID;
var TCID = oldData.TCID; var TCID = oldData.TCID;
console.log("checkHotel", ckedObj);
this.apipost('travel_get_GetHotelUsePriceListService_V2', { this.apipost('travel_get_GetHotelUsePriceListService_V2', {
HotelId: hotelId, HotelId: hotelId,
UseTime: useTime, UseTime: useTime,
...@@ -1103,7 +1085,6 @@ ...@@ -1103,7 +1085,6 @@
return item.ID === obj.CurrencyId; //筛选出匹配数据 return item.ID === obj.CurrencyId; //筛选出匹配数据
}); });
} }
//日元 //日元
let jpaObj = this.allCurrencyList.find(item => { let jpaObj = this.allCurrencyList.find(item => {
return item.ID === 3; //筛选出匹配数据 return item.ID === 3; //筛选出匹配数据
...@@ -1255,10 +1236,6 @@ ...@@ -1255,10 +1236,6 @@
} }
}); });
}) })
let mag = {
TotalList: this.list,
SingleItem: item
};
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => { this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 13147ce3
...@@ -22,26 +22,27 @@ ...@@ -22,26 +22,27 @@
{{$t('salesModule.CompanyNum')}} {{$t('salesModule.CompanyNum')}}
</th> </th>
<th colspan="17" style="text-align:left;"> <th colspan="17" style="text-align:left;">
<p class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</p> <p class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')"
style="text-decoration:underline;cursor:pointer;">{{TCNUM}}</p>
</th> </th>
</tr> </tr>
<tr> <tr>
<th width="100">{{$t('restaurant.res_etTime')}}</th> <th width="100">{{$t('restaurant.res_etTime')}}</th>
<th width="200">{{$t('restaurant.res_resName')}}</th> <th width="200">{{$t('restaurant.res_resName')}}</th>
<th width="150">{{$t('ground.xiugaict')}}</th> <th width="200">{{$t('ground.xiugaict')}}</th>
<th width="80">{{$t('ground.leibie')}}</th> <th width="80">{{$t('ground.leibie')}}</th>
<th width="70">{{$t('ground.zongrenshu')}}</th> <th width="70">{{$t('ground.zongrenshu')}}</th>
<th width="70">{{$t('ground.yongcanren')}}<br />{{$t('advmanager.v_type')}}</th> <th width="70">{{$t('ground.yongcanren')}}<br />{{$t('advmanager.v_type')}}</th>
<th width="70">{{$t('commonPickUp.Pick_Ding')}}<br />{{$t('admin.admin_personNumber')}}</th> <th width="70">{{$t('commonPickUp.Pick_Ding')}}<br />{{$t('admin.admin_personNumber')}}</th>
<th width="120">{{$t('Operation.Op_price')}}</th> <th width="120">{{$t('Operation.Op_price')}}</th>
<th width="90">{{$t('ground.mianrenshu')}}</th> <th width="90">{{$t('ground.mianrenshu')}}</th>
<th width="80">{{$t('ground.jinexiaoji')}}</th>
<th width="90">{{$t('hotel.hotel_commission')}}</th> <th width="90">{{$t('hotel.hotel_commission')}}</th>
<th width="80">{{$t('ground.jinexiaoji')}}</th>
<th width="100">{{$t('fnc.a_zongjine')}}</th> <th width="100">{{$t('fnc.a_zongjine')}}</th>
<th width="210">{{$t('ground.fkfsdcfsdth')}}</th> <th width="210">{{$t('ground.fkfsdcfsdth')}}</th>
<th width="170">{{$t('pub.pubRemark')}}</th> <th width="170">{{$t('pub.pubRemark')}}</th>
</tr> </tr>
<template v-for="(item,index) in list"> <template v-for="(item,index) in dinnerList">
<template v-for="(subItem,subIndex) in item.DiningSummaryList"> <template v-for="(subItem,subIndex) in item.DiningSummaryList">
<tr v-for="(childItem,childIndex) in subItem.DiningPriceList" :key="`d_`+index+subIndex+childIndex"> <tr v-for="(childItem,childIndex) in subItem.DiningPriceList" :key="`d_`+index+subIndex+childIndex">
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
...@@ -52,7 +53,7 @@ ...@@ -52,7 +53,7 @@
<tr> <tr>
<td colspan="2"> <td colspan="2">
<span style="padding-left:5px;" class="link" <span style="padding-left:5px;" class="link"
@click="goUrlR('restaurantList',subItem.DiningID,'餐厅列表')">{{subItem.DiningName}} @click="goUrlT('restaurantList',subItem.DiningID,'餐厅列表')">{{subItem.DiningName}}
<br /> <br />
{{$t('ground.zhenshimingcheng')}}: {{subItem.DiningRealName}} {{$t('ground.zhenshimingcheng')}}: {{subItem.DiningRealName}}
</span> </span>
...@@ -133,7 +134,7 @@ ...@@ -133,7 +134,7 @@
</td> </td>
<td> <td>
<template v-if="EditBtn||LineId==90"> <template v-if="EditBtn||LineId==90">
<el-input class='w50' v-model='childItem.UsePeopleNum' @input='calculationPrice(subItem)' <el-input class='w50' v-model='childItem.UsePeopleNum' @input='calculationPrice()'
@keyup.native="checkInteger(childItem,'UsePeopleNum')" type="text"></el-input> @keyup.native="checkInteger(childItem,'UsePeopleNum')" type="text"></el-input>
</template> </template>
<template v-else> <template v-else>
...@@ -142,30 +143,30 @@ ...@@ -142,30 +143,30 @@
</td> </td>
<td> <td>
<template v-if="EditBtn||LineId==90"> <template v-if="EditBtn||LineId==90">
<el-input class='w110' v-model='childItem.PeoplePrice' @input='calculationPrice(subItem)' <el-input class='w100' v-model='childItem.PeoplePrice' @input='calculationPrice()'
@keyup.native="checkPrice(childItem,'PeoplePrice')" type="text"></el-input> @keyup.native="checkPrice(childItem,'PeoplePrice')" type="text"></el-input>
</template> </template>
<template v-else> <template v-else>
<span class="spanlink" v-if='childItem.PeoplePrice==0' <span class="spanlink" v-if='childItem.PeoplePrice==0'
@click="goUrl('RestaurantPackage',subItem,'套餐查询')">{{$t('leader.leader_Set')}}</span> @click="goUrl('RestaurantPackage',subItem,'套餐查询')">{{$t('leader.leader_Set')}}</span>
<template v-else> <template v-else>
<el-input class='w110 tcenter' @input='calculationPrice(subItem)' v-model='childItem.PeoplePrice' <el-input class='w100 tcenter' @input='calculationPrice()' v-model='childItem.PeoplePrice'
@keyup.native="checkPrice(childItem,'PeoplePrice')"></el-input> @keyup.native="checkPrice(childItem,'PeoplePrice')"></el-input>
</template> </template>
</template> </template>
</td> </td>
<td> <td>
<el-input class='w110 tcenter' @input='calculationPrice(subItem)' maxlength='2' <el-input class='w50 tcenter' @input='calculationPrice()' maxlength='2' v-model='childItem.Discount'
v-model='childItem.Discount' @keyup.native="checkPrice(childItem,'Discount')"></el-input> @keyup.native="checkPrice(childItem,'Discount')"></el-input>
</td>
<td>
{{(childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice}}
</td> </td>
<td> <td>
<!--返佣--> <!--返佣-->
<el-input class='w50 tcenter' @input='calculationPrice(subItem)' v-model='childItem.DiscountPrice' <el-input class='w50 tcenter' @input='calculationPrice()' v-model='childItem.DiscountPrice'
@keyup.native="checkInteger(childItem,'DiscountPrice')"></el-input>% @keyup.native="checkInteger(childItem,'DiscountPrice')"></el-input>%
</td> </td>
<td>
{{(childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice}}
</td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
{{subItem.TotalPrice}} {{subItem.TotalPrice}}
<template v-if="subItem.NewTotalPrice"> <template v-if="subItem.NewTotalPrice">
...@@ -178,7 +179,7 @@ ...@@ -178,7 +179,7 @@
<td width="70" style="text-align:right;">{{$t('hotel.hotel_Currency')}}：</td> <td width="70" style="text-align:right;">{{$t('hotel.hotel_Currency')}}：</td>
<td> <td>
<el-select v-model="subItem.CurrencyId" :placeholder="$t('pub.pleaseSel')" class='w135 sel' <el-select v-model="subItem.CurrencyId" :placeholder="$t('pub.pleaseSel')" class='w135 sel'
@change="calculationPrice(subItem)"> @change="calculationPrice()">
<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 allCurrencyList" :key="index" :label="item.Name" <el-option v-for="(item,index) in allCurrencyList" :key="index" :label="item.Name"
:value="item.ID"> :value="item.ID">
...@@ -193,23 +194,15 @@ ...@@ -193,23 +194,15 @@
<td style="text-align:left;"> <td style="text-align:left;">
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"> <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.pleaseSel')" :value='0'></el-option> <el-option :label="$t('pub.pleaseSel')" :value='0'></el-option>
<!--v-if="subItem.PayStyleExt==1||LineId==90||LineId==168"--> <el-option :label='$t("ground.xianfu")' :value='1'></el-option>
<el-option :label='$t("ground.xianfu")' :value='1'> <el-option :label='$t("ground.qiandan")' :value='2'></el-option>
</el-option>
<!--v-if="subItem.PayStyleExt==2||LineId==90||LineId==168"-->
<el-option :label='$t("ground.qiandan")' :value='2'>
</el-option>
<!--v-if="subItem.PayStyleExt==3"-->
<el-option :label='$t("ground.shiwudk")' :value='3'></el-option> <el-option :label='$t("ground.shiwudk")' :value='3'></el-option>
<!--v-if="subItem.PayStyleExt==4"-->
<el-option :label='$t("ground.yufu")' :value='4'></el-option> <el-option :label='$t("ground.yufu")' :value='4'></el-option>
<!--v-if="subItem.PayStyleExt==5"--> <el-option :label='$t("ground.yufukuandk")' :value='5'></el-option>
<el-option :label='$t("ground.yufukuandk")' :value='5'>
</el-option>
<el-option :label='$t("ground.lingduidydf")' :value='10'></el-option> <el-option :label='$t("ground.lingduidydf")' :value='10'></el-option>
<el-option :label='$t("ground.gongsihetzf")' :value='6'></el-option> <el-option :label='$t("ground.gongsihetzf")' :value='6'></el-option>
<el-option :label='$t("ground.shuaka")' :value='11'></el-option> <el-option :label='$t("ground.shuaka")' :value='11'></el-option>
 <el-option :label="$t('ground.enterpriseAlipay')"  :value='15'></el-option> <el-option :label="$t('ground.enterpriseAlipay')" :value='15'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -231,7 +224,8 @@ ...@@ -231,7 +224,8 @@
{{$t('objFill.v101.Rest.dincanztai')}}： {{$t('objFill.v101.Rest.dincanztai')}}：
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
<el-select v-model='subItem.OrderState' class='w135 sel' :placeholder="$t('pub.pleaseSel')"> <el-select v-model='subItem.OrderState' class='w135 sel' :placeholder="$t('pub.pleaseSel')"
@change="changeState(subItem)">
<el-option :label="$t('pub.pleaseSel')" :value='-1'></el-option> <el-option :label="$t('pub.pleaseSel')" :value='-1'></el-option>
<el-option :label='$t("pub.sureBtn")' :value='1'></el-option> <el-option :label='$t("pub.sureBtn")' :value='1'></el-option>
<el-option :label='$t("visa.v_zanding")' :value='2'></el-option> <el-option :label='$t("visa.v_zanding")' :value='2'></el-option>
...@@ -297,7 +291,7 @@ ...@@ -297,7 +291,7 @@
<el-input type='textarea' rows="6" class='w120' v-model='subItem.Remarks'></el-input> <el-input type='textarea' rows="6" class='w120' v-model='subItem.Remarks'></el-input>
</td> </td>
</tr> </tr>
<tr> <tr style="display:none;">
<td width="80" style="text-align:right;"> <td width="80" style="text-align:right;">
{{$t('ground.canpeibz')}}： {{$t('ground.canpeibz')}}：
</td> </td>
...@@ -310,6 +304,40 @@ ...@@ -310,6 +304,40 @@
</tr> </tr>
</template> </template>
</template> </template>
<tfoot>
<tr>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td colspan="2">
合计
</td>
<td>
<font style="color:red;font-weight:bold;">
{{sTotalPrice}}
</font>
</td>
<td>
</td>
<td>
</td>
</tr>
</tfoot>
</table> </table>
</div> </div>
</div> </div>
...@@ -322,7 +350,7 @@ ...@@ -322,7 +350,7 @@
EditBtn: false, //房餐景点修改权限 EditBtn: false, //房餐景点修改权限
IsEditDinner: 0, //1有权限操作餐配 IsEditDinner: 0, //1有权限操作餐配
defaultSelectValue: 0, defaultSelectValue: 0,
list: [], dinnerList: [],
roomList: [], roomList: [],
TCNUM: "", TCNUM: "",
flightTotal: 0, flightTotal: 0,
...@@ -334,13 +362,22 @@ ...@@ -334,13 +362,22 @@
findex: 0, findex: 0,
childIndex: 0, childIndex: 0,
LineId: 0, LineId: 0,
currentUserInfo: {} currentUserInfo: {},
sTotalPrice: 0, //合计
}; };
}, },
components: { components: {
comCheckDinner, comCheckDinner,
}, },
methods: { methods: {
//订餐状态切换
changeState(subItem) {
if (subItem.OrderState == 1) {
subItem.SureTime = this.$commonUtils.getCurrentDate();
} else {
subItem.SureTime = "";
}
},
getChildDinner(index, subIndex, subItem) { getChildDinner(index, subIndex, subItem) {
this.findex = index; this.findex = index;
this.childIndex = subIndex; this.childIndex = subIndex;
...@@ -350,7 +387,7 @@ ...@@ -350,7 +387,7 @@
}, },
//选中赋值 //选中赋值
childDinnerList(obj) { childDinnerList(obj) {
var oldData = this.list[this.findex].DiningSummaryList[this.childIndex]; var oldData = this.dinnerList[this.findex].DiningSummaryList[this.childIndex];
oldData.Address = obj.Address; oldData.Address = obj.Address;
oldData.Tel = obj.Tel; oldData.Tel = obj.Tel;
oldData.PayStyle = obj.PayStyle; oldData.PayStyle = obj.PayStyle;
...@@ -358,23 +395,12 @@ ...@@ -358,23 +395,12 @@
oldData.NewDiningID = obj.ID; oldData.NewDiningID = obj.ID;
oldData.NewDiningName = obj.Name; oldData.NewDiningName = obj.Name;
oldData.NewDiningRealName = obj.RealName; oldData.NewDiningRealName = obj.RealName;
this.list.forEach(x => { this.dinnerList.forEach(x => {
x.DiningSummaryList.forEach(y => { x.DiningSummaryList.forEach(y => {
y.IsShowPop = false; y.IsShowPop = false;
}) })
}); });
}, },
//页面跳转[大写]
goUrlR(path, obj, title) {
this.$router.push({
name: path,
query: {
ID: obj,
blank: 'y',
tab: title
}
});
},
//页面跳转[小写] //页面跳转[小写]
goUrlT(path, obj, title) { goUrlT(path, obj, title) {
this.$router.push({ this.$router.push({
...@@ -419,7 +445,6 @@ ...@@ -419,7 +445,6 @@
item.DinnerList = []; item.DinnerList = [];
item.DiningSummaryList.forEach(x => { item.DiningSummaryList.forEach(x => {
x.DiningReserveType = x.DiningReserveType.toString(); x.DiningReserveType = x.DiningReserveType.toString();
this.calculationPrice(x);
var str = x.NewDiningName; var str = x.NewDiningName;
if (x.RealName) { if (x.RealName) {
str = x.RealName; str = x.RealName;
...@@ -428,7 +453,6 @@ ...@@ -428,7 +453,6 @@
RealName: str, RealName: str,
ID: x.NewDiningID ID: x.NewDiningID
}) })
if (x.ReserveNo == '' || x.ReserveNo == null) { if (x.ReserveNo == '' || x.ReserveNo == null) {
x.ReserveNo = this.$route.query.NewCombinationNum;; x.ReserveNo = this.$route.query.NewCombinationNum;;
} }
...@@ -439,10 +463,10 @@ ...@@ -439,10 +463,10 @@
x.SureTime = x.SureTime.replace("T", " "); x.SureTime = x.SureTime.replace("T", " ");
} }
} }
}) })
}); });
this.list = resultArray; this.dinnerList = resultArray;
this.calculationPrice();
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -450,54 +474,32 @@ ...@@ -450,54 +474,32 @@
err => {} err => {}
); );
}, },
calculationPrice(obj) { calculationPrice() {
let totalPrice = 0;
//获取当前选中的对象
let currentObj = {};
if (obj.CurrencyId != 0) {
currentObj = this.allCurrencyList.find(item => {
return item.ID === obj.CurrencyId; //筛选出匹配数据
});
}
//日元
let jpaObj = this.allCurrencyList.find(item => {
return item.ID === 3; //筛选出匹配数据
});
obj.DiningPriceList.forEach((item, index) => {
var tempPrice = 0;
var coefficient = 1; var coefficient = 1;
totalPrice += item.PeoplePrice * (item.UsePeopleNum - item.Discount) * (coefficient - item.DiscountPrice / var totalPrice = 0;
if (this.dinnerList && this.dinnerList.length > 0) {
this.dinnerList.forEach(rItem => {
if (rItem.DiningSummaryList && rItem.DiningSummaryList.length > 0) {
rItem.DiningSummaryList.forEach(dItem => {
let subPrice = 0;
if (dItem.DiningPriceList && dItem.DiningPriceList.length > 0) {
dItem.DiningPriceList.forEach(pItem => {
subPrice += pItem.PeoplePrice * (pItem.UsePeopleNum - pItem.Discount) * (coefficient -
pItem.DiscountPrice /
100); 100);
totalPrice += tempPrice;
}) })
obj.TotalPrice = totalPrice.toFixed(2);
if (this.LineId == 14) {
if (currentObj && currentObj.ID > 0) {
//人民币
if (currentObj.ID == 1) {
obj.NewTotalPrice = currentObj.Name + ":" + (totalPrice * jpaObj.PayRate).toFixed(2);
}
//日元
else if (currentObj.ID == 3) {
obj.NewTotalPrice = "";
} else {
if (currentObj.CurrentRate > 1) {
obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice * jpaObj.PayRate) / currentObj.CurrentRate)
.toFixed(2);
} else {
obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice * jpaObj.PayRate) * currentObj.CurrentRate)
.toFixed(2);
} }
dItem.TotalPrice = subPrice.toFixed(2);
totalPrice += subPrice;
})
} }
} else { });
obj.NewTotalPrice = "";
}
} }
this.$forceUpdate(); this.sTotalPrice = totalPrice.toFixed(2);
}, },
saveList() { saveList() {
this.saveLogding = true; this.saveLogding = true;
this.list.forEach(item => { this.dinnerList.forEach(item => {
item.DiningSummaryList.forEach(insideItem => { item.DiningSummaryList.forEach(insideItem => {
if (insideItem.DiningPriceList) { if (insideItem.DiningPriceList) {
insideItem.DiningPriceList.forEach(subItem => { insideItem.DiningPriceList.forEach(subItem => {
...@@ -511,7 +513,7 @@ ...@@ -511,7 +513,7 @@
} }
}) })
}) })
this.apipost('dmcstatistics_get_SetDiningOrder', this.list, res => { this.apipost('dmcstatistics_get_SetDiningOrder', this.dinnerList, res => {
this.saveLogding = false; this.saveLogding = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success(res.data.message); this.$message.success(res.data.message);
...@@ -581,6 +583,7 @@ ...@@ -581,6 +583,7 @@
}, err => {}); }, err => {});
} }
}; };
</script> </script>
<style> <style>
......
src/components/SalesModule/customerTransfer.vue
View file @ 13147ce3
...@@ -659,8 +659,6 @@ ...@@ -659,8 +659,6 @@
watch: { watch: {
'$route': { '$route': {
handler(val, oldVal) { handler(val, oldVal) {
// console.log(this.$route.query, '-------')
// this.getList(); // this.getList();
}, },
deep: true, deep: true,
...@@ -1260,7 +1258,6 @@ ...@@ -1260,7 +1258,6 @@
); );
}, },
changeDepart(node, id) { changeDepart(node, id) {
console.log(node, "changeDepart")
this.msg.CreateBy = ""; this.msg.CreateBy = "";
this.msg.DepartmentId = node.DepartmentID; this.msg.DepartmentId = node.DepartmentID;
this.employeeMsg.departmentId = node.DepartmentID; this.employeeMsg.departmentId = node.DepartmentID;
......
src/components/SalesModule/enrollTotal.vue
View file @ 13147ce3
...@@ -1178,7 +1178,6 @@ ...@@ -1178,7 +1178,6 @@
this.getCompanyMsg, this.getCompanyMsg,
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log("admin_get_BranchGetList",res.data);
this.companyList = res.data.data; this.companyList = res.data.data;
} else {} } else {}
}, },
......
src/components/SalesModule/groupTourOrder.vue
View file @ 13147ce3
...@@ -4895,11 +4895,9 @@ ...@@ -4895,11 +4895,9 @@
}, },
//点击修改单男单女 //点击修改单男单女
getOrderGender(item) { getOrderGender(item) {
console.log("我进来了",item);
this.subGenderInfo.TipMoney = item.oneSex; this.subGenderInfo.TipMoney = item.oneSex;
this.subGenderInfo.OrderId = item.orderId; this.subGenderInfo.OrderId = item.orderId;
this.showChangeGender = true; this.showChangeGender = true;
console.log("我进来了",this.subGenderInfo);
}, },
//关闭修改单男单女 //关闭修改单男单女
closeGenderDiv() { closeGenderDiv() {
......
src/components/SalesVisa/ModifyVisaProduct.vue
View file @ 13147ce3
...@@ -1221,23 +1221,6 @@ getCompanyList() { ...@@ -1221,23 +1221,6 @@ getCompanyList() {
updateTFimg(index) { updateTFimg(index) {
this.updateChoseIndex = index; this.updateChoseIndex = index;
}, },
//图片左移右移
// ExchangeImg(index, IsMove) {
// var imgItem = this.addMsg.CoverImageList[index];
// //左移
// if (IsMove == 0) {
// var upItem = this.addMsg.CoverImageList[index - 1];
// this.$set(this.addMsg.CoverImageList, index - 1, imgItem);
// this.$set(this.addMsg.CoverImageList, index, upItem);
// } else {
// //右移动
// var downItem = this.addMsg.CoverImageList[index + 1];
// this.$set(this.addMsg.CoverImageList, index + 1, imgItem);
// this.$set(this.addMsg.CoverImageList, index, downItem);
// }
// },
// 签证国家Id改变 // 签证国家Id改变
VisaCountry(val) { VisaCountry(val) {
this.GetProductLabel(val); this.GetProductLabel(val);
...@@ -1247,27 +1230,7 @@ getCompanyList() { ...@@ -1247,27 +1230,7 @@ getCompanyList() {
this.productlabel.TagType = num this.productlabel.TagType = num
this.productlabel.Id = tag.Id; this.productlabel.Id = tag.Id;
this.CountryTagList = this.CountryTagList.filter(x=>x.Id!=tag.Id); this.CountryTagList = this.CountryTagList.filter(x=>x.Id!=tag.Id);
console.log(list,tag.Id)
return return
this.$confirm(this.$t('objFill.shifouscbkhf'), this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: "warning"
})
.then(() => {
this.apipost('', {
Id: this.productlabel.Id
}, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
} else {
this.Error(res.data.message)
}
})
})
.catch(() => {});
}, },
// 双击编辑标签 // 双击编辑标签
EditTag(tag, num) { EditTag(tag, num) {
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 13147ce3
...@@ -2442,7 +2442,6 @@ ...@@ -2442,7 +2442,6 @@
//获取TCID //获取TCID
clickAirticket(item) { clickAirticket(item) {
this.updateAirticketObj.TCID = item.TCID; this.updateAirticketObj.TCID = item.TCID;
console.log(" this.updateAirticketObj", item.TCID, this.updateAirticketObj)
}, },
//开启散客机票 //开启散客机票
openAirticket() { openAirticket() {
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 13147ce3
...@@ -1541,7 +1541,6 @@ ...@@ -1541,7 +1541,6 @@
//获取TCID //获取TCID
clickAirticket(item) { clickAirticket(item) {
this.updateAirticketObj.TCID = item.TCID; this.updateAirticketObj.TCID = item.TCID;
console.log(" this.updateAirticketObj", item.TCID, this.updateAirticketObj)
}, },
//开启散客机票 //开启散客机票
openAirticket() { openAirticket() {
......
src/components/activity/CouponList.vue
View file @ 13147ce3
...@@ -834,7 +834,6 @@ ...@@ -834,7 +834,6 @@
} }
} }
this.addMsg = Object.assign({}, item); this.addMsg = Object.assign({}, item);
console.log("item",item.customerType);
if (item.couponPriceLists || item.lineId || item.lineteamId || item.effectDate || item.expirationDate) { if (item.couponPriceLists || item.lineId || item.lineteamId || item.effectDate || item.expirationDate) {
if(item.lineId>0){ if(item.lineId>0){
this.getLineTeamList(item.lineId); this.getLineTeamList(item.lineId);
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ 13147ce3
...@@ -1072,6 +1072,7 @@ ...@@ -1072,6 +1072,7 @@
this.AirPickUp = tempData.AirPickUp; this.AirPickUp = tempData.AirPickUp;
this.AirSend = tempData.AirSend; this.AirSend = tempData.AirSend;
this.PostConfig.PDFAlias = tempData.PDFAlias; this.PostConfig.PDFAlias = tempData.PDFAlias;
this.ScrollMethod();
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/public/StartDateLimit.vue
View file @ 13147ce3
<template> <template>
<el-date-picker <el-date-picker class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange" value-format="yyyy-MM-dd"
class="h34" :picker-options="pickerOptions" :range-separator="$t('OrderList.zhi')"
@change="timeAdd(1)" :clearable="((clearable==false||clearable)&&!isQueryHistoryData)?clearable:true"></el-date-picker>
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
:range-separator="$t('OrderList.zhi')"
:clearable="((clearable==false||clearable)&&!isQueryHistoryData)?clearable:true"
></el-date-picker>
</template> </template>
<script> <script>
export default { export default {
props:['dateTime','clearable'], props: ['dateTime', 'clearable'],
data() { data() {
return { return {
productionDate: [], productionDate: [],
pickerOptions: { pickerOptions: {
onPick: ({ maxDate, minDate }) => { onPick: ({
maxDate,
minDate
}) => {
this.choiceDate = minDate.getTime(); this.choiceDate = minDate.getTime();
if (maxDate) { if (maxDate) {
this.choiceDate = ""; this.choiceDate = "";
...@@ -50,18 +46,20 @@ ...@@ -50,18 +46,20 @@
this.GetSupperOrderEditAuth() this.GetSupperOrderEditAuth()
}, },
watch: { watch: {
dateTime:{ dateTime: {
handler(n,o){ handler(n, o) {
this.productionDate = this.dateTime this.productionDate = this.dateTime
}, },
deep:false, deep: false,
immediate: true, immediate: true,
}, },
clearable:{ clearable: {
handler(n,o){ handler(n, o) {
if(n)console.log(n,'--------') if (n) {
//console.log(n,'--------')
}
}, },
deep:false, deep: false,
immediate: true, immediate: true,
} }
}, },
...@@ -72,13 +70,12 @@ ...@@ -72,13 +70,12 @@
if (!this.productionDate) { if (!this.productionDate) {
this.startDate = ""; this.startDate = "";
this.endDate = ""; this.endDate = "";
this.$emit('change',this.startDate,this.endDate) this.$emit('change', this.startDate, this.endDate)
return; return;
} }
this.startDate = this.productionDate[0]; this.startDate = this.productionDate[0];
this.endDate = this.productionDate[1]; this.endDate = this.productionDate[1];
this.$emit('change',this.startDate,this.endDate) this.$emit('change', this.startDate, this.endDate)
} }
}, },
GetSupperOrderEditAuth() { GetSupperOrderEditAuth() {
...@@ -91,4 +88,5 @@ ...@@ -91,4 +88,5 @@
}, },
} }
} }
</script> </script>
src/components/rank/components/citiescount.vue
View file @ 13147ce3
...@@ -29,7 +29,6 @@ export default { ...@@ -29,7 +29,6 @@ export default {
watch: { watch: {
chartData: function (old, val) { chartData: function (old, val) {
if (this.chartData) { if (this.chartData) {
console.log(this.chartData);
this.pieData = this.chartData.pieData; this.pieData = this.chartData.pieData;
this.name = this.chartData.name; this.name = this.chartData.name;
} }
......
src/components/rank/components/customer.vue
View file @ 13147ce3
...@@ -191,7 +191,6 @@ ...@@ -191,7 +191,6 @@
setOpacity(seriesName) { setOpacity(seriesName) {
const option = this.chart.getOption(); const option = this.chart.getOption();
option.series.forEach((series) => { option.series.forEach((series) => {
console.log(series.name, seriesName + '----')
if (seriesName == '') { if (seriesName == '') {
if (series.itemStyle) series.itemStyle.opacity = 1; if (series.itemStyle) series.itemStyle.opacity = 1;
if (series.lineStyle) series.lineStyle.opacity = 1; if (series.lineStyle) series.lineStyle.opacity = 1;
......
src/components/sale/YNExpectedCommission.vue
View file @ 13147ce3
...@@ -496,8 +496,6 @@ ...@@ -496,8 +496,6 @@
// 年终奖 // 年终奖
this.AnnualBonus.AvgLureNum = this.CommissionInfor.BonusNum?this.CommissionInfor.BonusNum:0 this.AnnualBonus.AvgLureNum = this.CommissionInfor.BonusNum?this.CommissionInfor.BonusNum:0
this.AnnualBonus.AvfOrderNum = this.CommissionInfor.BonusNum?this.CommissionInfor.BonusNum:0 this.AnnualBonus.AvfOrderNum = this.CommissionInfor.BonusNum?this.CommissionInfor.BonusNum:0
console.log(this.JapaneseProfit);
}else { }else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 13147ce3
...@@ -22,12 +22,13 @@ ...@@ -22,12 +22,13 @@
{{$t('salesModule.CompanyNum')}} {{$t('salesModule.CompanyNum')}}
</th> </th>
<th colspan="15" style="text-align:left; padding-left:8px;"> <th colspan="15" style="text-align:left; padding-left:8px;">
<p class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</p> <p class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')"
style="text-decoration:underline;cursor:pointer;">{{TCNUM}}</p>
</th> </th>
</tr> </tr>
<tr> <tr>
<th width="115">{{$t('ground.youlanshijian')}}</th> <th width="115">{{$t('ground.youlanshijian')}}</th>
<th width="200">{{$t('visaT.jdname')}}</th> <th width="250">{{$t('visaT.jdname')}}</th>
<th width="70">{{$t('objFill.zongrenshu')}}</th> <th width="70">{{$t('objFill.zongrenshu')}}</th>
<th width="70">{{$t('objFill.youke')}}<br />{{$t('advmanager.v_type')}}</th> <th width="70">{{$t('objFill.youke')}}<br />{{$t('advmanager.v_type')}}</th>
<th width="70">{{$t('objFill.youke')}}<br />{{$t('admin.admin_personNumber')}}</th> <th width="70">{{$t('objFill.youke')}}<br />{{$t('admin.admin_personNumber')}}</th>
...@@ -35,7 +36,7 @@ ...@@ -35,7 +36,7 @@
<th width="70">{{$t('ground.mianrenshu')}}</th> <th width="70">{{$t('ground.mianrenshu')}}</th>
<th width="120">{{$t('fnc.danjia')}}</th> <th width="120">{{$t('fnc.danjia')}}</th>
<th width="90">{{$t('objFill.jingexj')}}</th> <th width="90">{{$t('objFill.jingexj')}}</th>
<th width="120">{{$t('hotel.hotel_commission')}})</th> <th width="120">{{$t('hotel.hotel_commission')}}</th>
<th width="100">{{$t('fnc.a_zongjine')}}</th> <th width="100">{{$t('fnc.a_zongjine')}}</th>
<th width="210">{{$t('ground.fkfsdth')}}</th> <th width="210">{{$t('ground.fkfsdth')}}</th>
<th width="200">{{$t('pub.pubRemark')}}</th> <th width="200">{{$t('pub.pubRemark')}}</th>
...@@ -102,17 +103,17 @@ ...@@ -102,17 +103,17 @@
{{childItem.PeopleNum}} {{childItem.PeopleNum}}
</td> </td>
<td> <td>
<el-input class='w50 tcenter' v-model='childItem.UsePeopleNum' type="number" <el-input class='w50 tcenter' v-model='childItem.UsePeopleNum' type="number" @input='calculationPrice()'
@input='calculationPrice(subItem)' @keyup.native="checkInteger(childItem,'UsePeopleNum')"></el-input> @keyup.native="checkInteger(childItem,'UsePeopleNum')"></el-input>
</td> </td>
<td> <td>
<el-input class='w50 tcenter' maxlength='2' v-model='childItem.Discount' type="number" <el-input class='w50 tcenter' maxlength='2' v-model='childItem.Discount' type="number"
@input='calculationPrice(subItem)' @keyup.native="checkInteger(childItem,'Discount')"></el-input> @input='calculationPrice()' @keyup.native="checkInteger(childItem,'Discount')"></el-input>
</td> </td>
<td> <td>
<template v-if="EditBtn||LineId==90"> <template v-if="EditBtn||LineId==90">
<el-input class='w100' v-model='childItem.PeoplePrice' <el-input class='w100' v-model='childItem.PeoplePrice'
@keyup.native="checkPrice(childItem,'PeoplePrice')" @input='calculationPrice(subItem)' type="text"> @keyup.native="checkPrice(childItem,'PeoplePrice')" @input='calculationPrice()' type="text">
</el-input> </el-input>
</template> </template>
<template v-else> <template v-else>
...@@ -128,9 +129,9 @@ ...@@ -128,9 +129,9 @@
</td> </td>
<td> <td>
<template v-if="EditBtn||LineId==90"> <template v-if="EditBtn||LineId==90">
<el-input class='w100' v-model='childItem.DiscountPrice' <el-input class='w50 tcenter' v-model='childItem.DiscountPrice'
@keyup.native="checkPrice(childItem,'DiscountPrice')" @input='calculationPrice(subItem)' @keyup.native="checkPrice(childItem,'DiscountPrice')" @input='calculationPrice()' type="text">
type="text"></el-input> </el-input>
</template> </template>
<template v-else> <template v-else>
<span class="spanlink" v-if='childItem.DiscountPrice==0' <span class="spanlink" v-if='childItem.DiscountPrice==0'
...@@ -160,13 +161,13 @@ ...@@ -160,13 +161,13 @@
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"> <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('objFill.qingxuanzhe')" value='0'></el-option> <el-option :label="$t('objFill.qingxuanzhe')" :value='0'></el-option>
<el-option :label="$t('objFill.xianfu')" value='1'></el-option> <el-option :label="$t('objFill.xianfu')" :value='1'></el-option>
<el-option :label="$t('objFill.qiandan')" value='2'></el-option> <el-option :label="$t('objFill.qiandan')" :value='2'></el-option>
<el-option :label="$t('objFill.shiweidikou')" value='5'></el-option> <el-option :label="$t('objFill.shiweidikou')" :value='5'></el-option>
<el-option :label="$t('objFill.yufu')" value='4'></el-option> <el-option :label="$t('objFill.yufu')" :value='4'></el-option>
<el-option :label="$t('objFill.wangding')" value='12'></el-option> <el-option :label="$t('objFill.wangding')" :value='12'></el-option>
 <el-option :label="$t('ground.enterpriseAlipay')"  :value='15'></el-option> <el-option :label="$t('ground.enterpriseAlipay')" :value='15'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -186,6 +187,38 @@ ...@@ -186,6 +187,38 @@
</tr> </tr>
</template> </template>
</template> </template>
<tfoot>
<tr>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td>
</td>
<td colspan="2">
合计
</td>
<td>
<font style="color:red;font-weight:bold;">
{{sTotalPrice}}
</font>
</td>
<td>
</td>
<td>
</td>
</tr>
</tfoot>
</table> </table>
</div> </div>
</div> </div>
...@@ -206,7 +239,8 @@ ...@@ -206,7 +239,8 @@
IsOperation: '', IsOperation: '',
saveLoading: false, saveLoading: false,
LineId: 0, //线路编号 LineId: 0, //线路编号
currentUserInfo: {} currentUserInfo: {},
sTotalPrice: 0, //合计
} }
}, },
methods: { methods: {
...@@ -218,6 +252,17 @@ ...@@ -218,6 +252,17 @@
if (str == 3) if (str == 3)
return this.$t('objFill.xiaoren') return this.$t('objFill.xiaoren')
}, },
//页面跳转[小写]
goUrlT(path, obj, title) {
this.$router.push({
name: path,
query: {
id: obj,
blank: 'y',
tab: title
}
});
},
goUrl(path, obj, name) { goUrl(path, obj, name) {
this.$router.push({ this.$router.push({
path: path, path: path,
...@@ -228,12 +273,26 @@ ...@@ -228,12 +273,26 @@
} }
}); });
}, },
calculationPrice(obj) { calculationPrice() {
let totalPrice = 0; var tempPrice = 0;
obj.TicketPriceList.forEach(item => { if (this.DataList && this.DataList.length > 0) {
totalPrice += item.PeoplePrice * (item.UsePeopleNum - item.Discount) * (1 - item.DiscountPrice / 100); this.DataList.forEach(rItem => {
}) if (rItem.ScenicStatisticsList && rItem.ScenicStatisticsList.length > 0) {
obj.TotalPrice = totalPrice.toFixed(2); rItem.ScenicStatisticsList.forEach(sItem => {
var totalPrice = 0;
if (sItem.TicketPriceList && sItem.TicketPriceList.length > 0) {
sItem.TicketPriceList.forEach(tItem => {
totalPrice += tItem.PeoplePrice * (tItem.UsePeopleNum - tItem.Discount) * (1 - tItem
.DiscountPrice / 100);
});
}
sItem.TotalPrice = totalPrice.toFixed(2);
tempPrice += Number(totalPrice);
});
}
});
}
this.sTotalPrice = tempPrice;
}, },
getCurrencyList: function () { getCurrencyList: function () {
this.apipost("financeinfo_post_GetList", { this.apipost("financeinfo_post_GetList", {
...@@ -254,15 +313,7 @@ ...@@ -254,15 +313,7 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.DataList = res.data.data.ScenicList; this.DataList = res.data.data.ScenicList;
this.IsOperation = res.data.data.IsOperation; this.IsOperation = res.data.data.IsOperation;
this.DataList.forEach(item => { this.calculationPrice();
item.ScenicStatisticsList.forEach(x => {
x.PayStyle = x.PayStyle.toString();
this.calculationPrice(x);
if (x.CombinationNum == '' || x.CombinationNum == null) {
x.CombinationNum = this.$route.query.NewCombinationNum;
}
})
})
} else { } else {
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
...@@ -332,6 +383,7 @@ ...@@ -332,6 +383,7 @@
this.getCurrencyList(); this.getCurrencyList();
}, },
} }
</script> </script>
<style> <style>
.admissionStatisticsDetailsTalbe { .admissionStatisticsDetailsTalbe {
...@@ -378,4 +430,5 @@ ...@@ -378,4 +430,5 @@
.admissionStatisticsDetailsTalbe .scenicTable tr td { .admissionStatisticsDetailsTalbe .scenicTable tr td {
border: none; border: none;
} }
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment