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

src/assets/css/feture2.css

@@ -1768,7 +1768,7 @@ div{
   margin: 0 0 0 20px;
   width: 227px;
   height: 227px;
-  border-radius: 50%;
+  /* border-radius: 50%; */
 }
 .restaurant_1_info_2_right>.restaurant_1_info_2_right_top>div:hover>.travel_toolbar{
   display: block;
@@ -1778,7 +1778,7 @@ div{
   position: absolute;
   z-index: 3;
   left: 0px;
-  top: -30px;
+  top: -25px;
 }
 .restaurant_1_info_2_right>.restaurant_1_info_2_right_top>div>.dragDiv{
   position: relative;

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -19,7 +19,7 @@
 .page_EasyReport_form .el-date-editor.el-input,.page_EasyReport_form .el-date-editor.el-input__inner{width: 100% !important;}
 </style>
 <template>
-  <div class="page_EasyReport">
+  <div class="page_EasyReport" v-loading="AALloading">
     <div class="page_EasyReport_set clearfix">
       <el-form class="clearfix page_EasyReport_form" label-width="110px">
         <el-row style="padding:15px 0 0 0;">
@@ -85,6 +85,7 @@ export default {
       pageIndex: 1,
       multipleSort: false,
       loading: false,
+      AALloading: false,
       userId: -2,
       columns: [
         {
@@ -340,6 +341,7 @@ export default {
     this.getData()
   },methods:{
     togbu: function () {
+      this.AALloading = true
       let msg = {
         Year: this.year,
         sharelist: [],
@@ -357,7 +359,7 @@ export default {
         if (res.data.resultCode == 1) {
           this.$message.success(res.data.message)
         } else {
-          this.loading = false
+          this.AALloading = false
           this.$message.error(res.data.message)
         }
       })

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -407,7 +407,7 @@ tr._item_list td:last-child {
 </style>
 
 <template>
-  <div class="page_fnDm page_RecPayQuery">
+  <div class="page_fnDm page_RecPayQuery" v-loading="AALloading">
     <div class="query-box">
       <el-form class="_info_box clearfix" label-width="110px">
         <el-row style="padding:15px 20px 0 0;">
@@ -1228,7 +1228,8 @@ export default {
       ],
       footer: [],
       pageSize: 6,
-      pageIndex: 1
+      pageIndex: 1,
+      AALloading: false,
     };
   },
   created() {},
@@ -1257,11 +1258,12 @@ export default {
       });
     },
     togbu: function () {
+      this.AALloading = true
       this.apipost('financestatistics_post_InsertFinanceStatistics', {}, res=>{
         if (res.data.resultCode == 1) {
           this.$message.success(res.data.message)
         } else {
-          this.loading = false
+          this.AALloading = false
           this.$message.error(res.data.message)
         }
       })

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -1494,9 +1494,9 @@
                   </tr>
                 </table>
               </div>
+                <span v-if='item.isOwn==1 || userId==1||userId==5 || isUpdateOrder' :style="{cursor: 'pointer',color:item.isEnd===0 ? '' : '#e95252' }" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
+                <span v-else>******</span>
               </el-popover>
-              <span v-if='item.isOwn==1 || userId==1||userId==5 || isUpdateOrder' :style="{cursor: pointer,color:item.isEnd===0 ? '' : '#e95252' }" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
-              <span v-else>******</span>
               <!-- <span v-if='item.isOwn!=1 && userId!=1&&userId!=5 && isUpdateOrder==false'>******</span> -->
             </td>
             <td>
@@ -1529,7 +1529,7 @@
 							确认函下载
 						</span>
 						<i v-if='item.confirmFileList.length>0&&item.commissionSharePeople !== userId' @click="deleteFile(item)" style="margin-left: 5px;" class="el-icon-error color999"></i>
-						<el-upload v-if='(item.confirmFileList.length==0&&item.isOwn==1)||userId==1||userId==5'  :http-request="uploadFileBtn"  :multiple="false"  :show-file-list="false" aciton=''>
+						<el-upload v-if='(item.confirmFileList.length==0&&item.isOwn==1)||userId==1||userId==5'  :http-request="uploadFileBtn"  :multiple="false"  :show-file-list="false">
 								<el-button size="small" type="danger" @click='getItem(item)'>上传</el-button>
 						</el-upload>
             </td>
@@ -1770,9 +1770,9 @@
                     <td colspan="4" align="center">暂无数据</td>
                   </tr>
                 </table>
-              </div>	
-                <span v-if='item.isEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
-                <span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
+              </div>	 
+                  <span v-if='item.isEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
+                  <span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span> 
               </el-popover>
             </td>
             <td>{{item.refund}}</td>
@@ -1791,7 +1791,7 @@
 							确认函下载
 						</span>
 						<i v-if='item.confirmFileList.length>0&&item.commissionSharePeople !== userId' @click="deleteFile(item)" style="margin-left: 5px;" class="el-icon-error color999"></i>
-						<el-upload v-if='(item.confirmFileList.length==0&&item.isOwn==1)||userId==1||userId==5'  :http-request="uploadFileBtn"  :multiple="false"  :show-file-list="false" aciton=''>
+						<el-upload v-if='(item.confirmFileList.length==0&&item.isOwn==1)||userId==1||userId==5'  :http-request="uploadFileBtn"  :multiple="false"  :show-file-list="false">
 								<el-button size="small" type="danger" @click='getItem(item)'>上传</el-button>
 						</el-upload>
           </td>
@@ -3491,6 +3491,7 @@ export default {
       );
     },
     getOrderDetail(obj) {
+      console.log(obj)
       this.apipost(
         "Financial_post_GetOrderFinanceList",
         { OrderId: obj.orderId, OrderResource: 8 },

src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue

@@ -1408,6 +1408,11 @@
             }
           }
         }
+        let json = this.FeatureData.FeatureHtmlJson ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) : '';
+        // console.log("jsonjsonjson",json)
+        this.hotelObj.title = json.hotelObj.title.first ? json.hotelObj.title : this.hotelObj.title;
+        this.restaurantObj.title = json.restaurantObj.title ? json.restaurantObj.title : this.restaurantObj.title;
+        this.viewSpotObj.title = json.viewSpotObj.title ? json.viewSpotObj.title : this.viewSpotObj.title;
       },
       // 酒店图片拖拽
       onHotelDragstop(x,y){
@@ -1854,7 +1859,8 @@
     watch:{
       FeatureData:{
         handler: function (val, oldVal) {
-          console.log('2019年1月31日16:38:08',oldVal)
+          console.log('2019年2月12日10:53:11',oldVal)
+          console.log('2019年2月12日10:53:22',val)
           if (this.ReadOnly) return;
           if (val && this.oldVal != null) {
             // console.log("watch_if_FeatureData",11111)