666

public/resource/js/schoolBusiness.js

@@ -44,7 +44,7 @@ define (['doT', 'text!temp/schoolBusiness_template_tpl.html','ckfinder','ckfinde
             _doc.on('click', '.add-pic', function(){
 				follow.getaddPicList();
 			});
-			_doc.on('click', '.pdf-pre-a', function() {
+			_doc.on('click', '.pdf-pre-b', function() {
 				var file_id = $(this).parent('li').attr('id') - 0 ;
 				var _url = '/index/downloadFile';
 			    window.open(_url + '?file_id=' + file_id);
@@ -185,12 +185,20 @@ define (['doT', 'text!temp/schoolBusiness_template_tpl.html','ckfinder','ckfinde
 							for ( var i = 0 ; i < file_paths.length ; i++ ){
 								console.log(file_paths[i]['file_name'])
 								var _tempArr = file_paths[i]['file_name'].split('/');
-								file_paths[i]['file_name'] && $('#fujian_ul').append('<li class="pdf-pre-li" id='+file_paths[i]['file_id'] +'><a class="pdf-pre-a" download="{1}" href="javascript:;" title="点击可下载">{2}</a></li>'.stringFormatObj({
+								if(file_paths[i]['file_former_name']){
+									file_paths[i]['file_name'] && $('#fujian_ul').append('<li class="pdf-pre-li" id='+file_paths[i]['file_id'] +'><a class="pdf-pre-a pdf-pre-b" download="{1}" href="javascript:;" title="点击可下载">{2}</a></li>'.stringFormatObj({
 									'0': '/' + file_paths[i]['show_file'],
 									'1': dealFileName(decodeURI(_tempArr[_tempArr.length-1])),
 									'2': file_paths[i]['file_former_name']?file_paths[i]['file_former_name']:dealFileName(decodeURI(_tempArr[_tempArr.length-1]))
-									
 								}));
+								}else{
+									file_paths[i]['file_name'] && $('#fujian_ul').append('<li class="pdf-pre-li" id='+file_paths[i]['file_id'] +'><a class="pdf-pre-a" download="{1}" href="{1}" title="点击可下载">{2}</a></li>'.stringFormatObj({
+									'0': '/' + file_paths[i]['show_file'],
+									'1': dealFileName(decodeURI(_tempArr[_tempArr.length-1])),
+									'2': file_paths[i]['file_former_name']?file_paths[i]['file_former_name']:dealFileName(decodeURI(_tempArr[_tempArr.length-1]))
+								}));
+								}
+
 							}
 						}
 						$('#announcement_title').attr('readonly','readonly');