Skip to content

S
SuperMan
Commit 3c5c8a78 authored by 黄奎's avatar 黄奎
Browse files
Options

新增修改餐，重复提交验证

parent eb521e50
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 84 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 3c5c8a78
......@@ -46,11 +46,10 @@
<div class="query-box" style="border-bottom: none;">
<ul>
<li>
<input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')"
@click="saveList(1)" />
<!--&&currentUserInfo.EmployeeId==615-->
<input v-if="IsOperation==1&& EditBtn " type="button"
class="fr normalBtn mb30" :value="$t('pub.saveBtn')" @click="saveList(1)" />
<el-button type="primary" class="fr normalBtn mb30" v-if="IsOperation!=1" :loading="saveLoading"
@click="saveList(1)">{{$t('pub.saveBtn')}}</el-button>
<el-button type="primary" class="fr normalBtn mb30" v-if="IsOperation==1&& EditBtn " :loading="saveLoading"
@click="saveList(1)">{{$t('pub.saveBtn')}}</el-button>
<span v-if="IsOperation==1" style="color:red;font-size:14px;">{{$t('ground.yizhidanbng')}}</span>
</li>
</ul>
......@@ -98,7 +97,7 @@
</td>
</tr>
</table>
<el-button slot="reference" style="background:#E95252; border-color:#E95252" type="primary">
<el-button slot="reference" style="background:#E95252;" type="primary">
批量上传手配书
</el-button>
</el-popover>
......@@ -134,8 +133,8 @@
</td>
</tr>
</table>
<el-button slot="reference" style="background:#E95252; border-color:#E95252;" type="primary"
v-if="EditBtn" @click="IsShowMoreUpdate=true">
<el-button slot="reference" style="background:#E95252; " type="primary" v-if="EditBtn"
@click="IsShowMoreUpdate=true">
批量修改酒店
</el-button>
</el-popover>
......@@ -173,7 +172,7 @@
<tbody>
<template v-for="(item,index) in list">
<template v-for="(subItem,subIndex) in item.HotelOrderList">
<tr v-for="(childItem,childIndex) in subItem.OrderDetailsList">
<tr v-for="(childItem,childIndex) in subItem.OrderDetailsList" :key="`h_`+index+subIndex+childIndex">
<td v-if="childIndex==0&&subIndex==0" :rowspan="6*item.HotelOrderList.length">
{{item.UseTimeStr}}
</td>
......@@ -724,6 +723,7 @@
],
ChooseCountry: "651",
currentUserInfo: {},
saveLoading: false, //保存，防止重复提交
}
},
components: {
......@@ -1148,10 +1148,11 @@
}
});
})
this.saveLoading = true;
this.loading = true;
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
this.loading = false;
this.saveLoading = false;
if (res.data.resultCode == 1) {
this.getList();
this.Success(res.data.message);
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 3c5c8a78
......@@ -4,16 +4,13 @@
<ul>
<li>
<template v-if="IsOperation != 1">
<!--v-if="IsEditDinner==1"-->
<input type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')" @click="saveList(1)"
:disabled="IsDisabled" />
<input v-if="IsEditDinner==0" type="button" class="fr normalBtn mb30" style="display:none;"
:value="$t('ground.baocuncaogao')" @click="saveList()" :disabled="IsDisabled" />
<el-button type="primary" class="fr normalBtn mb30" :loading="saveLogding" @click="saveList()">
{{$t('pub.saveBtn')}}</el-button>
</template>
<template v-else>
<span style="color:red;font-size:14px;">{{$t('ground.yizhidbnxg')}}!</span>
<input v-if="EditBtn&&currentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30"
:value="$t('pub.saveBtn')" @click="saveList()" />
<el-button v-if="EditBtn&&currentUserInfo.EmployeeId==615" class="fr normalBtn mb30" type="primary"
:loading="saveLogding" @click="saveList()">{{$t('pub.saveBtn')}}</el-button>
</template>
</li>
</ul>
......@@ -33,7 +30,6 @@
<th width="200">{{$t('restaurant.res_resName')}}</th>
<th width="150">{{$t('ground.xiugaict')}}</th>
<th width="80">{{$t('ground.leibie')}}</th>
<th width="70">{{$t('ground.zongrenshu')}}</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>
......@@ -47,7 +43,7 @@
</tr>
<template v-for="(item,index) in list">
<template v-for="(subItem,subIndex) in item.DiningSummaryList">
<tr v-for="(childItem,childIndex) in subItem.DiningPriceList">
<tr v-for="(childItem,childIndex) in subItem.DiningPriceList" :key="`d_`+index+subIndex+childIndex">
<td v-if="childIndex==0" :rowspan="3">
{{item.UseTimeStr}}
</td>
......@@ -234,7 +230,8 @@
确认时间：
</td>
<td style="text-align:left;">
<el-date-picker class='w135' v-model="subItem.SureTime" type="date" placeholder="选择确认时间" value-format="yyyy-MM-dd">
<el-date-picker class='w135' v-model="subItem.SureTime" type="date" placeholder="选择确认时间"
value-format="yyyy-MM-dd">
</el-date-picker>
</td>
</tr>
......@@ -306,8 +303,7 @@
GuestNum: 0,
loading: false,
IsOperation: '',
//是否禁用按钮
IsDisabled: false,
saveLogding: false,
allCurrencyList: [],
findex: 0,
childIndex: 0,
......@@ -474,7 +470,7 @@
this.$forceUpdate();
},
saveList() {
this.IsDisabled = true;
this.saveLogding = true;
this.list.forEach(item => {
item.DiningSummaryList.forEach(insideItem => {
if (insideItem.DiningPriceList) {
......@@ -490,12 +486,11 @@
})
})
this.apipost('dmcstatistics_get_SetDiningOrder', this.list, res => {
this.saveLogding = false;
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
this.IsDisabled = false;
} else {
this.IsDisabled = false;
this.$message.error(res.data.message);
}
}, err => {})
......
src/components/busManagement/BusInfo.vue
View file @ 3c5c8a78
......@@ -218,7 +218,7 @@
<el-table-column fixed :label="$t('sm.yongchejihua')" min-width="180">
<template slot-scope="scope">
<!-- {{scope.$index+1}} -->
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="subIndex">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpo_ap_`+subIndex">
<em>
<!--接机送机-->
<el-select class="w100" :placeholder="$t('pub.pleaseSel')" v-model="subItem.AirportPickUp"
......@@ -243,11 +243,10 @@
</el-table-column>
<el-table-column label="套团团号" min-width="230">
<template slot-scope="scope">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="subIndex">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpo_tt_`+subIndex">
<template v-if="subItem.AirportPickUp==15">
<div v-for="(childItem,childIndex) in subItem.MergeList" :key="childIndex">
<div v-for="(childItem,childIndex) in subItem.MergeList" :key="`bpo_me_`+childIndex">
<em>
<!--@change="GetTravelPrice(subItem)"-->
<el-select filterable style="margin-bottom:5px;" class="w170" :placeholder="$t('pub.pleaseSel')"
v-model="childItem.MTCID" @visible-change="GetPriceList(subItem)"
@change="GetPriceChange(subItem,childItem)">
......@@ -271,28 +270,28 @@
</el-table-column>
<el-table-column :label="$t('ground.sijiName')" min-width="120">
<template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpd_`+subIndex">
<el-input v-model="subItem.DriverName"></el-input>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('restaurant.res_ContactNumber')" min-width="140">
<template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpdt_`+subIndex">
<el-input v-model="subItem.DriverTel"></el-input>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('ground.cphaoma')" min-width="100">
<template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpo_`+subIndex">
<el-input v-model="subItem.BusNum"></el-input>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('hotel.hotel_Supplier')" min-width="150">
<template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bps_`+subIndex">
<el-select filterable :placeholder="$t('pub.pleaseSel')" v-model="subItem.BusCompany">
<el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
<el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID">
......@@ -303,7 +302,7 @@
</el-table-column>
<el-table-column :label="$t('ground.busType')" min-width="150">
<template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpo_b_`+subIndex">
<el-select filterable :placeholder="$t('pub.pleaseSel')" v-model="subItem.BusType"
:disabled="forbidInput" @change='getBusPrice(subItem)'>
<el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
......@@ -315,7 +314,7 @@
</el-table-column>
<el-table-column :label="$t('fnc.fkfangshi')" min-width="130">
<template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpo_p_`+subIndex">
<el-select class='sel' v-model='subItem.PayType' :disabled="isShowBtn==1||IsEditBus==0?true:false"
:placeholder="$t('pub.pleaseSel')" @change="PayTypeChange(scope.row)">
<el-option :label="$t('pub.pleaseSel')" :value='0'></el-option>
......@@ -332,7 +331,7 @@
<el-table-column :label="$t('ground.dingtuanhao')" min-width="180">
<template slot-scope="scope">
<div class="comBTM" v-for="(subItem,subIndex) in scope.row.BusPlanOrderList">
<div class="comBTM" v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" :key="`bpo_bo_`+subIndex">
<template v-if="scope.$index==0&&subIndex==0">
<i class="iconfont icon-tongshang" style="opacity:0;filter:alpha(opacity=0); "></i>
<el-input class='w135' type="text" v-model="subItem.BookGroup"></el-input>
......@@ -350,8 +349,9 @@
<el-table-column :label="$t('ground.sjzhusu')" min-width="180">
<template slot-scope="scope">
<!--司机住宿类型-->
<div v-for="childItem in scope.row.BusPlanOrderList" class="comBTM">
<span v-for="subItem in AccommodationTypeArray">
<div v-for="(childItem,childIndex) in scope.row.BusPlanOrderList" class="comBTM"
:key="`bpo_ac_`+childIndex">
<span v-for="(subItem,subIndex) in AccommodationTypeArray" :key="`bpo_acc_`+childIndex+subIndex">
<span class="subName" :class="{'spanCked':childItem.AccommodationType==subItem.Id}"
@click="AccommodationCLick(subItem.Id,childItem)">{{subItem.Name}}</span>
<span v-if="subItem.Id==1 && childItem.AccommodationType==1">
......@@ -365,14 +365,14 @@
</el-table-column>
<el-table-column :label="$t('ground.bcsm')" min-width="180">
<template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpo_pe_`+subIndex">
<el-input v-model="subItem.ParkExplain" :placeholder="$t('ground.qsrsm')"></el-input>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('ground.gsfeiyong')" min-width="120">
<template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpo_hsp_`+subIndex">
<el-input v-model="subItem.HighSpeedPrice" @keyup.native="checkPrice(subItem,'HighSpeedPrice')"
:placeholder="$t('ground.qsrfyong')" :disabled="isShowBtn==1||IsEditBus==0?true:false" class='w100'>
</el-input>
......@@ -382,7 +382,7 @@
<el-table-column :label="$t('ground.gsfkfs')" min-width="140">
<template slot-scope="scope">
<div>
<div v-for="(subItem,index) in scope.row.BusPlanOrderList" class="comBTM">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpo_hsp_`+subIndex">
<el-select class='sel w120' v-model='subItem.HighSpeedPayType' :placeholder="$t('pub.pleaseSel')"
@change="PayTypeChange(subItem)" :disabled="isShowBtn==1||IsEditBus==0?true:false">
<el-option :label="$t('pub.pleaseSel')" :value='0'></el-option>
......@@ -399,7 +399,7 @@
</el-table-column>
<el-table-column :label="$t('ground.UsePCount')" min-width="80">
<template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpo_un_`+subIndex">
<el-input v-model="subItem.UseNum" @keyup.native="checkPrice(subItem,'UseNum')"
:disabled="isShowBtn==1||IsEditBus==0?true:false"></el-input>
</div>
......@@ -407,7 +407,7 @@
</el-table-column>
<el-table-column :label="$t('ground.cbenjia')" min-width="120">
<template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpo_cp_`+subIndex">
<el-input v-model="subItem.CostPrice" :disabled="isShowBtn==1||IsEditBus==0?true:false"
@keyup.native="checkPrice(subItem,'CostPrice')" :placeholder="$t('ground.qingshurcbj')" class="w100">
</el-input>
......@@ -416,21 +416,23 @@
</el-table-column>
<el-table-column :label="$t('pub.pubRemark')" min-width="180">
<template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="comBTM">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="comBTM" :key="`bpo_rk_`+subIndex">
<el-input type="text" v-model="subItem.Remarks"></el-input>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('ground.park')" min-width="70">
<template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="park_List comBTM">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="park_List comBTM"
:key="`bpo_ihk_`+subIndex">
{{subItem.IsHavearking=='0'?$t('fnc.no'):'有'}}
</div>
</template>
</el-table-column>
<el-table-column :label="$t('ground.xiaoji')" min-width="80">
<template slot-scope="scope">
<div v-for="subItem in scope.row.BusPlanOrderList" class="park_List comBTM">
<div v-for="(subItem,subIndex) in scope.row.BusPlanOrderList" class="park_List comBTM"
:key="`bpo_cpt_`+subIndex">
{{subItem.CostPrice*(Number(subItem.TransferNum)+1) + Number(subItem.HighSpeedPrice)}}
</div>
</template>
......@@ -438,11 +440,12 @@
</el-table>
<div class="upBtnList">
<input v-if="isShowBtn==0" type="button" class="normalBtn" :class="{'disClick':!isSubmit}"
@click="SaveList(1)" :disabled="disButton" :value="$t('pub.saveBtn')" />
<el-button v-if="isShowBtn==0" type="primary" class="normalBtn" @click="SaveList(1)" :loading="saveLoading">
{{$t('pub.saveBtn')}}</el-button>
<el-button v-if="isShowBtn==1&&currentUserInfo.EmployeeId==615" type="primary" class="normalBtn"
@click="SaveList(1)" :loading="saveLoading">
{{$t('pub.saveBtn')}}</el-button>
<input v-if="isShowBtn==1&&currentUserInfo.EmployeeId==615" type="button" class="normalBtn"
:class="{'disClick':!isSubmit}" @click="SaveList(1)" :disabled="disButton" :value="$t('pub.saveBtn')" />
<span v-if="isShowBtn==1" style="color:red;margin-left:10px;">
{{$t('ground.xzdanbuneng')}}
</span>
......@@ -472,15 +475,13 @@
PostData: {},
//公用信息
CommonList: [],
//禁用文本框
diabledValue: true,
/*计划表数据*/
forbidInput: false,
PlanTableData: [],
UseTypeArray: [], //用车类型
BusAirportPickUpList: [], //用车类型
//禁止重复提交禁用按钮
disButton: false,
//防止重复提交
saveLoading: false,
//司机住宿类型
AccommodationTypeArray: [],
rules: {
......@@ -574,7 +575,6 @@
LeaderName: '',
GuideName: '',
loading: false,
isSubmit: true,
isShowBtn: 1, //1禁用高速费，成本费，高速付款方式文本框
IsEditBus: 0, //车辆修改权限
currentUserInfo: {},
......@@ -762,19 +762,17 @@
y.OrderState = type;
})
})
if (this.isSubmit) {
this.isSubmit = false;
this.apipost('bus_get_SetPlan_V2', this.PostData, res => {
this.isSubmit = true;
if (res.data.resultCode == 1) {
this.Success(this.$t('tips.saveYes'));
this.MsgBus.$emit('msg');
this.createTableData();
} else {
this.Error(res.data.message);
}
}, err => {})
}
this.saveLoading = true;
this.apipost('bus_get_SetPlan_V2', this.PostData, res => {
this.saveLoading = false;
if (res.data.resultCode == 1) {
this.Success(this.$t('tips.saveYes'));
this.MsgBus.$emit('msg');
this.createTableData();
} else {
this.Error(res.data.message);
}
}, err => {})
},
//司机住宿点击事件
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 3c5c8a78
......@@ -4,14 +4,13 @@
<ul>
<li>
<template v-if="IsOperation !=1">
<input type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')" @click="saveList(1)"
:disabled="IsDisabled" />
<!-- <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(1)" :disabled="IsDisabled" /> -->
<el-button type="primary" class="fr normalBtn mb30" :loading="saveLoading" @click="saveList(1)">
{{$t('pub.saveBtn')}}</el-button>
</template>
<template v-else>
<span style="color:red;font-size:14px;">已制单，不能在修改!</span>
<input v-if="EditBtn&&currentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30"
:value="$t('pub.saveBtn')" @click="saveList(1)" />
<el-button type="primary" class="fr normalBtn mb30" v-if="EditBtn&&currentUserInfo.EmployeeId==615"
:loading="saveLoading" @click="saveList(1)">{{$t('pub.saveBtn')}}</el-button>
</template>
</li>
</ul>
......@@ -34,16 +33,16 @@
<th width="70">游客<br />{{$t('admin.admin_personNumber')}}</th>
<th width="70">使用<br />{{$t('admin.admin_personNumber')}}</th>
<th width="70">免人数</th>
<th width="90">单价</th>
<th width="120">单价</th>
<th width="90">金额小计</th>
<th width="80">返佣</th>
<th width="120">返佣</th>
<th width="100">总金额</th>
<th width="210">付款方式/订团号</th>
<th width="200">{{$t('pub.pubRemark')}}</th>
</tr>
<template v-for="(item,index) in DataList">
<template v-for="(subItem,subIndex) in item.ScenicStatisticsList">
<tr v-for="(childItem,childIndex) in subItem.TicketPriceList">
<tr v-for="(childItem,childIndex) in subItem.TicketPriceList" :key="`s_`+index+subIndex+childIndex">
<td v-if="childIndex==0" :rowspan="3">
{{item.UseTimeStr}}
</td>
......@@ -101,7 +100,7 @@
</td>
<td>
<template v-if="EditBtn||LineId==90">
<el-input class='w135' v-model='childItem.PeoplePrice'
<el-input class='w100' v-model='childItem.PeoplePrice'
@keyup.native="checkPrice(childItem,'PeoplePrice')" @input='calculationPrice(subItem)' type="text">
</el-input>
</template>
......@@ -118,7 +117,7 @@
</td>
<td>
<template v-if="EditBtn||LineId==90">
<el-input class='w135' v-model='childItem.DiscountPrice'
<el-input class='w100' v-model='childItem.DiscountPrice'
@keyup.native="checkPrice(childItem,'DiscountPrice')" @input='calculationPrice(subItem)'
type="text"></el-input>
</template>
......@@ -193,8 +192,7 @@
GuestNum: 0,
loading: false,
IsOperation: '',
//是否禁用按钮
IsDisabled: false,
saveLoading: false,
LineId: 0, //线路编号
currentUserInfo: {}
}
......@@ -259,7 +257,7 @@
}, err => {})
},
saveList(type) {
this.IsDisabled = true;
this.saveLoading = true;
if (type == 0) {
this.DataList.forEach(item => {
item.ScenicStatisticsList.forEach(insideItem => {
......@@ -291,16 +289,14 @@
})
}
this.apipost('dmcstatistics_get_SetTicketOrder', this.DataList, res => {
this.saveLoading = false;
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
this.IsDisabled = false;
} else {
this.IsDisabled = false;
this.$message.error(res.data.message);
}
}, err => {})
},
CheckAuth() {
var actionCode = this.$AuthCode.EditRoomDinnerTIcket;
......
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