修改页面数据

src/components/Hotel/SupplierHandFee.vue

@@ -23,13 +23,9 @@
               filterable
               v-model="msg.Supplier"
             >
-            <el-option :label="$t('system.ph_buxian')" :value="-1"></el-option>
-            <!-- <el-option  
-                v-for="item in companyList"
-                :label="item.BName"
-                :value="item.Id"
-                :key="item.Id"
-            ></el-option> -->
+            <el-option :label="$t('system.ph_buxian')" :value="0"></el-option>
+            <el-option v-for="(item,index) in SupplierList" :key="index" :label="item.Name" :value="item.ID">
+            </el-option>
             </el-select>
           </span>
         </li>
@@ -38,7 +34,7 @@
             type="button"
             class="hollowFixedBtn"
             value="查询"
-            @click="getList()"
+            @click="getSearch()"
           > &nbsp;
           <input type="button" class="normalBtn" value="下载">
         </li>
@@ -48,26 +44,30 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
         <th>做账主体</th>
-        <th>团号</th>
+        <th width="300">团号</th>
         <th>单号</th>
         <th>日元</th>
         <th>人民币</th>
-        <th>手配定团号</th>
+        <th width="300">手配定团号</th>
         <th>泊数</th>
         <th>单价（日元）</th>
         <th>小计</th>
       </tr>
-      <tr v-for="item in dataList">
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-        <td></td>
-      </tr>
+      <tbody v-for="(item,index) in dataList" :key="index">
+        <template v-for="(subItem,subIndex) in item.SubList">
+            <tr :key="subIndex">
+                <td>{{subItem.OutBranchName}}</td>
+                <td v-if="subIndex==0" :rowspan="item.SubList.length">{{item.TCIDS}}</td>
+                <td>{{subItem.TCNUM}}</td>
+                <td>{{subItem.UnitPrice}}</td>
+                <td>{{subItem.UnitPrice}}</td>
+                <td v-if="subIndex==0" :rowspan="item.SubList.length">{{item.DMCNum}}</td>
+                <td>{{subItem.DayCount}}</td>
+                <td>{{subItem.UnitPrice}}</td>
+                <td>{{subItem.GuestNum}}</td>
+            </tr>
+        </template>
+      </tbody>
     </table>
     <div class="noDataNotice" v-if="dataList.length<1">
       <i class="iconfont icon-kong"></i>
@@ -100,10 +100,17 @@ export default {
         currentPage: 1,
         total:0,
         dataList:[],
+        
+        //供应商
+        SupplierList:[],
         pickerBeginDateBefore: {
             disabledDate: time => {
-                let endTime = new Date(this.msg.EndDate)
-                return endTime.getTime() < time.getTime()
+            if (this.msg.EndDate == null) {
+                return false;
+                } else {
+                    let endTime = new Date(this.msg.EndDate)
+                    return endTime.getTime() < time.getTime()
+                }
             }
         },
         pickerBeginDateAfter: {
@@ -115,19 +122,48 @@ export default {
     }
   },
   mounted() {
-    //this.getList();
+      this.initSupplier();
+      this.getList();
   },
   filters: {
   },
   methods: {
+    //点击查询
+    getSearch(){
+        var isA,isB,isC
+        if(this.msg.Supplier==0){
+            this.Error('请选择供应商');
+            isA=false
+        }else{
+            isA=true;
+        }
+        if(this.msg.StartDate==''||this.msg.StartDate==null){
+            this.Error('请选择开始日期');
+            isB=false
+        }else{
+            isB=true;
+        }
+        if(this.msg.EndDate==''||this.msg.EndDate==null){
+            this.Error('请选择结束日期');
+            isC=false
+        }else{
+            isC=true;
+        }
+        if(isA&&isB&&isC){
+            this.getList();
+        }
+    },
     //获取数据
     getList() {
       this.loading = true;
       this.apipost(
           'dmcstatistics_get_GetDmcSupplierHotelPageListService',this.msg,
           res => {
+            this.loading=false;
             if (res.data.resultCode == 1) {
                 console.log(res,'resss');
+                this.dataList=res.data.data.pageData;
+                this.total = res.data.data.count
             }else{
                 this.Error(res.data.message);
             }
@@ -139,6 +175,16 @@ export default {
       this.msg.PageIndex = val;
       this.getList();
     },
+    // 获取供应商
+    initSupplier() {
+        this.apipost("supplier_post_GetAllList", {
+            Type: 1
+        }, res => {
+            if (res.data.resultCode === 1) {
+            this.SupplierList = res.data.data;
+            }
+        }, err => {});
+    },
   }
 };
 </script>
\ No newline at end of file