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

app/base/base_bills_service.js

@@ -689,6 +689,7 @@ class BaseBillsSerivce extends TreeService {
             pos: pastePosData,
         };
     }
+
 }
 
 module.exports = BaseBillsSerivce;

app/base/base_tree_service.js

@@ -314,6 +314,11 @@ class TreeService extends Service {
         return data;
     }
 
+    async getImportInfo(mid) {
+        const maxId = await this._getMaxLid(mid);
+        return { maxId };
+    }
+
     /**
      * 获取最大节点id
      *

app/const/sign.js

@@ -10,7 +10,7 @@
 
 const path = {
     oss: 'https://measure-sign-pdf.oss-cn-shenzhen.aliyuncs.com/archive',
-    api: 'http://124.71.15.76:9091/eseal',
+    api: 'http://14.18.158.147:9091/eseal',
 };
 
 

app/controller/ledger_controller.js

@@ -14,6 +14,7 @@ const stdDataAddType = {
     next: 3,
 };
 const audit = require('../const/audit');
+const moment = require('moment');
 const auditConst = audit.ledger;
 const tenderMenu = require('../../config/menu').tenderMenu;
 const measureType = require('../const/tender').measureType;
@@ -28,6 +29,7 @@ const exportExcel = require('../lib/export_excel');
 const billsPosConvert = require('../lib/bills_pos_convert');
 const xlsx = require('js-xlsx');
 const stdConst = require('../const/standard');
+const sendToWormhole = require('stream-wormhole');
 
 module.exports = app => {
 
@@ -145,6 +147,14 @@ module.exports = app => {
                 }
                 const [stdBills, stdChapters] = await this.ctx.service.valuation.getValuationStdList(
                     ctx.tender.data.valuation, ctx.tender.data.measure_type);
+
+                    // 获取附件列表
+                const attData = await ctx.service.ledgerAtt.getDataByTenderId(ctx.tender.id);
+                for (const index in attData) {
+                    attData[index].in_time = moment(attData[index].in_time * 1000).format('YYYY-MM-DD');
+                }
+
+                const whiteList = this.ctx.app.config.multipart.whitelist;
                 const renderData = {
                     tender: tender.data,
                     tenderInfo: tender.info,
@@ -152,6 +162,8 @@ module.exports = app => {
                     auditors,
                     curAuditor,
                     user,
+                    attData,
+                    whiteList,
                     auditHistory,
                     ledgerSpreadSetting: JSON.stringify(ledgerSpread),
                     posSpreadSetting: JSON.stringify(posSpread),
@@ -741,6 +753,268 @@ module.exports = app => {
             const renderData = {};
             await this.layout('ledger/index.ejs', renderData);
         }
+        /**
+         * 上传附件
+         * @param {Object} ctx - egg全局变量
+         * @return {void}
+         */
+        async uploadFile(ctx) {
+            const responseData = {
+                err: 0,
+                msg: '',
+                data: [],
+            };
+            let stream;
+            try {
+                const parts = ctx.multipart({ autoFields: true });
+                const files = [];
+                let index = 0;
+                const extra_upload = ctx.tender.data.ledger_status === auditConst.status.checked;
+                while ((stream = await parts()) !== undefined) {
+                    // 判断用户是否选择上传文件
+                    if (!stream.filename) {
+                        throw '请选择上传的文件!';
+                    }
+                    const fileInfo = path.parse(stream.filename);
+                    const create_time = Date.parse(new Date()) / 1000;
+                    const filepath = `app/public/upload/${this.ctx.tender.id}/ledger/fujian_${create_time + index.toString() + fileInfo.ext}`;
+                    await ctx.helper.saveStreamFile(stream, path.resolve(this.app.baseDir, filepath));
+                    if (stream) {
+                        await sendToWormhole(stream);
+                    }
+                    // 保存数据到att表
+                    const fileData = {
+                        tid: ctx.params.id,
+                        in_time: create_time,
+                        filename: fileInfo.name,
+                        fileext: fileInfo.ext,
+                        filesize: Array.isArray(parts.field.size) ? parts.field.size[index] : parts.field.size,
+                        filepath,
+                        extra_upload,
+                    };
+                    const result = await ctx.service.ledgerAtt.save(parts.field, fileData, ctx.session.sessionUser.accountId);
+                    if (!result) {
+                        throw '导入数据库保存失败';
+                    }
+                    const attData = await ctx.service.ledgerAtt.getDataByFid(result.insertId);
+                    attData.in_time = moment(create_time * 1000).format('YYYY-MM-DD');
+                    files.length !== 0 ? files.unshift(attData) : files.push(attData);
+                    ++index;
+                }
+                responseData.data = files;
+            } catch (err) {
+                this.log(err);
+                // 失败需要消耗掉stream 以防卡死
+                if (stream) {
+                    await sendToWormhole(stream);
+                }
+                this.setMessage(err.toString(), this.messageType.ERROR);
+                responseData.err = 1;
+                responseData.msg = err.toString();
+            }
+            ctx.body = responseData;
+        }
+        /**
+         * 下载附件
+         * @param {Object} ctx - egg全局变量
+         * @return {void}
+         */
+        async downloadFile(ctx) {
+            const id = ctx.params.fid;
+            if (id) {
+                try {
+                    const fileInfo = await ctx.service.ledgerAtt.getDataById(id);
+                    if (fileInfo !== undefined && fileInfo !== '') {
+                        const fileName = path.join(this.app.baseDir, fileInfo.filepath);
+                        // 解决中文无法下载问题
+                        const userAgent = (ctx.request.header['user-agent'] || '').toLowerCase();
+                        let disposition = '';
+                        if (userAgent.indexOf('msie') >= 0 || userAgent.indexOf('chrome') >= 0) {
+                            disposition = 'attachment; filename=' + encodeURIComponent(fileInfo.filename + fileInfo.fileext);
+                        } else if (userAgent.indexOf('firefox') >= 0) {
+                            disposition = 'attachment; filename*="utf8\'\'' + encodeURIComponent(fileInfo.filename + fileInfo.fileext) + '"';
+                        } else {
+                            /* safari等其他非主流浏览器只能自求多福了 */
+                            disposition = 'attachment; filename=' + new Buffer(fileInfo.filename + fileInfo.fileext).toString('binary');
+                        }
+                        ctx.response.set({
+                            'Content-Type': 'application/octet-stream',
+                            'Content-Disposition': disposition,
+                            'Content-Length': fileInfo.filesize,
+                        });
+                        ctx.body = await fs.createReadStream(fileName);
+                    } else {
+                        throw '不存在该文件';
+                    }
+                } catch (err) {
+                    this.log(err);
+                    this.setMessage(err.toString(), this.messageType.ERROR);
+                }
+            }
+        }
+
+        /**
+         * 查看附件
+         * @param {Object} ctx - egg全局变量
+         * @return {void}
+         */
+        async checkFile(ctx) {
+            const responseData = { err: 0, msg: '' };
+            const { id = '' } = JSON.parse(ctx.request.body.data);
+            if (id) {
+                try {
+                    const fileInfo = await ctx.service.ledgerAtt.getDataById(id);
+                    if (fileInfo && Object.keys(fileInfo).length) {
+                        let filepath = fileInfo.filepath;
+                        if (!ctx.helper.canPreview(fileInfo.fileext)) {
+                            filepath = `/tender/${ctx.tender.id}/ledger/download/file/${fileInfo.id}`;
+                        } else {
+                            filepath = filepath.replace(/^app|\/app/, '');
+                        }
+                        fileInfo.filepath && (responseData.data = { filepath });
+                    }
+                } catch (error) {
+                    this.log(error);
+                    this.setMessage(error.toString(), this.messageType.ERROR);
+                    responseData.err = 1;
+                    responseData.msg = error.toString();
+                }
+            }
+            ctx.body = responseData;
+        }
+
+        /**
+         * 删除附件
+         * @param {Object} ctx - egg全局变量
+         * @return {void}
+         */
+        async deleteFile(ctx) {
+            const responseData = {
+                err: 0,
+                msg: '',
+                data: '',
+            };
+            try {
+                // this._checkStageCanModifyRe(ctx);
+
+                const data = JSON.parse(ctx.request.body.data);
+                const fileInfo = await ctx.service.ledgerAtt.getDataById(data.id);
+                if (!fileInfo || !Object.keys(fileInfo).length) {
+                    throw '该文件不存在';
+                }
+                if (!fileInfo.extra_upload && ctx.stage.status === auditConst.status.checked) {
+                    throw '无权限删除';
+                }
+                if (fileInfo !== undefined && fileInfo !== '') {
+                    // 先删除文件
+                    await fs.unlinkSync(path.join(this.app.baseDir, fileInfo.filepath));
+                    // 再删除数据库
+                    await ctx.service.ledgerAtt.deleteById(data.id);
+                    responseData.data = '';
+                } else {
+                    throw '不存在该文件';
+                }
+            } catch (err) {
+                responseData.err = 1;
+                responseData.msg = err;
+            }
+
+            ctx.body = responseData;
+        }
+
+        /**
+         * 保存附件（或替换）
+         * @param {Object} ctx - egg全局变量
+         * @return {void}
+         */
+        async saveFile(ctx) {
+            const responseData = {
+                err: 0,
+                msg: '',
+                data: [],
+            };
+            let stream;
+            try {
+                // this._checkStageCanModifyRe(ctx);
+                stream = await ctx.getFileStream({ requireFile: false });
+                let fileData = {};
+                if (stream.filename !== undefined) {
+                    const create_time = Date.parse(new Date()) / 1000;
+                    const fileInfo = path.parse(stream.filename);
+                    const dirName = `app/public/upload/${this.ctx.tender.id}/ledger`;
+                    const fileName = 'fujian_' + create_time + fileInfo.ext;
+
+                    // 判断文件夹是否存在，不存在则直接创建文件夹
+                    if (!fs.existsSync(path.join(this.app.baseDir, dirName))) {
+                        await fs.mkdirSync(path.join(this.app.baseDir, dirName));
+                    }
+                    // 保存文件
+                    await ctx.helper.saveStreamFile(stream, path.join(this.app.baseDir, dirName, fileName));
+                    // 保存数据到att表
+                    fileData = {
+                        filesize: stream.fields.size,
+                        filepath: path.join(dirName, fileName),
+                    };
+                }
+                const result = await ctx.service.ledgerAtt.updateByID(stream.fields, fileData);
+                if (!result) {
+                    throw '导入数据库保存失败';
+                }
+                const attData = await ctx.service.ledgerAtt.getDataByFid(stream.fields.id);
+                attData.in_time = moment(attData.in_time * 1000).format('YYYY-MM-DD');
+                responseData.data = attData;
+            } catch (err) {
+                this.log(err);
+                // 失败需要消耗掉stream 以防卡死
+                if (stream) {
+                    await sendToWormhole(stream);
+                }
+                this.setMessage(err.toString(), this.messageType.ERROR);
+                responseData.err = 1;
+                responseData.msg = err.toString();
+            }
+            ctx.body = responseData;
+        }
+
+        /**
+         * 批量下载 - 压缩成zip文件返回
+         * @param {Object} ctx - 全局上下文
+         */
+        async downloadZip(ctx) {
+            try {
+                const fileIds = JSON.parse(ctx.request.query.fileIds);
+                const zipFilename = `${ctx.tender.data.name}-计量台账-${ctx.params.order}-附件.zip`;
+                const time = Date.now();
+                const zipPath = `app/public/upload/${ctx.tender.id}/ledger/fu_jian_zip${time}.zip`;
+                const size = await ctx.service.ledgerAtt.compressedFile(fileIds, zipPath);
+
+                // 解决中文无法下载问题
+                const userAgent = (ctx.request.header['user-agent'] || '').toLowerCase();
+                let disposition = '';
+                if (userAgent.indexOf('msie') >= 0 || userAgent.indexOf('chrome') >= 0) {
+                    disposition = 'attachment; filename=' + encodeURIComponent(zipFilename);
+                } else if (userAgent.indexOf('firefox') >= 0) {
+                    disposition = 'attachment; filename*="utf8\'\'' + encodeURIComponent(zipFilename) + '"';
+                } else {
+                    /* safari等其他非主流浏览器只能自求多福了 */
+                    disposition = 'attachment; filename=' + new Buffer(zipFilename).toString('binary');
+                }
+                ctx.response.set({
+                    'Content-Type': 'application/octet-stream',
+                    'Content-Disposition': disposition,
+                    'Content-Length': size,
+                });
+                const readStream = fs.createReadStream(path.join(this.app.baseDir, zipPath));
+                ctx.body = readStream;
+                readStream.on('close', () => {
+                    if (fs.existsSync(path.resolve(this.app.baseDir, zipPath))) {
+                        fs.unlinkSync(path.resolve(this.app.baseDir, zipPath));
+                    }
+                });
+            } catch (error) {
+                this.log(error);
+            }
+        }
     }
 
     return LedgerController;

app/controller/report_archive_controller.js

