Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

config/gulpConfig.js

@@ -130,12 +130,6 @@ module.exports = {
         'lib/spreadjs/sheets/css/gc.spread.sheets.excel2013lightGray.10.0.1.css'
     ],
     compleGlj_jspaths: [
-        'lib/jquery-contextmenu/jquery.contextMenu.min.js',
-        'lib/jquery-contextmenu/jquery.ui.position.js',
-        'lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js',
-        'lib/ztree/jquery.ztree.core.js',
-        'lib/ztree/jquery.ztree.excheck.js',
-        'lib/ztree/jquery.ztree.exedit.js',
         'public/web/common_ajax.js',
         'public/web/treeDataHelper.js',
         'public/web/QueryParam.js',
@@ -152,9 +146,6 @@ module.exports = {
         'lib/spreadjs/sheets/css/gc.spread.sheets.excel2013lightGray.10.0.1.css'
     ],
     compleRation_ration_jspaths:[
-        'lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js',
-        'lib/jquery-contextmenu/jquery.contextMenu.min.js"',
-        'lib/jquery-contextmenu/jquery.ui.position.js',
         'web/building_saas/complementary_ration_lib/js/global.js',
         'public/web/id_tree.js',
         'public/web/tree_sheet/tree_sheet_controller.js',
@@ -182,10 +173,6 @@ module.exports = {
     ],
     compleRation_glj_jspaths: [
         'web/building_saas/complementary_ration_lib/js/global.js',
-        'lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js',
-        'lib/ztree/jquery.ztree.core.js',
-        'lib/ztree/jquery.ztree.excheck.js',
-        'lib/ztree/jquery.ztree.exedit.js',
         'public/web/common_ajax.js',
         'public/web/treeDataHelper.js',
         'public/web/QueryParam.js',
@@ -200,7 +187,6 @@ module.exports = {
     ],
     compleRation_coe_jspaths: [
         'web/building_saas/complementary_ration_lib/js/global.js',
-        'lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js',
         'public/web/common_ajax.js',
         'public/web/treeDataHelper.js',
         'public/web/QueryParam.js',

web/building_saas/complementary_glj_lib/html/tools-gongliaoji.html

@@ -178,19 +178,19 @@
         </div>
     </div>
     <!-- JS. -->
-    <!--inject:js-->
     <script src="/lib/jquery/jquery-3.2.1.min.js"></script>
     <script src="/lib/jquery-contextmenu/jquery.contextMenu.min.js"></script>
     <script src="/lib/jquery-contextmenu/jquery.ui.position.js"></script>
+    <script src = "/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
+    <script type="text/javascript" src="/lib/ztree/jquery.ztree.core.js"></script>
+    <script type="text/javascript" src="/lib/ztree/jquery.ztree.excheck.js"></script>
+    <script type="text/javascript" src="/lib/ztree/jquery.ztree.exedit.js"></script>
+    <!--inject:js-->
     <script src="/lib/popper/popper.min.js"></script>
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
     <script src="/web/building_saas/js/global.js"></script>
     <!-- zTree -->
-    <script src = "/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
     <script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
-    <script type="text/javascript" src="/lib/ztree/jquery.ztree.core.js"></script>
-    <script type="text/javascript" src="/lib/ztree/jquery.ztree.excheck.js"></script>
-    <script type="text/javascript" src="/lib/ztree/jquery.ztree.exedit.js"></script>
     <script type="text/javascript" src="/public/web/common_ajax.js"></script>
     <script type="text/javascript" src="/public/web/treeDataHelper.js"></script>
     <script type="text/javascript" src="/public/web/QueryParam.js"></script>

web/building_saas/complementary_ration_lib/html/dinge.html

@@ -429,12 +429,12 @@
             </div>
         </div>
         <!-- JS. -->
-        <!--inject:js-->
         <script type="text/javascript" src = "/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
-        <script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
-        <script type="text/javascript" src="/lib/jquery/jquery-3.2.1.min.js"></script>
         <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.contextMenu.min.js"></script>
         <script type="text/javascript" src="/lib/jquery-contextmenu/jquery.ui.position.js"></script>
+        <!--inject:js-->
+        <script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
+        <script type="text/javascript" src="/lib/jquery/jquery-3.2.1.min.js"></script>
         <script type="text/javascript" src="/lib/popper/popper.min.js"></script>
         <script type="text/javascript" src="/lib/bootstrap/bootstrap.min.js"></script>
         <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/global.js"></script>

web/building_saas/complementary_ration_lib/html/fuzhu.html

@@ -58,13 +58,13 @@
     </div>
 
     <!-- JS. -->
+    <script src = "/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
     <!--inject:js-->
     <script src="/lib/jquery/jquery-3.2.1.min.js"></script>
     <script src="/lib/popper/popper.min.js"></script>
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
     <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/global.js"></script>
     <!-- zTree -->
-    <script src = "/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
     <script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
     <script type="text/javascript" src="/public/web/common_ajax.js"></script>
     <script type="text/javascript" src="/public/web/treeDataHelper.js"></script>

web/building_saas/complementary_ration_lib/html/gongliao.html

@@ -214,17 +214,17 @@
         </div>
     </div>
     <!-- JS. -->
+    <script src = "/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
+    <script type="text/javascript" src="/lib/ztree/jquery.ztree.core.js"></script>
+    <script type="text/javascript" src="/lib/ztree/jquery.ztree.excheck.js"></script>
+    <script type="text/javascript" src="/lib/ztree/jquery.ztree.exedit.js"></script>
     <!--inject:js-->
     <script src="/lib/jquery/jquery-3.2.1.min.js"></script>
     <script type="text/javascript" src="/lib/popper/popper.min.js"></script>
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
     <script type="text/javascript" src="/web/building_saas/complementary_ration_lib/js/global.js"></script>
     <!-- zTree -->
-    <script src = "/lib/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
     <script>GC.Spread.Sheets.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
-    <script type="text/javascript" src="/lib/ztree/jquery.ztree.core.js"></script>
-  	<script type="text/javascript" src="/lib/ztree/jquery.ztree.excheck.js"></script>
-    <script type="text/javascript" src="/lib/ztree/jquery.ztree.exedit.js"></script>
     <script type="text/javascript" src="/public/web/common_ajax.js"></script>
     <script type="text/javascript" src="/public/web/treeDataHelper.js"></script>
     <script type="text/javascript" src="/public/web/QueryParam.js"></script>

web/building_saas/main/js/models/calc_program.js

@@ -346,7 +346,7 @@ let executeObj = {
                         let mds = projectObj.project.composition.getCompositionByGLJ(glj);
                         if (!mds) mds = [];
                         for (let md of mds){
-                            if (base.gljTypes.indexOf(md.glj_type) >= 0) {
+                            if (base.gljTypes.indexOf(md.type) >= 0) {
                                 let q = md["consumption"] ? md["consumption"] : 0;
                                 let p = md["basePrice"] ? md["basePrice"] : 0;
                                 mdSum = mdSum + (q * p).toDecimal(decimalObj.process);
@@ -426,9 +426,56 @@ let treeNodeTools = {
     getFormulaNodes: function () {
         let nodes = [];
         for (let node of projectObj.project.mainTree.items){
-              if (node.sourceType == ModuleNames.bills && node.data.calcBase && node.data.calcBase != '') nodes.push(node);
+              if (node.sourceType == ModuleNames.bills && node.data.calcBase && node.data.calcBase != '')
+                  nodes.push(node);
         };
-        return nodes;
+
+        if (nodes.length >= 2) return this.orderFormulaNodes(nodes)
+        else return nodes;
+    },
+
+    // 给公式结点清单换照引用计算顺序排序。
+    orderFormulaNodes: function (nodesArr) {
+        let orderArr = [];
+
+        function getNodesByExp(expression){
+            // for test --------------
+            function getNode(name) {
+                for (let node of projectObj.project.mainTree.items){
+                    if (node.data.name == name)
+                        return node;
+                };
+            };
+
+            if (expression.hasSubStr("{措施项目费}")){
+                let node = getNode('措施项目');
+                return [node];
+            }
+
+            else if (expression.hasSubStr("{技术措施项目费}")){
+                let node = getNode('1.技术措施项目');
+                return [node];
+            }
+            // -------------------------------
+
+            return [];
+        };
+
+        function recursionNode(nodes) {
+            for (let node of nodes){
+                if (orderArr.includes(node)) continue;    // 已排过序的节点则跳过
+
+                if (node.data.calcBase){
+                    let subNodes = getNodesByExp(node.data.calcBase);
+                    recursionNode(subNodes);
+                };
+
+                if (nodesArr.includes(node) && !orderArr.includes(node)) orderArr.push(node);
+            };
+        }
+
+        recursionNode(nodesArr);
+        return orderArr;
     },
 
     isBill: function(treeNode){

web/building_saas/main/js/views/character_content_view.js

@@ -124,7 +124,7 @@ let contentOprObj = {
     save: function (callback) {
         let selectedNode = projectObj.mainController.tree.selected;
         const setting = projectObj.project.property.addRule !== undefined ? projectObj.project.property.addRule : getAddRuleSetting();
-        pageCCOprObj.setCharacterBySetting(contentOprObj, selectedNode, setting, callback);
+        pageCCOprObj.setCharacterBySetting(selectedNode, setting, callback, contentOprObj);
     },
     onEditEnded: function (sender, args) {
         let me = contentOprObj;
@@ -498,7 +498,7 @@ let characterOprObj = {
     save: function (callback) {
         let selectedNode = projectObj.mainController.tree.selected;
         const setting = projectObj.project.property.addRule !== undefined ? projectObj.project.property.addRule : getAddRuleSetting();
-        pageCCOprObj.setCharacterBySetting(characterOprObj, selectedNode, setting, callback);
+        pageCCOprObj.setCharacterBySetting(selectedNode, setting, callback, characterOprObj);
     },
     onEditStart: function (sender, args) {
         let me = characterOprObj;
@@ -822,9 +822,8 @@ let pageCCOprObj = {
      * @param {Object} setting - 设置
      * @return {void}
      */
-    setCharacterBySetting: function(oprObj, node, setting, callback) {
+    setCharacterBySetting: function(node, setting, callback = null, oprObj = null) {
         let self = this;
-
         // 保存的条件数据
         const findSet = { ID: node.data.ID, projectID: node.data.projectID };
         const updateData = this.getCharacterUpdateData(setting, node);
@@ -843,7 +842,9 @@ let pageCCOprObj = {
             node.data.name = updateData.name;
             node.data.itemCharacterText = updateData.itemCharacterText;
             node.data.jobContentText = updateData.jobContentText;
-            pageCCOprObj.showData(oprObj.workBook.getSheet(0), oprObj.setting, oprObj.currentCache);//刷新特征及内容Spread
+            if (oprObj) {
+                pageCCOprObj.showData(oprObj.workBook.getSheet(0), oprObj.setting, oprObj.currentCache);//刷新特征及内容Spread
+            }
             if(callback){
                 callback();
             }