Переглянути джерело

单价无组成物小数位位数

zhangweicheng 4 роки тому
батько
коміт
cdb34ebb14

+ 1 - 1
modules/pm/models/project_property_template.js

@@ -6,7 +6,7 @@
 const defaultDecimal = {
     bills: { unitPrice: 2, totalPrice: 2 },
     ration: { quantity: 4, unitPrice: 2, totalPrice: 2 },
-    glj: { quantity: 4, unitPriceHasMix: 2, unitPrice: 3 },
+    glj: { quantity: 4, unitPriceHasMix: 2, unitPrice: 2 },
     feeRate: 3,
     quantity_detail: 4,
     material: 5,//三材系数

+ 1 - 1
web/building_saas/main/js/views/project_property_decimal_view.js

@@ -9,7 +9,7 @@ let defaultDecimal = {
     _def: {//editable: 开放给用户编辑的
         bills: {editable: true, data: {unitPrice: 2, totalPrice: 2}},
         ration: {editable: true, data: {quantity: 4, unitPrice: 2, totalPrice: 2}},
-        glj: {editable: true, data: {quantity: 4, unitPriceHasMix: 2, unitPrice: 3}},
+        glj: {editable: true, data: {quantity: 4, unitPriceHasMix: 2, unitPrice: 2}},
         material: {editable: false, data: 5},
         feeRate: {editable: true, data: 3},
         quantity_detail: {editable: false, data: 4},

+ 2 - 2
web/building_saas/pm/js/pm_newMain.js

@@ -1691,8 +1691,8 @@ const projTreeObj = {
         }else if(selectNode){
             let projectNode = null;
             if(selectNode.data.projType == projectType.project) projectNode = selectNode;
-            if(selectNode.data.projType == projectType.engineering) projectNode = selectNode.parent
-            if(selectNode.data.projType == projectType.tender)projectNode = selectNode.parent.parent
+            if(selectNode.data.projType == projectType.engineering) projectNode = selectNode.parent;
+            if(selectNode.data.projType == projectType.tender)projectNode = selectNode.parent.parent;
             parent = projectNode.parent;
             next = projectNode.nextSibling;
             updateData["update"] = {query:{ID:projectNode.id()}}

+ 1 - 1
web/building_saas/unit_price_file/index.js

@@ -390,7 +390,7 @@ let unitPriceObj = {
   getPrice:function(pricefield,unitprice){
     let quantity = 3;
     let unitPriceHasMix = 2;
-    let unitPrice = 3;
+    let unitPrice = 2;
     let process_decimal = 6;
     let uIndex = gljUtil.getIndex(unitprice);
     if(mixRatioMap[uIndex] && mixRatioMap[uIndex].length > 0){