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

app/controller/change_controller.js

@@ -24,6 +24,7 @@ const shenpiConst = require('../const/shenpi');
 const tenderMenu = require('../../config/menu').tenderMenu;
 const measureType = require('../const/tender').measureType;
 const spreadConst = require('../const/spread');
+const stdConst = require('../const/standard');
 // const tenderMenu = require('../../config/menu').tenderMenu;
 
 module.exports = app => {
@@ -1713,6 +1714,7 @@ module.exports = app => {
                 auditConst: audit.flow,
                 audit: audit.flow,
                 stdChapters,
+                nodeType: stdConst.nodeType,
             };
         }
 

app/public/js/change_revise.js

@@ -102,6 +102,7 @@ $(document).ready(() => {
     };
     sjsSettingObj.setFxTreeStyle(billsSpreadSetting, sjsSettingObj.FxTreeStyle.jz);
     if (thousandth) sjsSettingObj.setTpThousandthFormat(billsSpreadSetting);
+    sjsSettingObj.setNodeTypeCol(billsSpreadSetting.cols, [{field: 'node_type'}]);
     SpreadJsObj.initSpreadSettingEvents(billsSpreadSetting, billsCol);
     SpreadJsObj.initSheet(billsSheet, billsSpreadSetting);
     const posSpread = SpreadJsObj.createNewSpread($('#pos-spread')[0]);

app/view/change/revise.ejs

@@ -150,4 +150,5 @@
     const posSpreadSetting = JSON.parse('<%- JSON.stringify(posSpread) %>');
     const thousandth = <%- ctx.tender.info.display.thousandth %>;
     const decimal = JSON.parse('<%- JSON.stringify(ctx.tender.info.decimal) %>');
+    const nodeType = JSON.parse('<%- JSON.stringify(nodeType) %>');
 </script>