@@ -490,7 +490,7 @@ module.exports = app => {
                         const postData = {
                             requestJson: JSON.stringify(data.requestJson),
                         };
-                        const result = await ctx.helper.sendRequest(netcaSignApi + '/assemblyDigest', postData, 'POST');
+                        const result = await ctx.helper.sendMoreRequest(netcaSignApi + '/assemblyDigest', postData, 'POST');
                         response.data = result;
                         break;
                     // 生成签名pdf
@@ -498,22 +498,37 @@ module.exports = app => {
                         const postData2 = {
                             requestJson: JSON.stringify(data.requestJson),
                         };
-                        const result2 = await ctx.helper.sendRequest(netcaSignApi + '/assemblyPdf', postData2, 'POST');
+                        const result2 = await ctx.helper.sendMoreRequest(netcaSignApi + '/assemblyPdf', postData2, 'POST');
+                        console.log(result2);
                         // 上传到oss
                         if (result2.code === 0) {
-                            const result3 = await ctx.curl(netcaSignApi + result2.data);
-                            const oss_reuslt = await ctx.oss.put('archive/sign/' + data.requestJson.fileName + '.PDF', result3.data);
+                            const result3 = await ctx.helper.sendMoreRequest(netcaSignApi + result2.data);
+                            const oss_reuslt = await ctx.oss.put('archive/sign/' + data.requestJson.fileName + '.PDF', result3);
                             if (oss_reuslt && oss_reuslt.res && oss_reuslt.res.status === 200) {
-                                const versionId = oss_reuslt.res.headers['x-oss-version-id'];
-                                // 记录签名和保存
-                                await ctx.service.netcasignLog.add(data.requestJson.fileName, data.role, ctx.session.sessionUser.accountId, versionId);
-                                const signLogList = await ctx.service.netcasignLog.getLogList(ctx.tender.id);
-                                response.data = signLogList;
+                                if (data.end) {
+                                    const versionId = oss_reuslt.res.headers['x-oss-version-id'];
+                                    // 记录签名和保存
+                                    await ctx.service.netcasignLog.add(data.requestJson.fileName, data.role, ctx.session.sessionUser.accountId, versionId);
+                                    const signLogList = await ctx.service.netcasignLog.getLogList(ctx.tender.id);
+                                    response.data = signLogList;
+                                } else {
+                                    // next page
+                                }
                             } else {
                                 throw '上传文件失败';
                             }
                         }
-
+                        break;
+                    // 移除签名和已签移除pdf
+                    case 'removeSign':
+                        const oss_reuslt = await ctx.oss.delete('archive/sign/' + data.uuid + '.PDF');
+                        if (oss_reuslt && oss_reuslt.res && oss_reuslt.res.status === 204) {
+                            const delSign_result = await ctx.service.netcasignLog.removeSign(ctx.session.sessionUser.accountId, data.uuid);
+                            const signLogList = await ctx.service.netcasignLog.getLogList(ctx.tender.id);
+                            response.data = signLogList;
+                        } else {
+                            throw '删除文件失败';
+                        }
                         break;
                     default:throw '参数有误';
                 }

app/controller/stage_controller.js

@@ -1530,8 +1530,9 @@ module.exports = app => {
                 if (stream.filename !== undefined) {
                     const create_time = Date.parse(new Date()) / 1000;
                     const fileInfo = path.parse(stream.filename);
-                    const dirName = 'app/public/upload/stage/' + moment().format('YYYYMMDD');
-                    const fileName = 'stage' + create_time + fileInfo.ext;
+                    // const dirName = 'app/public/upload/stage/' + moment().format('YYYYMMDD');
+                    const dirName = `app/public/upload/${this.ctx.tender.id}/stage`;
+                    const fileName = 'fujian_' + create_time + fileInfo.ext;
 
                     // 判断文件夹是否存在，不存在则直接创建文件夹
                     if (!fs.existsSync(path.join(this.app.baseDir, dirName))) {

app/controller/tender_controller.js

@@ -21,6 +21,7 @@ const billsPosConvert = require('../lib/bills_pos_convert');
 const path = require('path');
 const sendToWormhole = require('stream-wormhole');
 const scheduleConst = require('../const/schedule');
+const SumLoad = require('../lib/sum_load');
 
 module.exports = app => {
 
@@ -165,14 +166,12 @@ module.exports = app => {
                 };
                 await this.layout(view, renderData, modal);
             } catch (err) {
-                console.log(err);
                 this.log(err);
                 this.ctx.redirect('/dashboard');
             }
         }
 
         async _list(view, renderData, modal = '', list_status = '') {
-            console.log(1);
             try {
                 renderData.tenderList = await this.ctx.service.tender.getList(list_status, renderData.userPermission, this.ctx.session.sessionUser.is_admin);
 
@@ -232,7 +231,6 @@ module.exports = app => {
          * @return {void}
          */
         async listInfo(ctx) {
-            console.log('listInfo');
             this.jsFiles = this.app.jsFiles.tender.info;
             await this._listDetail('tender/info.ejs', 'tender/modal.ejs');
         }
@@ -244,7 +242,6 @@ module.exports = app => {
          * @return {Promise<void>}
          */
         async listProgress(ctx) {
-            console.log('listProgress');
             this.jsFiles = this.app.jsFiles.tender.progress;
             await this._listDetail('tender/progress.ejs', 'tender/modal.ejs');
         }
@@ -256,7 +253,6 @@ module.exports = app => {
          * @return {Promise<void>}
          */
         async listManage(ctx) {
-            console.log('listManager');
             this.jsFiles = this.app.jsFiles.tender.manage;
             // 先判断权限
             // 获取用户新建标段权利
@@ -641,29 +637,6 @@ module.exports = app => {
         }
 
         /**
-         * 切换标段 --》 暂时废弃，不存在此功能
-         *
-         * @param {Object} ctx - egg全局变量
-         * @return {void}
-         */
-        async switchTender(ctx) {
-            let tenderId = ctx.params.tenderId;
-            tenderId = parseInt(tenderId);
-            try {
-                if (isNaN(tenderId) || tenderId <= 0) {
-                    throw '参数错误';
-                }
-                const result = await ctx.service.tender.switchTender(tenderId);
-                if (!result) {
-                    throw '切换标段失败!';
-                }
-            } catch (error) {
-                this.setMessage(error.toString(), this.messageType.ERROR);
-            }
-            ctx.redirect(ctx.request.header.referer);
-        }
-
-        /**
          * 保存标段操作
          *
          * @param {Object} ctx - egg全局变量
@@ -1060,6 +1033,94 @@ module.exports = app => {
                 ctx.body = this.ajaxErrorBody(err, '书签数据错误');
             }
         }
+
+        async listLoad(ctx) {
+            try {
+                const data = JSON.parse(ctx.request.body.data);
+                if (!data.tid || !data.lid || !data.type) throw '数据错误';
+                const responseData = {
+                    err: 0,
+                    msg: '',
+                    data: { ledgerAuditConst: auditConst.ledger, stageAuditConst: auditConst.stage },
+                };
+                responseData.data.category = await this.ctx.service.category.getAllCategory(this.ctx.session.sessionProject.id);
+                // 获取用户权限
+                const accountInfo = await this.ctx.service.projectAccount.getDataById(this.ctx.session.sessionUser.accountId);
+                const userPermission = accountInfo !== undefined && accountInfo.permission !== '' ? JSON.parse(accountInfo.permission) : null;
+                const tenderList = await this.ctx.service.tender.getList('', userPermission);
+                for (const t of tenderList) {
+                    if (t.ledger_status === auditConst.ledger.status.checked) {
+                        t.lastStage = await this.ctx.service.stage.getLastestStage(t.id, false);
+                    }
+                }
+                if (data.type === 'ledger') {
+                    responseData.data.tenders = tenderList.filter(x => {
+                        return x.ledger_status === auditConst.ledger.status.checked;
+                    });
+                    const history = await this.ctx.service.sumLoadHistory.getLedgerHistory(data.tid, data.lid);
+                    if (history) responseData.data.history = { tenders: history.tenders, load_time: history.load_time, type: 'ledger' };
+                } else if (data.type === 'stage') {
+                    responseData.data.tenders = tenderList.filter(x => {
+                        return x.ledger_status === auditConst.ledger.status.checked && !!x.lastStage;
+                    });
+                    let history = await this.ctx.service.sumLoadHistory.getStageHistory(data.tid, data.lid);
+                    if (history) {
+                        responseData.data.history = { tenders: history.tenders, load_time: history.load_time, type: 'stage' };
+                    } else {
+                        history = await this.ctx.service.sumLoadHistory.getReviseHistory(data.tid, data.lid);
+                        if (history) {
+                            responseData.data.history = { tenders: history.tenders, load_time: history.load_time, type: 'revise' };
+                        } else {
+                            history = await this.ctx.service.sumLoadHistory.getLedgerHistory(data.tid, data.lid);
+                            if (history) responseData.data.history = { tenders: history.tenders, load_time: history.load_time, type: 'ledger' };
+                        }
+                    }
+                } else if (data.type === 'revise') {
+                    responseData.data.tenders = tenderList.filter(x => {
+                        return x.ledger_status === auditConst.ledger.status.checked;
+                    });
+                    let history = await this.ctx.service.sumLoadHistory.getReviseHistory(data.tid, data.lid);
+                    if (history) {
+                        responseData.data.history = { tenders: history.tenders, load_time: history.load_time, type: 'revise' };
+                    } else {
+                        history = await this.ctx.service.sumLoadHistory.getLedgerHistory(data.tid, data.lid);
+                        if (history) responseData.data.history = { tenders: history.tenders, load_time: history.load_time, type: 'ledger' };
+                    }
+                }
+                ctx.body = responseData;
+            } catch(err) {
+                this.log(err);
+                this.ajaxErrorBody(err, '获取标段列表错误');
+            }
+        }
+
+        async sumLoad(ctx) {
+            try {
+                const data = JSON.parse(ctx.request.body.data);
+
+                if (!data.lid || !data.type || !data.tenders) throw '数据错误';
+
+                switch (data.type) {
+                    case 'ledger':
+                        const refreshData = await this.ctx.service.ledger.sumLoad(data.lid, data.tenders);
+                        ctx.body = {err: 0, msg: '', data: refreshData};
+                        break;
+                    case 'revise':
+                        const reviseData = await this.ctx.service.reviseBills.sumLoad(data.lid, this.ctx.revise.id, data.tenders);
+                        ctx.body = {err: 0, msg: '', data: reviseData};
+                        break;
+                    case 'stage':
+                        ctx.body = await this._sumLoadStage(data.tid, data.lid, data.tenders);
+                        break;
+                    default:
+                        throw '数据错误';
+                }
+            } catch (err) {
+                console.log(err);
+                this.log(err);
+                this.ajaxErrorBody(err, '导入数据失败');
+            }
+        }
     }
 
     return TenderController;

app/extend/helper.js

@@ -262,6 +262,39 @@ module.exports = {
     },
 
     /**
+     * 模拟多次发送请求(失败后再获取)
+     *
+     * @param {String} url - 请求地址
+     * @param {Object} data - 失败请求次数
+     * @param {String} type - 请求类型(POST) POST | GET
+     * @param {String} dataType - 数据类型 json|text
+     * @param {String} count - 重复次数
+     * @return {Object} - 请求结果
+     */
+    async sendMoreRequest(url, data = null, type = 'POST', dataType = 'json', count = 3) {
+        // 发起请求
+        try {
+            let response = data ? await this.ctx.curl(url, {
+                method: type,
+                data,
+                dataType,
+            }) : await this.ctx.curl(url);
+            console.log(response);
+            if (response.status !== 200) {
+                if (count > 0) {
+                    count = count - 1;
+                    response = await this.sendMoreRequest(url, data, type, dataType, count);
+                } else {
+                    throw '请求失败';
+                }
+            }
+            return response.data;
+        } catch (err) {
+            throw '请求失败';
+        }
+    },
+
+    /**
      * 深度验证数据
      *
      * @param {Object} rule - 数据规则

app/lib/analysis_excel.js

@@ -804,12 +804,9 @@ class AnalysisGclExcelTree {
                 const row = sheet.rows[iRow];
                 if (this.colsDef && !this.loadEnd) {
                     const result = this.loadRowData(row);
-                    // 读取失败则写入错误数据 todo 返回前端告知用户?
+                    // 读取失败则写入错误数据
                     if (!result) {
-                        this.errorData.push({
-                            serialNo: iRow,
-                            data: row,
-                        });
+                        this.errorData.push({ serialNo: iRow, data: row });
                     }
                 } else {
                     this.checkColHeader(row);

app/lib/rpt_data_analysis.js

@@ -699,7 +699,7 @@ const join = {
             }
         }
         for (const s of sub) {
-            let r = result.find(function(x) {
+            let subR = result.filter(function(x) {
                 for (const k of options.keyFields) {
                     switch (k.type) {
                         case 'string':
@@ -712,22 +712,24 @@ const join = {
                 }
                 return true;
             });
-            if (r && r._join_tag === 'main') {
-                r._join_tag = 'both';
-            }
-            if (!r) {
-                r = { _join_tag: 'sub' };
-                for (const k of options.keyFields) {
-                    r[k.main] = s[k.sub];
+            for (let r of subR) {
+                if (r && r._join_tag === 'main') {
+                    r._join_tag = 'both';
                 }
-                result.push(r);
-            }
-            for (const i of options.importFields) {
-                // r[i.main] = s[i.sub];
-                if (i.type === 'sum') {
-                    r[i.main] = ctx.helper.add(r[i.main], s[i.sub]);
-                } else {
-                    r[i.main] = s[i.sub];
+                if (!r) {
+                    r = { _join_tag: 'sub' };
+                    for (const k of options.keyFields) {
+                        r[k.main] = s[k.sub];
+                    }
+                    result.push(r);
+                }
+                for (const i of options.importFields) {
+                    // r[i.main] = s[i.sub];
+                    if (i.type === 'sum') {
+                        r[i.main] = ctx.helper.add(r[i.main], s[i.sub]);
+                    } else {
+                        r[i.main] = s[i.sub];
+                    }
                 }
             }
         }

app/lib/sum_load.js

@@ -0,0 +1,255 @@
+'use strict';
+
+/**
+ *
+ *
+ * @author Mai
+ * @date
+ * @version
+ */
+const Ledger = require('../lib/ledger');
+
+class loadGclBaseTree {
+    /**
+     * 构造函数
+     * @param {Array} tempData - 清单模板数据
+     */
+    constructor (ctx, setting) {
+        this.ctx = ctx;
+        this.parent = setting.parent;
+        this.defaultData = setting.defaultData;
+        // 常量
+        this.splitChar = '-';
+        // 索引
+        // 以code为索引
+        this.items = [];
+
+        // 缓存
+        this.keyNodeId = setting.maxId ? setting.maxId + 1 : 1;
+    }
+
+    /**
+     * 根据 编号 查找 父项项目节
+     * @param {String} code - 子项编号
+     * @returns {*}
+     */
+    findNode(node, parent) {
+        parent = parent || this.parent;
+        if (!parent.children) return null;
+
+        for (const child of parent.children) {
+            const checkLeaf = (child.is_leaf && node.is_leaf) || (!child.is_leaf && !node.is_leaf);
+            if (child.b_code === node.b_code && child.name === node.name && child.unit === node.unit && checkLeaf) return child;
+        }
+        return null;
+    }
+
+    /**
+     * 添加 树节点 并完善该节点的树结构
+     * @param {Object} node - 添加节点
+     * @param {Object} parent - 父项
+     * @returns {*}
+     */
+    addNode(source, parent) {
+        if (source.b_code === '101') console.log('101 parent', parent);
+        parent = parent ? parent : this.parent;
+        let node = this.findNode(source, parent);
+        if (source.b_code === '101') console.log('101 cur', node);
+        if (!node) {
+            if (!parent.children) parent.children = [];
+            node = {
+                id: this.ctx.app.uuid.v4(),
+                tender_id: this.ctx.tender.id,
+                ledger_id: this.keyNodeId,
+                ledger_pid: parent.ledger_id,
+                level: parent.level +1,
+                full_path: parent.full_path + '-' + this.keyNodeId,
+                order: parent.children.length + 1,
+                children: [],
+                b_code: source.b_code,
+                name: source.name,
+                unit: source.unit,
+                sgfh_qty: 0,
+                qtcl_qty: 0,
+                sjcl_qyt: 0,
+                quantity: 0,
+            };
+            this.keyNodeId += 1;
+            parent.children.push(node);
+            this.items.push(node);
+        }
+        return node;
+    }
+
+    gather(source, parent) {}
+    getUpdateData() {}
+}
+
+class loadLedgerGclTree extends loadGclBaseTree {
+    gather(source, parent) {
+        const node = this.addNode(source, parent);
+        node.sgfh_qty = this.ctx.helper.add(node.sgfh_qty, source.sgfh_qty);
+        node.qtcl_qty = this.ctx.helper.add(node.qtcl_qty, source.qtcl_qty);
+        node.sjcl_qty = this.ctx.helper.add(node.sjcl_qty, source.sjcl_qty);
+        node.quantity = this.ctx.helper.add(node.quantity, source.quantity);
+        return node;
+    }
+
+    getUpdateData() {
+        const update = {id: this.parent.id, is_leaf: false};
+        const create = [];
+        for (const i of this.items) {
+            create.push({
+                id: i.id, tender_id: i.tender_id, ledger_id: i.ledger_id, ledger_pid: i.ledger_pid,
+                level: i.level, order: i.order, full_path: i.full_path, is_leaf: !i.children || i.children.length === 0,
+                b_code: i.b_code, name: i.name, unit: i.unit,
+                sgfh_qty: i.sgfh_qty, sjcl_qty: i.sjcl_qty, qtcl_qty: i.qtcl_qty, quantity: i.quantity,
+            })
+        }
+        return {update, create};
+    }
+}
+
+class updateReviseGclTree extends loadGclBaseTree {
+    constructor (ctx, setting) {
+        super(ctx, setting);
+        this.baseNodes = [];
+    }
+    loadBase(datas) {
+        datas.sort((x, y) => { return x.level === y.level ? x.order - y.order : x.level - y.level; });
+        const Index = {};
+        for (const d of datas) {
+            const parent = this.parent.ledger_id === d.ledger_pid ? this.parent : Index[d.ledger_pid];
+            if (!parent) continue;
+
+            if (!parent.children) parent.children = [];
+            const baseNode = {
+                id: d.id,
+                ledger_id: d.ledger_id,
+                ledger_pid: d.ledger_pid,
+                level: d.level,
+                is_leaf: d.is_leaf,
+                full_path: d.full_path,
+                b_code: d.b_code,
+                name: d.name,
+                unit: d.unit,
+                unit_price: d.unit_price,
+                org_sgfh_qty: d.sgfh_qty || 0,
+                org_sjcl_qty: d.sjcl_qty || 0,
+                org_qtcl_qty: d.qtcl_qty || 0,
+                org_qty: d.quantity || 0,
+                org_order: d.order,
+                sgfh_qty: 0,
+                sjcl_qty: 0,
+                qtcl_qty: 0,
+                quantity: 0,
+            };
+            parent.children.push(baseNode);
+            Index[baseNode.ledger_id] = baseNode;
+            this.baseNodes.push(baseNode);
+        }
+    }
+    gather(source, parent) {
+        const node = this.addNode(source, parent);
+        if (source.b_code === '207-2-1') console.log('207-2-1', node, source);
+        node.sgfh_qty = this.ctx.helper.add(node.sgfh_qty, source.sgfh_qty);
+        node.qtcl_qty = this.ctx.helper.add(node.qtcl_qty, source.qtcl_qty);
+        node.sjcl_qty = this.ctx.helper.add(node.sjcl_qty, source.sjcl_qty);
+        node.quantity = this.ctx.helper.add(node.quantity, source.quantity);
+        return node;
+    }
+    getUpdateData() {
+        const result = {update: [], errors: [], create: []};
+        if (this.baseNodes.length === 0) {
+            result.update = [{id: this.parent.id, is_leaf: false}];
+        } else {
+            for (const bn of this.baseNodes) {
+                if (bn.children && bn.children.length > 0) continue;
+
+                if (bn.sjcl_qty < bn.org_sjcl_qty || bn.qtcl_qty < bn.org_qtcl_qty || bn.sgfh_qty < bn.org_sgfh_qty) {
+                    result.errors.push(bn);
+                } else if (bn.sjcl_qty !== bn.org_sjcl_qty || bn.qtcl_qty !== bn.org_qtcl_qty || bn.sgfh_qty !== bn.org_sgfh_qty) {
+                    result.update.push({
+                        id: bn.id, sgfh_qty: bn.sgfh_qty, sjcl_qty: bn.sjcl_qty, qtcl_qty: bn.qtcl_qty, quantity: bn.quantity,
+                    })
+                }
+            }
+        }
+        for (const i of this.items) {
+            result.create.push({
+                id: i.id, tender_id: i.tender_id, ledger_id: i.ledger_id, ledger_pid: i.ledger_pid,
+                level: i.level, order: i.order, full_path: i.full_path, is_leaf: !i.children || i.children.length === 0,
+                b_code: i.b_code, name: i.name, unit: i.unit,
+                sgfh_qty: i.sgfh_qty, sjcl_qty: i.sjcl_qty, qtcl_qty: i.qtcl_qty, quantity: i.quantity,
+            })
+        }
+        return result;
+    }
+}
+
+class sumLoad {
+    constructor (ctx) {
+        this.ctx = ctx;
+    }
+
+    recusiveLoadGatherGcl(node, parent) {
+        const cur = node.b_code ? this.loadTree.gather(node, parent) : parent;
+        if (!node.children || node.children.length === 0) return;
+        for (const child of node.children) {
+            this.recusiveLoadGatherGcl(child, cur);
+        }
+    }
+
+    async loadGatherGcl(select, maxId, tenders, defaultData) {
+        this.loadTree = new loadLedgerGclTree(this.ctx, {
+            parent: select, maxId, type: 'ledger', defaultData,
+        });
+        for (const tender of tenders) {
+            const billsData = await this.ctx.service.ledger.getData(tender.tid);
+            const billsTree = new Ledger.billsTree(this.ctx, {
+                id: 'ledger_id',
+                pid: 'ledger_pid',
+                order: 'order',
+                level: 'level',
+                rootId: -1,
+                keys: ['id', 'tender_id', 'ledger_id'],
+                stageId: 'id',
+            });
+            billsTree.loadDatas(billsData);
+            for (const top of billsTree.children) {
+                if ([1].indexOf(top.node_type) < 0) continue;
+                this.recusiveLoadGatherGcl(top, null);
+            }
+        }
+        return this.loadTree;
+    }
+
+    async updateGatherGcl(select, maxId, tenders, defaultData) {
+        this.loadTree = new updateReviseGclTree(this.ctx, {
+            parent: select, maxId, type: 'ledger', defaultData,
+        });
+        const posterity = await this.ctx.service.reviseBills.getPosterityByParentId(this.ctx.tender.id, select.ledger_id);
+        this.loadTree.loadBase(posterity);
+
+        for (const tender of tenders) {
+            const billsData = await this.ctx.service.ledger.getData(tender.tid);
+            const billsTree = new Ledger.billsTree(this.ctx, {
+                id: 'ledger_id',
+                pid: 'ledger_pid',
+                order: 'order',
+                level: 'level',
+                rootId: -1,
+                keys: ['id', 'tender_id', 'ledger_id'],
+                stageId: 'id',
+            });
+            billsTree.loadDatas(billsData);
+            for (const top of billsTree.children) {
+                if ([1].indexOf(top.node_type) < 0) continue;
+                this.recusiveLoadGatherGcl(top, null);
+            }
+        }
+        return this.loadTree;
+    }
+}
+
+module.exports = sumLoad;

app/middleware/revise_check.js

@@ -0,0 +1,53 @@
+'use strict';
+
+/**
+ *
+ *
+ * @author Mai
+ * @date
+ * @version
+ */
+
+module.exports = options => {
+    /**
+     * 标段校验 中间件
+     * 1. 读取标段数据（包括属性）
+     * 2. 检验用户是否可见标段（不校验具体权限）
+     *
+     * @param {function} next - 中间件继续执行的方法
+     * @return {void}
+     */
+    return function* reviseAuditCheck(next) {
+        try {
+            // 获取revise
+            this.revise = yield this.service.ledgerRevise.getLastestRevise(this.tender.id);
+            yield next;
+        } catch (err) {
+            // 输出错误到日志
+            if (err.stack) {
+                this.logger.error(err);
+            } else {
+                this.getLogger('fail').info(JSON.stringify({
+                    error: err,
+                    project: this.session.sessionProject,
+                    user: this.session.sessionUser,
+                    body: this.session.body,
+                }));
+            }
+            // 重定向值标段管理
+            if (this.helper.isAjax(this.request)) {
+                if (err.stack) {
+                    this.body = {err: 4, msg: '标段数据未知错误', data: null};
+                } else {
+                    this.body = {err: 3, msg: err.toString(), data: null};
+                }
+            } else {
+                if (this.helper.isWap(this.request)) {
+                    this.redirect('/wap/list');
+                } else {
+                    err === '您无权查看该内容' ? this.redirect(this.request.headers.referer) : this.redirect('/list');
+                }
+            }
+        }
+    };
+};

app/public/js/gcl_gather.js

@@ -316,8 +316,8 @@ const gclGatherModel = (function () {
                 node.b_code = node.code;
                 const gcl = getGclNode(node);
                 if (!node.quantity || !node.unit_price) continue;
-                gcl.deal_bills_qty = node.quantity;
-                gcl.deal_bills_tp = node.total_price;
+                gcl.deal_bills_qty = ZhCalc.add(gcl.deal_bills_qty, node.quantity);
+                gcl.deal_bills_tp = ZhCalc.add(gcl.deal_bills_tp, node.total_price);
             }
         }
     }

app/public/js/ledger.js

@@ -85,6 +85,10 @@ $(document).ready(function() {
         node.dgn_price = ZhCalc.round(ZhCalc.div(node.total_price, node.dgn_qty1), 2);
     };
     const ledgerTree = createNewPathTree('ledger', treeSetting);
+
+    //初始化所有附件列表
+    getAllList();
+
     // 初始化 计量单元
     const pos = new PosData({
         id: 'id', ledgerId: 'lid',
@@ -1003,21 +1007,6 @@ $(document).ready(function() {
     sjsSettingObj.setFxTreeStyle(ledgerSpreadSetting, sjsSettingObj.FxTreeStyle.jz);
     if (thousandth) sjsSettingObj.setTpThousandthFormat(ledgerSpreadSetting);
     ledgerTreeCol.initSpreadSetting(ledgerSpreadSetting);
-    // ledgerSpreadSetting.rowHeader = [
-    //     {
-    //         rowHeaderType: 'tag',
-    //         setting: {
-    //             getColor: function (index, data) {
-    //                 if (!data) return;
-    //                 if (index%10 === 0) return '#007bff';
-    //                 if (index%10 === 1) return '#28a745';
-    //                 if (index%10 === 2) return '#dc3545';
-    //                 if (index%10 === 3) return '#da9500';
-    //                 if (index%10 === 4) return '#17a2b8';
-    //             }
-    //         },
-    //     },
-    // ];
     ledgerSpreadSetting.headColWidth = [50];
     ledgerSpreadSetting.rowHeader = [
         {
@@ -1060,20 +1049,20 @@ $(document).ready(function() {
     SpreadJsObj.initSheet(ledgerSpread.getActiveSheet(), ledgerSpreadSetting);
     SpreadJsObj.selChangedRefreshBackColor(ledgerSpread.getActiveSheet());
     // 绑定事件
-    ledgerSpread.bind(GC.Spread.Sheets.Events.SelectionChanged, treeOperationObj.selectionChanged);
+    ledgerSpread.bind(spreadNS.Events.SelectionChanged, treeOperationObj.selectionChanged);
     ledgerSpread.bind(spreadNS.Events.TopRowChanged, treeOperationObj.topRowChanged);
 
     if (!ledgerSpreadSetting.readOnly) {
-        ledgerSpread.bind(GC.Spread.Sheets.Events.SelectionChanged, function (e, info) {
+        ledgerSpread.bind(spreadNS.Events.SelectionChanged, function (e, info) {
             treeOperationObj.refreshOperationValid(info.sheet, info.newSelections);
         });
-        ledgerSpread.bind(GC.Spread.Sheets.Events.EditEnded, treeOperationObj.editEnded);
+        ledgerSpread.bind(spreadNS.Events.EditEnded, treeOperationObj.editEnded);
         SpreadJsObj.addDeleteBind(ledgerSpread, treeOperationObj.deletePress);
-        ledgerSpread.bind(GC.Spread.Sheets.Events.ClipboardChanging, function (e, info) {
+        ledgerSpread.bind(spreadNS.Events.ClipboardChanging, function (e, info) {
             const copyText = SpreadJsObj.getFilterCopyText(info.sheet);
             SpreadJsObj.Clipboard.setCopyData(copyText);
         });
-        ledgerSpread.bind(GC.Spread.Sheets.Events.ClipboardPasting, treeOperationObj.clipboardPasting);
+        ledgerSpread.bind(spreadNS.Events.ClipboardPasting, treeOperationObj.clipboardPasting);
         ledgerSpread.bind(spreadNS.Events.EditStarting, treeOperationObj.editStarting);
         SpreadJsObj.addCutEvents(ledgerSpread, treeOperationObj.cut);
 
@@ -1527,6 +1516,15 @@ $(document).ready(function() {
         billsContextMenuOptions.items.sprBatch = '----';
     }
     if (!readOnly) {
+        const tenderSelect = TenderSelect({
+            type: 'ledger',
+            afterLoad: function (result) {
+                const ledgerSheet = ledgerSpread.getActiveSheet();
+                const refreshNode = ledgerTree.loadPostData(result);
+                treeOperationObj.refreshTree(ledgerSheet, refreshNode);
+                treeOperationObj.refreshOperationValid(ledgerSheet);
+            }
+        });
         billsContextMenuOptions.items.importExcel = {
             name: '导入分项清单Excel',
             icon: 'fa-file-excel-o',
@@ -1563,10 +1561,6 @@ $(document).ready(function() {
                     // }
                     //u_type: importExcel.uploadType.file,
                 });
-                //$('#upload-ledger').modal('show');
-            },
-            visible: function (key, opt) {
-                return !readOnly;
             }
         };
         billsContextMenuOptions.items.importGclBills2Xmj = {
@@ -1605,9 +1599,19 @@ $(document).ready(function() {
                         }, null);
                     }
                 });
+            }
+        };
+        billsContextMenuOptions.items.importGclBills2Xmj = {
+            name: '导入(其他标段)工程量清单至项目节',
+            icon: 'fa-file-excel-o',
+            disabled: function (key, opt) {
+                const node = SpreadJsObj.getSelectObject(ledgerSpread.getActiveSheet());
+                return readOnly || !node
+                    || (node.children && node.children.length > 0)
+                    || (!_.isNil(node.b_code) && node.b_code !== '');
             },
-            visible: function (key, opt) {
-                return !readOnly;
+            callback: function (key, opt) {
+                tenderSelect.showSelect(SpreadJsObj.getSelectObject(ledgerSpread.getActiveSheet()));
             }
         };
         billsContextMenuOptions.items.sprImport = '----';
@@ -1742,6 +1746,7 @@ $(document).ready(function() {
             if (node) {
                 const posData = pos.ledgerPos[itemsPre + node.id] || [];
                 SpreadJsObj.loadSheetData(posSpread.getActiveSheet(), 'data', posData);
+                getNodeList(node.id);
             } else {
                 SpreadJsObj.loadSheetData(posSpread.getActiveSheet(), 'data', []);
             }
@@ -2354,9 +2359,10 @@ $(document).ready(function() {
         if (!tab.hasClass('active')) {
             const close = $('.active', '#side-menu').length === 0;
             $('a', '#side-menu').removeClass('active');
+            $('.tab-content .tab-select-show').removeClass('active');
             tab.addClass('active');
-            $('.tab-content .tab-pane').removeClass('active');
             tabPanel.addClass('active');
+            // $('.tab-content .tab-pane').removeClass('active');
             showSideTools(tab.hasClass('active'));
             if (tab.attr('content') === '#std-xmj') {
                 if (!stdXmj) {
@@ -2429,6 +2435,9 @@ $(document).ready(function() {
                 errorList.spread.refresh();
             } else if (tab.attr('content') === '#check-list') {
                 checkList.spread.refresh();
+            } else if (tab.attr('content') === '#fujian') {
+              const node = SpreadJsObj.getSelectObject(ledgerSpread.getActiveSheet());
+              getNodeList(node.id);
             }
         } else { // 收起工具栏
             tab.removeClass('active');
@@ -3386,7 +3395,337 @@ $(document).ready(function() {
             checkList: checkList,
         })
     });
+
+    // 切换附件里节点和所有附件
+    $('#fujian .nav-link').on('click', function () {
+      const tabPanel = $(this).attr('fujian-content');
+      if (tabPanel !== 'syfujian') {
+          $('#showPage').hide();
+          $('#bach-download').prop('type', 'curr');
+      } else {
+          $('#showPage').show();
+          $('#bach-download').prop('type', 'all')
+      }
+      $('#showAttachment').hide();
+    });
+    // 上传附件
+    $('#upload-file-btn').click(function () {
+        // if (curAuditor && curAuditor.aid !== cur_uid) {
+        //     return toastr.error('当前操作没有权限！');
+        // }
+        const files = $('#upload-file')[0].files;
+        const node = SpreadJsObj.getSelectObject(ledgerSpread.getActiveSheet());
+        console.log(node);
+        const formData = new FormData();
+        formData.append('lid', node.id);
+        for (const file of files) {
+            if (file === undefined) {
+                toastr.error('未选择上传文件！');
+                return false;
+            }
+            const filesize = file.size;
+            if (filesize > 30 * 1024 * 1024) {
+                toastr.error('存在上传文件大小过大！');
+                return false;
+            }
+            const fileext = '.' + file.name.toLowerCase().split('.').splice(-1)[0];
+            if (whiteList.indexOf(fileext) === -1) {
+                toastr.error('只能上传指定格式的附件！');
+                return false;
+            }
+            formData.append('size', filesize);
+            formData.append('file[]', file);
+        }
+        postDataWithFile('/tender/' + tender.id + '/ledger/upload/file', formData, function (data) {
+            $('#upload').modal('hide');
+            // 插入到attData中
+            attData = data.concat(attData);
+            // 重新生成List
+            getAllList();
+            getNodeList(node.id);
+        }, function () {
+            toastr.error('附件上传失败');
+        });
+        $('#upload-file').val('');
+    });
+    // 获取附件信息
+    $('.list-table').on('click', '.att-file-name', function () {
+      const fid = $(this).attr('file-id');
+      if ($('#showAttachment').attr('file-id') === fid && !$('#showAttachment').is(":hidden")) {
+          return;
+      }
+      const att = attData.find(function (item) {
+          return item.id === parseInt(fid);
+      });
+      $('#edit-att').hide();
+      $('#show-att').show();
+      if (att !== undefined) {
+          // 进来先把编辑功能隐藏
+          $('#btn-att a').eq(3).hide()
+          $('#show-att tr').eq(0).children('td').text(att.filename + att.fileext);
+          const name = att.code !== null && att.code !== '' ? att.code : (att.b_code !== null ? att.b_code : '');
+          $('#show-att tr').eq(1).children('td').text($.trim(name + ' ' + att.lname));
+          // $('#show-att tr').eq(2).find('a').attr('href', '/tender/' + tender.id + '/measure/stage/' + stage.order + '/download/file/' + att.id);
+          // $('#show-att tr').eq(2).find('a').attr('href', att.filepath);
+          $('#show-att tr').eq(2).children('td').eq(0).text(att.username);
+          $('#show-att tr').eq(2).children('td').eq(1).text(att.in_time);
+          $('#show-att tr').eq(3).children('td').text(att.remark);
+          // 附件uid等于当前用户id, 附件上传本人
+          if (parseInt(cur_uid) === att.uid) {
+              $('#btn-att').show();
+              const showDel = tender.ledger_status === auditConst.status.checked ? Boolean(att.extra_upload) : true;
+              if (showDel) $('#btn-att a').eq(3).show();
+              // $('#btn-att a').eq(3).show();
+              $('#btn-att a').eq(2).hide();
+              $('#btn-att a').eq(4).hide();
+              $('#btn-att a').eq(5).hide();
+          } else {
+              $('#btn-att').hide();
+              $('#btn-att a').eq(3).hide();
+              $('#btn-att a').eq(2).hide();
+              $('#btn-att a').eq(4).hide();
+              $('#btn-att a').eq(5).hide();
+          }
+          $('#showAttachment').attr('file-id', fid);
+          $('#showAttachment').show();
+      } else {
+          $('#showAttachment').hide();
+          $('#showAttachment').attr('file-id', '');
+          toastr.error('附件信息获取失败');
+      }
+  });
+  // $('body').on('click', '.alllist-table a', handleFileList);
+  $('body').on('click', '#btn-att a', function () {
+      const content = $(this).attr('content');
+      const fid = $('#showAttachment').attr('file-id');
+      const node = SpreadJsObj.getSelectObject(ledgerSpread.getActiveSheet());
+      if (content === 'edit') {
+          $('#btn-att a').eq(3).hide();
+          $('#btn-att a').eq(2).show();
+          $('#btn-att a').eq(4).show();
+          $('#btn-att a').eq(5).show();
+          $('#show-att').hide();
+          $('#edit-att').show();
+          const att = attData.find(function (item) {
+              return item.id === parseInt(fid);
+          });
+          $('#edit-att .form-group').eq(0).find('input').val(att.filename);
+          $('#edit-att .form-group').eq(0).find('span').eq(1).text(att.fileext);
+          const name = att.code !== null && att.code !== '' ? att.code : (att.b_code !== null ? att.b_code : '');
+          $('#edit-att .form-group').eq(1).find('input').val($.trim(name + ' ' + att.lname));
+          $('#edit-att .form-group').eq(2).find('input').val(att.in_time);
+          $('#edit-att .form-group').eq(3).find('input').val(att.remark);
+      } else if (content === 'cancel') {
+          $('#show-att').show();
+          $('#edit-att').hide();
+          $('#btn-att a').eq(3).show();
+          $('#btn-att a').eq(2).hide();
+          $('#btn-att a').eq(4).hide();
+          $('#btn-att a').eq(5).hide();
+      } else if (content === 'save') {
+          const formData = new FormData();
+          formData.append('id', fid);
+          formData.append('filename', $('#edit-att .form-group').eq(0).find('input').val());
+          formData.append('fileext', $('#edit-att .form-group').eq(0).find('span').eq(1).text());
+          formData.append('remark', $('#edit-att .form-group').eq(3).find('input').val());
+          const file = $('#change-att-btn')[0];
+          if (file.files[0] !== undefined) {
+              const filesize = file.files[0].size;
+              formData.append('size', filesize);
+              formData.append('file', file.files[0]);
+          }
+          postDataWithFile('/tender/' + tender.id + '/ledger/save/file', formData, function (data) {
+              // 替换到attData中
+              const att_index = attData.findIndex(function (item) {
+                  return item.id === parseInt(fid);
+              });
+              attData.splice(att_index, 1, data);
+              // 重新生成List
+              getAllList(parseInt($('#currentPage').text()));
+              getNodeList(node.id);
+              $('#show-att').show();
+              $('#edit-att').hide();
+              $('#show-att tr').eq(0).children('td').text(data.filename + data.fileext);
+              const name = data.code !== null && data.code !== '' ? data.code : (data.b_code !== null ? data.b_code : '');
+              $('#show-att tr').eq(1).children('td').text($.trim(name + ' ' + data.lname));
+              $('#show-att tr').eq(2).children('td').eq(0).text(data.username);
+              $('#show-att tr').eq(2).children('td').eq(1).text(data.in_time);
+              $('#show-att tr').eq(3).children('td').text(data.remark);
+              $('#btn-att a').eq(3).show();
+              $('#btn-att a').eq(2).hide();
+              $('#btn-att a').eq(4).hide();
+              $('#btn-att a').eq(5).hide();
+          }, function () {
+              toastr.error('附件上传失败');
+          });
+          $('#change-att-btn').val('');
+      } else if (content === 'del') {
+          const data = {id: fid};
+          postData('/tender/' + tender.id + '/ledger/delete/file', data, function (result) {
+              // 删除到attData中
+              const att_index = attData.findIndex(function (item) {
+                  return item.id === parseInt(fid);
+              });
+              attData.splice(att_index, 1);
+              // 重新生成List
+
+              if ($('#alllist-table tr').length === 1) {
+                  getAllList(parseInt($('#currentPage').text()) - 1);
+
+              } else {
+                  getAllList(parseInt($('#currentPage').text()));
+              }
+              getNodeList(node.id);
+              $('#showAttachment').hide();
+              $('#showAttachment').attr('file-id', '');
+          });
+      } else if (content === 'view') {
+          const data = {id: fid};
+          postData('/tender/' + tender.id + '/ledger/check/file', data, function (result) {
+              const { filepath } = result
+              $('#load-file').attr('href', filepath);
+              $('#load-file')[0].click();
+          });
+      } else if (content === 'location') {
+          const att = attData.find(item => item.id === parseInt(fid));
+          if (Object.keys(att).length) {
+              SpreadJsObj.locateTreeNode(ledgerSpread.getActiveSheet(), att.ledger_id, true);
+              posOperationObj.loadCurPosData();
+          }
+      }
+  });
+
+  // 替换附件
+  $('#change-att-btn').on('change', function () {
+      const file = $('#change-att-btn')[0].files[0];
+      const name = file.name;
+      const filename = name.substring(0, name.lastIndexOf("."));
+      const fileext = name.substr(name.indexOf("."));
+      const filesize = file.size;
+      if (filesize > 10 * 1024 * 1024) {
+          toastr.error('文件大小过大！');
+          $('#change-att-btn').val('');
+          return false;
+      }
+      if (whiteList.indexOf(fileext) === -1) {
+          toastr.error('只能上传指定格式的附件！');
+          $('#change-att-btn').val('');
+          return false;
+      }
+      $('#edit-att .form-group').eq(0).find('input').val(filename);
+      $('#edit-att .form-group').eq(0).find('span').eq(1).text(fileext);
+  });
+
+  // 切换页数
+  $('.page-select').on('click', function () {
+      const totalPageNum = parseInt($('#totalPage').text());
+      const lastPageNum = parseInt($('#currentPage').text());
+      const status = $(this).attr('content');
+      if (status === 'pre' && lastPageNum > 1) {
+          getAllList(lastPageNum-1);
+          $('#showAttachment').hide();
+          $('#syfujian .check-all-file').prop('checked', false)
+      } else if (status === 'next' && lastPageNum < totalPageNum) {
+          getAllList(lastPageNum+1);
+          $('#showAttachment').hide();
+          $('#syfujian .check-all-file').prop('checked', false)
+      }
+  });
+
+  // 批量下载
+  $('#bach-download').click(function() {
+      const fileIds = [];
+      const type = $(this).prop('type');
+      let node = ''
+      if (type === 'curr') {
+          node = '#nodelist-table .check-file:checked'
+      } else {
+          node = '#alllist-table .check-file:checked'
+      }
+      $(node).each(function() {
+          const fileId = $(this).attr('file-id');
+          fileId && fileIds.push(fileId);
+      });
+
+      if (fileIds.length) {
+          const url = `/tender/${tender.id}/ledger/download/compresse-file?fileIds=${JSON.stringify(fileIds)}`;
+          $('#zipDown').attr('href', url);
+          $("#zipDown")[0].click();
+      }
+  });
+
+  // 监听附件check是否选中
+  $('.list-table').on('click', '.check-file', function() {
+      const checkedList = $(this).parents('.list-table').children().find('input:checked');
+      const childs = $(this).parents('.list-table').children().length;
+      const checkBox = $(this).parents('.list-table').parent().find('.check-all-file');
+      if (checkedList.length === childs) {
+          checkBox.prop("checked", true);
+      } else {
+          checkBox.prop("checked", false);
+      }
+  });
+  $('.check-all-file').click(function() {
+      const isCheck = $(this).is(':checked');
+      $(this).parents('table').find('.list-table').each(function() {
+          $(this).find('input:checkbox').prop("checked", isCheck);
+      })
+  });
 });
+// 生成当前节点列表
+function getNodeList(node) {
+  let html = '';
+  for(const att of attData) {
+      if (node === att.lid) {
+          // html += '<tr><td><a href="javascript:void(0)" file-id="'+ att.id +'">'+ att.filename + att.fileext +'</a></td><td>'+ att.username +'</td></tr>';
+          html += `<tr>
+          <td width="25"><input type="checkbox" class="check-file" file-id=${att.id}></td>
+          <td>
+          <div class="d-flex">
+              <a href="javascript:void(0)" class="pl-0 col-11 att-file-name" file-id=${att.id}>${att.filename}${att.fileext}</a>
+              <a href="/tender/${tender.id}/ledger/download/file/${att.id}" class="col-1 pl-0 att-file-btn"><i class="fa fa-download"></i></a>
+          </div>
+          </td><td>${att.username}</td></tr>`
+      }
+  }
+  $('#nodelist-table').html(html);
+  $('#nodelist-table').on('click', 'tr', function() {
+      $('#nodelist-table tr').removeClass('bg-light')
+      $(this).addClass('bg-light')
+  })
+}
+
+
+// 生成所有附件列表
+function getAllList(currPageNum = 1) {
+  // 每页最多几个附件
+  const pageCount = 15;
+  // 附件总数
+  const total = attData.length;
+  // 总页数
+  const pageNum = Math.ceil(total/pageCount);
+  $('#totalPage').text(pageNum);
+  $('#currentPage').text(total === 0 ? 0 : currPageNum);
+  // 当前页附件内容
+  const currPageAttData = attData.slice((currPageNum-1)*pageCount, currPageNum*pageCount);
+  let html = '';
+  for(const att of currPageAttData) {
+      html += `<tr>
+      <td width="25"><input type="checkbox" class="check-file" file-id=${att.id}></td>
+      <td>
+      <div class="d-flex">
+          <a href="javascript:void(0)" class="pl-0 col-11 att-file-name" file-id=${att.id}>${att.filename}${att.fileext}</a>
+          <a href="/tender/${tender.id}/ledger/download/file/${att.id}" class="col-1 pl-0 att-file-btn"><i class="fa fa-download"></i></a>
+      </div>
+      </td><td>${att.username}</td></tr>`
+  }
+  console.log(attData);
+  $('#alllist-table').html(html);
+  $('#alllist-table').on('click', 'tr', function() {
+      $('#alllist-table tr').removeClass('bg-light')
+      $(this).addClass('bg-light')
+  })
+}
 
 // 检查上报情况
 function checkAuditorFrom () {

app/public/js/revise.js

@@ -1257,6 +1257,26 @@ $(document).ready(() => {
                 });
             }
         };
+
+        const tenderSelect = TenderSelect({
+            type: 'revise',
+            afterLoad: function (result) {
+                const refreshNode = billsTree.loadPostData(result);
+                billsTreeSpreadObj.refreshTree(billsSheet, refreshNode);
+                billsTreeSpreadObj.refreshOperationValid(billsSheet);
+            }
+        });
+        billsContextMenuOptions.items.importGclBills2Xmj = {
+            name: '更新(其他标段)工程量清单至项目节',
+            icon: 'fa-file-excel-o',
+            disabled: function (key, opt) {
+                const node = SpreadJsObj.getSelectObject(billsSheet);
+                return readOnly || !node || (!_.isNil(node.b_code) && node.b_code !== '');
+            },
+            callback: function (key, opt) {
+                tenderSelect.showSelect(SpreadJsObj.getSelectObject(billsSheet));
+            }
+        };
     }
     billsContextMenuOptions.items.sprTag = '----';
     billsContextMenuOptions.items.showLast = {

app/public/js/shares/gcl_gather_compare.js

@@ -441,8 +441,8 @@ const gclCompareModel = (function () {
                 node.b_code = node.code;
                 const gcl = getGclNode(node);
                 if (!node.quantity || !node.unit_price) continue;
-                gcl.deal_bills_qty = node.quantity || 0;
-                gcl.deal_bills_tp = node.total_price || 0;
+                gcl.deal_bills_qty = ZhCalc.add(gcl.deal_bills_qty, node.quantity || 0);
+                gcl.deal_bills_tp = ZhCalc.add(gcl.deal_bills_tp, node.total_price || 0);
 
                 otherChapter.hj.deal_bills_tp = ZhCalc.add(otherChapter.hj.deal_bills_tp, node.total_price);
                 otherChapter.qd.deal_bills_tp = ZhCalc.add(otherChapter.qd.deal_bills_tp, node.total_price);

app/public/js/shares/tender_select.js

@@ -0,0 +1,199 @@
+const TenderSelect = function (setting) {
+    const tsObj = {
+        setting,
+        tenderSpread: null,
+        tenderSheet: null,
+        resultSpread: null,
+        resultSheet: null,
+        select: null,
+        tenderSourceTree: null,
+        trHistory: {},
+        trArray: [],
+        _rebuildStageSelect: function () {
+            if (tsObj.setting.type === 'stage') {
+                const getItems = function (data) {
+                    if (!data) return [];
+                    const items = [];
+                    for (let i = 1; i <= data.stageCount; i++) {
+                        items.push({value: i, text: `第${i}期`});
+                    }
+                    return items;
+                };
+                for (let i = 0; i < tsObj.resultSheet.getRowCount(); i++) {
+                    const cellType2 = new spreadNS.CellTypes.ComboBox().itemHeight(10).editorValueType(spreadNS.CellTypes.EditorValueType.value).items(getItems(tsObj.trArray[i]));
+                    tsObj.resultSheet.getCell(i, 1).cellType(cellType2);
+                }
+            }
+        },
+        _initSelected: function () {
+            for (const node of this.tenderSourceTree.nodes) {
+                node.selected = this.trArray.findIndex(x => { return node.tid === x.tid; }) >= 0;
+            }
+        },
+        _checkSelectTender: function () {
+            if (!this.trHistory.tenders || this.trHistory.tenders.length === 0) return;
+            let differ = this.trHistory.tenders.length !== this.trArray.length;
+            if (!differ) {
+                for (const tr of this.trArray) {
+                    if (this.trHistory.tenders.findIndex(x => { return x.tid === tr.tid; }) < 0) {
+                        differ = true;
+                        break;
+                    }
+                }
+            }
+            if (differ) {
+                $('#tender-select-hint').show();
+                const checkType = tsObj.setting.type === tsObj.trHistory.type ? '上次' : '台账';
+                $('#ts-hint-text').html(`勾选的标段与${checkType}不同，请仔细确认。`);
+            } else {
+                $('#tender-select-hint').hide();
+            }
+        },
+        _addTender: function (tender) {
+            const tr = tsObj.trArray.find(x => { return x.tid === tender.tid; });
+            const t = {tid: tender.tid, name: tender.name, stageCount: tender.stageCount};
+            if (!tr) tsObj.trArray.push(t);
+            return t;
+        },
+        _removeTender: function (tender) {
+            const gri = tsObj.trArray.findIndex(function (x, i, arr) {
+                return x.tid === tender.tid;
+            });
+            if (gri >= 0) tsObj.trArray.splice(gri, 1);
+        },
+        reloadResultData: function () {
+            SpreadJsObj.reLoadSheetData(tsObj.resultSheet);
+            this._checkSelectTender();
+            this._rebuildStageSelect();
+        },
+        tsButtonClicked: function (e, info) {
+            if (!info.sheet.zh_setting) return;
+
+            const col = info.sheet.zh_setting.cols[info.col];
+            if (col.field !== 'selected') return;
+
+            const node = SpreadJsObj.getSelectObject(info.sheet);
+            node.selected = !node.selected;
+            if (node.children && node.children.length > 0) {
+                const posterity = tsObj.tenderSourceTree.getPosterity(node);
+                for (const p of posterity) {
+                    p.selected = node.selected;
+                    if (!p.children || p.children.length === 0){
+                        if (p.selected) {
+                            tsObj._addTender(p);
+                        } else {
+                            tsObj._removeTender(p);
+                        }
+                    }
+                }
+                SpreadJsObj.reLoadRowData(info.sheet, info.row, posterity.length + 1);
+            } else {
+                if (node.selected) {
+                    tsObj._addTender(node);
+                } else {
+                    tsObj._removeTender(node);
+                }
+                SpreadJsObj.reLoadRowData(info.sheet, info.row, 1);
+            }
+            tsObj.reloadResultData();
+        },
+        trEditEnded: function (e, info) {
+            const data = SpreadJsObj.getSelectObject(info.sheet);
+            const col = info.sheet.zh_setting.cols[info.col];
+            data[col.field] = info.sheet.getValue(info.row, info.col);
+        },
+        loadHistory: function () {
+            postData('/list/load', {type: tsObj.setting.type, tid: tsObj.select.tender_id, lid: tsObj.select.id}, data => {
+                tsObj.trHistory = data.history || {};
+                tsObj.tenderSourceTree = Tender2Tree.convert(data.category, data.tenders, data.ledgerAuditConst, data.stageAuditConst);
+                tsObj.resetSelect();
+            });
+        },
+        initTenderSelect: function () {
+            if (this.tenderSpread) return;
+
+            this.tenderSpread = SpreadJsObj.createNewSpread($('#ts-source-spread')[0]);
+            this.tenderSheet = this.tenderSpread.getActiveSheet();
+            SpreadJsObj.initSheet(this.tenderSheet, {
+                cols: [
+                    {title: '选择', field: 'selected', hAlign: 1, width: 40, formatter: '@', cellType: 'checkbox'},
+                    {title: '名称', field: 'name', hAlign: 0, width: 180, formatter: '@', cellType: 'tree'},
+                    {title: '期数', field: 'phase', hAlign: 1, width: 60, formatter: '@'},
+                    {title: '审批状态', field: 'status', hAlign: 1, width: 60, formatter: '@'}
+                ],
+                emptyRows: 0,
+                headRows: 1,
+                headRowHeight: [32],
+                defaultRowHeight: 21,
+                headerFont: '12px 微软雅黑',
+                font: '12px 微软雅黑',
+                headColWidth: [0],
+                selectedBackColor: '#fffacd',
+                readOnly: true,
+            });
+
+            this.resultSpread = SpreadJsObj.createNewSpread($('#ts-result-spread')[0]);
+            this.resultSheet = this.resultSpread.getActiveSheet();
+
+            const resultSpreadSetting = {
+                cols: [],
+                emptyRows: 0,
+                headRows: 1,
+                headRowHeight: [32],
+                defaultRowHeight: 21,
+                headerFont: '12px 微软雅黑',
+                font: '12px 微软雅黑',
+                headColWidth: [],
+            };
+            if (this.setting.type === 'ledger' || this.setting.type === 'revise') {
+                resultSpreadSetting.cols.push(
+                    {title: '名称', colSpan: '1', rowSpan: '1', field: 'name', hAlign: 0, width: 230, formatter: '@', readOnly: true}
+                );
+            } else if (this.setting.type === 'stage') {
+                resultSpreadSetting.cols.push(
+                    {title: '名称', colSpan: '1', rowSpan: '1', field: 'name', hAlign: 0, width: 180, formatter: '@', readOnly: true},
+                    {title: '可选期', colSpan: '1', rowSpan: '1', field: 'stage', hAlign: 0, width: 60},
+                )
+            }
+            SpreadJsObj.initSheet(this.resultSheet, resultSpreadSetting);
+            this.tenderSpread.bind(spreadNS.Events.ButtonClicked, tsObj.tsButtonClicked);
+            if (this.setting.type === 'stage') {
+                this.resultSpread.bind(spreadNS.Events.EditEnded, tsObj.trEditEnded);
+            }
+
+            $('#tender-select-ok').click(() => {
+                const updateData = {lid: tsObj.select.id, type: tsObj.setting.type, tenders: tsObj.trArray};
+                postData(window.location.pathname + '/sumLoad', updateData, result => {
+                    tsObj.setting.afterLoad(result);
+                    $('#tender-select').modal('hide');
+                });
+            });
+
+            this.loadHistory();
+        },
+        resetSelect: function () {
+            tsObj.trArray.length = 0;
+            if (tsObj.trHistory.tenders) tsObj.trArray.push(...tsObj.trHistory.tenders);
+            tsObj._initSelected();
+            SpreadJsObj.loadSheetData(tsObj.tenderSheet, SpreadJsObj.DataType.Tree, tsObj.tenderSourceTree);
+            SpreadJsObj.loadSheetData(tsObj.resultSheet, SpreadJsObj.DataType.Data, tsObj.trArray);
+            $('#tender-select-hint').hide();
+        }
+    };
+
+    $('#tender-select').on('shown.bs.modal', () => {
+        tsObj.initTenderSelect();
+        tsObj.loadHistory();
+    });
+
+    $('#tender-select-reset').click(tsObj.resetSelect);
+
+    const showSelect = function (node) {
+        tsObj.select = node;
+        $('#tender-select-hint').hide();
+        tsObj.trArray = [];
+        $('#tender-select').modal('show');
+    };
+
+    return { showSelect }
+};

app/public/js/spreadjs_rela/spreadjs_zh.js

@@ -676,6 +676,13 @@ const SpreadJsObj = {
             }
             sheet.getRange(-1, col, -1, 1).cellType(sheet.extendCellType[cellKey]);
         }
+        if (colSetting.cellType === 'stageCombo') {
+            if (!sheet.extendCellType.stageCombo) {
+                sheet.extendCellType.stageCombo = this.CellType.getStageComboCellType();
+                SpreadJsObj._addActivePaintEvents(sheet, sheet.extendCellType.stageCombo);
+            }
+            sheet.getRange(-1, col, -1, 1).cellType(sheet.extendCellType.stageCombo);
+        }
         if (colSetting.cellType === 'datepicker') {
             if (!sheet.extendCellType.datepicker) {
                 sheet.extendCellType.datepicker = this.CellType.getDatePickerCellType();
@@ -2186,6 +2193,18 @@ const SpreadJsObj = {
             combo.itemHeight(10).editorValueType(spreadNS.CellTypes.EditorValueType.value).items(items);
             return combo;
         },
+        getStageComboCellType: function () {
+            const ComboCellType = function () {};
+            ComboCellType.prototype = new spreadNS.CellTypes.ComboBox();
+            const proto = ComboCellType.prototype;
+            proto.paint = function (ctx, value, x, y, w, h, style, context) {
+                const setting = context.sheet.zh_setting;
+                const col = setting.cols[context.col];
+                const data = SpreadJsObj.getSelectObject(context.sheet);
+                this.itemHeight(10).editorValueType(spreadNS.CellTypes.EditorValueType.value).items(col.getItems(data));
+            };
+            return new ComboCellType();
+        },
         /**
          * 获取 日期选择 CellType
          * @returns {DatePickerCellType}

app/public/js/stage.js

@@ -181,6 +181,7 @@ function getHintMsg () {
 
 
 $(document).ready(() => {
+    const tenderSelect = TenderSelect({type: 'stage'});
     const exportExcelSetting = {
         cols: [
             {title: '项目节编号', colSpan: '1', rowSpan: '2', field: 'code', hAlign: 0, width: 145, formatter: '@', cellType: 'tree'},
@@ -1516,7 +1517,22 @@ $(document).ready(() => {
                     const node = SpreadJsObj.getSelectObject(slSpread.getActiveSheet());
                     return !node;
                 }
-            }
+            },
+            importSpr: '---',
+            importStageGcl: {
+                name: '导入(其他标段)工程量清单计量数据',
+                icon: 'fa-file-excel-o',
+                disabled: function (key, opt) {
+                    const node = SpreadJsObj.getSelectObject(slSpread.getActiveSheet());
+                    return readOnly || !node || (!_.isNil(node.b_code) && node.b_code !== '');
+                },
+                callback: function (key, opt) {
+                    tenderSelect.showSelect(SpreadJsObj.getSelectObject(slSpread.getActiveSheet()));
+                },
+                visible: function (key, opt) {
+                    return !readOnly;
+                }
+            },
         }
     });
 

app/public/report/js/rpt_archive.js

@@ -128,6 +128,7 @@ let rptArchiveObj = {
             try {
                 if (can_netcasign) {
                     const msgSign = _.find(ARCHIVE_ENCRYPTION_LIST, {rpt_id: me.currentNode.ID});
+                    console.log(msgSign, me.currentArchiveUuid);
                     me.currentEncryptionList = msgSign;
                     const uSignLogList = _.filter(signLogList, { uuid: me.currentArchiveUuid });
                     let html = '';
@@ -154,8 +155,15 @@ let rptArchiveObj = {
                     $('#role-list').html(html);
                     $('#page-list').html(pagetr);
                     $('#sign_num').text(uSignLogList.length);
+                    const uHadSign = _.filter(uSignLogList, { uid: USER_ID});
+                    // 是否显示撤销按钮
+                    if(uHadSign && uHadSign.length > 0) {
+                        $('#show-removesign-modal-btn').show();
+                    } else {
+                        $('#show-removesign-modal-btn').hide();
+                    }
                     postData('/tender/'+ TENDER_ID +'/signReport/post', {type: 'pdfIsExist', uuid: me.currentArchiveUuid}, function (result) {
-                        me.currentArchivePdfPath = result ? oss_path + '/sign/'+ me.currentArchiveUuid +'.PDF' : oss_path + '/'+ me.currentArchiveUuid +'.PDF';
+                        me.currentArchivePdfPath = result ? oss_path + '/sign/'+ me.currentArchiveUuid +'.PDF' + (uSignLogList.length !== 0 ? '?' + uSignLogList.length : '') : oss_path + '/'+ me.currentArchiveUuid +'.PDF';
                         $('#iframe_made').html('<iframe src="/archive/pdf/show?file=' + me.currentArchivePdfPath + '" height="750px" width="100%" style="border: none;"></iframe>');
                     }, function () {
                         me.currentArchivePdfPath = oss_path + '/'+ me.currentArchiveUuid +'.PDF';
@@ -182,7 +190,8 @@ let rptArchiveObj = {
         me.currentArchiveDateStr = dom.innerHTML;
         if(can_netcasign) {
             postData('/tender/'+ TENDER_ID +'/signReport/post', {type: 'pdfIsExist', uuid: me.currentArchiveUuid}, function (result) {
-                me.currentArchivePdfPath = result ? oss_path + '/sign/'+ me.currentArchiveUuid +'.PDF' : oss_path + '/'+ me.currentArchiveUuid +'.PDF';
+                const uSignLogList = _.filter(signLogList, { uuid: me.currentArchiveUuid });
+                me.currentArchivePdfPath = result ? oss_path + '/sign/'+ me.currentArchiveUuid +'.PDF' + (uSignLogList.length !== 0 ? '?' + uSignLogList.length : '') : oss_path + '/'+ me.currentArchiveUuid +'.PDF';
                 $('#iframe_made').html('<iframe src="/archive/pdf/show?file=' + me.currentArchivePdfPath + '" height="750px" width="100%" style="border: none;"></iframe>');
                 me._buildeArchiveDateSelect();
             }, function () {
@@ -196,7 +205,6 @@ let rptArchiveObj = {
             $('#iframe_made').html('<iframe src="/archive/pdf/show?file=' + oss_path + '/'+ me.currentArchiveUuid +'.PDF" height="750px" width="100%" style="border: none;"></iframe>');
             me._buildeArchiveDateSelect();
         }
-
     },
 
     _buildeArchiveDateSelect: function () {
@@ -241,10 +249,17 @@ let rptArchiveObj = {
         }
         $('#page-list').html(pagetr);
         if (needFrame) {
-            me.currentArchivePdfPath = oss_path + '/sign/'+ me.currentArchiveUuid +'.PDF';
-            $('#iframe_made').html('<iframe src="/archive/pdf/show?file=' + me.currentArchivePdfPath + '" height="750px" width="100%" style="border: none;"></iframe>');
+            me.currentArchivePdfPath = uSignLogList.length > 0 ? oss_path + '/sign/'+ me.currentArchiveUuid +'.PDF' : oss_path + '/'+ me.currentArchiveUuid +'.PDF';
+            $('#iframe_made').html('<iframe src="/archive/pdf/show?file=' + me.currentArchivePdfPath + (uSignLogList.length !== 0 ? '?' + uSignLogList.length : '') + '" height="750px" width="100%" style="border: none;"></iframe>');
         }
         $('#sign_num').text(uSignLogList.length);
+        const uHadSign = _.filter(uSignLogList, { uid: USER_ID});
+        // 是否显示撤销按钮
+        if(uHadSign && uHadSign.length > 0) {
+            $('#show-removesign-modal-btn').show();
+        } else {
+            $('#show-removesign-modal-btn').hide();
+        }
     },
 
     _countChkedRptTpl: function () {

app/router.js

@@ -27,6 +27,8 @@ module.exports = app => {
     const changeCheck = app.middlewares.changeCheck();
     // 投资进度中间件
     const scheduleCheck = app.middlewares.scheduleCheck();
+    // 修订
+    const reviseCheck = app.middlewares.reviseCheck();
     // 登入登出相关
     app.get('/login', 'loginController.index');
     app.get('/login/port', api2otherCheck, 'loginController.port');
@@ -108,6 +110,7 @@ module.exports = app => {
      */
     // 金额概况
     app.get('/list', sessionAuth, 'tenderController.listDefault');
+    app.post('/list/load', sessionAuth, 'tenderController.listLoad');
     app.get('/list/info', sessionAuth, 'tenderController.listInfo');
 
     // 计量进度
@@ -166,6 +169,14 @@ module.exports = app => {
     app.post('/tender/:id/ledger/deal2sgfh', sessionAuth, tenderCheck, uncheckTenderCheck, 'ledgerController.deal2sgfh');
     app.post('/tender/:id/ledger/check', sessionAuth, tenderCheck, uncheckTenderCheck, 'ledgerController.check');
 
+    // 台账附件
+    app.post('/tender/:id/ledger/upload/file', sessionAuth, tenderCheck, uncheckTenderCheck, 'ledgerController.uploadFile');
+    app.get('/tender/:id/ledger/download/file/:fid', sessionAuth, 'ledgerController.downloadFile');
+    app.post('/tender/:id/ledger/delete/file', sessionAuth, tenderCheck, uncheckTenderCheck, 'ledgerController.deleteFile');
+    app.post('/tender/:id/ledger/save/file', sessionAuth, tenderCheck, uncheckTenderCheck, 'ledgerController.saveFile');
+    app.post('/tender/:id/ledger/check/file', sessionAuth, tenderCheck, uncheckTenderCheck, 'ledgerController.checkFile');
+    app.get('/tender/:id/ledger/download/compresse-file', sessionAuth, tenderCheck, uncheckTenderCheck, 'ledgerController.downloadZip');
+
     // 台账审批相关
     app.get('/tender/:id/ledger/audit', sessionAuth, tenderCheck, uncheckTenderCheck, 'ledgerAuditController.index');
     app.post('/tender/:id/ledger/audit/add', sessionAuth, tenderCheck, uncheckTenderCheck, 'ledgerAuditController.add');
@@ -502,6 +513,11 @@ module.exports = app => {
     app.post('/tender/:id/ledger/tag', sessionAuth, tenderCheck, uncheckTenderCheck, 'tenderController.billsTag');
     app.post('/tender/:id/measure/stage/:order/tag', sessionAuth, tenderCheck, uncheckTenderCheck, stageCheck, 'tenderController.billsTag');
 
+    // 总分包
+    app.post('/tender/:id/ledger/sumLoad', sessionAuth, tenderCheck, uncheckTenderCheck, 'tenderController.sumLoad');
+    app.post('/tender/:id/measure/stage/:order/sumLoad', sessionAuth, tenderCheck, uncheckTenderCheck, 'tenderController.sumLoad');
+    app.post('/tender/:id/revise/info/sumLoad', sessionAuth, tenderCheck, uncheckTenderCheck, reviseCheck, 'tenderController.sumLoad');
+
     // 扫码登录
     app.get('/wxAuth', 'loginController.wxAuth');
     app.get('/wxproject', 'loginController.wxProject');

app/service/ledger.js

@@ -29,6 +29,7 @@ const tpFields = ['sgfh_tp', 'sjcl_tp', 'qtcl_tp', 'total_price', 'deal_tp'];
 const rootId = -1;
 const keyPre = 'tender_node_maxId:';
 const measureType = require('../const/tender').measureType;
+const SumLoad = require('../lib/sum_load');
 
 module.exports = app => {
 
@@ -763,6 +764,30 @@ module.exports = app => {
                 throw err;
             }
         }
+
+        async sumLoad(lid, tenders) {
+            const maxId = await this._getMaxLid(this.ctx.tender.id);
+            const select = await this.getDataById(lid);
+            const sumLoad = new SumLoad(this.ctx);
+            const loadTree = await sumLoad.loadGatherGcl(select, maxId, tenders, {
+
+            });
+            const result = loadTree.getUpdateData();
+
+            const conn = await this.db.beginTransaction();
+            try {
+                this._cacheMaxLid(this.ctx.tender.id, loadTree.keyNodeId);
+                await this.ctx.service.sumLoadHistory.saveLedgerHistory(this.ctx.tender.id, lid, tenders);
+                await conn.update(this.tableName, result.update);
+                await conn.insert(this.tableName, result.create);
+                await conn.commit();
+                return result;
+            } catch (err) {
+                console.log(err);
+                await conn.rollback();
+                throw (err.stack ? '导入工程量数据出错': err);
+            }
+        }
     }
 
     return Ledger;

app/service/ledger_att.js

@@ -0,0 +1,147 @@
+'use strict';
+
+/**
+ *
+ *  附件
+ * @author LanJianRong
+ * @date 2021/7/30
+ * @version
+ */
+
+const archiver = require('archiver');
+const path = require('path');
+const fs = require('fs');
+module.exports = app => {
+    class LedgerAtt extends app.BaseService {
+        /**
+         * 构造函数
+         *
+         * @param {Object} ctx - egg全局变量
+         * @return {void}
+         */
+        constructor(ctx) {
+            super(ctx);
+            this.tableName = 'ledger_attachment';
+        }
+
+        /**
+         * 添加附件
+         * @param {Object} postData - 表单信息
+         * @param {Object} fileData - 文件信息
+         * @param {int} uid - 上传者id
+         * @return {void}
+         */
+        async save(postData, fileData, uid) {
+            const data = {
+                lid: postData.lid,
+                uid,
+                remark: '',
+            };
+            Object.assign(data, fileData);
+            const result = await this.db.insert(this.tableName, data);
+            return result;
+        }
+
+        /**
+         * 更新附件
+         * @param {Object} postData - 表单信息
+         * @param {Object} fileData - 文件信息
+         * @param {int} uid - 上传者id
+         * @return {void}
+         */
+        async updateByID(postData, fileData) {
+            delete postData.size;
+            const data = {};
+            Object.assign(data, fileData);
+            Object.assign(data, postData);
+            const result = await this.db.update(this.tableName, data);
+            return result.affectedRows === 1;
+        }
+
+        /**
+         * 获取所有附件
+         * @param {int} tid - 标段id
+         * @return {void}
+         */
+        async getDataByTenderId(tid) {
+            const sql = 'SELECT att.id, att.lid, att.uid, att.filename, att.fileext, att.filesize, att.extra_upload, att.remark, att.in_time,' +
+                ' pa.name as `username`, leg.name as `lname`, leg.code as `code`, leg.ledger_id as `ledger_id`, leg.b_code as `b_code`' +
+                ' FROM ?? AS att,?? AS pa,?? AS leg' +
+                ' WHERE leg.id = att.lid AND pa.id = att.uid AND att.tid = ? ORDER BY att.id DESC';
+            const sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, this.ctx.service.ledger.tableName, tid];
+            return await this.db.query(sql, sqlParam);
+        }
+
+        /**
+         * 获取单个附件
+         * @param {int} tid - 标段id
+         * @param {int} sid - 当前期数
+         * @return {void}
+         */
+        async getDataByFid(id) {
+            const { ctx } = this;
+            const sql = 'SELECT att.id, att.lid, att.uid, att.filepath, att.filename, att.extra_upload, att.fileext, att.filesize, att.remark, att.in_time,' +
+                ' pa.name as `username`, leg.name as `lname`, leg.code as `code`, leg.ledger_id as `ledger_id`,leg.b_code as `b_code`' +
+                ' FROM ?? AS att,?? AS pa,?? AS leg' +
+                ' WHERE leg.id = att.lid AND pa.id = att.uid AND att.id = ? ORDER BY att.in_time DESC';
+            const sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, this.ctx.service.ledger.tableName, id];
+            const result = await this.db.queryOne(sql, sqlParam);
+            if (!ctx.helper.canPreview(result.fileext)) result.filepath = `/tender/${ctx.tender.id}/ledger/download/file/${result.id}`;
+            else result.filepath = result.filepath.replace(/^app|\/app/, '');
+            return result;
+        }
+
+        /**
+         * 将文件压缩成zip，并返回zip文件的路径
+         * @param {array} fileIds - 文件数组id
+         * @param {string} zipPath - 压缩文件存储路径
+         * @return {string} 压缩后的zip文件路径
+         */
+        async compressedFile(fileIds, zipPath) {
+            this.initSqlBuilder();
+            this.sqlBuilder.setAndWhere('id', {
+                value: fileIds,
+                operate: 'in',
+            });
+            const [sql, sqlParam] = this.sqlBuilder.build(this.tableName);
+            const files = await this.db.query(sql, sqlParam);
+            // const paths = files.map(item => {
+            //     return { name: item.filename + item.fileext, path: item.filepath }
+            // })
+            return new Promise((resolve, reject) => {
+                // 每次开一个新的archiver
+                const ziparchiver = archiver('zip');
+                const outputPath = fs.createWriteStream(path.resolve(this.app.baseDir, zipPath));
+
+                outputPath.on('error', err => {
+                    reject(err);
+                });
+                ziparchiver.pipe(outputPath);
+                files.forEach(item => {
+                    ziparchiver.file(item.filepath, { name: item.filename + item.fileext });
+                });
+
+                // 存档警告
+                ziparchiver.on('warning', function(err) {
+                    if (err.code === 'ENOENT') {
+                        console.warn('stat故障和其他非阻塞错误');
+                    }
+                    reject(err);
+
+                });
+
+                // 存档出错
+                ziparchiver.on('error', function(err) {
+                    console.log(err);
+                    reject(err);
+                });
+
+                ziparchiver.finalize();
+                outputPath.on('close', () => {
+                    resolve(ziparchiver.pointer());
+                });
+            });
+        }
+    }
+    return LedgerAtt;
+};

app/service/netcasign_log.js

@@ -41,6 +41,10 @@ module.exports = app => {
             const sqlParam = [this.tableName, this.ctx.service.projectAccount.tableName, tid];
             return await this.db.query(sql, sqlParam);
         }
+
+        async removeSign(uid, uuid) {
+            return await this.db.delete(this.tableName, { uid, uuid });
+        }
     }
 
     return NetcasignLog;

app/service/project_account.js

@@ -248,8 +248,6 @@ module.exports = app => {
 
         async getPageShow(page_show) {
             const info = page_show ? JSON.parse(page_show) : {};
-            console.log(info);
-            console.log(pageShowConst);
             for (const pi in pageShowConst) {
                 info[pi] = !info[pi] || info[pi] === '' ? pageShowConst[pi] : parseInt(info[pi]);
                 this.ctx.helper._.defaults(info[pi], pageShowConst[pi]);

app/service/revise_bills.js

@@ -7,6 +7,7 @@
  * @date
  * @version
  */
+const SumLoad = require('../lib/sum_load');
 
 module.exports = app => {
     class ReviseBills extends app.BaseBillsService {
@@ -276,6 +277,29 @@ module.exports = app => {
             }
             await this._calcNode(node, transaction);
         }
+
+        async sumLoad(lid, rid, tenders) {
+            const conn = await this.db.beginTransaction();
+            try {
+                const maxId = await this._getMaxLid(this.ctx.tender.id);
+                const select = await this.getDataById(lid);
+                const sumLoad = new SumLoad(this.ctx);
+                const loadTree = await sumLoad.updateGatherGcl(select, maxId, tenders, {
+                    crid: rid,
+                });
+                const result = loadTree.getUpdateData();
+
+                this._cacheMaxLid(this.ctx.tender.id, loadTree.keyNodeId);
+                await this.ctx.service.sumLoadHistory.saveReviseHistory(this.ctx.tender.id, rid, lid, tenders, result.errors);
+                if (result.update.length > 0) await conn.updateRows(this.tableName, result.update);
+                if (result.create.length > 0)await conn.insert(this.tableName, result.create);
+                await conn.commit();
+                return result;
+            } catch (err) {
+                await conn.rollback();
+                throw (err.stack ? err : '导入工程量数据出错');
+            }
+        }
     }
 
     return ReviseBills;

app/service/sum_load_history.js

@@ -0,0 +1,92 @@
+'use strict';
+
+/**
+ *
+ *
+ * @author Mai
+ * @date 2021/7/20
+ * @version
+ */
+
+module.exports = app => {
+
+    class SumLoadHistory extends app.BaseService {
+
+        /**
+         * 构造函数
+         *
+         * @param {Object} ctx - egg全局变量
+         * @return {void}
+         */
+        constructor(ctx) {
+            super(ctx);
+            this.tableName = 'sum_load_history';
+        }
+
+        async getHistroy(tid, lid, type) {
+            const his = await this.db.select(this.tableName, {
+                where: { tid, lid, type },
+                orders: [['load_time', 'desc']],
+                limit: 1,
+                offset: 0,
+            });
+            const result = his.length > 0 ? his[0] : null;
+            if (result && result.tenders) result.tenders = JSON.parse(result.tenders);
+            if (result && result.errors) result.errors = JSON.parse(result.errors);
+            return result;
+        }
+
+        async getLedgerHistory(tid, lid) {
+            return await this.getHistroy(tid, lid, 'ledger');
+        }
+
+        async getReviseHistory(tid, lid) {
+            return await this.getHistroy(tid, lid, 'revise');
+        }
+
+        async getStageHistory(tid, lid) {
+            return await this.getHistroy(tid, lid, 'stage');
+        }
+
+        async saveLedgerHistory(tid, lid, tenders, errors) {
+            const data = {
+                tid, lid, type: 'ledger',
+                load_time: new Date(), uid: this.ctx.session.sessionUser.accountId,
+                tenders: JSON.stringify(tenders), errors: errors ? JSON.stringify(errors) : '',
+            };
+            await this.db.insert(this.tableName, data);
+        }
+
+        async saveReviseHistory(tid, rid, lid, tenders, errors) {
+            const data = {
+                tid, lid, type: 'revise', rid,
+                load_time: new Date(), uid: this.ctx.session.sessionUser.accountId,
+                tenders: JSON.stringify(tenders), errors: errors ? JSON.stringify(errors) : '',
+            };
+            await this.db.insert(this.tableName, data);
+        }
+
+        async saveStageHistory(tid, sid, lid, tenders, errors) {
+            const data = {
+                tid, lid, type: 'revise', sid,
+                load_time: new Date(), uid: this.ctx.session.sessionUser.accountId,
+                tenders: JSON.stringify(tenders), errors: errors ? JSON.stringify(errors) : '',
+            };
+            await this.db.insert(this.tableName, data);
+        }
+
+        async getReviseLastestData(rid) {
+            const sql = 'SELECT * FROM ' + this.tableName +
+                '  WHERE id in ( SELECT top 1 id FROM ' + this.tableName + ' WHERE rid = ? order by load_time desc)';
+            return await this.db.query(sql, [rid])
+        }
+
+        async getStageLastestData(sid) {
+            const sql = 'SELECT * FROM ' + this.tableName +
+                '  WHERE id in ( SELECT top 1 id FROM ' + this.tableName + ' WHERE sid = ? order by load_time desc)';
+            return await this.db.query(sql, [sid])
+        }
+    }
+
+    return SumLoadHistory;
+};

app/view/ledger/explode.ejs

@@ -156,6 +156,122 @@
                     </div>
                     <div id="check-list" class="tab-pane">
                     </div>
+                    <div id="fujian" class="tab-pane tab-select-show">
+                      <div class="sjs-bar">
+                          <ul class="nav nav-tabs">
+                              <li class="nav-item">
+                                  <a class="nav-link active" data-toggle="tab" href="#dqjiedian" role="tab" fujian-content="dqjiedian">当前节点</a>
+                              </li>
+                              <li class="nav-item">
+                                  <a class="nav-link" data-toggle="tab" href="#syfujian" role="tab" fujian-content="syfujian">所有附件</a>
+                              </li>
+                              <li class="nav-item ml-auto pt-1">
+                                  <a href="javascript:void(0);" id="bach-download" class="btn btn-sm btn-primary" type="curr">批量下载</a>
+                                  <!--所有附件 翻页-->
+                                  <span id="showPage" style="display: none"><a href="javascript:void(0);" class="page-select ml-3" content="pre"><i class="fa fa-chevron-left"></i></a> <span id="currentPage">1</span>/<span id="totalPage">10</span> <a href="javascript:void(0);" class="page-select mr-3" content="next"><i class="fa fa-chevron-right"></i></a></span>
+                                  <% if (!ctx.tender.isTourist) { %>
+                                  <a href="#upload" data-toggle="modal" data-target="#upload"  class="btn btn-sm btn-outline-primary ml-3">上传</a>
+                                  <% } %>
+                              </li>
+                          </ul>
+                      </div>
+                      <a href="javascript: void(0);" id="zipDown" download style="display: none;"></a>
+                      <div class="tab-content">
+                          <div class="tab-pane active" id="dqjiedian">
+                              <div class="sjs-height-3" style="overflow:auto; overflow-x:hidden;">
+                                  <table class="table table-sm table-bordered table-hover" style="word-break:break-all; table-layout: fixed">
+                                      <tr><th width="25"><input type="checkbox" class="check-all-file"><th>文件名</th><th width="80">上传</th></tr>
+                                      <tbody id="nodelist-table" class="list-table">
+                                      </tbody>
+                                  </table>
+                              </div>
+                          </div>
+                          <div class="tab-pane" id="syfujian">
+                              <div class="sjs-height-3" style="overflow:auto; overflow-x:hidden;">
+                                  <table class="table table-sm table-bordered table-hover" style="word-break:break-all; table-layout: fixed">
+                                      <tr><th width="25"><input type="checkbox" class="check-all-file"></th><th>文件名</th><th width="80">上传</th></tr>
+                                      <tbody id="alllist-table" class="list-table">
+                                      </tbody>
+                                  </table>
+                              </div>
+                          </div>
+                          <div class="sjs-bottom">
+                              <div class="resize-y" id="file-spr" r-Type="height" div1=".sjs-height-3" div2=".sjs-bottom" title="调整大小"><!--调整上下高度条--></div>
+                              <br>
+                              <div class="tab-content" id="showAttachment" style="display: none" file-id="">
+                                  <div class="sjs-bottom-2">
+                                      <a href="javascript:void(0);" target="_blank" style="display: none" id="load-file"></a>
+                                      <div class="d-flex justify-content-end mb-1" id="btn-att">
+                                          <a href="javascript:void(0);" content="location" class="btn btn-sm btn-outline-primary" style="margin-right: 5px">定位</a>
+                                          <a href="javascript:void(0);" content="view" class="btn btn-sm btn-outline-primary" style="margin-right: 5px">查看</a>
+                                          <!--默认 有删除权限-->
+                                          <a href="javascript:void(0);" content="del" class="btn btn-sm text-danger" style="display: none; margin-right: 5px">删除</a>
+                                          <!--默认 有编辑权限-->
+                                          <a href="javascript:void(0);" content="edit" class="btn btn-sm btn-outline-primary" style="display: none; margin-right: 5px">编辑</a>
+                                          <!--编辑模式-->
+                                          <a href="javascript:void(0);" content="save" class="btn btn-sm btn-outline-success mr-1" style="display: none; margin-right: 5px">保存</a>
+                                          <a href="javascript:void(0);" content="cancel" class="btn btn-sm btn-outline-secondary" style="display: none; margin-right: 5px">取消</a>
+                                      </div>
+                                      <!--显示信息-->
+                                      <table class="table table-sm table-bordered" id="show-att" style="word-break:break-all; table-layout: fixed">
+                                          <tbody>
+                                          <tr><th>文件名</th><td colspan="3">asdasd.jpg</td></tr>
+                                          <tr><th>所在节点</th><td colspan="3" id="show-att-node">1 第一部分 建筑安装工程非</td></tr>
+                                          <!-- <tr><td colspan="4"><a href="javascript:void(0);" target="_blank"><span>下载附件</span></a></td></tr> -->
+                                          <tr><th>上传者</th><td>张三</td><th>上传时间</th><td>2018-10-20</td></tr>
+                                          <tr><th>备注</th><td colspan="3"></td></tr>
+                                          </tbody>
+                                      </table>
+                                      <div id="edit-att" style="display: none">
+                                      <!--编辑模式-->
+                                          <div class="form-group">
+                                              <div class="input-group input-group-sm">
+                                                  <div class="input-group-prepend">
+                                                      <span class="input-group-text">文件名</span>
+                                                  </div>
+                                                  <input type="text" class="form-control form-control-sm" value="asdasd">
+                                                  <div class="input-group-append">
+                                                      <span class="input-group-text">.jpg</span>
+                                                  </div>
+                                              </div>
+                                          </div>
+                                          <div class="form-group">
+                                              <div class="input-group input-group-sm">
+                                                  <div class="input-group-prepend">
+                                                      <span class="input-group-text">所在节点</span>
+                                                  </div>
+                                                  <input type="text" class="form-control form-control-sm" value="1 第一部分 建筑安装工程非" readonly="">
+                                              </div>
+                                          </div>
+                                          <div class="form-group">
+                                              <div class="input-group input-group-sm">
+                                                  <div class="input-group-prepend">
+                                                      <span class="input-group-text">上传时间</span>
+                                                  </div>
+                                                  <input type="text" class="form-control form-control-sm" value="2018-10-20" readonly="">
+                                              </div>
+                                          </div>
+                                          <div class="form-group">
+                                              <div class="input-group input-group-sm">
+                                                  <div class="input-group-prepend">
+                                                      <span class="input-group-text">备注</span>
+                                                  </div>
+                                                  <input type="text" class="form-control form-control-sm" value="">
+                                              </div>
+                                          </div>
+                                          <div class="form-group">
+                                              <label>替换文件</label>
+                                              <div class="custom-file">
+                                                  <input type="file" class="custom-file-input" id="change-att-btn">
+                                                  <label class="custom-file-label" data-browse="浏览" for="customFile">选择文件</label>
+                                              </div>
+                                          </div>
+                                      </div>
+                                  </div>
+                              </div>
+                          </div>
+                      </div>
+                  </div>
                 </div>
             </div>
         </div>
@@ -178,6 +294,9 @@
                     <a class="nav-link" content="#bills-tag" href="javascript: void(0);">书签</a>
                 </li>
                 <li class="nav-item">
+                    <a class="nav-link" content="#fujian" href="javascript: void(0);">附件</a>
+                </li>
+                <li class="nav-item">
                     <a class="nav-link" content="#error-list" id="error-list-tab" href="javascript: void(0);" style="display: none;">错误列表</a>
                 </li>
                 <li class="nav-item">
@@ -193,6 +312,9 @@
     const tender = JSON.parse('<%- JSON.stringify(tender) %>');
     const tenderInfo = JSON.parse(unescape('<%- escape(JSON.stringify(tenderInfo)) %>'));
     const thousandth = <%- ctx.tender.info.display.thousandth %>;
+    const auditConst = JSON.parse('<%- JSON.stringify(auditConst) %>');
+    let attData = JSON.parse(unescape('<%- escape(JSON.stringify(attData)) %>'));
+    const whiteList = JSON.parse('<%- JSON.stringify(whiteList) %>');
     const measureType = JSON.parse('<%- JSON.stringify(measureType) %>');
     let ledgerSpreadSetting = '<%- ledgerSpreadSetting %>';
     ledgerSpreadSetting = JSON.parse(ledgerSpreadSetting);
@@ -220,5 +342,6 @@
 <script>
     const accountList = JSON.parse('<%- JSON.stringify(accountList) %>');
     const accountGroup = JSON.parse('<%- JSON.stringify(accountGroup) %>');
+    
 </script>
 <% } %>

app/view/ledger/explode_modal.ejs

@@ -343,6 +343,28 @@
         </div>
     </div>
 </div>
+
+<!--上传附件-->
+<div class="modal fade" id="upload" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">上传附件</h5>
+            </div>
+            <div class="modal-body">
+                <div class="form-group">
+                    <label for="formGroupExampleInput">大小限制：30MB，支持<span data-toggle="tooltip" data-placement="bottom" title="" data-original-title="doc,docx,xls,xlsx,ppt,pptx,pdf">office等文档格式</span>、<span data-toggle="tooltip" data-placement="bottom" title="" data-original-title="jpg,png,bmp">图片格式</span>、<span data-toggle="tooltip" data-placement="bottom" title="" data-original-title="rar,zip">压缩包格式</span></label>
+                    <input type="file" class="" id="upload-file" multiple>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary btn-sm" id="upload-file-btn">确认</button>
+            </div>
+        </div>
+    </div>
+</div>
+
 <% if (ctx.session.sessionUser.accountId === ctx.tender.data.user_id && (ctx.tender.data.ledger_status === auditConst.status.uncheck || ctx.tender.data.ledger_status === auditConst.status.checkNo)) { %>
     <script>
         const shenpi_status = <%- ctx.tender.info.shenpi.ledger %>;
@@ -404,3 +426,4 @@
 <% include ../shares/check_data_modal.ejs %>
 <% include ../shares/check_modal2.ejs %>
 <% include ../shares/new_tag_modal.ejs %>
+<% include ../shares/tender_select_modal.ejs %>

app/view/report/index_sign.ejs

@@ -171,6 +171,8 @@
     const PROJECT_ID = <%- project_id %>;
     const TENDER_ID = <%- tender_id %>;
     const STAGE_ID = <%- stg_id %>;
+    const USER_ID = <%- ctx.session.sessionUser.accountId %>;
+    const USER_NAME = '<%- ctx.session.sessionUser.name %>';
     const STAGE_ORDER = <%- stg_order %>;
     const STAGE_LIST = <%- stage_list %>;
     const can_netcasign = <%- can_netcasign %>;
@@ -353,6 +355,7 @@
 
             const _self = $(this);
             const params={};
+            let curr_sign_page = 1;
             NetcaPKI.GetCertList(params)
                 .Then(function(res){
                     if (res && res.deviceCount === 0) {
@@ -384,13 +387,14 @@
                             } else {
                                 // 开始签名！
                                 const encrypt = rptArchiveObj.currentEncryptionList.encryption[val];
+                                console.log(encrypt);
                                 const requestJson = {
                                     width: encrypt.areas[0].width,
                                     height: encrypt.areas[0].height,
-                                    x: encrypt.areas[0].Top,
-                                    y: encrypt.areas[0].Left,
-                                    page: rptArchiveObj.currentEncryptionList.total_page ? rptArchiveObj.currentEncryptionList.total_page : 1,
-                                    // page: 0,
+                                    x: encrypt.areas[0].Left*0.75,
+                                    y: encrypt.areas[0].Top*0.75,
+                                    // page: rptArchiveObj.currentEncryptionList.total_page ? rptArchiveObj.currentEncryptionList.total_page : 1,
+                                    page: curr_sign_page,
                                     // url: 'https://measure-sign-pdf.oss-cn-shenzhen.aliyuncs.com/archive/'+ rptArchiveObj.currentArchiveUuid + '.PDF',
                                     url: rptArchiveObj.currentArchivePdfPath,
                                     hashAlgo: 'SHA256',
@@ -398,11 +402,12 @@
                                     imageBase64: netcaSignData.sign_base64,
                                     certContent: res.certCode,
                                 }
+                                console.log(requestJson);
                                 // 先获取摘要值
                                 postData('/tender/'+ TENDER_ID +'/signReport/post', { type: 'assemblyDigest', requestJson}, function (result) {
                                     if(result.code === 0) {
                                         signDigest = result.data;
-                                        signPdf();
+                                        signPdf(res);
                                     } else {
                                         failedCallBack(result);
                                     }
@@ -413,7 +418,7 @@
                                 })
                             }
                         }
-                        function signPdf() {
+                        function signPdf(res) {
                             const certEncode = "";
                             const tbs = utf8_to_b64(signDigest);
                             const _tsaURL = "http://tsa.cnca.net/NETCATimeStampServer/TSAServer.jsp";
@@ -433,9 +438,10 @@
                                 tsaURL: _tsaURL,
                                 includeCertOption: _includeCertOption//整数	包含证书的标识
                             };
+                            const curr_res = res;
                             NetcaPKI.signedDataSign(params)
                                 .Then(function (res) {
-                                    _self.text('签名中...');
+                                    _self.text('签名中,请勿关闭本页...');
                                     let retSignValue = res.signValue;
 
                                     //处理base填充问题，这里去掉Base64的填充内容
@@ -473,14 +479,28 @@
                                         p7Base64: retSignValue,
                                     }
                                     const encrypt = rptArchiveObj.currentEncryptionList.encryption[val];
+                                    // rptArchiveObj.currentEncryptionList.total_page = rptArchiveObj.currentEncryptionList.total_page ? rptArchiveObj.currentEncryptionList.total_page : 1;
+                                    const end = rptArchiveObj.currentEncryptionList.total_page === curr_sign_page;
                                     // 生成pdf
-                                    postData('/tender/'+ TENDER_ID +'/signReport/post', { type: 'assemblyPdf', requestJson: rJson, role: encrypt.name }, function (result) {
-                                        toastr.success("已成功签名");
-                                        signLogList = result;
-                                        rptArchiveObj._updateSignHtmlAndFrame(true);
-                                        $('#sign').modal('hide');
-                                        _self.attr('disabled', false);
-                                        _self.text('确定');
+                                    postData('/tender/'+ TENDER_ID +'/signReport/post', { type: 'assemblyPdf', requestJson: rJson, role: encrypt.name, end }, function (result) {
+                                        if (end) {
+                                            toastr.success("已成功签名");
+                                            signLogList = result;
+                                            signDigest = '';
+                                            rptArchiveObj._updateSignHtmlAndFrame(true);
+                                            $('#sign').modal('hide');
+                                            _self.attr('disabled', false);
+                                            _self.text('确定');
+                                        } else {
+                                            signDigest = '';
+                                            rptArchiveObj.currentArchivePdfPath = oss_path + '/sign/'+ rptArchiveObj.currentArchiveUuid +'.PDF';
+                                            let uhtml = ' <span class="text-success"><i class="fa fa-check"></i> '+ encrypt.name +'（'+ USER_NAME +'）</span>';
+                                            $('#page-list tr').eq(curr_sign_page - 1).children('td').eq(2).append(uhtml);
+                                            ++curr_sign_page;
+                                            setTimeout(function () {
+                                                successGetCertEncodeCallBack(curr_res);
+                                            }, 3000);
+                                        }
                                     }, function () {
                                         _self.attr('disabled', false);
                                         _self.text('确定');
@@ -516,6 +536,16 @@
                     return false;
                 });
         })
+
+        $('#sign-remove').click(function () {
+            // 移除签名并更新
+            postData('/tender/'+ TENDER_ID +'/signReport/post', { type: 'removeSign', uuid: rptArchiveObj.currentArchiveUuid }, function (result) {
+                signLogList = result;
+                rptArchiveObj._updateSignHtmlAndFrame(true);
+                $('#sign2').modal('hide');
+            }, function () {
+            })
+        })
     })
 
     rptArchiveObj.iniPage();

app/view/report/index_sign_modal.ejs

@@ -54,7 +54,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <!--<a href="" class="btn btn-sm btn-danger mr-5" data-toggle="modal" data-target="#sign2" data-dismiss="modal">撤销签名</a>-->
+                <a href="javascript:void(0)" style="display: none" id="show-removesign-modal-btn" class="btn btn-sm btn-danger mr-5" data-toggle="modal" data-target="#sign2" data-dismiss="modal">撤销签名</a>
                 <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
                 <button type="button" id="sign_pdf" class="btn btn-sm btn-primary">确定</button>
             </div>
@@ -102,3 +102,24 @@
         </form>
     </div>
 </div>
+<!--弹出批量电子签名-->
+<div class="modal fade" id="sign2" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">撤销签名</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <p>撤销签名，可以重新选择签名归档版本；</p>
+                <p>撤销签名，所有签名都需要重新签名，请谨慎操作。</p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
+                <button id="sign-remove" class="btn btn-sm btn-danger">确定撤销</button>
+            </div>
+        </div>
+    </div>
+</div>

app/view/revise/info_modal.ejs

@@ -721,6 +721,7 @@
     <% include ../shares/delete_hint_modal.ejs %>
     <% include ../shares/check_data_modal.ejs %>
     <% include ../shares/check_modal2.ejs %>
+    <% include ../shares/tender_select_modal.ejs %>
     <% if(ctx.session.sessionUser.accountId === revise.uid && (revise.status === auditConst.status.uncheck || revise.status === auditConst.status.checkNo)) { %>
     <script>
         const cur_uid = '<%- ctx.session.sessionUser.accountId %>';

app/view/shares/tender_select_modal.ejs

@@ -0,0 +1,34 @@
+<div class="modal fade" id="tender-select" data-backdrop="static">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="tender-select-title">选择标段</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-6">
+                        <h5>可选标段 </h5>
+                        <div class="modal-height-300" id="ts-source-spread">
+                        </div>
+                    </div>
+                    <div class="col-6">
+                        <h5>已选标段 </h5>
+                        <div class="modal-height-300" id="ts-result-spread">
+                        </div>
+                    </div>
+                    <div id="tender-select-hint">
+                        <div class="text-danger text-center ml-3 d-inline-block" id="ts-hint-text">我是提示呀</div>
+                        <button class="btn btn-sm btn-primary ml-auto" id="tender-select-reset">重置</button>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
+                <button class="btn btn-sm btn-primary" id="tender-select-ok">确定</button>
+            </div>
+        </div>
+    </div>
+</div>

app/view/stage/stage_sub_menu.ejs

@@ -15,7 +15,7 @@
                 </li>
             </ul>
         </div>
-        <% if (ctx.session.sessionProject.page_show.stageExtra1) { %>
+        <% if (ctx.session.sessionProject.page_show.stageExtra) { %>
         <div class="nav-box">
             <ul class="nav-list list-unstyled">
                 <li class="<% if (ctx.url === '/tender/' + ctx.tender.id + '/measure/stage/' + ctx.stage.order + '/extra/jgcl') { %>active<% } %>">

config/web.js

@@ -152,6 +152,8 @@ const JsFiles = {
                     '/public/js/ledger_tree_col.js',
                     '/public/js/std_lib.js',
                     '/public/js/ledger_check.js',
+                    '/public/js/shares/tenders2tree.js',
+                    '/public/js/shares/tender_select.js',
                     '/public/js/ledger.js',
                 ],
                 mergeFile: 'explode',
@@ -232,6 +234,8 @@ const JsFiles = {
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
                     '/public/js/std_lib.js',
+                    '/public/js/shares/tenders2tree.js',
+                    '/public/js/shares/tender_select.js',
                     '/public/js/ledger_check.js',
                     '/public/js/revise.js',
                 ],
@@ -313,6 +317,8 @@ const JsFiles = {
                     '/public/js/zh_calc.js',
                     '/public/js/path_tree.js',
                     '/public/js/stage_im.js',
+                    '/public/js/shares/tenders2tree.js',
+                    '/public/js/shares/tender_select.js',
                     '/public/js/ledger_check.js',
                     '/public/js/stage.js',
                     '/public/js/stage_audit.js',

sql/update.sql

@@ -12,3 +12,18 @@ ALTER TABLE `zh_material_list` ADD `expr` VARCHAR(500) NULL DEFAULT '' COMMENT '
 ALTER TABLE `zh_s2b_proj`
 ADD COLUMN `gxby_ratio_valid`  tinyint(1) NULL DEFAULT 0 COMMENT '工序报验，ratio是否生效' AFTER `gxby_status`,
 ADD COLUMN `dagl_ratio_valid`  tinyint(1) NOT NULL DEFAULT 1 COMMENT '工序报验，ratio是否生效' AFTER `dagl_status`;
+
+CREATE TABLE `zh_ledger_attachment` (
+  `id` INT(11) NOT NULL AUTO_INCREMENT COMMENT '主键',
+  `tid` INT(11) NOT NULL COMMENT '标段id',
+  `lid` VARCHAR(100) CHARACTER SET 'utf8' NOT NULL COMMENT '台账节点id（uuid）',
+  `uid` INT(11) NOT NULL COMMENT '上传者id',
+  `filename` VARCHAR(1000) NOT NULL COMMENT '文件名称',
+  `fileext` VARCHAR(10) NOT NULL COMMENT '文件后缀',
+  `filesize` VARCHAR(255) NOT NULL COMMENT '文件大小',
+  `filepath` VARCHAR(500) NOT NULL COMMENT '文件存储路径',
+  `remark` VARCHAR(100) NOT NULL COMMENT '备注',
+  `status` TINYINT(1) NOT NULL DEFAULT '1' COMMENT '状态：1存在，2回收站',
+  `in_time` VARCHAR(15) NOT NULL COMMENT '创建时间',
+  `extra_upload` TINYINT(1) NOT NULL DEFAULT '0' COMMENT '是否为审核通过后再次上传的文件，0为否',
+  PRIMARY KEY (`id`));