页面修改

src/components/LeaveGroupDownload/index.vue

@@ -4,24 +4,24 @@
       <div class="absolute z-index1 column" style="left: 0;right: 0; top: 0;bottom: 0;">
         <Header :TripColor="dataAll&&dataAll.tripColor" :orderMsg="orderMsg"></Header>
 
-          <div class="travelDaysTitlle row-aic">
-            <div class="travelDaysTitlle-left">
-              <div class="travelDaysTitlle-left-text column-ajc">
-                <div class="travelDaysTitlle-left-textOne">
-                  <span></span>
-                </div>
-                <div class="travelDaysTitlle-left-textTwo">
-                  <span></span>
-                </div>
+        <div class="travelDaysTitlle row-aic">
+          <div class="travelDaysTitlle-left">
+            <div class="travelDaysTitlle-left-text column-ajc">
+              <div class="travelDaysTitlle-left-textOne">
+                <span></span>
+              </div>
+              <div class="travelDaysTitlle-left-textTwo">
+                <span></span>
               </div>
             </div>
-            <div class="travelDaysTitlle-right">
-              <div class="travelDaysTitlle-right-text row-aic"
+          </div>
+          <div class="travelDaysTitlle-right">
+            <div class="travelDaysTitlle-right-text row-aic"
               :style="{'background': dataAll&&dataAll.tripColor,'font-size': getFontSize(orderMsg.lineteamName+orderMsg.dayNum),'color':textColor}">
-                {{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游
-              </div>
+              {{ orderMsg.lineteamName }}{{ orderMsg.dayNum }}日游
             </div>
           </div>
+        </div>
         <div style="margin: 0 30px;">
           <div class="trip-adviser" style="margin-top: 20px;">
             <!-- <h1 class="trip-nav-title">
@@ -103,12 +103,11 @@
                 <td class="essential-item jianju">
                   <p class="pkey">机场服务</p>
                   <p class="pvalue">
-                    <template v-if="
-                            orderMsg &&
-                              orderMsg.airportServicePerson &&
-                              orderMsg.airportServicePerson != ''
-                          ">
-                      {{ orderMsg.airportServicePerson }}
+                    <template v-if="orderTripdiff&& orderTripdiff.airportService&& orderTripdiff.airportService!=''">
+                      {{ orderTripdiff.airportService}}
+                    </template>
+                    <template v-else-if="orderMsg&&orderMsg.airportServicePerson&&orderMsg.airportServicePerson!=''">
+                      {{orderMsg.airportServicePerson+"/"+    orderMsg.airportServicePhone}}}
                     </template>
                   </p>
                 </td>
@@ -128,8 +127,11 @@
                   <p class="pkey">紧急联系人</p>
                   <p class="pvalue">
                     <span v-if="vshowLLR">
-                      <template v-if="orderMsg.emergencyContact != ''">
-                        {{ orderMsg.emergencyContact }}
+                      <template v-if="orderTripdiff!=null&&orderTripdiff.emergencyContact!=''">
+                        {{orderTripdiff.emergencyContact}}
+                      </template>
+                      <template v-else-if="orderMsg.branchManager!=''&&orderMsg.mobilePhone!=''">
+                        {{orderMsg.branchManager+"/"+orderMsg.mobilePhone}}
                       </template>
                     </span>
                   </p>
@@ -238,10 +240,10 @@
     },
 
     methods: {
-      getFontSize(title){
-        if(title.length+2>60){
-          return 929/60 +'px'
-        }else{
+      getFontSize(title) {
+        if (title.length + 2 > 60) {
+          return 929 / 60 + 'px'
+        } else {
           return '30px'
         }
       },
@@ -250,15 +252,15 @@
     watch: {
       dataAll: {
         handler(val, oldVal) {
-          if(val&&val.tripColor){
+          if (val && val.tripColor) {
             this.backgroundColor = this.hexToRgb(val.tripColor, 0.2)
             let rgba = this.hexToRgb(val.tripColor, 1)
             rgba = rgba.split(',')
             let rgba0 = rgba[0].split('(')
-            let arr = [rgba0[1],rgba[1],rgba[2]]
-            if(this.getRgbLevel(arr)>50){
+            let arr = [rgba0[1], rgba[1], rgba[2]]
+            if (this.getRgbLevel(arr) > 50) {
               this.textColor = "#fff"
-            }else{
+            } else {
               this.textColor = "#333"
             }
           }

src/components/LeaveGroupDownload/travelDays.vue

@@ -111,7 +111,7 @@
           <div class="travelDaysdetails-text row">
             <span>住宿：</span>
             <div>
-              <p v-for="(j,i) in item.jiu2">{{j.name}}</p>
+              <p v-for="(j,i) in item.jiu2">{{j.name}} </p> 或同級
             </div>
           </div>
         </div>

src/components/confirmationOrderDownLoadNew.vue

@@ -656,6 +656,27 @@
             }
           })
         }, err => {})
+      },
+            //上移下移(IsUp:0上移，1下移)
+      MoveItem(item, subIndex, IsUp) {
+        var currentItem = this.editForm.travelOrderFlightList[subIndex];
+        //上移
+        if (IsUp == 0) {
+          if (subIndex > 0) {
+            var upItem = this.editForm.travelOrderFlightList[subIndex - 1];
+            this.$set(this.editForm.travelOrderFlightList, subIndex - 1, currentItem);
+            this.$set(this.editForm.travelOrderFlightList, subIndex, upItem);
+            this.$forceUpdate();
+          }
+        } else {
+          //下移
+          if (subIndex != this.editForm.travelOrderFlightList.length - 1) {
+            var downItem = this.editForm.travelOrderFlightList[subIndex + 1];
+            this.$set(this.editForm.travelOrderFlightList, subIndex + 1, currentItem);
+            this.$set(this.editForm.travelOrderFlightList, subIndex, downItem);
+            this.$forceUpdate();
+          }
+        }
       },
       //初始化行程
       initTrip(res, data) {