From 366f8baa2e288c9d13799450465dab00ab6ed4dc Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Wed, 15 Nov 2023 09:53:00 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/toCarryOutLegislativeReforms/delay/index.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/toCarryOutLegislativeReforms/delay/index.vue b/src/views/toCarryOutLegislativeReforms/delay/index.vue
index bee5f52..f5c0c48 100644
--- a/src/views/toCarryOutLegislativeReforms/delay/index.vue
+++ b/src/views/toCarryOutLegislativeReforms/delay/index.vue
@@ -120,7 +120,7 @@
>
<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>
@@ -130,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"
/>
@@ -202,7 +202,7 @@
// ���������������������
handleSizeChange(val) {
// ���������������������������
- this.pagination.PageSize = val
+ this.pagination.pageSize = val
// ���������������������������������������������������������������������������
this.pagination.currentPage = 1
this.handleSearch()
--
Gitblit v1.8.0