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

src/components/Restaurant/ChangeDining.vue

@@ -9,7 +9,7 @@
       </ul>
     </div>
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
-      <table border="0" cellspacing="1" cellpadding="0" class="bookDinnerStatisticsTalbe">
+      <table border="0" cellspacing="1" cellpadding="0" class="bookDinnerStatisticsTalbe" v-loading="loading">
         <tr>
           <th width="120">公司团号</th>
           <th width="150">用餐时间</th>
@@ -21,7 +21,7 @@
           <th width="150">{{$t('Operation.Op_price')}}</th>
           <th width="80">{{$t('hotel.table_operat')}}</th>
         </tr>
-        <tr v-for="(item,index) in list">
+        <tr v-for="(item,index) in list" :key="`d_`+index">
           <td :rowspan="list.length" v-if="index==0">
             <div class="w120">
               <p class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</p>
@@ -33,8 +33,10 @@
           <td>
             <div class="w200">
               <p style="height: 84px; padding-left: 10px; display:flex; align-items:center;"
-                v-for="subItem in item.DiningSummaryList" class="link pHouseStyle"
-                @click="goUrlR('restaurantList',subItem.DiningID,'餐厅列表')" :style="{color: subItem.DiningChangeState==1?'red':''}">{{subItem.DiningName}}
+                v-for="(subItem,subIndex) in item.DiningSummaryList" class="link pHouseStyle"
+                @click="goUrlR('restaurantList',subItem.DiningID,'餐厅列表')"
+                :style="{color: subItem.DiningChangeState==1?'red':''}" :key="`d_s_n_`+index+subIndex">
+                {{subItem.DiningName}}
                 <br />
                 真实名称:{{subItem.DiningRealName}}
               </p>
@@ -43,7 +45,9 @@
           <td>
             <div class="w200">
               <p style="height: 84px; padding-left: 10px; display:flex; align-items:center;"
-                v-for="subItem in item.DiningSummaryList" class="link pHouseStyle" :style="{color: subItem.DiningChangeState==1?'red':''}">{{subItem.NewDiningName}}
+                v-for="(subItem,subIndex) in item.DiningSummaryList" class="link pHouseStyle"
+                :style="{color: subItem.DiningChangeState==1?'red':''}" :key="`d_r_n_`+index+subIndex">
+                {{subItem.NewDiningName}}
                 <br />
                 真实名称:{{subItem.NewDiningRealName}}
               </p>
@@ -51,15 +55,18 @@
           </td>
           <td>
             <div class="w80">
-              <p style="height: 84px; line-height: 84px;" v-for="subItem in item.DiningSummaryList" class="pHouseStyle">
+              <p style="height: 84px; line-height: 84px;" v-for="(subItem,subIndex) in item.DiningSummaryList"
+                :key="`d_r_ds_`+index+subIndex" class="pHouseStyle">
                 {{subItem.UseDinnerTypeStr}}
               </p>
             </div>
           </td>
           <td>
             <div class="w180">
-              <div class="DivStyle" v-for="subItem in item.DiningSummaryList">
-                <p v-for="childItem in subItem.DiningPriceList">
+              <div class="DivStyle" v-for="(subItem,subIndex) in item.DiningSummaryList"
+                :key="`d_r_dspt_`+index+subIndex">
+                <p v-for="(childItem,childIndex) in subItem.DiningPriceList"
+                  :key="`d_r_dsptd_`+index+subIndex+childIndex">
                   {{personStrToWord(childItem.PeopleType)}}
                 </p>
               </div>
@@ -67,8 +74,10 @@
           </td>
           <td>
             <div class="w80">
-              <div class="DivStyle" v-for="subItem in item.DiningSummaryList">
-                <p v-for="childItem in subItem.DiningPriceList">
+              <div class="DivStyle" v-for="(subItem,subIndex) in item.DiningSummaryList"
+                :key="`d_r_dsp_`+index+subIndex">
+                <p v-for="(childItem,childIndex) in subItem.DiningPriceList"
+                  :key="`d_r_dsp_d_`+index+subIndex+childIndex">
                   {{childItem.PeopleNum}}
                 </p>
               </div>
@@ -76,8 +85,10 @@
           </td>
           <td>
             <div>
-              <div class="DivStyle" v-for="subItem in item.DiningSummaryList">
-                <p v-for="childItem in subItem.DiningPriceList">
+              <div class="DivStyle" v-for="(subItem,subIndex) in item.DiningSummaryList"
+                :key="`d_r_dsp_a_`+index+subIndex">
+                <p v-for="(childItem,childIndex) in subItem.DiningPriceList"
+                  :key="`d_r_dsp_b_`+index+subIndex+childIndex">
                   <span class="spanlink" v-if='childItem.PeoplePrice==0'
                     @click="goUrl('RestaurantPackage',subItem,'套餐查询')">设置</span>
                   <span v-if='childItem.PeoplePrice!=0'>{{childItem.PeoplePrice}}</span>
@@ -88,7 +99,7 @@
           <td>
             <div class="w120">
               <p style="height: 84px; padding-left: 10px; display:flex; align-items:center;"
-                v-for="subItem in item.DiningSummaryList" class="link pHouseStyle">
+                v-for="(subItem,subIndex) in item.DiningSummaryList" class="link pHouseStyle"  :key="`d_r_dsp_c_`+index+subIndex">
                 <span v-if="subItem.DiningChangeState==1">
                   <input type="button" class="normalBtn" value="同意" @click="HotelChangeState(subItem,2)" />
                   <input type="button" class="normalBtn" value="拒绝" @click="HotelChangeState(subItem,3)" />
@@ -107,7 +118,8 @@
       return {
         list: [],
         TCNUM: "",
-        isShowBtn: 0
+        isShowBtn: 0,
+        loading: false,
       };
     },
     methods: {
@@ -152,11 +164,13 @@
           return '婴儿'
       },
       getList() {
+        this.loading = true;
         this.apipost(
           "dmcstatistics_get_GetDinnerStaticsDetail", {
             TCIDs: this.$route.query.id
           },
           res => {
+            this.loading = false;
             if (res.data.resultCode == 1) {
               var tempData = res.data.data;
               if (tempData && tempData.DiningList && tempData.DiningList.length > 0) {
@@ -198,7 +212,6 @@
           this.saveList(0);
         }
       },
-
       ChangeHotelInfo(type) {
         if (type == 2) {
           this.$confirm('是否同意？同意后将覆盖之前的信息！', this.$t('tips.tips'), {
@@ -238,6 +251,7 @@
           if (res.data.resultCode == 1) {
             this.$message.success(res.data.message)
             this.getList()
+
           } else {
             this.$message.error(res.data.message)
           }

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -232,7 +232,7 @@
                 this.goUrl('newQuotation');
               }
             } else {
-              this.Error(res.data.message);
+              this.ErrorHtml(res.data.message);
             }
           },
           err => {}

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -595,7 +595,7 @@
               this.isSubmit = true;
             } else {
               this.FeatureData.IsSave = false;
-              this.Error(res.data.message);
+              this.ErrorHtml(res.data.message);
               this.isSubmit = true;
               this.submitText = "提交";
               this.$refs.TravelFeature.del_show = true;

src/plug/index.js

@@ -216,6 +216,16 @@ export default {
         });
       },
 
+      //错误提示Html格式
+      Vue.prototype.ErrorHtml = function (msg) {
+        this.$message({
+          message: msg,
+          dangerouslyUseHTMLString: true,
+          duration: 3000,
+          type: "error"
+        });
+      },
+
       //一般提示
       Vue.prototype.Info = function (msg) {
         this.$message({