Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/const/spread.js

@@ -51,7 +51,7 @@ const withCl = {
             {title: '|小计', colSpan: '|1', rowSpan: '|1', field: 'quantity', hAlign: 2, width: 60, type: 'Number', readOnly: true},
             {title: '图册号', colSpan: '1', rowSpan: '2', field: 'drawing_code', hAlign: 0, width: 80, formatter: '@'},
         ],
-        emptyRows: 20,
+        emptyRows: 3,
         headRows: 2,
         headRowHeight: [35, 35],
         defaultRowHeight: 21,
@@ -86,7 +86,7 @@ const withoutCl = {
             {title: '施工图复核数量', colSpan: '1', rowSpan: '1', field: 'sgfh_qty', hAlign: 2, width: 120, type: 'Number'},
             {title: '图册号', colSpan: '1', rowSpan: '2', field: 'drawing_code', hAlign: 0, width: 80, formatter: '@'},
         ],
-        emptyRows: 20,
+        emptyRows: 3,
         headRows: 1,
         headRowHeight: [40],
         defaultRowHeight: 21,

app/controller/ledger_controller.js

@@ -123,6 +123,7 @@ module.exports = app => {
                         auditHistory.push(await ctx.service.ledgerAudit.getAuditors(ctx.tender.id, i));
                     }
                 }
