Skip to content

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

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

parents 7787212f 3c5c8a78
Expand all Show whitespace changes
Inline Side-by-side
Showing with 195 additions and 159 deletions
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @ 515b9a5e
...@@ -1068,7 +1068,7 @@ export default { ...@@ -1068,7 +1068,7 @@ export default {
endDate=that.year+"-"+column.end endDate=that.year+"-"+column.end
} }
if(rowIndex<20){ if(rowIndex<20 || rowData.ZhaiYao=="团内承担燃油费"){
// if(BranchId == 1245){ // if(BranchId == 1245){
// that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} }) // that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} })
// } // }
...@@ -1077,15 +1077,15 @@ export default { ...@@ -1077,15 +1077,15 @@ export default {
} }
// 跳转到应收团款查询 // 跳转到应收团款查询
else if(rowData.ZhaiYao=="营业总收入"){ else if(rowData.ZhaiYao=="营业总收入"){
that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} }) that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,DataType:-1,blank:'y',tab:"营收报表"} })
// that.goUrl("RecPayQueryTeam",startDate,endDate,BranchId,"应收团款查询") // that.goUrl("RecPayQueryTeam",startDate,endDate,BranchId,"应收团款查询")
} }
else if(rowData.ZhaiYao=="营业总成本"){ else if(rowData.ZhaiYao=="营业总成本"){
that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} }) that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,DataType:-1,blank:'y',tab:"营收报表"} })
// that.goUrl("RecPayQueryTeamV2",startDate,endDate,BranchId,"应付团款查询") // that.goUrl("RecPayQueryTeamV2",startDate,endDate,BranchId,"应付团款查询")
} }
else{ else{
that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} }) that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,DataType:-1,blank:'y',tab:"营收报表"} })
} }
}else{ }else{
if(rowData.ZhaiYao=="员工提成"){ if(rowData.ZhaiYao=="员工提成"){
...@@ -1184,7 +1184,7 @@ export default { ...@@ -1184,7 +1184,7 @@ export default {
that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds,StandardCurrencyId) that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds,StandardCurrencyId)
//} //}
} }
else if(rowData.ZhaiYao =='车辆折旧'){ else if(rowData.ZhaiYao =='车辆折旧' || rowData.ZhaiYao =='营业税金及附加' || rowData.ZhaiYao =='净利润(亏损)' || rowData.ZhaiYao =='营业利润(亏损)'|| rowData.ZhaiYao =='管销费用'){
//不跳转 //不跳转
} }
else{ else{
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 515b9a5e
...@@ -2482,6 +2482,9 @@ export default { ...@@ -2482,6 +2482,9 @@ export default {
this.productionDate[1]=this.msg.endDate; this.productionDate[1]=this.msg.endDate;
} }
if(this.$route.query.DataType){
this.msg.DataType=this.$route.query.DataType;
}
if(this.msg.LineId>0){ if(this.msg.LineId>0){
this.msg.DataType="1"; this.msg.DataType="1";
} }
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 515b9a5e
...@@ -46,11 +46,10 @@ ...@@ -46,11 +46,10 @@
<div class="query-box" style="border-bottom: none;"> <div class="query-box" style="border-bottom: none;">
<ul> <ul>
<li> <li>
<input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')" <el-button type="primary" class="fr normalBtn mb30" v-if="IsOperation!=1" :loading="saveLoading"
@click="saveList(1)" /> @click="saveList(1)">{{$t('pub.saveBtn')}}</el-button>
<!--&&currentUserInfo.EmployeeId==615--> <el-button type="primary" class="fr normalBtn mb30" v-if="IsOperation==1&& EditBtn " :loading="saveLoading"
<input v-if="IsOperation==1&& EditBtn " type="button" @click="saveList(1)">{{$t('pub.saveBtn')}}</el-button>
class="fr normalBtn mb30" :value="$t('pub.saveBtn')" @click="saveList(1)" />
<span v-if="IsOperation==1" style="color:red;font-size:14px;">{{$t('ground.yizhidanbng')}}</span> <span v-if="IsOperation==1" style="color:red;font-size:14px;">{{$t('ground.yizhidanbng')}}</span>
</li> </li>
</ul> </ul>
...@@ -98,7 +97,7 @@ ...@@ -98,7 +97,7 @@
</td> </td>
</tr> </tr>
</table> </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-button>
</el-popover> </el-popover>
...@@ -134,8 +133,8 @@ ...@@ -134,8 +133,8 @@
</td> </td>
</tr> </tr>
</table> </table>
<el-button slot="reference" style="background:#E95252; border-color:#E95252;" type="primary" <el-button slot="reference" style="background:#E95252; " type="primary" v-if="EditBtn"
v-if="EditBtn" @click="IsShowMoreUpdate=true"> @click="IsShowMoreUpdate=true">
批量修改酒店 批量修改酒店
</el-button> </el-button>
</el-popover> </el-popover>
...@@ -173,7 +172,7 @@ ...@@ -173,7 +172,7 @@
<tbody> <tbody>
<template v-for="(item,index) in list"> <template v-for="(item,index) in list">
<template v-for="(subItem,subIndex) in item.HotelOrderList"> <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"> <td v-if="childIndex==0&&subIndex==0" :rowspan="6*item.HotelOrderList.length">
{{item.UseTimeStr}} {{item.UseTimeStr}}
</td> </td>
...@@ -724,6 +723,7 @@ ...@@ -724,6 +723,7 @@
], ],
ChooseCountry: "651", ChooseCountry: "651",
currentUserInfo: {}, currentUserInfo: {},
saveLoading: false, //保存，防止重复提交
} }
}, },
components: { components: {
...@@ -1148,10 +1148,11 @@ ...@@ -1148,10 +1148,11 @@
} }
}); });
}) })
this.saveLoading = true;
this.loading = true; this.loading = true;
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => { this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
this.loading = false; this.loading = false;
this.saveLoading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.getList(); this.getList();
this.Success(res.data.message); this.Success(res.data.message);
......
src/components/LeaderManagement/leaderArrangement.vue
View file @ 515b9a5e
...@@ -738,7 +738,8 @@ ...@@ -738,7 +738,8 @@
this.Success(this.$t("ground.shezhichenggong")); this.Success(this.$t("ground.shezhichenggong"));
this.isShow = false; this.isShow = false;
} else { } else {
that.Confirm(that.$t('ground.sheizhichongtu'), function () { var tipMessage = res.data.message;
that.Confirm(tipMessage, function () {
that.addMsg.IsSure = 1; that.addMsg.IsSure = 1;
that.apipost( that.apipost(
"LeaderSchedule_post_Set", "LeaderSchedule_post_Set",
...@@ -749,6 +750,7 @@ ...@@ -749,6 +750,7 @@
that.getNoTaskLeader(); that.getNoTaskLeader();
that.Success(that.$t("ground.shezhichenggong")); that.Success(that.$t("ground.shezhichenggong"));
that.isShow = false; that.isShow = false;
that.addMsg.IsSure = 0;
} }
}, },
err => {} err => {}
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 515b9a5e
...@@ -4,16 +4,13 @@ ...@@ -4,16 +4,13 @@
<ul> <ul>
<li> <li>
<template v-if="IsOperation != 1"> <template v-if="IsOperation != 1">
<!--v-if="IsEditDinner==1"--> <el-button type="primary" class="fr normalBtn mb30" :loading="saveLogding" @click="saveList()">
<input type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')" @click="saveList(1)" {{$t('pub.saveBtn')}}</el-button>
:disabled="IsDisabled" />
<input v-if="IsEditDinner==0" type="button" class="fr normalBtn mb30" style="display:none;"
:value="$t('ground.baocuncaogao')" @click="saveList()" :disabled="IsDisabled" />
</template> </template>
<template v-else> <template v-else>
<span style="color:red;font-size:14px;">{{$t('ground.yizhidbnxg')}}!</span> <span style="color:red;font-size:14px;">{{$t('ground.yizhidbnxg')}}!</span>
<input v-if="EditBtn&&currentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" <el-button v-if="EditBtn&&currentUserInfo.EmployeeId==615" class="fr normalBtn mb30" type="primary"
:value="$t('pub.saveBtn')" @click="saveList()" /> :loading="saveLogding" @click="saveList()">{{$t('pub.saveBtn')}}</el-button>
</template> </template>
</li> </li>
</ul> </ul>
...@@ -33,7 +30,6 @@ ...@@ -33,7 +30,6 @@
<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="150">{{$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>
...@@ -47,7 +43,7 @@ ...@@ -47,7 +43,7 @@
</tr> </tr>
<template v-for="(item,index) in list"> <template v-for="(item,index) in list">
<template v-for="(subItem,subIndex) in item.DiningSummaryList"> <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"> <td v-if="childIndex==0" :rowspan="3">
{{item.UseTimeStr}} {{item.UseTimeStr}}
</td> </td>
...@@ -234,7 +230,8 @@ ...@@ -234,7 +230,8 @@
确认时间： 确认时间：
</td> </td>
<td style="text-align:left;"> <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> </el-date-picker>
</td> </td>
</tr> </tr>
...@@ -306,8 +303,7 @@ ...@@ -306,8 +303,7 @@
GuestNum: 0, GuestNum: 0,
loading: false, loading: false,
IsOperation: '', IsOperation: '',
//是否禁用按钮 saveLogding: false,
IsDisabled: false,
allCurrencyList: [], allCurrencyList: [],
findex: 0, findex: 0,
childIndex: 0, childIndex: 0,
...@@ -474,7 +470,7 @@ ...@@ -474,7 +470,7 @@
this.$forceUpdate(); this.$forceUpdate();
}, },
saveList() { saveList() {
this.IsDisabled = true; this.saveLogding = true;
this.list.forEach(item => { this.list.forEach(item => {
item.DiningSummaryList.forEach(insideItem => { item.DiningSummaryList.forEach(insideItem => {
if (insideItem.DiningPriceList) { if (insideItem.DiningPriceList) {
...@@ -490,12 +486,11 @@ ...@@ -490,12 +486,11 @@
}) })
}) })
this.apipost('dmcstatistics_get_SetDiningOrder', this.list, res => { this.apipost('dmcstatistics_get_SetDiningOrder', this.list, res => {
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);
this.getList(); this.getList();
this.IsDisabled = false;
} else { } else {
this.IsDisabled = false;
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}, err => {}) }, err => {})
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 515b9a5e
...@@ -4317,6 +4317,7 @@ ...@@ -4317,6 +4317,7 @@
TipMessage: "", TipMessage: "",
CTTCNUM: "", CTTCNUM: "",
CTTCID: 0, CTTCID: 0,
IsSure: 0,
}, },
// 订单转团 // 订单转团
transferData: { transferData: {
...@@ -6353,24 +6354,55 @@ ...@@ -6353,24 +6354,55 @@
setTheLeader() { setTheLeader() {
if (this.isSubmit) { if (this.isSubmit) {
this.isSubmit = false; this.isSubmit = false;
var that = this;
this.apipost( this.apipost(
"LeaderSchedule_post_SetPriceLeader", "LeaderSchedule_post_SetPriceLeader",
this.setMsg, this.setMsg,
(res) => { (res) => {
this.isSubmit = true; that.isSubmit = true;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); that.Success(res.data.message);
this.getList(); that.getList();
this.getConfig(); that.getConfig();
this.showSetLeader = false; that.showSetLeader = false;
this.leaderListArr = []; that.leaderListArr = [];
this.ScheduleArray = []; that.ScheduleArray = [];
this.setMsg.TipMessage = ""; that.setMsg.TipMessage = "";
that.setMsg.IsSure = 0;
} else if (res.data.resultCode == 2) {
var tipMsg = res.data.message
that.Confirm(tipMsg, function () {
that.setMsg.IsSure = 1;
that.apipost(
"LeaderSchedule_post_SetPriceLeader",
that.setMsg,
res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
that.getConfig();
that.showSetLeader = false;
that.leaderListArr = [];
that.ScheduleArray = [];
that.setMsg.TipMessage = "";
that.setMsg.IsSure = 0;
} else {
that.Error(res.data.message);
that.setMsg.TipMessage = res.data.message;
that.setMsg.CTTCNUM = res.data.data.TCNUM;
that.setMsg.CTTCID = res.data.data.TCID;
that.setMsg.IsSure = 0;
}
},
null
);
});
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
this.setMsg.TipMessage = res.data.message; this.setMsg.TipMessage = res.data.message;
this.setMsg.CTTCNUM = res.data.data.TCNUM; this.setMsg.CTTCNUM = res.data.data.TCNUM;
this.setMsg.CTTCID = res.data.data.TCID; this.setMsg.CTTCID = res.data.data.TCID;
that.setMsg.IsSure = 0;
} }
}, },
(err) => {} (err) => {}
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 515b9a5e
...@@ -656,26 +656,29 @@ ...@@ -656,26 +656,29 @@
</p> </p>
<p class="travelnowrap" <p class="travelnowrap"
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 "> v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-tooltip class="item" effect="dark" content="点击查看酒店预订详情" placement="top-start">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj" <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM" :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo> @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
<div slot="reference"> <span slot="reference"
<a class="price" style="cursor:pointer;text-decoration:underline;">{{$t('salesModule.HotelOrder')}}
style="cursor:pointer;text-decoration:underline;">{{$t('salesModule.HotelOrder')}}</a> <font style="color:#e95252;text-decoration:none;">
<a style="color: #e95252">op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}{{$t('op.Fenfang')}}</a> op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}{{$t('op.Fenfang')}}
</div> </font>
</span>
</el-popover> </el-popover>
</el-tooltip>
</p> </p>
<p class="travelnowrap" <p class="travelnowrap"
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 "> v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 ">
<el-tooltip class="item" effect="dark" content="点击查看餐厅预订详情" placement="top-start">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID" <commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo> :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo>
<div slot="reference"> <span slot="reference" style="cursor:pointer;text-decoration:underline;">餐厅预订情况</span>
<a class="price" style="cursor:pointer;text-decoration:underline;">餐厅预订情况</a>
</div>
</el-popover> </el-popover>
</el-tooltip>
</p> </p>
<p v-if="(item.LineID==14 ||item.LineID==118) && item.BusOrderList && item.BusOrderList.length>0 "> <p v-if="(item.LineID==14 ||item.LineID==118) && item.BusOrderList && item.BusOrderList.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 515b9a5e
...@@ -495,27 +495,29 @@ ...@@ -495,27 +495,29 @@
</p> </p>
<p <p
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 "> v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-tooltip class="item" effect="dark" content="点击查看酒店预订详情" placement="top-start">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj" <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM" :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo> @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
<div slot="reference"> <span slot="reference"
<span class="price" style="cursor:pointer;text-decoration:underline;">{{$t('salesModule.HotelOrder')}}
style="cursor:pointer;text-decoration:underline;">{{$t('salesModule.HotelOrder')}}</span> <font style="color:#e95252;text-decoration:none;">
<span op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}{{$t('op.Fenfang')}}
style="color: #e95252">op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}{{$t('op.Fenfang')}}</span> </font>
</div> </span>
</el-popover> </el-popover>
</el-tooltip>
</p> </p>
<p <p
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 "> v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 ">
<el-tooltip class="item" effect="dark" content="点击查看餐厅预订详情" placement="top-start">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID" <commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo> :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo>
<div slot="reference"> <span slot="reference" style="cursor:pointer;text-decoration:underline;">餐厅预订情况</span>
<a class="price" style="cursor:pointer;text-decoration:underline;">餐厅预订情况</a>
</div>
</el-popover> </el-popover>
</el-tooltip>
</p> </p>
<p v-if="(item.LineID==14 || item.LineID==118 ) && item.BusOrderList && item.BusOrderList.length>0 "> <p v-if="(item.LineID==14 || item.LineID==118 ) && item.BusOrderList && item.BusOrderList.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 515b9a5e
...@@ -461,29 +461,30 @@ ...@@ -461,29 +461,30 @@
</p> </p>
<p <p
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 "> v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-tooltip class="item" effect="dark" content="点击查看酒店预订详情" placement="top-start">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj" <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM" :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo> @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
<div slot="reference"> <span slot="reference"
<span class="price" style="cursor:pointer;text-decoration:underline;">{{$t('salesModule.HotelOrder')}}
style="cursor:pointer;text-decoration:underline;">{{$t('salesModule.HotelOrder')}}</span> <font style="color:#e95252;text-decoration:none;">
<span op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}{{$t('op.Fenfang')}}
style="color: #e95252">op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}{{$t('op.Fenfang')}}</span> </font>
</div> </span>
</el-popover> </el-popover>
</el-tooltip>
</p> </p>
<p class="travelnowrap" <p class="travelnowrap"
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 "> v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.DiningList && item.DiningList.length>0 ">
<el-tooltip class="item" effect="dark" content="点击查看餐厅预订详情" placement="top-start">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID" <commonDinnerInfo :DiningObj="item.DiningList" :showHotelObj="showHotelObj" :TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo> :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"></commonDinnerInfo>
<div slot="reference"> <span slot="reference" style="cursor:pointer;text-decoration:underline;">餐厅预订情况</span>
<a class="price" style="cursor:pointer;text-decoration:underline;">餐厅预订情况</a>
</div>
</el-popover> </el-popover>
</el-tooltip>
</p> </p>
<p v-if="(item.LineID==14 || item.LineID==118 ) && item.BusOrderList && item.BusOrderList.length>0 "> <p v-if="(item.LineID==14 || item.LineID==118 ) && item.BusOrderList && item.BusOrderList.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonBusInfo :busData="item.BusOrderList" :TCID="item.TCID" :DMCNum="item.DMCNum" <commonBusInfo :busData="item.BusOrderList" :TCID="item.TCID" :DMCNum="item.DMCNum"
......
src/components/busManagement/BusInfo.vue
View file @ 515b9a5e
This diff is collapsed.
src/components/commonPage/commonDinnerInfo.vue
View file @ 515b9a5e
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
<th width="100" v-if="showHotelObj.showZhan">预约时间</th> <th width="100" v-if="showHotelObj.showZhan">预约时间</th>
<th width="100" v-if="showHotelObj.showZhan">操作人</th> <th width="100" v-if="showHotelObj.showZhan">操作人</th>
<th width="100" v-if="showHotelObj.showZhan">确认时间</th> <th width="100" v-if="showHotelObj.showZhan">确认时间</th>
</tr> </tr>
<template v-if=" DiningObj&& DiningObj.length>0"> <template v-if=" DiningObj&& DiningObj.length>0">
<tr v-for="(hotelSubItem,hotelSubIndex) in DiningObj"> <tr v-for="(hotelSubItem,hotelSubIndex) in DiningObj">
...@@ -95,8 +94,9 @@ ...@@ -95,8 +94,9 @@
</span> </span>
</td> </td>
<td v-if="showHotelObj.showPrice&&hotelSubItem.PriceList&&hotelSubItem.PriceList.length>0"> <td v-if="showHotelObj.showPrice&&hotelSubItem.PriceList&&hotelSubItem.PriceList.length>0">
<div v-for="(priceSubItem,priceSubIndex) in hotelSubItem.PriceList" :key="`din`+priceSubIndex"> <div v-for="(priceSubItem,priceSubIndex) in hotelSubItem.PriceList" :key="`din`+priceSubIndex"
<template v-if="priceSubItem.DiningNum>0"> style="text-align:left;padding-left:2px;">
<template v-if="priceSubItem.DiningNum>0&&priceSubItem.UnitPrice>0">
{{priceSubItem.GuestType==1?"大人：":(priceSubItem.GuestType==2?"中人：":(priceSubItem.GuestType==3?"小人：":""))}} {{priceSubItem.GuestType==1?"大人：":(priceSubItem.GuestType==2?"中人：":(priceSubItem.GuestType==3?"小人：":""))}}
<template v-if="priceSubItem.DiningDiscount>0"> <template v-if="priceSubItem.DiningDiscount>0">
({{priceSubItem.DiningNum}}-{{priceSubItem.DiningDiscount}}) ({{priceSubItem.DiningNum}}-{{priceSubItem.DiningDiscount}})
...@@ -106,7 +106,10 @@ ...@@ -106,7 +106,10 @@
{{priceSubItem.DiningNum}} ×{{priceSubItem.UnitPrice>0?(priceSubItem.UnitPrice):""}} {{priceSubItem.DiningNum}} ×{{priceSubItem.UnitPrice>0?(priceSubItem.UnitPrice):""}}
</template> </template>
</template> </template>
<template
v-if="priceSubItem.DiningNum>0&&priceSubItem.UnitPrice>0&&priceSubIndex!=hotelSubItem.PriceList.length-1">
<br /> <br />
</template>
</div> </div>
</td> </td>
<td> <td>
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 515b9a5e
...@@ -373,9 +373,9 @@ ...@@ -373,9 +373,9 @@
<span style="color: #4BCA81;" v-if="item.FoodsResult==1">√</span> <span style="color: #4BCA81;" v-if="item.FoodsResult==1">√</span>
<span class="colorE95252" v-else>{{item.FoodsResult=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.FoodsResult=='-1'?"x":"O"}}</span>
</div> </div>
<a style="text-decoration:underline;cursor:pointer;" title="点击下载餐配信息" <!-- <a style="text-decoration:underline;cursor:pointer;" title="点击下载餐配信息"
@click="DownLoadDinner(item)">{{$t('ground.peicanxiazai')}}</a> @click="DownLoadDinner(item)">{{$t('ground.peicanxiazai')}}</a> -->
<a style="text-decoration:underline;cursor:pointer;display:none;" title="点击下载新餐配信息" <a style="text-decoration:underline;cursor:pointer;" title="点击下载新餐配信息"
@click="DownLoadNewDinner(item)">{{$t('ground.peicanxiazai')}}</a> @click="DownLoadNewDinner(item)">{{$t('ground.peicanxiazai')}}</a>
</td> </td>
<td> <td>
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 515b9a5e
...@@ -4,14 +4,13 @@ ...@@ -4,14 +4,13 @@
<ul> <ul>
<li> <li>
<template v-if="IsOperation !=1"> <template v-if="IsOperation !=1">
<input type="button" class="fr normalBtn mb30" :value="$t('pub.saveBtn')" @click="saveList(1)" <el-button type="primary" class="fr normalBtn mb30" :loading="saveLoading" @click="saveList(1)">
:disabled="IsDisabled" /> {{$t('pub.saveBtn')}}</el-button>
<!-- <input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(1)" :disabled="IsDisabled" /> -->
</template> </template>
<template v-else> <template v-else>
<span style="color:red;font-size:14px;">已制单，不能在修改!</span> <span style="color:red;font-size:14px;">已制单，不能在修改!</span>
<input v-if="EditBtn&&currentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" <el-button type="primary" class="fr normalBtn mb30" v-if="EditBtn&&currentUserInfo.EmployeeId==615"
:value="$t('pub.saveBtn')" @click="saveList(1)" /> :loading="saveLoading" @click="saveList(1)">{{$t('pub.saveBtn')}}</el-button>
</template> </template>
</li> </li>
</ul> </ul>
...@@ -34,16 +33,16 @@ ...@@ -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">使用<br />{{$t('admin.admin_personNumber')}}</th> <th width="70">使用<br />{{$t('admin.admin_personNumber')}}</th>
<th width="70">免人数</th> <th width="70">免人数</th>
<th width="90">单价</th> <th width="120">单价</th>
<th width="90">金额小计</th> <th width="90">金额小计</th>
<th width="80">返佣</th> <th width="120">返佣</th>
<th width="100">总金额</th> <th width="100">总金额</th>
<th width="210">付款方式/订团号</th> <th width="210">付款方式/订团号</th>
<th width="200">{{$t('pub.pubRemark')}}</th> <th width="200">{{$t('pub.pubRemark')}}</th>
</tr> </tr>
<template v-for="(item,index) in DataList"> <template v-for="(item,index) in DataList">
<template v-for="(subItem,subIndex) in item.ScenicStatisticsList"> <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"> <td v-if="childIndex==0" :rowspan="3">
{{item.UseTimeStr}} {{item.UseTimeStr}}
</td> </td>
...@@ -101,7 +100,7 @@ ...@@ -101,7 +100,7 @@
</td> </td>
<td> <td>
<template v-if="EditBtn||LineId==90"> <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"> @keyup.native="checkPrice(childItem,'PeoplePrice')" @input='calculationPrice(subItem)' type="text">
</el-input> </el-input>
</template> </template>
...@@ -118,7 +117,7 @@ ...@@ -118,7 +117,7 @@
</td> </td>
<td> <td>
<template v-if="EditBtn||LineId==90"> <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)' @keyup.native="checkPrice(childItem,'DiscountPrice')" @input='calculationPrice(subItem)'
type="text"></el-input> type="text"></el-input>
</template> </template>
...@@ -193,8 +192,7 @@ ...@@ -193,8 +192,7 @@
GuestNum: 0, GuestNum: 0,
loading: false, loading: false,
IsOperation: '', IsOperation: '',
//是否禁用按钮 saveLoading: false,
IsDisabled: false,
LineId: 0, //线路编号 LineId: 0, //线路编号
currentUserInfo: {} currentUserInfo: {}
} }
...@@ -259,7 +257,7 @@ ...@@ -259,7 +257,7 @@
}, err => {}) }, err => {})
}, },
saveList(type) { saveList(type) {
this.IsDisabled = true; this.saveLoading = true;
if (type == 0) { if (type == 0) {
this.DataList.forEach(item => { this.DataList.forEach(item => {
item.ScenicStatisticsList.forEach(insideItem => { item.ScenicStatisticsList.forEach(insideItem => {
...@@ -291,16 +289,14 @@ ...@@ -291,16 +289,14 @@
}) })
} }
this.apipost('dmcstatistics_get_SetTicketOrder', this.DataList, res => { this.apipost('dmcstatistics_get_SetTicketOrder', this.DataList, res => {
this.saveLoading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success(res.data.message); this.$message.success(res.data.message);
this.getList(); this.getList();
this.IsDisabled = false;
} else { } else {
this.IsDisabled = false;
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
}, err => {}) }, err => {})
}, },
CheckAuth() { CheckAuth() {
var actionCode = this.$AuthCode.EditRoomDinnerTIcket; 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