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

src/components/Hotel/HotelManagement.vue

@@ -331,9 +331,9 @@
           </div>
         </div>
         <div style="padding-left:15px">
-          <p>操作人:{{item.UpdateName}}</p>
-          <p>操作时间:{{item.UpdateTimeStr}}</p>
-          
+          <i style="top:2px" class="iconfont icon-renyuanguanli"></i>
+          <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}/</span>
+          {{item.UpdateTimeStr}}
         </div>
         <div class="btnList">
           <button @click="goSubInfo('HotelInfo',item.ID)" class="hotelBtnMan">{{$t('pub.updateMsg')}}</button>

src/components/Restaurant/restaurantList.vue

@@ -336,8 +336,9 @@
           </div>
         </div>
          <div style="padding:0 0 10px 15px;margin-top: -5px;">
-          <p>操作人:{{item.UpdateName}}</p>
-          <p>操作时间:{{item.UpdateTimeStr}}</p>
+           <i class="iconfont icon-renyuanguanli"></i>
+           <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}/</span>
+           {{item.UpdateTimeStr}}
           
         </div>
         <div class="btnList">

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -480,7 +480,7 @@
         var newMsg = {
           ID: configId
         };
-        var fileName = "成本下载" + this.DataObj.TeamNum + ".xls";
+        var fileName = "成本下载" + configId + ".xls";
         this.GetLocalFile("quotation_get_DownLoadQuotation", newMsg, fileName, res => {
           this.loading=false;
         });

src/components/scenicSpot/scenicSpotList.vue

@@ -314,8 +314,9 @@
           <div class="hotelTitle">{{item.Name}}</div>
         </el-tooltip>
         <div style="padding-left:15px">
-          <p>操作人:{{item.UpdateName}}</p>
-          <p>操作时间:{{item.UpdateTimeStr}}</p>
+          <i style="top: 1px;position: relative;" class="iconfont icon-renyuanguanli"></i>
+          <span v-if="item.UpdateName && item.UpdateName!=''">{{item.UpdateName}}/</span>
+          {{item.UpdateTimeStr}}
           
         </div>
         <div class="btnList">