修改confirmationOrderDownLoadNew

src/assets/css/UpgradedVersion.css

@@ -655,8 +655,8 @@ img {
   }
 
   .UpgradedVersionDetails1 {
-    left: 16px;
-    top: 122px;
+    left: 10px;
+    top: 147px;
   }
 
   /**/
@@ -1123,3 +1123,6 @@ img {
   bottom: 0;
   color: #e95252;
 }
+.cursorInitial{
+  cursor: initial
+}

src/components/TravelManager/TravelList/OpTripList.vue

@@ -128,7 +128,7 @@
                   <el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary">
                     {{$t('Operation.Op_tripUpdate')}}</el-button>
                   <el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
-                  <el-button @click="goUrlR('confirmationOrderDownLoad',item)" type="primary">
+                  <el-button @click="goUrlR('confirmationOrderDownLoadNew',item)" type="primary">
                     {{$t('Operation.Op_tripDownLoad')}}</el-button>
 
                   <el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">

src/components/TravelManager/TravelList/SaleTripList.vue

@@ -106,7 +106,7 @@
                   <el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
                   <el-button v-if="item.TCNUMS==''&&item.CreateBy==CurrentUserId" @click="delConfig(item.ID)" type="primary">{{$t('system.table_delete')}}</el-button>
                   <!-- <el-button @click="goUrlR('SalesconfirmationOrder',item)" type="primary">行程下载</el-button> -->
-                  <el-button @click="goUrlR('confirmationOrderDownLoad',item)" type="primary">
+                  <el-button @click="goUrlR('confirmationOrderDownLoadNew',item)" type="primary">
                     {{$t('Operation.Op_tripDownLoad')}}</el-button>
                 </div>
               </div>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1086,7 +1086,7 @@
                         @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
                         {{$t('Operation.Op_shouzhiDetail')}}
                       </el-dropdown-item>
-                      <el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoad',item)">
+                      <el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoadNew',item)">
                         {{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item>
                       <el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}}
                       </el-dropdown-item>

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -783,7 +783,7 @@
                       <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
                         {{$t('Operation.Op_shouzhiDetail')}}</el-dropdown-item>
                       <el-dropdown-item
-                        @click.native="goUrlR('confirmationOrderDownLoad',item)">
+                        @click.native="goUrlR('confirmationOrderDownLoadNew',item)">
                         {{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item>
                       <el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}}
                       </el-dropdown-item>

src/components/commonPage/TripDownLoadCommon.vue

