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 d9afc0d..6290489 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html @@ -250,11 +250,9 @@ actions.push('已驳回 '); actions.push('重新上传附件 '); }else if (row.status === '4'){ - actions.push('已完成 '); + actions.push(('已完成'+row.updateTime.substr(0,10)+' ')); actions.push('查看附件 '); - if (row.unit){ - actions.push('继续上传附件 '); - } + 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 a2b98bb..2648d2b 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/day.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/day.html @@ -275,11 +275,9 @@ actions.push('已驳回 '); actions.push('重新上传附件 '); }else if (row.status === '4'){ - actions.push((row.unit !==''?'已完成'+row.updateTime.substr(0,10)+' ':'已完成 ')); + actions.push(('已完成'+row.updateTime.substr(0,10)+' ')); actions.push('查看附件 '); - if (row.unit !== ''){ - actions.push('继续上传 '); - } + 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 51544db..559c5cb 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html @@ -244,11 +244,9 @@ actions.push('已驳回 '); actions.push('重新上传附件 '); }else if (row.status === '4'){ - actions.push('已完成 '); + actions.push(('已完成'+row.updateTime.substr(0,10)+' ')); actions.push('查看附件 '); - if (row.unit){ - actions.push('继续上传附件 '); - } + actions.push('继续上传 '); } return actions.join(''); } diff --git a/cyx-admin/src/main/resources/templates/base/affairs/viewFiles.html b/cyx-admin/src/main/resources/templates/base/affairs/viewFiles.html index e16dd00..eaeb1b7 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/viewFiles.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/viewFiles.html @@ -236,34 +236,34 @@ data.forEach((item,index) => { let _nameFile = item.name.substr(item.name.lastIndexOf('/')+1,item.name.length-1); if(item.name.indexOf('png') > -1 || item.name.indexOf('jpg')>-1){ - _file_list_str += '
' + + _file_list_str += '
' + '
('+(index+1)+') '+_nameFile+'
' + - '
下载删除
'; + '
下载('+item.name.substr(16,10)+')删除
'; }else if(item.name.indexOf('pdf') > -1){ - _file_list_str += '
' + + _file_list_str += '
' + '
('+(index+1)+') '+_nameFile+'
' + - '
预览下载删除
'; + '
预览下载('+item.name.substr(16,10)+')删除
'; }else{ - _file_list_str += '
' + + _file_list_str += '
' + '
('+(index+1)+') '+_nameFile+'
' + - '
下载删除
'; + '
下载('+item.name.substr(16,10)+')删除
'; } }) }else{ data.forEach((item,index) => { let _nameFile = item.name.substr(item.name.lastIndexOf('/')+1,item.name.length-1); if(item.name.indexOf('png') > -1 || item.name.indexOf('jpg')>-1){ - _file_list_str += '
' + + _file_list_str += '
' + '
('+(index+1)+') '+_nameFile+'
' + - '
下载
'; + '
下载('+item.name.substr(16,10)+')
'; }else if(item.name.indexOf('pdf') > -1){ - _file_list_str += '
' + + _file_list_str += '
' + '
('+(index+1)+') '+_nameFile+'
' + - '
预览下载
'; + '
预览下载('+item.name.substr(16,10)+')
'; }else{ - _file_list_str += '
' + + _file_list_str += '
' + '
('+(index+1)+') '+_nameFile+'
' + - '
下载
'; + '
下载('+item.name.substr(16,10)+')
'; } }) } 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 3777c85..360be4c 100644 --- a/cyx-admin/src/main/resources/templates/base/affairs/year.html +++ b/cyx-admin/src/main/resources/templates/base/affairs/year.html @@ -269,11 +269,9 @@ actions.push('已驳回 '); actions.push('重新上传附件 '); }else if (row.status === '4'){ - actions.push((row.unit !==''?'已完成'+row.updateTime.substr(0,10)+' ':'已完成 ')); + actions.push(('已完成'+row.updateTime.substr(0,10)+' ')); actions.push('查看附件 '); - if (row.unit !== ''){ - actions.push('继续上传 '); - } + actions.push('继续上传 '); } return actions.join(''); }