From fc89d746424577392fcec92cc8b8fea34006ce1c Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 14 九月 2023 13:49:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.22:9001/r/mom-before
---
src/components/view/technical.vue | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 753f2ac..1eeba08 100644
--- a/src/components/view/technical.vue
+++ b/src/components/view/technical.vue
@@ -4,7 +4,7 @@
<el-row>
<el-col :span="12">鎶�鏈枃浠�</el-col>
<el-col :span="12" style="text-align: right;">
- <el-button icon="el-icon-plus">鐢熸垚椤圭洰涔�</el-button>
+ <el-button icon="el-icon-plus">鐢熸垚椤圭洰涔�</el-button>
</el-col>
</el-row>
</div>
@@ -22,23 +22,24 @@
</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" placeholder="鍏ㄩ儴" style="width: 310px;">
+ <el-select v-model="searchData.type" size="small" placeholder="鍏ㄩ儴" style="width: 250px;">
<el-option label="寰呯紪鍒�" :value="0"></el-option>
<el-option label="宸茬紪鍒�" :value="1"></el-option>
</el-select>
</el-form-item>
- <el-form-item >
- <el-button plain @click="resetBtn">閲� 缃�</el-button>
- <el-button @click="searchTechnical">鏌� 璇�</el-button>
+ <el-form-item>
+ <el-button plain @click="resetBtn" style="margin-left: 12px;">閲� 缃�</el-button>
+ <el-button @click="searchTechnical">鏌� 璇�</el-button>
</el-form-item>
</el-form>
</div>
<div class="technical-table">
<div class="table-box">
<el-table
+ height="500"
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()
}
},
@@ -335,6 +336,7 @@
background: #fff;
padding: 24px 32px;
}
+
.search-header .el-form-item__label{
padding: 0 30px 0 0;
}
@@ -391,7 +393,7 @@
} */
.technical-table .table-box {
flex: 1;
- overflow-y: scroll;
+ /* overflow-y: scroll; */
}
.technical-table .el-pagination{
margin-top: 23px;
@@ -416,3 +418,12 @@
}
</style>
+<style>
+ .technical .title *{
+ font-size: 14px;
+ }
+
+ .technical .search-header *{
+ font-size: 14px;
+ }
+</style>
--
Gitblit v1.9.3