@@ -165,7 +165,7 @@
     data() {
       return {
         TripLayer: {},
-        TripPath: "confirmationOrderDownLoad"
+        TripPath: "confirmationOrderDownLoadNew"
       };
     },
     methods: {

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/UpgradedVersionDetails.vue

@@ -14,9 +14,9 @@
         <div class="UpgradedVersionDetails-imgbox row-aic UpgradedVersion-Hover">
           <div class="UpgradedVersionDetails-img relative">
             <div class="UpgradedVersionDetails1 absolute z-index1">
-              <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'column'" isImg="1" :isUploadImg="true"
+              <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" isImg="1" :isUploadImg="true"
                 :isSelectImg="true" @toUploadImg="UploadImg(i)" @toSelectImg="SelectImg(i)" @toAddImg="AddImg"
-                @toDeleteImg="DeleteImg(i)" />
+                @toDeleteImg="DeleteImg(i)" :x="312" :y="312" />
             </div>
             <div class="UpgradedVersionDetails-imgOne bjE6">
               <template v-if="item.ImgList&&item.ImgList.length>0">

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/featureControls.vue

 <template>
   <div class="featureControls">
     <div class="row-aic featureControls-bottom featureControls-bottomOne" v-if="ControlsType=='row'">
-
       <el-tooltip class="item" effect="dark" content="上传图" placement="top">
         <div @click="toUploadImg" v-if="isUploadImg">
           <i class="el-icon-upload2"></i>
@@ -22,6 +21,9 @@
           <i class="el-icon-delete"></i>
         </div>
       </el-tooltip>
+      <el-tooltip class="item" effect="dark" content="尺寸" placement="top" v-if="x&&y">
+        <div class="cursorInitial fz14">{{x}} * {{y}}</div>
+      </el-tooltip>
     </div>
     <div class="column featureControls-bottom featureControls-bottomTwo" v-else>
       <template v-if="!isImg&&!isTemplate">
@@ -74,7 +76,7 @@
 
     },
     props: ['index', 'FeatureData', 'ControlsType','isImg', 'pagesType', 'isDeletePage',
-      'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template'
+      'isUploadImg', 'isSelectImg', 'isAddImg', 'isDeleteImg', 'isTemplate', 'Template','x','y'
     ],
     data() {
       return {

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/components/subheading.vue

@@ -61,9 +61,9 @@
           <div class="subIdeImg1 bjE6 UpgradedVersion-Hover">
             <div class="subIdeImg1relative relative UpgradedVersion-Hover">
               <div class="subIdeImgForm1Box absolute">
-                <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isImg="1" :isUploadImg="true"
+                <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
                   :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(0)" @toSelectImg="toSelectImg(0)"
-                  @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" />
+                  @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(0)" :x="Template>2?178:250" :y="187" />
               </div>
               <template v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>0">
                 <img :src="FeatureData.dataObj.SubList[0].url" />
@@ -77,9 +77,9 @@
           <div class="subIdeImg1 bjE6 UpgradedVersion-Hover">
             <div class="subIdeImg1relative relative">
               <div class="subIdeImgForm1Box absolute">
-                <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :isImg="1" :isUploadImg="true"
+                <FeatureControls v-if="FeatureData" :index="index" :FeatureData="FeatureData" :ControlsType="'row'" :isImg="1" :isUploadImg="true"
                   :isSelectImg="true" :isDeleteImg="false" @toUploadImg="toUploadImg(1)" @toSelectImg="toSelectImg(1)"
-                  @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" />
+                  @toAddImg="toAddImg" @toDeleteImg="toDeleteImg(1)" :x="Template==1?331:250" :y="187" />
               </div>
               <template v-if="FeatureData.dataObj&&FeatureData.dataObj.SubList &&FeatureData.dataObj.SubList.length>1 ">
                 <img :src="FeatureData.dataObj.SubList[1].url" />

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/featureHome.vue

@@ -17,7 +17,8 @@
       <div class="featureHome-vToolBar-one absolute z-index3">
         <FeatureControls :index="index" :FeatureData="FeatureItem" :ControlsType="'row'" :isTemplate="false"
           :isUploadImg="true" :isSelectImg="true" :isAddImg="false" :isDeleteImg="false" @toUploadImg="UploadImg"
-          @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></FeatureControls>
+          @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"
+          :x="697" :y="930"></FeatureControls>
         <input type="file" style="display:none" :id="'homefile_'+(FeatureItem * 2 + 1) + '_'+index" @change="uploadpic">
       </div>
       <div class="featureHome-vToolBar-two absolute z-index3">

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/index.vue

@@ -258,13 +258,17 @@
             tempImgUrl = tripObj.scenicArray[0].ImgList[0].url;
           }
           newObj.ImgList = [{
-            url: tempImgUrl
+            url: tempImgUrl,
+            x: 0,
+            y: 0,
           }];;
           newObj.MainDesc = tripObj.scenicArray[0].MainDesc;
         } else {
           newObj.DetailsName = "景点介绍";
           newObj.ImgList = [{
-            url: this.homeBg2
+            url: this.homeBg2,
+            x: 0,
+            y: 0,
           }];
           newObj.MainDesc = "景点描述";
         }
@@ -274,7 +278,9 @@
         newObj.MainName = "日本旅行专家";
         newObj.SubName = "『印象日本』日本豪华游代名词";
         newObj.ImgList = [{
-          url: this.homeBg1
+          url: this.homeBg1,
+          x: 0,
+          y: 0,
         }];
         newObj.MainDesc = "描述信息";
       },
@@ -283,7 +289,9 @@
         var dinnerObj = {
           MainName: "行程特色餐1",
           ImgList: [{
-            url: this.dinner1
+            url: this.dinner1,
+            x: 0,
+            y: 0,
           }],
           MainDesc: "行程特色餐1描述"
         };
@@ -313,7 +321,9 @@
                 newObj.SubList.push({
                   MainName: dItem.MainName,
                   ImgList: [{
-                    url: tempUrl
+                    url: tempUrl,
+                    x: 0,
+                    y: 0,
                   }],
                   MainDesc: dItem.MainDesc
                 });
