From 3ab3f3c61633d5dd27abbf9f8f6822da17ab980e Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Thu, 28 Sep 2023 16:58:32 +0800
Subject: [PATCH] fix:立行立改
---
src/views/toCarryOutLegislativeReforms/reform/index.vue | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/views/toCarryOutLegislativeReforms/reform/index.vue b/src/views/toCarryOutLegislativeReforms/reform/index.vue
index df6afda..ea5f8c4 100644
--- a/src/views/toCarryOutLegislativeReforms/reform/index.vue
+++ b/src/views/toCarryOutLegislativeReforms/reform/index.vue
@@ -151,7 +151,7 @@
<el-button v-if="scope.row.state===9" type="text" size="medium" @click="handleOpenDialog(scope.row,'edit')">������</el-button>
<el-button v-if="scope.row.state>30&&scope.row.isInvalid===0" type="text" size="medium" @click="handleCancel(scope.row)">������</el-button>
<el-button v-if="scope.row.state===20" type="text" size="medium" @click="openWorkOrdinDialog(scope.row,'work')">������</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>
<el-button v-if="scope.row.state===20&&scope.row.changeType===2&&scope.row.applyState===0" type="text" size="medium" @click="openWorkOrdinDialog(scope.row,'delay')">������������</el-button>
</template>
</el-table-column>
@@ -162,9 +162,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"
/>
@@ -241,7 +241,10 @@
pageState: 'add',
invalidReason: '',
slectRow: {},
- title: ''
+ title: '',
+ searchData: {
+ isInvalid: 0
+ }
}
},
@@ -376,11 +379,15 @@
})
},
handleSearch(obj) {
+ this.searchData.isInvalid = 0
+ if (obj) {
+ this.searchData = obj
+ }
this.$request({
url: '/allocation/page',
method: 'post',
data: {
- ...obj,
+ ...this.searchData,
'page': this.pagination
}
}).then((res) => {
@@ -396,14 +403,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) {
--
Gitblit v1.8.0