From 8dcd4cca0876069016954cb8c5c7d6e76ca6bba4 Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Tue, 10 Oct 2023 10:26:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=92=8C?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../resources/templates/base/affairs/affairs.html | 7 +++++--
.../main/resources/templates/base/affairs/day.html | 11 +++++++----
.../resources/templates/base/affairs/partystyle.html | 7 +++++--
.../resources/templates/base/affairs/reviewed.html | 2 +-
.../main/resources/templates/base/affairs/year.html | 7 +++++--
5 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
index 433648d..d9afc0d 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
@@ -250,8 +250,11 @@
actions.push('已驳回 ');
actions.push('重新上传附件 ');
}else if (row.status === '4'){
- actions.push('已完成 ');
- actions.push('查看附件 ');
+ actions.push('已完成 ');
+ actions.push('查看附件 ');
+ if (row.unit){
+ actions.push('继续上传附件 ');
+ }
}
return actions.join('');
}
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/day.html b/cyx-admin/src/main/resources/templates/base/affairs/day.html
index 27b7261..a2b98bb 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/day.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/day.html
@@ -153,7 +153,7 @@
},
{
field: 'branch',
- title: '支部名称'
+ title: '支部名称',
},
{
field: 'type',
@@ -230,7 +230,7 @@
},
{
field: 'finishDate',
- title: '完成截止时间',
+ title: '截止时间',
align: 'center',
formatter: function(value, row, index) {
if (row.unit === '1'){
@@ -275,8 +275,11 @@
actions.push('已驳回 ');
actions.push('重新上传附件 ');
}else if (row.status === '4'){
- actions.push('已完成 ');
- actions.push('查看附件 ');
+ actions.push((row.unit !==''?'已完成'+row.updateTime.substr(0,10)+' ':'已完成 '));
+ actions.push('查看附件 ');
+ if (row.unit !== ''){
+ actions.push('继续上传 ');
+ }
}
return actions.join('');
}
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
index 0db3750..51544db 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
@@ -244,8 +244,11 @@
actions.push('已驳回 ');
actions.push('重新上传附件 ');
}else if (row.status === '4'){
- actions.push('已完成 ');
- actions.push('查看附件 ');
+ actions.push('已完成 ');
+ actions.push('查看附件 ');
+ if (row.unit){
+ actions.push('继续上传附件 ');
+ }
}
return actions.join('');
}
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html b/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html
index 04cd8b2..bbaa97f 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/reviewed.html
@@ -103,7 +103,7 @@
data: {
},
success: function(data) {
- location.reload();
+ parent.window.location.reload();
}
});
}
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/year.html b/cyx-admin/src/main/resources/templates/base/affairs/year.html
index e185cc3..3777c85 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/year.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/year.html
@@ -269,8 +269,11 @@
actions.push('已驳回 ');
actions.push('重新上传附件 ');
}else if (row.status === '4'){
- actions.push('已完成 ');
- actions.push('查看附件 ');
+ actions.push((row.unit !==''?'已完成'+row.updateTime.substr(0,10)+' ':'已完成 '));
+ actions.push('查看附件 ');
+ if (row.unit !== ''){
+ actions.push('继续上传 ');
+ }
}
return actions.join('');
}