+                const [stdBills, stdChapters] = await this.ctx.service.valuation.getValuationStdList(ctx.tender.data.valuation);
                 const renderData = {
                     tender: tender.data,
                     tenderInfo: tender.info,
@@ -139,6 +140,8 @@ module.exports = app => {
                     preUrl: '/tender/' + tender.id,
                     measureType,
                     jsFiles: this.app.jsFiles.common.concat(this.app.jsFiles.ledger.explode),
+                    stdBills,
+                    stdChapters,
                 };
                 if ((tender.data.ledger_status === auditConst.status.uncheck || tender.data.ledger_status === auditConst.status.checkNo) && tender.data.user_id === ctx.session.sessionUser.accountId) {
                     renderData.accountGroup = accountGroup;

app/controller/measure_controller.js

@@ -250,6 +250,7 @@ module.exports = app => {
                 ctx.redirect('/tender/' + ctx.tender.id + '/measure/stage/');
             } catch (err) {
                 this.log(err);
+                console.log(err);
                 ctx.redirect(ctx.request.header.referer);
             }
         }

app/controller/revise_controller.js

@@ -62,6 +62,7 @@ module.exports = app => {
                 const count = await ctx.service.ledgerRevise.count({tid: ctx.tender.id});
                 const ledgerRevise = await ctx.service.ledgerRevise.getReviseList(ctx.tender.id);
                 const addValid = await this._getAddReviseValid(ctx);
+                const [stdBills, stdChapters] = await this.ctx.service.valuation.getValuationStdList(ctx.tender.data.valuation);
                 const renderData = {
                     tender: ctx.tender.data,
                     tenderMenu: this.menu.tenderMenu,
@@ -74,6 +75,8 @@ module.exports = app => {
                     ledgerRevise,
                     addValid,
                     auditConst: audit.revise,
+                    stdBills,
+                    stdChapters,
                 };
                 await this.layout('revise/index.ejs', renderData, 'revise/modal.ejs');
             } catch (err) {

app/controller/tender_controller.js

@@ -43,6 +43,7 @@ module.exports = app => {
                     t.completeStage = await this.ctx.service.stage.getLastestCompleteStage(t.id);
                 }
                 const categoryData = await this.ctx.service.category.getAllCategory(this.ctx.session.sessionProject.id);
+                const valuations = await this.ctx.service.valuation.getProjectValidValuation(this.ctx.session.sessionProject.id);
                 const renderData = {
                     tenderList,
                     tenderConst,
@@ -53,6 +54,7 @@ module.exports = app => {
                     jsFiles: this.app.jsFiles.common.concat(this.jsFiles),
                     auditConst,
                     userPermission,
+                    valuations,
                 };
                 await this.layout(view, renderData, modal);
             } catch (err) {
@@ -121,7 +123,7 @@ module.exports = app => {
                 }
                 console.log(ctx.request.body.data);
                 const data = JSON.parse(ctx.request.body.data);
-                if (!data.name || data.name === '') {
+                if (!data.name || data.name === '' || !data.valuation) {
                     throw '标段信息不完整';
                 }
 

app/public/js/ledger.js

@@ -1076,7 +1076,7 @@ $(document).ready(function() {
             showSideTools(tab.hasClass('active'));
             if (tab.attr('content') === '#std-chapter') {
                 if (!stdChapter) {
-                    stdChapter = new stdLib('#std-chapter-spread', 'chapter', {
+                    stdChapter = new stdLib('#std-chapter', 'chapter', {
                         id: 'chapter_id',
                         pid: 'pid',
                         order: 'order',
@@ -1095,12 +1095,12 @@ $(document).ready(function() {
                         headRowHeight: [40],
                         defaultRowHeight: 21,
                     });
-                    stdChapter.loadLib(1);
+                    stdChapter.loadLib($('select', '#std-chapter').val());
                 }
                 stdChapter.spread.refresh();
             } else if (tab.attr('content') === '#std-bills') {
                 if (!stdBills) {
-                    stdBills = new stdLib('#std-bills-spread', 'bills', {
+                    stdBills = new stdLib('#std-bills', 'bills', {
                         id: 'bill_id',
                         pid: 'pid',
                         order: 'order',
@@ -1109,7 +1109,7 @@ $(document).ready(function() {
                         keys: ['id', 'list_id', 'bill_id']
                     }, {
                         cols: [
-                            {title: '清单编号', field: 'code', hAlign: 0, width: 120, formatter: '@', readOnly: true, cellType: 'tree'},
+                            {title: '清单编号', field: 'b_code', hAlign: 0, width: 120, formatter: '@', readOnly: true, cellType: 'tree'},
                             {title: '名称', field: 'name', hAlign: 0, width: 230, formatter: '@', readOnly: true},
                             {title: '单位', field: 'unit', hAlign: 1, width: 50, formatter: '@', readOnly: true}
                         ],
@@ -1119,14 +1119,14 @@ $(document).ready(function() {
                         headRowHeight: [40],
                         defaultRowHeight: 21,
                     });
-                    stdBills.loadLib(1);
+                    stdBills.loadLib($('select', '#std-bills').val());
                 }
                 stdBills.spread.refresh();
             } else if (tab.attr('content') === '#deal-bills') {
                 if (!dealBills) {
                     dealBills = new DealBills('#deal-bills-spread', {
                         cols: [
-                            {title: '清单编号', field: 'code', hAlign: 0, width: 120, formatter: '@', readOnly: true},
+                            {title: '清单编号', field: 'b_code', hAlign: 0, width: 120, formatter: '@', readOnly: true},
                             {title: '名称', field: 'name', hAlign: 0, width: 230, formatter: '@', readOnly: true},
                             {title: '单位', field: 'unit', hAlign: 1, width: 50, formatter: '@', readOnly: true},
                             {title: '单价', field: 'unit_price', hAlign: 2, width: 50, readOnly: true},
@@ -1180,7 +1180,8 @@ $(document).ready(function() {
 
     class stdLib {
         constructor(selector, stdType, treeSetting, spreadSetting) {
-            this.obj = $(selector)[0];
+            const self = this;
+            this.obj = $(selector + '-spread')[0];
             this.url = '/std/' + stdType;
             this.treeSetting = treeSetting;
             treeSetting.preUrl = this.url;
@@ -1218,13 +1219,26 @@ $(document).ready(function() {
                 });
             });
             this.pathTree = createNewPathTree('base', this.treeSetting);
+            this.cacheLib = [];
+            $('select', selector).change(function () {
+                self.loadLib(parseInt(this.value));
+            });
         }
         loadLib (listId) {
-            const self = this;
-            postData(this.url+'/get-data', {list_id: listId}, function (data) {
-                self.pathTree.loadDatas(data);
-                SpreadJsObj.loadSheetData(self.spread.getActiveSheet(), 'tree', self.pathTree);
+            const cacheData = this.cacheLib.find(function (lib) {
+                return lib.id === listId;
             });
+            if (cacheData) {
+                this.pathTree.loadDatas(cacheData.data);
+                SpreadJsObj.loadSheetData(this.spread.getActiveSheet(), 'tree', this.pathTree);
+            } else {
+                const self = this;
+                postData(this.url+'/get-data', {list_id: listId}, function (data) {
+                    self.cacheLib.push({id: listId, data: data});
+                    self.pathTree.loadDatas(data);
+                    SpreadJsObj.loadSheetData(self.spread.getActiveSheet(), 'tree', self.pathTree);
+                });
+            }
         }
     }
     class DealBills {

app/public/js/revise.js

@@ -318,8 +318,9 @@ $(document).ready(() => {
     });
 
     class stdLib {
-        constructor(obj, stdType, treeSetting, spreadSetting) {
-            this.obj = obj;
+        constructor(selector, stdType, treeSetting, spreadSetting) {
+            const self = this;
+            this.obj = $(selector + '-spread')[0];
             this.url = '/std/' + stdType;
             this.treeSetting = treeSetting;
             treeSetting.preUrl = this.url;
@@ -349,13 +350,26 @@ $(document).ready(() => {
                 });
             });
             this.pathTree = createNewPathTree('base', this.treeSetting);
+            this.cacheLib = [];
+            $('select', selector).change(function () {
+                self.loadLib(parseInt(this.value));
+            });
         }
         loadLib (listId) {
-            const self = this;
-            postData(this.url+'/get-data', {list_id: listId}, function (data) {
-                self.pathTree.loadDatas(data);
-                SpreadJsObj.loadSheetData(self.spread.getActiveSheet(), 'tree', self.pathTree);
+            const cacheData = this.cacheLib.find(function (lib) {
+                return lib.id === listId;
             });
+            if (cacheData) {
+                this.pathTree.loadDatas(cacheData.data);
+                SpreadJsObj.loadSheetData(this.spread.getActiveSheet(), 'tree', this.pathTree);
+            } else {
+                const self = this;
+                postData(this.url+'/get-data', {list_id: listId}, function (data) {
+                    self.cacheLib.push({id: listId, data: data});
+                    self.pathTree.loadDatas(data);
+                    SpreadJsObj.loadSheetData(self.spread.getActiveSheet(), 'tree', self.pathTree);
+                });
+            }
         }
     }
     class DealBills {
@@ -642,7 +656,7 @@ $(document).ready(() => {
             showSideTools(tab.hasClass('active'));
             if (tab.attr('content') === '#std-chapter') {
                 if (!stdChapter) {
-                    stdChapter = new stdLib($('#std-chapter-spread')[0], 'chapter', {
+                    stdChapter = new stdLib('#std-chapter', 'chapter', {
                         id: 'chapter_id',
                         pid: 'pid',
                         order: 'order',
@@ -661,12 +675,12 @@ $(document).ready(() => {
                         headRowHeight: [40],
                         defaultRowHeight: 21,
                     });
-                    stdChapter.loadLib(1);
+                    stdChapter.loadLib($('select', '#std-chapter').val());
                 }
                 stdChapter.spread.refresh();
             } else if (tab.attr('content') === '#std-bills') {
                 if (!stdBills) {
-                    stdBills = new stdLib($('#std-bills-spread')[0], 'bills', {
+                    stdBills = new stdLib('#std-bills', 'bills', {
                         id: 'bill_id',
                         pid: 'pid',
                         order: 'order',
@@ -675,7 +689,7 @@ $(document).ready(() => {
                         keys: ['id', 'list_id', 'bill_id']
                     }, {
                         cols: [
-                            {title: '清单编号', field: 'code', hAlign: 0, width: 120, formatter: '@', readOnly: true, cellType: 'tree'},
+                            {title: '清单编号', field: 'b_code', hAlign: 0, width: 120, formatter: '@', readOnly: true, cellType: 'tree'},
                             {title: '名称', field: 'name', hAlign: 0, width: 230, formatter: '@', readOnly: true},
                             {title: '单位', field: 'unit', hAlign: 1, width: 50, formatter: '@', readOnly: true}
                         ],
@@ -685,7 +699,7 @@ $(document).ready(() => {
                         headRowHeight: [40],
                         defaultRowHeight: 21,
                     });
-                    stdBills.loadLib(1);
+                    stdBills.loadLib($('select', '#std-bills').val());
                 }
                 stdBills.spread.refresh();
             } else if (tab.attr('content') === '#deal-bills') {

app/public/js/spreadjs_rela/spreadjs_zh.js

@@ -78,10 +78,12 @@ const SpreadJsObj = {
         spread.options.cutCopyIndicatorVisible = false;
         spread.options.allowCopyPasteExcelStyle = false;
         spread.options.allowUserDragDrop = false;
+        spread.options.allowUserDragFill = false;
+        spread.options.showDragFillSmartTag = false;
         spread.options.allowUserEditFormula = false;
         spread.options.allowExtendPasteRange = true;
         spread.options.copyPasteHeaderOptions = spreadNS.CopyPasteHeaderOptions.noHeaders;
-        spread.getActiveSheet().options.clipBoardOptions = GC.Spread.Sheets.ClipboardPasteOptions.values;//设置粘贴时只粘贴值
+        spread.getActiveSheet().options.clipBoardOptions = spreadNS.ClipboardPasteOptions.values;//设置粘贴时只粘贴值
         spread.getActiveSheet().setRowCount(3);
         return spread;
     },
@@ -113,6 +115,10 @@ const SpreadJsObj = {
         sheet.options.protectionOptions = option;
         sheet.options.isProtected = true;
         sheet.options.allowCellOverflow = false;
+
+        const defaultStyle = sheet.getDefaultStyle();
+        defaultStyle.locked = false;
+        sheet.setDefaultStyle(defaultStyle);
     },
     /**
      * sheet批量操作优化(sheet操作大批量数据时, 屏蔽数据刷新, 可优化大量时间)
@@ -260,11 +266,13 @@ const SpreadJsObj = {
         if (sheet.zh_setting.headerFont) {
             const vStyle = new spreadNS.Style();
             vStyle.font = sheet.zh_setting.headerFont;
+            vStyle.locked = false;
             sheet.setDefaultStyle(vStyle, spreadNS.SheetArea.colHeader);
         }
         if (sheet.zh_setting.font) {
             const vStyle = new spreadNS.Style();
             vStyle.font = sheet.zh_setting.font;
+            vStyle.locked = false;
             sheet.setDefaultStyle(vStyle, spreadNS.SheetArea.viewport);
         }
     },

app/public/js/stage.js

@@ -716,7 +716,6 @@ $(document).ready(() => {
                     break;
                 }
             }
-            console.log(data);
             if (data.updateData.length === 0) {
                 toastr.info('其下全部部位明细均已计量');
                 return;
@@ -1382,7 +1381,7 @@ $(document).ready(() => {
                         }
                         if (checkEmpty) {
                             if (sd.quantity) {
-                                if (!sd.end_gather_qty || checkZero(sd.end_gather_qty)) match = true;
+                                if (!sd.end_gather_qty || ZhCalc.sub(sd.quantity, sd.end_gather_qty) > 0) match = true;
                             }
                         }
                         if (keyword && keyword !== '' && sd.name && sd.name.indexOf(keyword) === -1) match = false;

app/public/js/stage_change.js

@@ -87,7 +87,7 @@ $(document).ready(() => {
     const billsSpreadSetting = {
         cols: [
             {title: '本期使用', colSpan: '1', rowSpan: '1', field: '', hAlign: 1, width: 40, formatter: '@', readOnly: true, cellType: 'image', img: function (data) {
-                if (!checkZero(data.cur_qty)) {
+                if (data.cur_qty && !checkZero(data.cur_qty)) {
                     return $('#icon-ok')[0];
                 } else {
                     return null;
@@ -194,7 +194,7 @@ $(document).ready(() => {
         filterUsedBills: function (isFilter) {
             const bills = SpreadJsObj.getSortData(billsSpread.getActiveSheet());
             for (const b of bills) {
-                b.visible = !isFilter || !checkZero(b.cur_qty);
+                b.visible = !isFilter ||(b.cur_qty && !checkZero(b.cur_qty));
             }
             SpreadJsObj.refreshTreeRowVisible(billsSpread.getActiveSheet());
         }

app/public/js/stage_compare.js

@@ -113,6 +113,9 @@ $(document).ready(function () {
     const scPos = new MasterPosData(scPosSetting);
 
     postData(window.location.pathname + '/load', {main: true, roles: scRoles}, function (result) {
+        for (const r of scRoles) {
+            if (r != 0) $('input[audit-order=' + r + ']')[0].checked = true;
+        }
         scTree.loadDatas(result.main.ledger);
         scPos.loadDatas(result.main.pos);
         for (const aData of result.roles) {

app/public/js/stage_detail.js

@@ -25,6 +25,8 @@ $(document).ready(() => {
         readOnly: readOnly,
     };
     const detailSpread = SpreadJsObj.createNewSpread($('#detail-spread')[0]);
+    detailSpread.options.allowUserDragFill = true;
+    detailSpread.options.defaultDragFillType = spreadNS.Fill.AutoFillType.fillSeries;
 
     $.subMenu({
         menu: '#sub-menu', miniMenu: '#sub-mini-menu', miniMenuList: '#mini-menu-list',
@@ -220,11 +222,52 @@ $(document).ready(() => {
                 }
             }
         },
+        dragFillBlock: function (e, info) {
+            info.cancel = true;
+            if (!info.sheet.zh_setting || !info.sheet.zh_data) return;
+            const sel = info.sheet.getSelections()[0];
+            const col = info.sheet.zh_setting.cols[info.fillRange.col];
+            if (info.fillRange.colCount > 1 || !sel || col.field !== 'doc_code') return;
+            const text = info.sheet.getText(sel.row + sel.rowCount - 1, sel.col);
+            if (text === '') return;
+
+            const regRst = /(\d+)$/g.exec(text), datas = [];
+            for (let iRow = 0; iRow < info.fillRange.rowCount; iRow++) {
+                const curRow = info.fillRange.row + iRow;
+                const data = info.sheet.zh_data[curRow];
+                if (data) {
+                    const updateData = {lid: data.lid};
+                    if (data.uuid) {
+                        updateData.uuid = data.uuid;
+                    } else {
+                        updateData.code = data.code;
+                        updateData.name = data.name;
+                        updateData.unit = data.unit;
+                        updateData.unit_price = data.unit_price;
+                    }
+                    if (regRst) {
+                        updateData.doc_code = text.substr(0, regRst.index) + (parseInt(regRst[0]) + iRow + 1);
+                    } else {
+                        updateData.doc_code = text.replace('\n', '');
+                    }
+                    datas.push(updateData);
+                }
+            }
+            if (datas.length > 0) {
+                postData(window.location.pathname + '/save', datas, function (result) {
+                    stageIm.loadUpdateDetailData(result);
+                    SpreadJsObj.reLoadRowData(info.sheet, info.fillRange.row, info.fillRange.rowCount);
+                }, function () {
+                    SpreadJsObj.reLoadRowData(info.sheet, info.fillRange.row, info.fillRange.rowCount);
+                })
+            }
+        },
     };
     detailSpread.bind(spreadNS.Events.SelectionChanged, detailOperationObj.selectionChanged);
     if (!readOnly) {
         detailSpread.bind(spreadNS.Events.EditEnded, detailOperationObj.editEnded);
         detailSpread.bind(spreadNS.Events.ClipboardPasted, detailOperationObj.clipboardPasted);
+        detailSpread.bind(spreadNS.Events.DragFillBlock, detailOperationObj.dragFillBlock);
         SpreadJsObj.addDeleteBind(detailSpread, detailOperationObj.deletePress);
     }
 

app/public/js/stage_im.js

@@ -172,7 +172,6 @@ const stageIm = (function () {
             _.assignInWith(im, cd, function (oV, sV, key) {
                 return imFields.indexOf(key) > -1 && sV !== undefined ? sV : oV;
             });
-            console.log(im);
         }
     }
 

app/public/js/tender_list.js

@@ -383,6 +383,7 @@ $(document).ready(() => {
     $('#add-bd-ok').click(function () {
         const data = {
             name: $('[name=name]', '#add-bd').val(),
+            valuation: $('[name=valuation]:checked').val(),
             category: [],
         };
         if (!data.name || data.name === '') {

app/public/js/tender_list_manage.js

@@ -383,6 +383,7 @@ $(document).ready(() => {
     $('#add-bd-ok').click(function () {
         const data = {
             name: $('[name=name]', '#add-bd').val(),
+            valuation: $('[name=valuation]:checked').val(),
             category: [],
         };
         if (!data.name || data.name === '') {

app/public/js/tender_list_progress.js

@@ -350,6 +350,7 @@ $(document).ready(() => {
     $('#add-bd-ok').click(function () {
         const data = {
             name: $('[name=name]', '#add-bd').val(),
+            valuation: $('[name=valuation]:checked').val(),
             category: [],
         };
         if (!data.name || data.name === '') {

app/service/change.js

@@ -763,7 +763,7 @@ module.exports = app => {
                         '      ON sc.stimes = MF.stimes And sc.sorder = MF.sorder And sc.cbid = MF.cbid' +
                         '    GROUP BY sc.cbid' +
                         '  ) As scb ON cb.id = scb.cbid' +
-                        '  WHERE c.tid = ? And c.status = ? And ' + filter +
+                        '  WHERE c.tid = ? And c.status = ? And c.valid And ' + filter +
                         '  ORDER BY c.in_time';
             const sqlParam = [tid, tid, audit.flow.status.checked];
             const changes = await this.db.query(sql, sqlParam);
@@ -820,10 +820,10 @@ module.exports = app => {
                 '    LEFT JOIN ' + this.ctx.service.changeAuditList.tableName + ' As cb ON sc.cbid = cb.id' +
                 '    GROUP By sc.`cbid`' +
                 '  ) As U ON C.cid = U.cid' +
-                '  WHERE C.tid = ?' +
+                '  WHERE C.tid = ? And C.status = ? And C.valid' +
                 '  GROUP By C.cid' +
                 '  ORDER By in_time';
-            const sqlParam = [this.ctx.tender.info.decimal.tp, tid, tid];
+            const sqlParam = [this.ctx.tender.info.decimal.tp, tid, tid, audit.flow.status.checked];
             return await this.db.query(sql, sqlParam);
         }
 

app/service/ledger.js

@@ -65,10 +65,10 @@ module.exports = app => {
             // 整理数据
             const insertData = [];
             for (const tmp of datas) {
-                tmp.ledger_id = tmp.id;
+                tmp.ledger_id = tmp.template_id;
                 tmp.ledger_pid = tmp.pid;
                 tmp.tender_id = tenderId;
-                delete tmp.id;
+                delete tmp.template_id;
                 delete tmp.pid;
                 tmp.id = this.uuid.v4();
                 insertData.push(tmp);
@@ -766,6 +766,7 @@ module.exports = app => {
                 name: stdData.name,
                 unit: stdData.unit,
                 source: stdData.source,
+                node_type: stdData.node_type,
             };
             result.code = stdData.code ? stdData.code : '';
             result.b_code = stdData.b_code ? stdData.b_code : '';

app/service/stage_change.js

@@ -10,6 +10,7 @@
 
 const defaultPid = -1; // 非pid
 const audit = require('../const/audit');
+const timesLen = 100;
 
 module.exports = app => {
 
@@ -258,13 +259,13 @@ module.exports = app => {
                         '  FROM ' + this.ctx.service.changeAuditList.tableName + ' As cb' +
                         '  LEFT JOIN ' + this.tableName + ' As c ON cb.id = c.cbid ' +
                         '  INNER JOIN (' +
-                        '    SELECT MAX(`stimes`) As `stimes`, MAX(`sorder`) As `sorder`, `lid`, `pid`, `cbid`, sChange.`sid`, `cid` ' +
+                        '    SELECT  MAX(`stimes` * ' + timesLen + ' + `sorder`) As `flow`, `lid`, `pid`, `cbid`, sChange.`sid`, `cid` ' +
                         '      FROM ' + this.tableName + ' As sChange' +
                         '      LEFT JOIN ' + this.ctx.service.stage.tableName + ' As s ON sChange.sid = s.id' +
                         '      WHERE sChange.tid = ? AND cid = ?' + filter +
                         '      GROUP By `lid`, `pid`, `cbid`, sChange.`sid`' +
                         '  ) As m' +
-                        '  ON c.stimes = m.stimes And c.sorder = m.sorder And c.`cbid` = m.`cbid` AND c.`sid` = m.`sid` And c.`cid` = m.`cid`' +
+                        '  ON (c.stimes * ' + timesLen + ' + c.sorder) = m.flow And c.`cbid` = m.`cbid` AND c.`sid` = m.`sid` And c.`cid` = m.`cid`' +
                         '  WHERE cb.cid = ?' +
                         '  GROUP By c.`cbid`';
             const sqlParam = [tid, cid, cid];
@@ -286,11 +287,11 @@ module.exports = app => {
                         '    p.name As `p_name`, p.drawing_code As `p_drawing_code`, p.`quantity` As `p_qty`' +
                         '  FROM ' + this.tableName + ' As c ' +
                         '  INNER JOIN ( ' +
-                        '    SELECT MAX(`stimes`) As `stimes`, MAX(`sorder`) As `sorder`, `lid`, `pid`, `cbid` From ' + this.tableName +
+                        '    SELECT MAX(`stimes` * ' + timesLen + ' + `sorder`) As `flow`, `lid`, `pid`, `cbid` From ' + this.tableName +
                         '      WHERE sid = ? And cid = ?' +
                         '      GROUP By `lid`, `pid`, `cbid`' +
                         '  ) As m ' +
-                        '  ON c.stimes = m.stimes And c.sorder = m.sorder And c.lid = m.lid And c.pid = m.pid And c.cbid = m.cbid' +
+                        '  ON (c.stimes * ' + timesLen + ' + c.sorder) = m.flow And c.lid = m.lid And c.pid = m.pid And c.cbid = m.cbid' +
                         '  LEFT JOIN ' + this.ctx.service.ledger.tableName + ' As l ON c.lid = l.id' +
                         '  LEFT JOIN ' + this.ctx.service.pos.tableName + ' As p ON c.pid = p.id';
             const sqlParam = [sid, cid];
@@ -305,15 +306,15 @@ module.exports = app => {
         async getStageUsedChangeId(sid) {
             const sql = 'SELECT c.`cid` FROM ' + this.tableName + ' As c' +
                         '  INNER JOIN (' +
-                        '    SELECT MAX(`stimes`) As `stimes`, MAX(`sorder`) As `sorder`, `lid`, `pid`, `cbid` From ' + this.tableName +
-                        '      WHERE sid = ? And not ISNULL(qty)' +
+                        '    SELECT MAX(`stimes` * ' + timesLen + ' + `sorder`) As `flow`, `lid`, `pid`, `cbid` From ' + this.tableName +
+                        '      WHERE sid = ?' +
                         '      GROUP By `lid`, `pid`, `cbid`' +
                         '  ) As m' +
-                        '  ON c.stimes = m.stimes And c.sorder = m.sorder And c.lid = m.lid And c.pid = m.pid And c.cbid = m.cbid' +
+                        '  ON (c.stimes * ' + timesLen + ' + c.sorder) = m.flow And c.lid = m.lid And c.pid = m.pid And c.cbid = m.cbid' +
                         '  GROUP BY c.`cid`';
             const sqlParam = [sid];
             const result = await this.db.query(sql, sqlParam);
-            return this._.map(result, 'cid');
+            return this._.map(this._.filter(result, 'qty'), 'cid');
         }
     }
 

app/service/stage_detail.js

@@ -135,6 +135,10 @@ module.exports = app => {
                     await this.db.update(this.tableName, newData);
                     return newData;
                 } else {
+                    data.code = org.code;
+                    data.name = org.name;
+                    data.unit = org.unit;
+                    data.unit_price = org.unit_price;
                     data.uuid = org.uuid;
                     data.tid = this.ctx.tender.id;
                     data.sid = this.ctx.stage.id;
@@ -170,7 +174,7 @@ module.exports = app => {
                             await transaction.update(this.tableName, d);
                             result.push(d);
                         } else {
-                            const nd = this._.assign(od, data);
+                            const nd = this._.assign(od, d);
                             nd.times = this.ctx.stage.curTimes;
                             nd.order = this.ctx.stage.curOrder;
                             await transaction.insert(this.tableName, nd);

app/service/stage_pos.js

@@ -353,6 +353,7 @@ module.exports = app => {
                     said: this.ctx.session.sessionUser.accountId,
                     times: this.ctx.stage.curTimes,
                     order: this.ctx.stage.curOrder,
+                    contract_qty: orgPos.contract_qty,
                     qc_qty: qty,
                 });
             }

app/service/standard_lib.js

@@ -24,10 +24,6 @@ class StandardLib extends BaseTreeService {
         this.stdType = '';
     }
 
-    // 供子类继承（不同的标准库可能需要转换一下数据）
-    convertData (data) {
-    }
-
 
     /**
      * 实例中具体的dataId使用字段不相同，统一赋值到source下
@@ -61,7 +57,6 @@ class StandardLib extends BaseTreeService {
         const [sql, sqlParam] = this.sqlBuilder.build(this.tableName);
         const node = await this.db.queryOne(sql, sqlParam);
         this.setSourceData(node);
-        this.convertData(node);
 
         return node;
     }
@@ -84,7 +79,6 @@ class StandardLib extends BaseTreeService {
         const [sql, sqlParam] = this.sqlBuilder.build(this.tableName);
         const resultData = await this.db.query(sql, sqlParam);
         this.setSourceData(resultData);
-        this.convertData(resultData);
         return resultData;
     }
     /**
@@ -110,7 +104,6 @@ class StandardLib extends BaseTreeService {
         const [sql, sqlParam] = this.sqlBuilder.build(this.tableName);
         const data = await this.db.query(sql, sqlParam);
         this.setSourceData(data);
-        this.convertData(data);
         return data;
     };
 }

app/service/std_bills.js

@@ -32,23 +32,6 @@ module.exports = app => {
             }, 'bill');
             this.stdType = 'bill';
         }
-
-        /**
-         * 查询数据后，转换数据(用于兼容项目节与清单的不同)
-         * @param data
-         */
-        convertData (data) {
-            if (data instanceof Array) {
-                for (const d of data) {
-                    d.b_code = d.code;
-                    delete d.code;
-                }
-            } else if (data.code) {
-                data.b_code = data.code;
-                delete data.code;
-            }
-        }
-
     }
 
     return StdBills;

app/service/tender.js

@@ -12,7 +12,7 @@ const tenderConst = require('../const/tender');
 const auditConst = require('../const/audit');
 const fs = require('fs');
 const path = require('path');
-const commonQueryColumns = ['id', 'project_id', 'name', 'status', 'category', 'ledger_times', 'ledger_status', 'measure_type', 'user_id'];
+const commonQueryColumns = ['id', 'project_id', 'name', 'status', 'category', 'ledger_times', 'ledger_status', 'measure_type', 'user_id', 'valuation'];
 
 module.exports = app => {
 
@@ -163,6 +163,7 @@ module.exports = app => {
          */
         async add(data) {
             let result = false;
+            const templateId = await this.ctx.service.valuation.getValuationTemplate(data.valuation);
             this.transaction = await this.db.beginTransaction();
             try {
                 // 获取当前用户信息
@@ -177,6 +178,7 @@ module.exports = app => {
                     user_id: sessionUser.accountId,
                     create_time: new Date(),
                     category: JSON.stringify(data.category),
+                    valuation: data.valuation,
                 };
                 const operate = await this.transaction.insert(this.tableName, insertData);
 
@@ -186,7 +188,7 @@ module.exports = app => {
                 }
 
                 // 获取标段项目节点模板
-                const tenderNodeTemplateData = await this.ctx.service.tenderNodeTemplate.getData();
+                const tenderNodeTemplateData = await this.ctx.service.tenderNodeTemplate.getData(templateId);
                 // 复制模板数据到标段数据表
                 result = await this.ctx.service.ledger.innerAdd(tenderNodeTemplateData, operate.insertId, this.transaction);
                 if (!result) {

app/service/tender_node_template.js

@@ -26,10 +26,11 @@ module.exports = app => {
         /**
          * 获取模板数据
          *
+         * @param {Integer} tid - 模板id
          * @param {Boolean} isCache - 是否使用缓存
          * @return {Array} - 返回模板数据
          */
-        async getData(isCache = true) {
+        async getData(tid, isCache = true) {
             const cacheKey = 'tenderTPL';
             const data = await this.cache.get(cacheKey);
 
@@ -38,7 +39,10 @@ module.exports = app => {
             }
 
             // 获取所有数据
-            const templateData = await this.db.select(this.tableName);
+            const templateData = await this.db.select(this.tableName, {
+                where: {list_id: tid},
+                columns: ['code', 'name', 'unit', 'source', 'remark', 'pid', 'level', 'order', 'full_path', 'is_leaf', 'template_id', 'node_type'],
+            });
             if (templateData.length <= 0) {
                 return [];
             }

app/service/valuation.js

@@ -0,0 +1,58 @@
+'use strict';
+
+/**
+ *
+ *
+ * @author Mai
+ * @date
+ * @version
+ */
+
+module.exports = app => {
+
+    class Valuation extends app.BaseService {
+
+        /**
+         * 构造函数
+         *
+         * @param {Object} ctx - egg全局变量
+         * @return {void}
+         */
+        constructor(ctx) {
+            super(ctx);
+            this.tableName = 'valuation_list';
+        }
+
+        async getProjectValidValuation(pid) {
+            const project = await this.ctx.service.project.getDataById(pid);
+            const vid =  this._.map(project.valuation.split(','), this._.toInteger);
+            return await this.db.select(this.tableName, {
+                where: {id: vid},
+                columns: ['id', 'name'],
+            });
+        }
+
+        async getValuationTemplate(id) {
+            const valuation = await this.getDataById(id);
+            return parseInt(valuation.template_id);
+        }
+
+        async getValuationStdList(id) {
+            const valuation = await this.getDataById(id);
+            const billsId = this._.map(valuation.bill_id.split(','), this._.toInteger);
+            const chaptersId = this._.map(valuation.chapter_id.split(','), this._.toInteger);
+            const billsList = await this.db.select('zh_bill_list', {
+                where: {id: billsId},
+                columns: ['id', 'name'],
+            });
+            const chapterList = await this.db.select('zh_project_chapter_list', {
+                where: {id: chaptersId},
+                columns: ['id', 'name'],
+            });
+            return [billsList, chapterList];
+        }
+
+    }
+
+    return Valuation;
+};

app/view/ledger/explode.ejs

@@ -101,7 +101,11 @@
                     <div id="std-chapter" class="tab-pane">
                         <div class="sjs-bar-2">
                             <div class="pb-1">
-                                <select class="form-control form-control-sm"><option>0号计量台帐部位参考(项目节)</option></select>
+                                <select class="form-control form-control-sm">
+                                    <% for (const c of stdChapters) { %>
+                                    <option value="<%- c.id %>" <% if (stdChapters.indexOf(c) === 0) { %>selected<% } %>><%- c.name %></option>
+                                    <% } %>
+                                </select>
                             </div>
                         </div>
                         <div id="std-chapter-spread" class="sjs-sh-2">
@@ -110,7 +114,11 @@
                     <div id="std-bills" class="tab-pane">
                         <div class="sjs-bar-3">
                             <div class="pb-1">
-                                <select class="form-control form-control-sm"><option>0号计量台帐清单参考(工程量清单)</option></select>
+                                <select class="form-control form-control-sm">
+                                    <% for (const b of stdBills) { %>
+                                    <option value="<%- b.id %>" <% if (stdBills.indexOf(b) === 0) { %>selected<% } %>><%- b.name %></option>
+                                    <% } %>
+                                </select>
                             </div>
                         </div>
                         <div id="std-bills-spread" class="sjs-sh-3">

app/view/measure/stage_modal.ejs

@@ -43,7 +43,7 @@
                 <h5>删除后，数据无法恢复，请谨慎操作。</h5>
             </div>
             <div class="modal-footer">
-                <input type="hidden" name="stage_id" value="<%= stages[stages.length-1].id %>">
+                <input type="hidden" name="stage_id" value="<%= stages[0].id %>">
                 <input type="hidden" name="_csrf" value="<%= ctx.csrf %>" />
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 <button type="submit" class="btn btn-danger">确定删除</button>

app/view/stage/compare_modal.ejs

@@ -9,9 +9,9 @@
             <div class="modal-body">
                 <table class="table table-sm">
                     <tr><th>审批人</th><th width="90">选择</th></tr>
-                    <% for (const a of ctx.stage.auditors) { %>
+                    <% for (const [i, a] of ctx.stage.auditors.entries()) { %>
                     <% if (a.status === auditConst.status.checked || a.aid === ctx.session.sessionUser.accountId) { %>
-                    <tr auditorId="<%- a.aid %>"><td><%- a.name %></td><td><input type="checkbox"></td></tr>
+                    <tr auditorId="<%- a.aid %>"><td><%- a.name %></td><td><input type="checkbox" audit-order="<%- i + 1 %>"></td></tr>
                     <% } %>
                     <% } %>
                 </table>

app/view/stage/detail.ejs

@@ -12,16 +12,16 @@
             </div>
             <div class="ml-auto">
                 <!--完成中间计量-->
-                <% if (!ctx.stage.readOnly && ctx.stage.check_detail) { %>
-                <% if (ctx.stage.check_detail) { %>
-                <a href="javascirpt: void(0);" data-toggle="modal" data-target="#done" class="btn btn-success btn-sm pull-right">完成本期中间计量</a>
-                <% } else { %>
-                <% if (ctx.stage.user_id = ctx.session.sessionUser.accountId) {%>
-                <span class="text-success" id="locked-hint">请继续完成上报审批。如需修改计量，点击 <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail/unlock">编辑</a></span>
-                <% } else { %>
-                <span class="text-success" id="locked-hint">已完成，请继续完成「上报审批」 <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail/unlock">解锁编辑</a></span>
-                <% } %>
-                <% } %>
+                <% if (!ctx.stage.readOnly) { %>
+                    <% if (ctx.stage.check_detail) { %>
+                        <a href="javascirpt: void(0);" data-toggle="modal" data-target="#done" class="btn btn-success btn-sm pull-right">完成本期中间计量</a>
+                    <% } else { %>
+                        <% if (ctx.stage.user_id = ctx.session.sessionUser.accountId) {%>
+                        <span class="text-success" id="locked-hint">请继续完成上报审批。如需修改计量，点击 <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail/unlock">编辑</a></span>
+                        <% } else { %>
+                        <span class="text-success" id="locked-hint">已完成，请继续完成「上报审批」 <a href="/tender/<%- ctx.tender.id %>/measure/stage/<%- ctx.stage.order %>/detail/unlock">解锁编辑</a></span>
+                        <% } %>
+                    <% } %>
                 <% } %>
             </div>
         </div>

app/view/tender/modal.ejs

@@ -10,6 +10,17 @@
                     <label>标段名称<b class="text-danger">*</b></label>
                     <input class="form-control"  placeholder="输入标段名称" type="text" name="name">
                 </div>
+                <div class="form-group">
+                    <label ><b class="text-danger">*</b>计价规范</label>
+                    <div>
+                        <% for (const v of valuations) { %>
+                        <div class="form-check form-check-inline mt-2">
+                            <input class="form-check-input" name="valuation" type="radio" id="valuation<%- v.id %>" value="<%- v.id %>" checked="">
+                            <label class="form-check-label" for="valuation<%- v.id %>"><%- v.name %></label>
+                        </div>
+                        <% } %>
+                    </div>
+                </div>
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>