Browse Source

量价类别下拉,不选值,移走焦点,数据丢失的Bug。

Chenshilong 7 năm trước cách đây
mục cha
commit
2ca13389c8

+ 15 - 1
web/building_saas/main/js/models/main_consts.js

@@ -58,4 +58,18 @@ const subSheetIndex = {
     ssiCalcProgram: 4,
     ssiMemo: 5,
     ssiFeature: 6
-}
+};
+
+const volumePriceMaps = {
+    "量人": "人工",
+    "量材": "材料",
+    "量机": "机械",
+    "量主": "主材",
+    "量设": "设备",
+
+    "人工": "量人",
+    "材料": "量材",
+    "机械": "量机",
+    "主材": "量主",
+    "设备": "量设"
+};

+ 2 - 5
web/building_saas/main/js/views/main_tree_col.js

@@ -10,11 +10,8 @@ let MainTreeCol = {
             } else if (node.sourceType === projectObj.project.Ration.getSourceType()) {
                 return '定';
             } else if (node.sourceType === projectObj.project.VolumePrice.getSourceType()) {
-                if (node.data.type === '人工') return '量人'
-                else if (node.data.type === '材料') return '量材'
-                else if (node.data.type === '机械') return '量机'
-                else if (node.data.type === '主材') return '量主'
-                else if (node.data.type === '设备') return '量设';
+                if (node.data.type.indexOf('量') != 0)
+                    return volumePriceMaps[node.data.type];
             } else if (node.sourceType === projectObj.project.ration_glj.getSourceType()) {
                 return '主';
             }

+ 10 - 4
web/building_saas/main/js/views/project_view.js

@@ -125,11 +125,17 @@ var projectObj = {
         else if (colSetting.data.field === 'programID') {
             return this.project.calcProgram.compiledTemplateMaps[editingText];
         }
+        else if (colSetting.data.field === 'type') {
+            if (editingText.indexOf('量') == 0)
+                return volumePriceMaps[editingText]
+            else
+                return editingText;
+        }
         else {
             return this.checkCommonField(editingText, colSetting);
         }
     },
-    updateAndReCalculate: function (node, fieldName, value) {
+    /*updateAndReCalculate: function (node, fieldName, value) {
         let project = projectObj.project, calc = new BillsCalcHelper(project), nodes = [];
         let getNodes = function (node) {
             let cur = node, nodes = [];
@@ -172,7 +178,7 @@ var projectObj = {
         }
         this.mainController.refreshTreeNode(nodes, false);
         calc = null;
-    },
+    },*/
     updateBillsCode: function (node, value) {
         let project = projectObj.project;
         let stdMatchCode, formatCode, matchs;
@@ -278,9 +284,9 @@ var projectObj = {
                        return;
                    }
                 } else if (fieldName === 'marketUnitFee') {
-                    if (value) {value = parseFloat(value).toDecimal(projectObj.project.Decimal.common.unitFee)};
+                    if (value) {value = parseFloat(value).toDecimal(decimalObj.decimal("unitPrice", node))};
                 } else if (fieldName === 'calcBase') {
-                    if (value) {value = parseFloat(value).toDecimal(projectObj.project.Decimal.common.totalFee)};
+                    if (value) {value = parseFloat(value).toDecimal(decimalObj.decimal("totalPrice", node))};
                 };
 
                 node.changed = true;