From 6faf0a8967282e3151bca398f326d6fcce172bff Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Wed, 25 Oct 2023 15:01:19 +0800
Subject: [PATCH] fix:无人机搜索修改
---
src/views/toCarryOutLegislativeReforms/delay/index.vue | 87 ++++++++++++++++++++++++++++---------------
1 files changed, 57 insertions(+), 30 deletions(-)
diff --git a/src/views/toCarryOutLegislativeReforms/delay/index.vue b/src/views/toCarryOutLegislativeReforms/delay/index.vue
index 20c511f..f5c0c48 100644
--- a/src/views/toCarryOutLegislativeReforms/delay/index.vue
+++ b/src/views/toCarryOutLegislativeReforms/delay/index.vue
@@ -6,7 +6,8 @@
<el-table
:data="tableData"
border
- max-height=" 400px"
+ size="mini"
+ max-height="680"
style="width: 100%"
:header-cell-style="{
color: '#101111', fontSize: '16px'
@@ -15,7 +16,7 @@
<el-table-column
type="index"
label="������"
- width="100px"
+ width="60px"
align="center"
/>
<el-table-column
@@ -46,21 +47,23 @@
label="������������"
>
<template slot-scope="scope">
- <p> {{ dictObj.changeEnum[scope.row.changeType] }}</p>
+ <div> {{ dictObj.changeEnum[scope.row.changeType] }}</div>
</template>
</el-table-column>
<el-table-column
align="center"
prop="extensionNum"
+ width="60px"
label="������������"
>
<template slot-scope="scope">
- <p> {{ scope.row.extensionNum }}���</p>
+ <div> {{ scope.row.extensionNum }}���</div>
</template>
</el-table-column>
<el-table-column
align="center"
prop="address"
+ width="80px"
label="������"
>
<template slot-scope="scope">
@@ -86,39 +89,38 @@
</el-table-column>
<el-table-column
align="center"
- prop="address"
- label="���������������������"
>
- <template slot="header" slot-scope="scope">
- <p>������������</p>
- <p>���������</p>
+ <template slot="header">
+ <div>������������</div>
+ <div>���������</div>
</template>
<template slot-scope="scope">
- <p> {{ scope.row.escalationName }}</p>
- <p> {{ updatUnitIdFormatter(scope.row) }}</p>
+ <div> {{ scope.row.escalationName }}</div>
+ <div> {{ updatUnitIdFormatter(scope.row) }}</div>
</template>
</el-table-column>
<el-table-column
align="center"
>
- <template slot="header" slot-scope="scope">
- <p>���������</p>
- <p>������������</p>
+ <template slot="header">
+ <div>���������</div>
+ <div>������������</div>
</template>
<template slot-scope="scope">
- <p>{{ scope.row.updateName }}</p>
- <p>{{ scope.row.updateTime }}</p>
+ <div>{{ scope.row.updateName }}</div>
+ <div>{{ scope.row.updateTime }}</div>
</template>
</el-table-column>
<el-table-column
align="center"
prop="address"
+ width="100px"
label="������"
>
<template slot-scope="scope">
<el-button type="text" size="medium" @click="openWorkOrdinDialog(scope.row,'detail')">������</el-button>
- <el-button v-if="scope.row.state===30" type="text" size="medium" @click="openWorkOrdinDialog(scope.row,'approve')">������</el-button>
+ <el-button v-if="scope.row.state===30&&scope.row.isApprove===1" type="text" size="medium" @click="openWorkOrdinDialog(scope.row,'approve')">������</el-button>
</template>
</el-table-column>
</el-table>
@@ -128,9 +130,9 @@
background
:current-page="pagination.currentPage"
:page-sizes="pagination.pageSizes"
- :page-size="pagination.PageSize"
+ :page-size="pagination.pageSize"
:total="pagination.totalCount"
- layout="sizes,prev, pager, next, jumper"
+ layout="total, sizes, prev, pager, next, jumper"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
@@ -142,7 +144,7 @@
<script>
import workOrderInformation from '@/views/toCarryOutLegislativeReforms/components/workOrderInformation'
-import searchBar from '@/views/toCarryOutLegislativeReforms/components/queryForm'
+import searchBar from '@/views/toCarryOutLegislativeReforms/delay/componets/queryForm'
export default {
components: {
searchBar,
@@ -166,7 +168,8 @@
pageSizes: [10, 20, 30, 40],
// ������������������������������������������
pageSize: 10
- }
+ },
+ searchData: {}
}
},
created() {
@@ -179,6 +182,10 @@
this.handleSearch()
},
handleSearch(obj) {
+ this.searchData.isInvalid = 0
+ if (obj) {
+ this.searchData = obj
+ }
this.$request({
url: '/allocationExtension/page',
method: 'post',
@@ -195,14 +202,16 @@
// ���������������������
handleSizeChange(val) {
// ���������������������������
- this.pagination.PageSize = val
+ this.pagination.pageSize = val
// ���������������������������������������������������������������������������
this.pagination.currentPage = 1
+ this.handleSearch()
},
// ���������������
handleCurrentChange(val) {
// ���������������������
this.pagination.currentPage = val
+ this.handleSearch()
// console.log(val)
},
openWorkOrdinDialog(row, type) {
@@ -280,18 +289,36 @@
<style scoped lang="scss">
.main{
padding: 20px;
+ padding-top: 0px;
+ height: 100%;
+ overflow: overlay;
}
.tab {
- margin-top: 10px;
+ margin-top: 0px;
+ /deep/ .el-tag{
+ font-size: 16px;
+ }
}
-/deep/ .el-table__body-wrapper {
- overflow: scroll;
- position: relative;
- overflow-x: hidden;
- max-height: 400px;
-}
+// /deep/ .el-table__body-wrapper {
+// overflow: scroll;
+// position: relative;
+// overflow-x: hidden;
+// max-height: 400px;
+// }
.pagina{
margin-top: 10px;
- text-align: right;
+}
+/deep/ .el-table__row{
+ font-size: 18px;
+}
+.el-pagination {
+ padding: 0;
+ .el-select{
+ /deep/.el-input{
+ margin:0;
+ }
+ }
+
}
</style>
+
--
Gitblit v1.8.0