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

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -2086,7 +2086,7 @@ export default {
             if(BranchStatus==-2){
               BranchStatus = -1;
               this.shujuType = true;
-              this.apipost("line_post_GetList", {}, res => {
+              this.apipost("line_post_GetList", {'LineDirection':2}, res => {
                 if (res.data.resultCode == 1) {
                   this.LineList = res.data.data;
                 } else {

src/components/Hotel/HotelManagement.vue

@@ -285,7 +285,7 @@
         <div class="reTopInfo" :class="{'comCursorUrl':item.URL}" @click="OpenNewUrl(item.URL)">
           <img v-if="!item.PicPath" src="../../assets/img/bg_c3@3x.png">
           <img v-else :src='compressImg(item.PicPath, "filt", 213, "")' :onerror="defaultImg">
-          <div class="RemainingInventory">{{item.RemainingInventory}}</div>
+          <!-- <div class="RemainingInventory">{{item.RemainingInventory}}</div> -->
           <div class="resTypeList">
             <span v-for="(items,index) in item.OpenPlatformList" :key="index" :class="{'L1':items.ID==1,'L2':items.ID==2,'L3':items.ID==3,'L4':items.ID==4,'L5':items.ID==5}">{{items.Name}}</span>
           </div>