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

src/components/FinancialModule/FinancialDocuments.vue

@@ -1282,7 +1282,7 @@
 
       </el-form>
       <p style="color: red;text-align: right;padding: 5px;">注:冲抵请勾选单据后点击下方确认冲抵</p>
-      <table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0">
+      <table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0" v-loading="yfcdLoading">
         <tr>
           <th></th>
           <th>单号</th>
@@ -1376,6 +1376,7 @@
   export default {
     data() {
       return {
+        yfcdLoading: false,
         isTerminate: -1,
         hbMsg: {
           FrIDList: [],
@@ -1805,10 +1806,12 @@
         if (msg.FrID == "") {
           msg.FrID = 0;
         }
+        this.yfcdLoading = true
         this.apipost(
           "Financial_get_GetAdvanceFinancePageList",
           msg,
           res => {
+            this.yfcdLoading = false
             if (res.data.resultCode === 1) {
               this.czList = res.data.data.pageData;
               this.total2 = res.data.data.count;

src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue

@@ -547,7 +547,6 @@
       FeatureData: {
         //深度监听，可监听到对象、数组的变化
         handler: function (val, oldVal) {
-          this.FeatureData.FeatureType = 8
           this.$emit("featureCallBack", this.FeatureData);
           this.initFeature();
         },

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

@@ -78,6 +78,21 @@
         </div>
       </div>
     </div>
+    <el-dialog custom-class="resourceImgAdd"
+    :title="$t('sm.chooseImg')"
+    center
+    :visible.sync="isShowScenicImg">
+      <!--imgType:1-酒店,2-餐厅,3-景点,4-票务,5-车辆,6-领队,7-购物店,isCheckmore:是否多选图片-->
+      <DMCchooseImg
+        @closeImg="closeDMCchooseImg"
+        ref="DMCchooseImg1"
+        @headCallBack="getDMCimg"
+        v-bind:isCheckmore="1"
+        v-bind:imgType="choseType"
+        v-bind:queryItem="queryItem"
+        v-bind:IsShowAdd="true"
+        v-bind:IsShowVideo="true"></DMCchooseImg>
+    </el-dialog>
   </div>
 
 </template>
@@ -85,10 +100,12 @@
 <script>
   import vEditDiv from "../TravelTemp/VEditDiv";
   import vToolBar from "../TravelTemp/VToolBar";
+  import DMCchooseImg from "../../../commonPage/DMCchooseImg.vue";
   export default {
     components: {
       vEditDiv,
-      vToolBar
+      vToolBar,
+      DMCchooseImg
     },
     props: {
       // FeatureData
@@ -99,7 +116,7 @@
         first1: '风景美术馆日本平系列',
         first2: '顶鸠级住屋宿.温泉.美食.铁道之旅',
         first3: '秋 季 国 庆 森 之 京 都 七 日',
-        first4: '枫叶隧道列车之旅,日本米其林星级美食与住宿追寻,秋季赏枫+网红打卡漫游 </br> 印象日本全新改版行程日本旅游新体验',
+        first4: '枫叶隧道列车之旅,日本米其林星级美食与住宿追寻,秋季赏枫+网红打卡漫游 印象日本全新改版行程日本旅游新体验',
         first5: '在古老的日本樱花街道',
         first6: '遇见最美好的自己',
         first7: '冲绳 大阪城公园湖 伊豆 大阪',
@@ -151,8 +168,84 @@
       };
     },
     methods: {
+      // 返回数据对象
+      getFeatureData() {
+        this.canEditChange(false);
+        let travelFeature2 = {
+          hotelObj: this.hotelObj,
+          viewSpotObj: this.viewSpotObj,
+          restaurantObj: this.restaurantObj
+        };
+        var obj = {
+          basicData: travelFeature2,
+          deleteArray: this.deleteArray
+        };
+        return obj;
+      },
+      // 设置编辑状态
+      canEditChange(val) {
+        this.canEdit = val;
+        this.$forceUpdate();
+      },
+      //关闭添加弹窗
+      closeDMCchooseImg() {
+        this.isShowScenicImg = false;
+        this.queryItem.queryName = "";
+      },
+      //获取选择的图片
+      getDMCimg(imgArr) {
+        if (imgArr.length > 0) {
+          if (this.name === "hotel") {
+            if (this.hotelObj.list[this.currentIndex].images[this.imgIndex]) {
+              this.$refs[
+                "hotelVds_" + this.currentIndex + "_" + this.imgIndex
+              ][0]._data.top = 0;
+              this.hotelObj.list[this.currentIndex].images[this.imgIndex].Url =
+                imgArr[0].Path;
+            } else {
+              this.hotelObj.list[this.currentIndex].images[this.imgIndex] = {
+                x: 0,
+                y: 0,
+                Url: imgArr[0].Path
+              };
+            }
+          } else if (this.name === "viewSpot") {
+            if (this.viewSpotObj.list[this.currentIndex].images[this.imgIndex]) {
+              this.$refs[
+                "viewSpotVds_" + this.currentIndex + "_" + this.imgIndex
+              ][0]._data.top = 0;
+              this.viewSpotObj.list[this.currentIndex].images[this.imgIndex].Url =
+                imgArr[0].Path;
+            } else {
+              this.viewSpotObj.list[this.currentIndex].images[this.imgIndex] = {
+                x: 0,
+                y: 0,
+                Url: imgArr[0].Path
+              };
+            }
+          } else if (this.name === "restaurant") {
+            if (
+              this.restaurantObj.list[this.currentIndex].images[this.imgIndex]
+            ) {
+              this.$refs[
+                "restaurantVds_" + this.currentIndex + "_" + this.imgIndex
+              ][0]._data.top = 0;
+              this.restaurantObj.list[this.currentIndex].images[
+                this.imgIndex
+              ].Url = imgArr[0].Path;
+            } else {
+              this.restaurantObj.list[this.currentIndex].images[this.imgIndex] = {
+                x: 0,
+                y: 0,
+                Url: imgArr[0].Path
+              };
+            }
+          }
+        }
+        this.$forceUpdate();
+      },
       // 图片高度重置
-      imgTopReset: function (name, index1, index2) {
+      imgTopReset(name, index1, index2) {
           let imgList = [];
           if (name === 'hotel') {
               imgList = this.hotelObj.list[index1].images;
@@ -181,7 +274,7 @@
           }
       },
       // 图片顺序上移
-      imgToPreY: function (name, index1, index2) {
+      imgToPreY(name, index1, index2) {
             let imgList = [];
             if (name === 'hotel') {
                 imgList = this.hotelObj.list[index1].images
@@ -197,7 +290,7 @@
             this.$set(imgList, index2, JSON.parse(preImg))
         },
         // 图片顺序下移
-        imgToNextY: function (name, index1, index2) {
+        imgToNextY(name, index1, index2) {
             let imgList = [];
             if (name === 'hotel') {
                 imgList = this.hotelObj.list[index1].images
@@ -213,7 +306,7 @@
             this.$set(imgList, index2+1, JSON.parse(nowImg))
         },
         // 图片顺序置顶
-        imgToPreZ: function (name, index1, index2) {
+        imgToPreZ(name, index1, index2) {
             let imgList = [];
             if (name === 'hotel') {
                 imgList = this.hotelObj.list[index1].images
@@ -228,7 +321,7 @@
             imgList.splice(0,0,JSON.parse(nowImg))
         },
         // 图片顺序置底
-        imgToNextZ: function (name, index1, index2) {
+        imgToNextZ(name, index1, index2) {
             let imgList = [];
             if (name === 'hotel') {
                 imgList = this.hotelObj.list[index1].images
@@ -243,7 +336,7 @@
             imgList.push(JSON.parse(nowImg))
         },
         // 图片替换
-        imgToHuan: function (name, index1, index2) {
+        imgToHuan(name, index1, index2) {
             if (name === 'hotel') {
                 document.querySelector("#hotelfile_"+index1+"_"+index2).click()
             } else if (name === 'viewSpot') {
@@ -256,7 +349,7 @@
             this.imgIndex = index2
         },
         // 图片选择
-        imgToXuan: function (name, index1, index2) {
+        imgToXuan(name, index1, index2) {
             if (name === 'hotel') {
                 this.choseType = 1;
                 this.queryItem.queryName = this.hotelObj.list[index1].name;
@@ -277,7 +370,7 @@
             this.imgIndex = index2
         },
         // 图片删除
-        imgToDelete: function (name, index1, index2) {
+        imgToDelete(name, index1, index2) {
             let imgList = [];
             if (name === 'hotel') {
                 imgList = this.hotelObj.list[index1].images
@@ -290,7 +383,7 @@
             imgList.splice(index2,1)
         },
         // 版块顺序上移
-        bolckToPreY: function (name, index1, index2) {
+        bolckToPreY(name, index1, index2) {
             let blockList = [];
             if (name === 'hotel') {
                 blockList = this.hotelObj.list
@@ -306,7 +399,7 @@
             this.$set(blockList, index1, JSON.parse(preBlock))
         },
         // 版块顺序下移
-        bolckToNextY: function (name, index1, index2) {
+        bolckToNextY(name, index1, index2) {
             let blockList = [];
             if (name === 'hotel') {
                 blockList = this.hotelObj.list
@@ -322,7 +415,7 @@
             this.$set(blockList, index1+1, JSON.parse(nowBlock))
         },
         // 版块顺序置顶
-        bolckToPreZ: function (name, index1, index2) {
+        bolckToPreZ(name, index1, index2) {
             let blockList = [];
             if (name === 'hotel') {
                 blockList = this.hotelObj.list
@@ -337,7 +430,7 @@
             blockList.splice(0,0,JSON.parse(nowBlock))
         },
         // 版块顺序置底
-        bolckToNextZ: function (name, index1, index2) {
+        bolckToNextZ(name, index1, index2) {
             let blockList = [];
             if (name === 'hotel') {
                 blockList = this.hotelObj.list
@@ -352,7 +445,7 @@
             blockList.push(JSON.parse(nowBlock))
         },
         // 版块删除
-        bolckToDelete: function (name, index1, index2) {
+        bolckToDelete(name, index1, index2) {
             let blockList = [];
             if (name === 'hotel') {
                 blockList = this.hotelObj.list
@@ -365,7 +458,7 @@
             blockList.splice(index1,1);
             this.pageCount(name)
         },
-        pageCount: function (type) {
+        pageCount(type) {
             if (type === 'hotel') {
                 if (this.hotelObj.list.length!==0) {
                     this.hotelObj.pageList = [];
@@ -445,10 +538,7 @@
   padding: 0 0 0 83px;
 }
 .featureHome-text .edit_div{
-  /* height: 66px;
-  overflow: hidden; */
-  /* text-overflow: ellipsis; */
-  /* white-space: nowrap; */
+
 }
 .featureHome-text-title{
   height: 80px;
@@ -470,8 +560,6 @@
   border: 2px solid #CC0066;
   display: inline-block;
   overflow: hidden;
-  /* text-overflow: ellipsis; */
-  /* white-space: nowrap; */
   padding: 8px 14px;
 }
 .featureHome-text-box .edit_div{
@@ -519,15 +607,19 @@
   background: #CC0066;
   bottom: 267px;
   right: 339px;
+  padding: 47px 0 47px 58px;
 }
 .featureHome-left-two .edit_div{
+  height: 540px;
+  overflow: hidden;
   font-size: 45px;
   font-family: FZCuSong-B09S;
   font-weight: 400;
   color: #FFFFFF;
-  padding: 47px 0 47px 58px;
 }
 .featureHome-left-three{
+  height: 167px;
+  overflow: hidden;
   left: 85px;
   right: 338px;
   top: 1368px;
@@ -561,10 +653,14 @@
   opacity: 0.1;
 }
 .featureHome-right-one{
+  height: 790px;
+  overflow: hidden;
   right: 256px;
   bottom: 53px;
 }
 .featureHome-right-two{
+  height: 632px;
+  overflow: hidden;
   top: 564px;
   right: 181px;
 }
@@ -585,10 +681,14 @@
   color: #2A2A2A;
 }
 .featureHome-three-textOne{
+  height: 600px;
+  overflow: hidden;
   top: 93px;
   left: 24px;
 }
 .featureHome-three-textTwo{
+  height: 650px;
+  overflow: hidden;
   top: 22px;
   right: 31px;
 }

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

 <template>
-  <div id="newFeatureBox">
-    <!--  UpgradedVersion-introduceBj UpgradedVersion-otherBj -->
+  <div id="newFeatureBox3">
+    <!--  UpgradedVersion-introduceBj 介绍、宿 UpgradedVersion-otherBj 详情、食、景 -->
     <div class="UpgradedVersion-box UpgradedVersion-homebj relative">
       <!-- logo -->
       <Header></Header>
@@ -95,4 +95,7 @@
 .otherJourney-footer .otherJourney-introduceFooter{
   background: #CC0066;
 }
+img{
+  pointer-events: none;
+}
 </style>