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

src/components/FinancialModule/accDetail/CashAccDetail.vue

@@ -923,6 +923,7 @@ export default {
             },err=>{})
         },
     getList(){ //获取列表
+            this.checkList=[];
             this.loading = true;
             if( this.msg.ClientID === '' ){
                 this.msg.ClientID = 0;

src/components/FinancialModule/accDetail/CompanyAccDetail.vue

@@ -547,6 +547,7 @@ export default {
             }, err => {})
         },
         getList(){ //获取列表
+            this.checkList=[];        
             // this.loading = true
             if( this.msg.ClientID == '' ){
                 this.msg.ClientID = 0;

src/components/FinancialModule/accDetail/PlatformAccDetail.vue

@@ -544,6 +544,7 @@ export default {
             }, err => {})
         },
         getList(){ //获取列表
+            this.checkList=[];
             this.loading = true
             if( this.msg.ClientID == '' ){
                 this.msg.ClientID = 0;

src/components/FinancialModule/accDetail/PoolAccDetail.vue

@@ -591,6 +591,7 @@ export default {
             }, err => {})
         },
         getList(){ //获取列表
+            this.checkList=[];        
             this.loading = true
             if( this.msg.ClientID == '' ){
                 this.msg.ClientID = 0;

src/components/Hotel/HotelSalesBoard.vue

@@ -264,8 +264,9 @@
     </div>
     <div class="title">
       酒店统计 共
-      <span class="Owe_Room">{{TotalInventory}}</span> 间, 使用
-      <span class="Owe_Room">{{UseInventory}}</span>间
+      <span class="Owe_Room">{{TotalInventory}}</span> 间, 当前使用
+      <span class="Owe_Room">{{UseInventory}}</span> 间,占比
+      <span class="Owe_Room">{{((UseInventory/TotalInventory)*100).toFixed(2)}}</span> %.
       &nbsp;&nbsp;
       <span class="hasStock_1" style="padding:2px 4px;border-radius:5px">红日</span>
       <span class="hasStock_2" style="padding:2px 4px;border-radius:5px">旺季</span>

src/components/SalesVisa/ModifyVisaProduct.vue

@@ -896,7 +896,7 @@ export default {
             "dmc_get_visa_GetVisaProductInfo_V1",
             {Pid:Pid},
             res => {
-              console.log(res);
+              // console.log(res);
               if (res.data.resultCode == 1) {
                   let data=res.data.data;
                   this.addMsg=res.data.data;

src/components/Supplier/HotelSalesBoard.vue

@@ -264,8 +264,9 @@
     </div>
     <div class="title">
       酒店统计 共
-      <span class="Owe_Room">{{TotalInventory}}</span> 间, 使用
-      <span class="Owe_Room">{{UseInventory}}</span>间
+      <span class="Owe_Room">{{TotalInventory}}</span> 间, 当前使用
+      <span class="Owe_Room">{{UseInventory}}</span> 间,占比
+      <span class="Owe_Room">{{((UseInventory/TotalInventory)*100).toFixed(2)}}</span> %.
       &nbsp;&nbsp;
       <span class="hasStock_1" style="padding:2px 4px;border-radius:5px">红日</span>
       <span class="hasStock_2" style="padding:2px 4px;border-radius:5px">旺季</span>