1

src/components/DomesticTravelcontract.vue

@@ -999,7 +999,8 @@
                           <span v-if="
                             subItem.childItem.playTimeHour != null &&
                             subItem.childItem.playTimeHour != ''
-                          ">（{{ subItem.childItem.playTimeHour }}小时</span>
+                          ">（{{ subItem.childItem.playTimeHour }}{{(subItem.childItem.playTimeHour.indexOf('时')!=-1||subItem.childItem.playTimeHour.indexOf('分')!=-1?'': '小时')}}
+                          {{(subItem.childItem.playTimeMinutes!=null && subItem.childItem.playTimeMinutes != ''?'':'）')}}</span>
                           <span v-if="
                             subItem.childItem.playTimeMinutes != null &&
                             subItem.childItem.playTimeMinutes != ''
@@ -1008,7 +1009,7 @@
                               subItem.childItem.playTimeHour == null &&
                               subItem.childItem.playTimeHour != ''
                             ">（</template>
-                            {{ subItem.childItem.playTimeMinutes }}分钟）</span>
+                            {{ subItem.childItem.playTimeMinutes }}{{(subItem.childItem.playTimeHour.indexOf('时')!=-1||subItem.childItem.playTimeHour.indexOf('分')!=-1?'': '分钟')}}）</span>
                         </span>
                         <span v-if="
                           subItem.type == 7 &&
@@ -1041,8 +1042,12 @@
                     {{ item.TrifficType }}
                   </td>
                   <td contenteditable="true">
-                    <span v-if="index != tripList.length - 1">旅游酒店</span>
+                    <template v-for="subItem in item.dayArray">
+                        <template v-if="subItem.type == 3">
+                          <span v-if="subItem.childItem.hotelName!=null && subItem.childItem.hotelName!=''">{{subItem.childItem.hotelName}}/或同级<br/></span>
                           <span v-else>无</span>
+                        </template>
+                      </template>
                   </td>
                   <td contenteditable="true">
                     <span v-if="index != tripList.length - 1">{{$t('objFill.shuanrenjian')}}</span>
