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

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -86,14 +86,18 @@
                   <el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.RealName' :value='itemHotel.ID'
                     :key='itemHotel.ID'></el-option>
                 </el-select>
+                <template v-if="subItem.NewDiningRealName">
                   <span style="color:green">{{subItem.NewDiningRealName}}</span><br />
-                <el-popover placement="right" width="540" trigger="click" v-model="subItem.isShowPop">
-                  <comCheckDinner :ref="'comCheckDinner'+index+subIndex+''" :UseDate="item.UseTimeStr"
-                    v-on:childDinner="childDinnerList" :Country="651">
+                </template>
+                <template v-else-if="subItem.NewDiningName">
+                  <span style="color:green">{{subItem.NewDiningName}}</span><br />
+                </template>
+                <el-popover placement="right" width="540" trigger="click">
+                  <comCheckDinner v-show="subItem.IsShowPop" :ref="'comCheckDinner'+index+subIndex+''"
+                    :UseDate="item.UseTimeStr" v-on:childDinner="childDinnerList" :Country="651">
                   </comCheckDinner>
                   <el-button size="small" type="danger" :data-index="'comCheckDinner'+index+subIndex+''"
-                    slot="reference" style="cursor:pointer;"
-                    @click="getChildDinner(index,subIndex),subItem.isShowPop=true">
+                    slot="reference" style="cursor:pointer;" @click="getChildDinner(index,subIndex,subItem)">
                     {{$t('ground.cantingxuanz')}}
                   </el-button>
                 </el-popover>
@@ -172,8 +176,10 @@
                     <td style="text-align:left;">
                       <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("ground.xianfu")' :value='1' v-if="subItem.PayStyleExt==1||LineId==90"></el-option>
-                        <el-option :label='$t("ground.qiandan")' :value='2' v-if="subItem.PayStyleExt==2||LineId==90"></el-option>
+                        <el-option :label='$t("ground.xianfu")' :value='1' v-if="subItem.PayStyleExt==1||LineId==90">
+                        </el-option>
+                        <el-option :label='$t("ground.qiandan")' :value='2' v-if="subItem.PayStyleExt==2||LineId==90">
+                        </el-option>
                         <el-option :label='$t("ground.shiwudk")' :value='3' v-if="subItem.PayStyleExt==3"></el-option>
                         <el-option :label='$t("ground.yufu")' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
                         <el-option :label='$t("ground.yufukuandk")' :value='5' v-if="subItem.PayStyleExt==5">
@@ -267,11 +273,12 @@
       comCheckDinner,
     },
     methods: {
-      getChildDinner(index, subIndex) {
+      getChildDinner(index, subIndex, subItem) {
         this.findex = index;
         this.childIndex = subIndex;
         let str = `comCheckDinner${index}${subIndex}`
         this.$refs[str][0].getCheckDinner();
+        subItem.IsShowPop = true;
       },
       //选中赋值
       childDinnerList(obj) {
@@ -285,7 +292,7 @@
         oldData.NewDiningRealName = obj.RealName;
         this.list.forEach(x => {
           x.DiningSummaryList.forEach(y => {
-            y.isShowPop = false;
+            y.IsShowPop = false;
           })
         });
       },
@@ -343,7 +350,6 @@
               resultArray.forEach(item => {
                 item.DinnerList = [];
                 item.DiningSummaryList.forEach(x => {
-                  x.isShowPop = false;
                   x.DiningReserveType = x.DiningReserveType.toString();
                   this.calculationPrice(x);
                   var str = x.NewDiningName;
@@ -376,7 +382,6 @@
             return item.ID === obj.CurrencyId; //筛选出匹配数据
           });
         }
-
         //日元
         let jpaObj = this.allCurrencyList.find(item => {
           return item.ID === 3; //筛选出匹配数据