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

Dockerfile_qa

@@ -4,7 +4,6 @@ WORKDIR /ConstructionOperation
 
 RUN git pull http://192.168.1.12:3000/SmartCost/ConstructionOperation master
 
-RUN mkdir tmp
 
 RUN cnpm install
 

web/users/js/main_tree_col.js

@@ -23,6 +23,9 @@ let MainTreeCol = {
         ration: function (node) {
             return node.sourceType === projectObj.project.Ration.getSourceType();
         },
+        glj: function (node) {
+            return node.sourceType == projectObj.project.ration_glj.getSourceType();
+        },
         volumePrice: function (node) {
             return node.sourceType === projectObj.project.VolumePrice.getSourceType();
         },
@@ -53,6 +56,9 @@ let MainTreeCol = {
         },
         forFeeRate:function (node) {
             return MainTreeCol.readOnly.non_bills(node)||MainTreeCol.readOnly.billsParent(node)||MainTreeCol.readOnly.leafBillsWithDetail(node);
+        },
+        forQuantity:function (node) {
+            return MainTreeCol.readOnly.glj(node)||MainTreeCol.readOnly.billsParent(node)
         }
     },
     cellType: {