Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/extend/helper.js

@@ -1228,7 +1228,7 @@ module.exports = {
      * @return {Boolean} 匹配结果
      */
     canPreview(ext) {
-        const reg = /(.png)|(.gif)|(.txt)|(.jpg)|(.jpeg)|(.pdf)/;
+        const reg = /(.png)|(.gif)|(.txt)|(.jpg)|(.jpeg)|(.pdf)/i;
         return reg.test(ext);
     },
 

app/public/js/sr_detail.js

@@ -799,11 +799,12 @@ $(document).ready(() => {
             if (data.attachment) {
                 for (const att of data.attachment) {
                     const delHtml = (parseInt(att.uid) === userID && (att.renew || stage.status !== auditConst.status.checked))
-                        ? '<a class="delete-att text-danger" href="javascript:void(0);" data-imid="'+ data.att_uuid +'" data-attid="'+ att.file_id +'" title="删除"><i class="fa fa-remove "></i></a>'
+                        ? '<a class="delete-att text-danger ml-1" href="javascript:void(0);" data-imid="'+ data.att_uuid +'" data-attid="'+ att.file_id +'" title="删除"><i class="fa fa-remove "></i></a>'
                         : '';
+                    const viewHtml = att.viewpath ? `<a class="ml-1" href="${att.viewpath}" target="_blank" title="预览"><i class="fa fa-eye"></i></a>` : '';
+                    const downloadHtml = '<a href="'+ window.location.pathname + '/im-file/download?im_id='+ data.att_uuid +'&file_id='+ att.file_id +'" title="下载"><i class="fa fa-download "></i></a>';
                     html.push('<tr><td style="width: 200px">' + att.filename + att.fileext + '</td><td>' + att.username + '</td><td>' + att.in_time + '</td>',
-                        '<td><a href="'+ window.location.pathname + '/im-file/download?im_id='+ data.att_uuid +'&file_id='+ att.file_id +'" title="下载"><i class="fa fa-download "></i></a> ',
-                        delHtml, '</td></tr>');
+                        '<td>', downloadHtml, viewHtml, delHtml, '</td></tr>');
                 }
             }
             $('#im-attList').html(html.join(''));

app/view/stage_rela/detail_modal.ejs

@@ -36,7 +36,7 @@
                 <div class="modal-height-500" style="overflow:auto;">
                     <table class="table table-sm table-bordered" style="word-break:break-all; table-layout: fixed">
                         <thead>
-                        <tr><th width="240">文件名</th><th>上传人</th><th>上传时间</th><th width="40">操作</th></tr>
+                        <tr><th width="240">文件名</th><th>上传人</th><th>上传时间</th><th width="52">操作</th></tr>
                         </thead>
                         <tbody id="im-attList">
                         </tbody>