From 9ab353d083dd22a90a8a0f09b9b7b756d58cc1bd Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 14 九月 2023 15:38:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

---
 src/components/view/technical.vue |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 424ee7e..ff9bf51 100644
--- a/src/components/view/technical.vue
+++ b/src/components/view/technical.vue
@@ -22,7 +22,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="浜у搧鍚嶇О:">
-          <el-input v-model="searchData.name" @input="query"></el-input>
+          <el-input v-model="searchData.name" ></el-input>
         </el-form-item>
         <el-form-item label="缂栧埗鐘舵��:" >
           <el-select v-model="searchData.type" size="small" placeholder="鍏ㄩ儴" style="width: 250px;">
@@ -39,6 +39,7 @@
     <div class="technical-table">
       <div class="table-box">
         <el-table
+        height="490"
           border style="width: 100%"
           :data="technicalTable"
           >
@@ -108,9 +109,9 @@
     <el-pagination
        @size-change="handleSizeChange"
       @current-change="handleCurrentChange"
-      :current-page="pageParams.pageNo"
-      :page-sizes="[100, 200, 300, 400]"
-      :page-size="pageParams.pageSize"
+      :current-page="pageParams.pageSize"
+      :page-sizes="[10, 20, 50, 100]"
+      :page-size="pageParams.countSize"
       layout="total, sizes, prev, pager, next, jumper"
       :total="pageParams.total">
     </el-pagination>
@@ -240,8 +241,8 @@
        showDetail: false,
        selectedRow: {},
        pageParams:{
-        pageNo:1,
-        pageSize:10,
+        pageSize:1,
+        countSize:10,
         total:0
        }
     }
@@ -276,8 +277,8 @@
       async  getTechnicalTableData() {
         const res = await this.$axios.get(this.$api.url.selectAllOrder,{
           params:{
-            pageSize:(this.pageParams.pageNo-1),
-            countSize:this.pageParams.pageSize,...this.searchData,
+            pageSize:(this.pageParams.pageSize),
+            countSize:this.pageParams.countSize,...this.searchData,
             orderCode:this.searchData.id, 
             time:this.searchData.date,
             name:this.searchData.name,
@@ -299,11 +300,11 @@
         this.getTechnicalTableData()
       },
       handleSizeChange(value){
-        this.pageParams.pageSize = value
+        this.pageParams.countSize = value
         this.getTechnicalTableData()
       },
       handleCurrentChange(value){
-        this.pageParams.pageNo = value
+        this.pageParams.pageSize = value
         this.getTechnicalTableData()
       }
     },
@@ -379,7 +380,7 @@
 /* 鎶�鏈枃浠惰〃鏍兼牱寮� */
 .technical-table{
   margin-top: 11px;
-  height: calc(100% - 140px);
+  /* height: calc(100% - 140px); */
   background: #fff;
   padding: 23px 21px ;
   font-size: 14px;

--
Gitblit v1.9.3