@@ -2172,6 +2177,9 @@
           }
         }
         this.trifficList.forEach((x, index) => {
+          if(x.busTip!=null && x.busTip!=''){
+          this.tripDays[index].TrifficType = x.busTip;
+        }else{
           if (x.airportPickUp == 1 || x.airportPickUp == 2) {
             if (x.isUseBus == 1) {
               this.tripDays[index].TrifficType = "飞机+大巴";
@@ -2190,6 +2198,7 @@
               this.tripDays[index].TrifficType = this.$t('fnc.no')
             }
           }
+        }
         });
       },
       changeDmcCompany(item){

src/components/TravelContractNew.vue

@@ -1103,7 +1103,8 @@
                           <span v-if="
                             subItem.childItem.playTimeHour != null &&
                             subItem.childItem.playTimeHour != ''
-                          ">（{{ subItem.childItem.playTimeHour }}{{$t('objFill.xiaoshi')}}</span>
+                          ">（{{ subItem.childItem.playTimeHour }}{{(subItem.childItem.playTimeHour.indexOf('时')!=-1||subItem.childItem.playTimeHour.indexOf('分')!=-1?'': '小时')}}
+                          {{(subItem.childItem.playTimeMinutes!=null && subItem.childItem.playTimeMinutes != ''?'':'）')}}</span>
                           <span v-if="
                             subItem.childItem.playTimeMinutes != null &&
                             subItem.childItem.playTimeMinutes != ''
@@ -1112,7 +1113,7 @@
                               subItem.childItem.playTimeHour == null &&
                               subItem.childItem.playTimeHour != ''
                             ">（</template>
-                            {{ subItem.childItem.playTimeMinutes }}分钟）</span>
+                            {{ subItem.childItem.playTimeMinutes }}{{(subItem.childItem.playTimeHour.indexOf('时')!=-1||subItem.childItem.playTimeHour.indexOf('分')!=-1?'': '分钟')}}）</span>
                         </span>
                         <span v-if="
                           subItem.type == 7 &&
@@ -1145,8 +1146,12 @@
                     {{ item.TrifficType }}
                   </td>
                   <td contenteditable="true">
-                    <span v-if="index != tripList.length - 1">旅游酒店</span>
-                    <span v-else>{{$t('fnc.no')}}</span>
+                    <template v-for="subItem in item.dayArray">
+                        <template v-if="subItem.type == 3">
+                          <span v-if="subItem.childItem.hotelName!=null && subItem.childItem.hotelName!=''">{{subItem.childItem.hotelName}}/或同级<br/></span>
+                          <span v-else>无</span>
+                        </template>
+                      </template>
                   </td>
                   <td contenteditable="true">
                     <span v-if="index != tripList.length - 1">{{$t('objFill.shuanrenjian')}}</span>
@@ -2667,6 +2672,9 @@
           }
         }
         this.trifficList.forEach((x, index) => {
+          if(x.busTip!=null && x.busTip!=''){
+          this.tripDays[index].TrifficType = x.busTip;
+        }else{
           if (x.airportPickUp == 1 || x.airportPickUp == 2) {
             if (x.isUseBus == 1) {
               this.tripDays[index].TrifficType = "飞机+大巴";
@@ -2685,6 +2693,7 @@
               this.tripDays[index].TrifficType = this.$t('fnc.no')
             }
           }
+        }
         });
       },
       changeDmcCompany(item){

src/components/onedayTripContract.vue

@@ -985,10 +985,12 @@
                       <div v-if="subItem.type == 2||subItem.type == 7" :key="`tdd_`+index+subIndex">
                         <span v-if="subItem.type == 2">
                           {{ subItem.childItem.couponsName }}
+
                           <span v-if="
                             subItem.childItem.playTimeHour != null &&
                             subItem.childItem.playTimeHour != ''
-                          ">（{{ subItem.childItem.playTimeHour }}小时</span>
+                          ">（{{ subItem.childItem.playTimeHour }}{{(subItem.childItem.playTimeHour.indexOf('时')!=-1||subItem.childItem.playTimeHour.indexOf('分')!=-1?'': '小时')}}
+                          {{(subItem.childItem.playTimeMinutes!=null && subItem.childItem.playTimeMinutes != ''?'':'）')}}</span>
                           <span v-if="
                             subItem.childItem.playTimeMinutes != null &&
                             subItem.childItem.playTimeMinutes != ''
@@ -997,7 +999,7 @@
                               subItem.childItem.playTimeHour == null &&
                               subItem.childItem.playTimeHour != ''
                             ">（</template>
-                            {{ subItem.childItem.playTimeMinutes }}分钟）</span>
+                            {{ subItem.childItem.playTimeMinutes }}{{(subItem.childItem.playTimeHour.indexOf('时')!=-1||subItem.childItem.playTimeHour.indexOf('分')!=-1?'': '分钟')}}）</span>
                         </span>
                         <span v-if="
                           subItem.type == 7 &&
@@ -1031,8 +1033,12 @@
                     {{ item.TrifficType }}
                   </td>
                   <td contenteditable="true">
-                    <span v-if="index != tripList.length - 1">旅游酒店</span>
+                    <template v-for="subItem in item.dayArray">
+                        <template v-if="subItem.type == 3">
+                          <span v-if="subItem.childItem.hotelName!=null && subItem.childItem.hotelName!=''">{{subItem.childItem.hotelName}}/或同级<br/></span>
                           <span v-else>无</span>
+                        </template>
+                      </template>
                   </td>
                   <td contenteditable="true">
                     <span v-if="index != tripList.length - 1">{{$t('objFill.shuanrenjian')}}</span>
@@ -1998,6 +2004,9 @@
           }
         }
         this.trifficList.forEach((x, index) => {
+        if(x.busTip!=null && x.busTip!=''){
+          this.tripDays[index].TrifficType = x.busTip;
+        }else{
           if (x.airportPickUp == 1 || x.airportPickUp == 2) {
             if (x.isUseBus == 1) {
               this.tripDays[index].TrifficType = "飞机+大巴";
@@ -2016,6 +2025,7 @@
               this.tripDays[index].TrifficType = this.$t('fnc.no')
             }
           }
+        }
         });
       },
     },