文件增加时间

cyx-admin/src/main/resources/templates/base/affairs/affairs.html

@@ -250,11 +250,9 @@
                             actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)">已驳回</a> ');
                             actions.push('<a data-type="edit" data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-files="'+row.files+'" class="viewFiles912 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>重新上传附件</a> ');
                         }else if (row.status === '4'){
-                            actions.push('<a class="btn btn-default btn-xs" href="javascript:void(0)">已完成</a> ');
+                            actions.push(('<a class="btn btn-default btn-xs" href="javascript:void(0)">已完成'+row.updateTime.substr(0,10)+'</a> '));
                             actions.push('<a data-type="view" data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-files="'+row.files+'" class="viewFiles912 btn btn-default btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>查看附件</a> ');
-                            if (row.unit){
+                            actions.push('<a data-type="edit" data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-files="'+row.files+'" class="viewFiles912 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>继续上传</a> ');
-                                actions.push('<a data-type="edit" data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-files="'+row.files+'" class="viewFiles912 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>继续上传附件</a> ');
-                            }
                         }
                         return actions.join('');
                     }

cyx-admin/src/main/resources/templates/base/affairs/day.html

@@ -275,11 +275,9 @@
                             actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)">已驳回</a> ');
                             actions.push('<a data-type="edit" data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-files="'+row.files+'" class="viewFiles912 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>重新上传附件</a> ');
                         }else if (row.status === '4'){
-                            actions.push((row.unit !==''?'<a class="btn btn-default btn-xs" href="javascript:void(0)">已完成'+row.updateTime.substr(0,10)+'</a> ':'<a class=\"btn btn-default btn-xs\" href=\"javascript:void(0)\">已完成</a> '));
+                            actions.push(('<a class="btn btn-default btn-xs" href="javascript:void(0)">已完成'+row.updateTime.substr(0,10)+'</a> '));
                             actions.push('<a data-type="view" data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-files="'+row.files+'" class="viewFiles912 btn btn-default btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>查看附件</a> ');
-                            if (row.unit !== ''){
+                            actions.push('<a data-type="edit" data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-files="'+row.files+'" class="viewFiles912 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>继续上传</a> ');
-                                actions.push('<a data-type="edit" data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-files="'+row.files+'" class="viewFiles912 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>继续上传</a> ');
-                            }
                         }
                         return actions.join('');
                     }

cyx-admin/src/main/resources/templates/base/affairs/partystyle.html

@@ -244,11 +244,9 @@
                             actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)">已驳回</a> ');
                             actions.push('<a data-type="edit" data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-files="'+row.files+'" class="viewFiles912 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>重新上传附件</a> ');
                         }else if (row.status === '4'){
-                            actions.push('<a class="btn btn-default btn-xs" href="javascript:void(0)">已完成</a> ');
+                            actions.push(('<a class="btn btn-default btn-xs" href="javascript:void(0)">已完成'+row.updateTime.substr(0,10)+'</a> '));
                             actions.push('<a data-type="view" data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-files="'+row.files+'" class="viewFiles912 btn btn-default btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>查看附件</a> ');
-                            if (row.unit){
+                            actions.push('<a data-type="edit" data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-files="'+row.files+'" class="viewFiles912 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>继续上传</a> ');
-                                actions.push('<a data-type="edit" data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-files="'+row.files+'" class="viewFiles912 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>继续上传附件</a> ');
-                            }
                         }
                         return actions.join('');
                     }

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 += '<div class="pre_view_item">' +
+                            _file_list_str += '<div class="pre_view_item" title = "'+item.name.substr(16,10)+'">' +
                                 '<div class="item_left pre_img" data-img="'+item.name+'" style="cursor: pointer"><img src="'+window.location.origin+item.name+'" /><span>('+(index+1)+') '+_nameFile+'</span></div>' +