@@ -328,7 +338,9 @@
               newObj.SubList.push({
                 MainName: dItem.MainName,
                 ImgList: [{
-                  url: tempUrl2
+                  url: tempUrl2,
+                  x: 0,
+                  y: 0,
                 }],
                 MainDesc: dItem.MainDesc
               });
@@ -340,7 +352,9 @@
               newObj.SubList.push({
                 MainName: dItem.MainName,
                 ImgList: [{
-                  url: tempUrl3
+                  url: tempUrl3,
+                  x: 0,
+                  y: 0,
                 }],
                 MainDesc: dItem.MainDesc
               });
@@ -359,13 +373,19 @@
         newObj.SubName = "特色酒店";
         newObj.MainName = "行程酒店";
         newObj.ImgList = [{
-          url: this.homeBg1
+          url: this.homeBg1,
+          x: 0,
+          y: 0,
         }];
         newObj.MainDesc = "行程酒店描述信息";
         newObj.SubList = [{
-          url: this.homeBg3
+          url: this.homeBg3,
+          x: 0,
+          y: 0,
         }, {
-          url: this.homeBg3
+          url: this.homeBg3,
+          x: 0,
+          y: 0,
         }];
         if (tripObj.hotelArray && tripObj.hotelArray.length > 0) {
           newObj.MainName = tripObj.hotelArray[0].MainName;
@@ -376,22 +396,32 @@
           if (tripObj.hotelArray[0].ImgList && tripObj.hotelArray[0].ImgList.length > 2) {
             newObj.SubList = [];
             newObj.SubList.push({
-              url: tripObj.hotelArray[0].ImgList[1].url
+              url: tripObj.hotelArray[0].ImgList[1].url,
+              x: 0,
+              y: 0,
             });
             newObj.SubList.push({
-              url: tripObj.hotelArray[0].ImgList[2].url
+              url: tripObj.hotelArray[0].ImgList[2].url,
+              x: 0,
+              y: 0,
             });
           } else if (tripObj.hotelArray[0].ImgList && tripObj.hotelArray[0].ImgList.length > 1) {
             newObj.SubList = [];
             newObj.SubList.push({
-              url: tripObj.hotelArray[0].ImgList[1].url
+              url: tripObj.hotelArray[0].ImgList[1].url,
+              x: 0,
+              y: 0,
             });
             newObj.SubList.push({
-              url: this.homeBg3
+              url: this.homeBg3,
+              x: 0,
+              y: 0,
             });
           }
           newObj.ImgList = [{
-            url: tempHotelImg
+            url: tempHotelImg,
+            x: 0,
+            y: 0,
           }];
           newObj.MainDesc = tripObj.hotelArray[0].MainDesc;
         }
