From d46f3b348ab5f913cd15be977ce16137ee4343d0 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期四, 14 九月 2023 17:40:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/view/technical.vue | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 424ee7e..aa90cdd 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"
>
@@ -98,7 +99,7 @@
<template slot-scope="scope">
<!-- <el-button type="text" size="small" @click="showDetails(scope.row)">鏌ョ湅璇︽儏</el-button>
<el-button type="text" size="small">缂栬緫闄勪欢</el-button> -->
- <el-button type="text" size="small" @click="authorizedstrength(scope.row)">缂栧埗</el-button>
+ <el-button v-if="scope.row.type===0" type="text" size="small" @click="authorizedstrength(scope.row)">缂栧埗</el-button>
</template>
</el-table-column>
</el-table>
@@ -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
}
}
@@ -261,8 +262,8 @@
id:this.compiledata.id
}).then( res =>{
this.$message.success('缂栧埗瀹屾垚')
- })
this.getTechnicalTableData()
+ })
},
async showDetails(row){
@@ -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