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

app/controller/stage_extra_controller.js

@@ -355,8 +355,11 @@ module.exports = app => {
                     ]
                 });
                 for (const pf of bonus.proof_file) {
-                    delete pf.filepath;
                     pf.username = (await ctx.service.projectAccount.getAccountInfoById(pf.uid)).name;
+                    if (ctx.helper.canPreview(pf.fileext)){
+                        pf.viewpath = pf.filepath.substr(3, pf.filepath.length - 3);
+                    }
+                    delete pf.filepath;
                 }
                 ctx.body = {err: 0, msg: '', data: bonus.proof_file};
             } catch (error) {

app/public/js/se_bonus.js

@@ -148,7 +148,12 @@ $(document).ready(() => {
             if (files !== null && files !== undefined) {
                 for (const [i, f] of files.entries()) {
                     html.push('<tr>');
-                    html.push('<td style="width: 200px">', f.filename + f.fileext, '</td>');
+                    if (f.viewpath) {
+                        html.push(`<td style="width: 200px"><a href="${f.viewpath}" target="_blank">${f.filename}${f.fileext}</a></td>`);
+                        //html.push(`<td style="width: 200px"><a href="download/file?b_id=${id}&index=${i}&view=1" target="_blank">${f.filename}${f.fileext}</a></td>`);
+                    } else {
+                        html.push(`<td style="width: 200px"><a href="download/file?b_id=${id}&index=${i}" title="下载">${f.filename}${f.fileext}</a></td>`);
+                    }
                     html.push('<td>', f.username, '</td>');
                     html.push('<td>', f.in_time, '</td>');
                     html.push('<td>');

app/service/stage_bonus.js

@@ -23,11 +23,17 @@ module.exports = app => {
         }
 
         _parseData(data) {
+            const helper = this.ctx.helper;
             if (!data) return;
             const datas = data instanceof Array ? data : [data];
             for (const d of datas) {
                 if (d.proof_file) {
                     d.proof_file = JSON.parse(d.proof_file);
+                    d.proof_file.forEach(f => {
+                        if (helper.canPreview(f.fileext)){
+                            f.viewpath = f.filepath.substr(3, f.filepath.length - 3);
+                        }
+                    });
                 } else {
                     d.proof_file = [];
                 }
@@ -143,6 +149,7 @@ module.exports = app => {
             }
             if (uDatas.length > 0) {
                 await this.db.updateRows(this.tableName, uDatas);
+                this._parseData(uDatas);
                 return uDatas;
             } else {
                 return [];

app/view/payment/detail.ejs

@@ -236,7 +236,7 @@
                         imgSrc = OSS_PATH + dtlPath;
                     }
                     let couldCreate = true;
-                    if (srcCell.picFeatures && srcCell.picFeatures.length === paths.length && srcCell.picFeatures[dtlPathIdx] === 'not found!') {
+                    if (srcCell.picFeatures && srcCell.picFeatures.length === paths.length && (srcCell.picFeatures[dtlPathIdx] === 'not found!')) {
                         couldCreate = false;
                     }
                     if (couldCreate) {
@@ -249,6 +249,7 @@
                             }
                             let tmpArea = srcCell.area;
                             srcCell.area = area;
+                            srcCell.isOrgShow = (dtlPathIdx !== 0);
                             let signArea = getProperSignatureArea(srcCell, control, 0, 0, JV);
                             srcCell.area = tmpArea;
                             area[JV.PROP_LEFT] = signArea[0];
@@ -259,11 +260,12 @@
                         const newStampCell = {
                             signature_name: 'dummy_pic',
                             control: srcCell.control,
-                            style: srcCell.style,
+                            // style: srcCell.style,
+                            style: (srcCell.style && srcCell.style !== '') ? srcCell.style : 'sign_pic' ,
                             path: imgSrc,
                             isStamp: true,
                             area,
-                            // isOrgShow: (dtlPathIdx === 0),
+                            isOrgShow: (dtlPathIdx === 0),
                         };
                         rstCells.push(newStampCell);
                     }