merge test

src/views/order/monitoring/orderCompletionMonitoring/index.vue

@@ -6,9 +6,24 @@
       ref="searchBarForm"
       @headBtnClick="buttonClick"
     />
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <base-table
+      :page="1"
+      :limit="5000"
+      :table-props="tableProps"
+      :table-data="list"
+      :max-height="tableH"
+    >
+      <method-btn
+        v-if="tableBtn.length"
+        slot="handleBtn"
+        :width="250"
+        label="操作"
+        :method-list="tableBtn"
+        @clickBtn="handleClick"
+      />
+    </base-table>
+    <!-- <el-tabs v-model="activeName" @tab-click="toggleTab">
       <el-tab-pane label="数据列表" name="dataList">
-        <!-- 列表 -->
         <base-table
           :page="queryParams.pageNo"
           :limit="queryParams.pageSize"
@@ -26,7 +41,7 @@
           />
         </base-table>
       </el-tab-pane>
-      <el-tab-pane label="柱状图" name="barChart">
+      <el-tab-pane label="环形图" name="barChart">
         <div class="boxTitle">
           <span class="blueTitle"></span>
           <span>各订单环形图</span>
@@ -36,7 +51,7 @@
           style="width: 182px; height: 180px;"
         ></div>
       </el-tab-pane>
-    </el-tabs>
+    </el-tabs> -->
   </div>
 </template>
 <script>
@@ -147,14 +162,15 @@ export default {
       activeName: 'dataList',
       // 查询参数
       queryParams: {
-        pageNo: 1,
-        pageSize: 20,
+        // pageNo: 1,
+        // pageSize: 5000,
         name: null,
         startProduceTime: []
       },
       tableProps,
       list: [],
-      tableH: this.tableHeight(270),
+      // tableH: this.tableHeight(270),
+      tableH: this.tableHeight(230),
       total: 0,
       tableBtn: [
       this.$auth.hasPermi('base:order-completion-monitoring:orderDet')
@@ -175,12 +191,13 @@ export default {
               btnName: '发货详情'
             }
           : undefined
-      ].filter((v) => v),
+      ].filter((v) => v)
     }
   },
   mounted() {
     window.addEventListener('resize', () => {
-      this.tableH = this.tableHeight(270)
+      // this.tableH = this.tableHeight(270)
+      this.tableH = this.tableHeight(230)
     })
     this.getOrderList()
     this.getPage()
@@ -345,8 +362,13 @@ export default {
           this.$router.push({
             path: '/delivery/delivery-log?orderId='+encodeURI(val.data.name)
           })
+        }
+    },
+    toggleTab() {
+      if (this.activeName === 'barChart') {
+        this.getPieChart()
+      }
     }
-  }
 }
 }
 </script>