feat:切分支 缓存

src/views/reportQuery/purchaseReport/components/columns.js

@@ -42,7 +42,7 @@ const table2 = [
   // },
   {
     prop: "addtime",
-    label: "竞价时间",
+    label: "创建时间",
     minWidth: "155px",
   },
   {
@@ -52,22 +52,12 @@ const table2 = [
   },
   {
     prop: "total_fee",
-    label: "采购金额",
+    label: "采购总金额",
     minWidth: "155px",
   },
   {
     prop: "total_num",
-    label: "数量",
-    minWidth: "155px",
-  },
-  {
-    prop: "wait_total_fee",
-    label: "待处理采购金额",
-    minWidth: "155px",
-  },
-  {
-    prop: "wait_total_num",
-    label: "待处理采购单数",
+    label: "总订单数",
     minWidth: "155px",
   },
 ];
@@ -148,6 +138,11 @@ const table4 = [
     label: "采购货款",
     minWidth: "155px",
   },
+  {
+    prop: "count_num",
+    label: "订单数量",
+    minWidth: "155px",
+  },
   {
     prop: "wait_good_num",
     label: "待处理采购数量",

src/views/reportQuery/purchaseReport/components/table2.vue

@@ -3,14 +3,8 @@
     <div style="width: 100%">
       <el-row style="padding: 10px 0 0 0px">
         <el-col :span="6" style="width: 363px">
-          <periodDatePickerActive
-            :start="parmValue.start_date"
-            :end="parmValue.end_date"
-            :placeholder="'竞价'"
-            :width="'165px'"
-            :size="searchSize"
-            @timeReturned="time"
-          />
+          <periodDatePickerActive :start="parmValue.start_date" :end="parmValue.end_date" :placeholder="'创建'"
+            :width="'165px'" :size="searchSize" @timeReturned="time" />
         </el-col>
         <!-- <el-col :span="4" style="width: 66px; float: right">
           <el-button
@@ -24,38 +18,33 @@
           </el-button>
         </el-col> -->
         <el-col :span="3" style="width: 66px; float: right">
-          <el-button
-            :size="searchSize"
-            type="primary"
-            style="float: right; margin-left: 5px"
-            @click="searchList"
-          >
+          <el-button :size="searchSize" type="primary" style="float: right; margin-left: 5px" @click="searchList">
             刷新
           </el-button>
         </el-col>
         <el-col :span="4" style="width: 66px; float: right">
-          <el-button
-            type="warning"
-            class="fr"
-            :size="searchSize"
-            @click="restSearch"
-          >
+          <el-button type="warning" class="fr" :size="searchSize" @click="restSearch">
             重置
           </el-button>
         </el-col>
       </el-row>
     </div>
-    <el-table
-      :data="tableData"
-      :size="searchSize"
-      :span-method="objectSpanMethod"
-      border
-      style="width: 100%; margin-top: 20px"
-    >
-      <el-table-column :prop="item.prop" :label="item.label" v-for="(item,index) in table2" :key="index"/>
-      
+    <el-table :data="tableData" :size="searchSize" :span-method="objectSpanMethod" border
+      style="width: 100%; margin-top: 20px">
+      <el-table-column :prop="item.prop" :label="item.label" v-for="(item,index) in table2" :key="index" />
+
+      <el-table-column label="待与供应商确认">
+        <el-table-column label="总金额" prop="wait_confirm_total_fee" />
+        <el-table-column label="总单数" prop="wait_confirm_total_num" />
+      </el-table-column>
+
+      <el-table-column label="待入库">
+        <el-table-column label="总金额" prop='wait_in_total_fee' />
+        <el-table-column label="总单数" prop="wait_in_total_num" />
+      </el-table-column>
+
     </el-table>
-    <el-pagination
+    <!-- <el-pagination
         :current-page.sync="pageInfo.curr"
         :page-sizes="[15, 50, 100]"
         :page-size="pageInfo.size"
@@ -64,10 +53,10 @@
         :total="pageInfo.total"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-      />
+      /> -->
   </div>
 </template>
-   <script>
+<script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import urlConfig from "@/apis/url-config";
@@ -125,20 +114,20 @@ export default {
   },
 
   methods: {
-     //分页集合
-    handleSizeChange(val){
+    //分页集合
+    handleSizeChange(val) {
       this.parmValue.size = val;
       this.parmValue.page = 1;
       // this.pageInfo.total = val;
 
-      this.searchList() 
+      this.searchList()
     },
-    handleCurrentChange(val){
+    handleCurrentChange(val) {
       // this.pageInfo.total = val;
       this.parmValue.page = val;
       this.searchList()
     },
-     //合并方法
+    //合并方法
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex == 0) {
         //合并相同的名字
@@ -196,7 +185,7 @@ export default {
 
       const res = await asyncRequest.reportpurcheaseordersum(this.parmValue);
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
+        this.tableData = res.data;
         this.pageInfo.total = Number(res.data.count);
       } else if (res && res.code >= 100 && res.code <= 104) {
         await this.logout();
@@ -316,13 +305,14 @@ export default {
   },
 };
 </script>
-   <style lang="scss" scoped>
+<style lang="scss" scoped>
 .purchaseOrder {
   // text-align: right;
 }
-/deep/ .el-pagination{
+
+/deep/ .el-pagination {
   float: right;
-    margin-top: 10px;
+  margin-top: 10px;
 }
 </style>
    

src/views/reportQuery/purchaseReport/components/table3.vue

@@ -12,6 +12,10 @@
             @timeReturned="time"
           />
         </el-col>
+
+        <el-col :span="6" style="width: 263px">
+          <el-input size="mini" v-model="parmValue.supplierNo" placeholder="供应商编码" @change="searchList" />
+        </el-col>
         <!-- <el-col :span="4" style="width: 66px; float: right">
           <el-button
             type="primary"
@@ -97,6 +101,7 @@ export default {
       parmValue: {
         start_date: "", //起始时间
         end_date: "", // 结束时间
+        supplierNo:"",
 
         page: 1, // 页码
         size: 15, // 每页显示条数