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/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>