-                                '<div class="item_right"><span data-url="'+item.name+'" class="btn btn-primary btn-xs down_load_file">下载</span><span data-index="'+item.index+'" class="btn btn-danger btn-xs del_file">删除</span></div></div>';
+                                '<div class="item_right"><span data-url="'+item.name+'" class="btn btn-primary btn-xs down_load_file">下载('+item.name.substr(16,10)+')</span><span data-index="'+item.index+'" class="btn btn-danger btn-xs del_file">删除</span></div></div>';
                         }else if(item.name.indexOf('pdf') > -1){
-                            _file_list_str += '<div class="pre_view_item">' +
+                            _file_list_str += '<div class="pre_view_item" title = "'+item.name.substr(16,10)+'">' +
                                 '<div class="item_left"><img src="/img/file_word.png" /><span>('+(index+1)+') '+_nameFile+'</span></div>' +
-                                '<div class="item_right"><span data-url="'+item.name+'" class="btn btn-primary btn-xs pre_view_pdf">预览</span><span data-url="'+item.name+'" class="btn btn-primary btn-xs down_load_file">下载</span><span data-index="'+item.index+'" class="btn btn-danger btn-xs del_file">删除</span></div></div>';
+                                '<div class="item_right"><span data-url="'+item.name+'" class="btn btn-primary btn-xs pre_view_pdf">预览</span><span data-url="'+item.name+'" class="btn btn-primary btn-xs down_load_file">下载('+item.name.substr(16,10)+')</span><span data-index="'+item.index+'" class="btn btn-danger btn-xs del_file">删除</span></div></div>';
                         }else{
-                            _file_list_str += '<div class="pre_view_item">' +
+                            _file_list_str += '<div class="pre_view_item" title = "'+item.name.substr(16,10)+'">' +
                                 '<div class="item_left"><img src="/img/file_word.png" /><span>('+(index+1)+') '+_nameFile+'</span></div>' +
-                                '<div class="item_right"><span data-url="'+item.name+'" class="btn btn-primary btn-xs down_load_file">下载</span><span data-index="'+item.index+'" class="btn btn-danger btn-xs del_file">删除</span></div></div>';
+                                '<div class="item_right"><span data-url="'+item.name+'" class="btn btn-primary btn-xs down_load_file">下载('+item.name.substr(16,10)+')</span><span data-index="'+item.index+'" class="btn btn-danger btn-xs del_file">删除</span></div></div>';
                         }
                     })
                 }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 += '<div class="pre_view_item">' +
+                            _file_list_str += '<div class="pre_view_item" title = "'+item.name.substr(16,10)+'">' +
                                 '<div class="item_left pre_img" data-img="'+item.name+'" style="cursor: pointer"><img src="'+window.location.origin+item.name+'" /><span>('+(index+1)+') '+_nameFile+'</span></div>' +
-                                '<div class="item_right"><span data-url="'+item.name+'" class="btn btn-primary btn-xs down_load_file">下载</span></div></div>';
+                                '<div class="item_right"><span data-url="'+item.name+'" class="btn btn-primary btn-xs down_load_file">下载('+item.name.substr(16,10)+')</span></div></div>';
                         }else if(item.name.indexOf('pdf') > -1){
-                            _file_list_str += '<div class="pre_view_item">' +
+                            _file_list_str += '<div class="pre_view_item" title = "'+item.name.substr(16,10)+'">' +
                                 '<div class="item_left"><img src="/img/file_word.png" /><span>('+(index+1)+') '+_nameFile+'</span></div>' +
-                                '<div class="item_right"><span data-url="'+item.name+'" class="btn btn-primary btn-xs pre_view_pdf">预览</span><span data-url="'+item.name+'" class="btn btn-primary btn-xs down_load_file">下载</span></div></div>';
+                                '<div class="item_right"><span data-url="'+item.name+'" class="btn btn-primary btn-xs pre_view_pdf">预览</span><span data-url="'+item.name+'" class="btn btn-primary btn-xs down_load_file">下载('+item.name.substr(16,10)+')</span></div></div>';
                         }else{
-                            _file_list_str += '<div class="pre_view_item">' +
+                            _file_list_str += '<div class="pre_view_item" title = "'+item.name.substr(16,10)+'">' +
                                 '<div class="item_left"><img src="/img/file_word.png" /><span>('+(index+1)+') '+_nameFile+'</span></div>' +
-                                '<div class="item_right"><span data-url="'+item.name+'" class="btn btn-primary btn-xs down_load_file">下载</span></div></div>';
+                                '<div class="item_right"><span data-url="'+item.name+'" class="btn btn-primary btn-xs down_load_file">下载('+item.name.substr(16,10)+')</span></div></div>';
                         }
                     })
                 }

cyx-admin/src/main/resources/templates/base/affairs/year.html

@@ -269,11 +269,9 @@
                             actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)">已驳回</a> ');
                             actions.push('<a data-type="edit" data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-files="'+row.files+'" class="viewFiles912 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>重新上传附件</a> ');
                         }else if (row.status === '4'){
-                            actions.push((row.unit !==''?'<a class="btn btn-default btn-xs" href="javascript:void(0)">已完成'+row.updateTime.substr(0,10)+'</a> ':'<a class=\"btn btn-default btn-xs\" href=\"javascript:void(0)\">已完成</a> '));
+                            actions.push(('<a class="btn btn-default btn-xs" href="javascript:void(0)">已完成'+row.updateTime.substr(0,10)+'</a> '));
                             actions.push('<a data-type="view" data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-files="'+row.files+'" class="viewFiles912 btn btn-default btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>查看附件</a> ');
-                            if (row.unit !== ''){
+                            actions.push('<a data-type="edit" data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-files="'+row.files+'" class="viewFiles912 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>继续上传</a> ');
-                                actions.push('<a data-type="edit" data-id="'+row.id+'" data-header="'+row.header+'" data-shotname="'+row.shotName+'" data-deptname="'+row.deptName+'" data-files="'+row.files+'" class="viewFiles912 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>继续上传</a> ');
-                            }
                         }
                         return actions.join('');
                     }