@@ -400,13 +430,19 @@
       getDinnerData(tripObj, newObj) {
         newObj.SubName = "特色餐食";
         newObj.SubList = [{
-          url: this.homeBg3
+          url: this.homeBg3,
+          x: 0,
+          y: 0,
         }, {
-          url: this.homeBg3
+          url: this.homeBg3,
+          x: 0,
+          y: 0,
         }];
         newObj.MainName = "行程餐食";
         newObj.ImgList = [{
           url: this.dinner4,
+          x: 0,
+          y: 0,
         }];
         newObj.MainDesc = "行程餐食描述";
         if (tripObj.dinnerArray && tripObj.dinnerArray.length > 0) {
@@ -418,23 +454,33 @@
           if (tripObj.dinnerArray[0].ImgList && tripObj.dinnerArray[0].ImgList.length > 2) {
             newObj.SubList = [];
             newObj.SubList.push({
-              url: tripObj.dinnerArray[0].ImgList[1].url
+              url: tripObj.dinnerArray[0].ImgList[1].url,
+              x: 0,
+              y: 0,
             });
             newObj.SubList.push({
-              url: tripObj.dinnerArray[0].ImgList[2].url
+              url: tripObj.dinnerArray[0].ImgList[2].url,
+              x: 0,
+              y: 0,
             });
           }
           if (tripObj.dinnerArray[0].ImgList && tripObj.dinnerArray[0].ImgList.length > 1) {
             newObj.SubList = [];
             newObj.SubList.push({
-              url: tripObj.dinnerArray[0].ImgList[1].url
+              url: tripObj.dinnerArray[0].ImgList[1].url,
+              x: 0,
+              y: 0,
             });
             newObj.SubList.push({
-              url: this.homeBg3
+              url: this.homeBg3,
+              x: 0,
+              y: 0,
             });
           }
           newObj.ImgList = [{
-            url: tempDinnerImg
+            url: tempDinnerImg,
+            x: 0,
+            y: 0,
           }];
           newObj.MainDesc = tripObj.dinnerArray[0].MainDesc;
         }
@@ -443,13 +489,19 @@
       getScenicData(tripObj, newObj) {
         newObj.SubName = "特色景点";
         newObj.SubList = [{
-          url: this.homeBg3
+          url: this.homeBg3,
+          x: 0,
+          y: 0,
         }, {
-          url: this.homeBg3
+          url: this.homeBg3,
+          x: 0,
+          y: 0,
         }];
         newObj.MainName = "行程景点";
         newObj.ImgList = [{
-          url: this.homeBg1
+          url: this.homeBg1,
+          x: 0,
+          y: 0,
         }];
         newObj.MainDesc = "行程景点描述信息";
         if (tripObj.scenicArray && tripObj.scenicArray.length > 0) {
@@ -461,22 +513,32 @@
           if (tripObj.scenicArray[0].ImgList && tripObj.scenicArray[0].ImgList.length > 2) {
             newObj.SubList = [];
             newObj.SubList.push({
-              url: tripObj.scenicArray[0].ImgList[1].url
+              url: tripObj.scenicArray[0].ImgList[1].url,
+              x: 0,
+              y: 0,
             });
             newObj.SubList.push({
-              url: tripObj.scenicArray[0].ImgList[2].url
+              url: tripObj.scenicArray[0].ImgList[2].url,
+              x: 0,
+              y: 0,
             });
           } else if (tripObj.scenicArray[0].ImgList && tripObj.scenicArray[0].ImgList.length > 1) {
             newObj.SubList = [];
             newObj.SubList.push({
-              url: tripObj.scenicArray[0].ImgList[1].url
+              url: tripObj.scenicArray[0].ImgList[1].url,
+              x: 0,
+              y: 0,
             });
             newObj.SubList.push({
-              url: this.homeBg3
+              url: this.homeBg3,
+              x: 0,
+              y: 0,
             });
           }
           newObj.ImgList = [{
-            url: tempScenicImg
+            url: tempScenicImg,
+            x: 0,
+             y: 0,
           }];
           newObj.MainDesc = tripObj.scenicArray[0].MainDesc;
         }
@@ -509,7 +571,9 @@
                 if (sItem.NewImaArray && sItem.NewImaArray.length > 0) {
                   sItem.NewImaArray.forEach(iItem => {
                     tempImgList.push({
-                      url: iItem.Url
+                      url: iItem.Url,
+                      x: 0,
+                      y: 0,
                     });
                   })
                 }
@@ -534,7 +598,9 @@
                   if (sItem.ImaArray && sItem.ImaArray.length > 0) {
                     sItem.ImaArray.forEach(iItem => {
                       tempImgList.push({
-                        url: iItem.Url
+                        url: iItem.Url,
+                        x: 0,
+                        y: 0,
                       });
                     })
                   }
@@ -558,7 +624,9 @@
                   if (sItem.ImaArray && sItem.ImaArray.length > 0) {
                     sItem.ImaArray.forEach(iItem => {
                       tempImgList.push({
-                        url: iItem.Url
+                        url: iItem.Url,
+                        x: 0,
+                        y: 0,
                       });
                     })
                   }

src/components/newTravelmanager/TravelGroupControl/UpgradedVersion/otherJourney.vue

@@ -9,7 +9,7 @@
           :isUploadImg="FeatureItem.pageType==2?true:false" :isSelectImg="FeatureItem.pageType==2?true:false" :isAddImg="FeatureItem.pageType==2?false:
           FeatureItem.pageType!=2&&FeatureItem.dataObj.ImgList
           &&FeatureItem.dataObj.ImgList.length!=9?true:false" :isDeleteImg="false" @toUploadImg="UploadImg"
-          @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg"></FeatureControls>
+          @toSelectImg="SelectImg" @toAddImg="AddImg" @toDeleteImg="DeleteImg" :x="1019" :y="577"></FeatureControls>
         <input type="file" style="display:none" :id="'introducefile_'+(FeatureItem * 2 + 1) + '_'+index" @change="uploadpic">
       </div>
       <div class="MasterMapList-box-two absolute z-index3">