Commit 08ac1174 authored by 黄奎's avatar 黄奎
parents 251c5f72 73dcc146
...@@ -1988,7 +1988,7 @@ ...@@ -1988,7 +1988,7 @@
<div class="needfenshu"> <div class="needfenshu">
<label>需要份数:</label><el-input type="number" v-model="SQPhotoNum" class="w200"></el-input> <label>需要份数:</label><el-input type="number" v-model="SQPhotoNum" class="w200"></el-input>
</div> </div>
<p style="color: red">注:每人每份10</p> <p style="color: red">注:每人每份5</p>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="ShenQingPhotoShow=false">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" @click="ShenQingPhotoShow=false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="SQPhoto">{{$t('pub.sureBtn')}}</button> <button class="normalBtn" type="primary" @click="SQPhoto">{{$t('pub.sureBtn')}}</button>
......
...@@ -2706,7 +2706,7 @@ ...@@ -2706,7 +2706,7 @@
<div class="needfenshu"> <div class="needfenshu">
<label>需要份数:</label><el-input type="number" v-model="SQPhotoNum" class="w200"></el-input> <label>需要份数:</label><el-input type="number" v-model="SQPhotoNum" class="w200"></el-input>
</div> </div>
<p style="color: red">注:每人每份10</p> <p style="color: red">注:每人每份5</p>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="ShenQingPhotoShow=false">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" @click="ShenQingPhotoShow=false">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" type="primary" @click="SQPhoto">{{$t('pub.sureBtn')}}</button> <button class="normalBtn" type="primary" @click="SQPhoto">{{$t('pub.sureBtn')}}</button>
......
...@@ -1539,7 +1539,7 @@ export default { ...@@ -1539,7 +1539,7 @@ export default {
list.push(ai) list.push(ai)
} }
} }
for(let i = 0; i < list.length; i++) { for(let i = 0; i < list.length; i++) {
Diningdest.push({ Diningdest.push({
UseTimeStr: ai.UseTimeStr, UseTimeStr: ai.UseTimeStr,
DiningID: ai.DiningID, DiningID: ai.DiningID,
...@@ -1577,13 +1577,23 @@ export default { ...@@ -1577,13 +1577,23 @@ export default {
}); });
Scenicmap[ai.UseTimeStr] = ai; Scenicmap[ai.UseTimeStr] = ai;
}else{ }else{
for(var j = 0; j < Scenicdest.length; j++){ let list = []
var dj = Scenicdest[j]; for(var j = 0; j < Scenicdest.length; j++){
if(dj.UseTimeStr == ai.UseTimeStr && dj.TicketID == ai.TicketID){ var dj = Scenicdest[j];
dj.data.push(ai); if(dj.UseTimeStr == ai.UseTimeStr && dj.TicketID == ai.TicketID){
break; dj.data.push(ai);
} break;
} }else{
list.push(ai)
}
}
for(let i = 0; i < list.length; i++) {
Scenicdest.push({
UseTimeStr: ai.UseTimeStr,
DiningID: ai.DiningID,
data: [ai]
});
}
} }
} }
for(var i = 0; i < Scenicdest.length; i++){ for(var i = 0; i < Scenicdest.length; i++){
...@@ -1593,7 +1603,8 @@ export default { ...@@ -1593,7 +1603,8 @@ export default {
} }
Scenicdest[i].row = row Scenicdest[i].row = row
} }
this.ScenicDataList = Scenicdest this.ScenicDataList = this.unique(Scenicdest);
// this.ScenicDataList = Scenicdest
//酒 //酒
let HotelList = [] let HotelList = []
for(let i = 0; i < res.data.data.HotelOrderListReport.length; i++) { for(let i = 0; i < res.data.data.HotelOrderListReport.length; i++) {
......
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