|
@@ -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;
|