|
@@ -1053,7 +1053,7 @@ $(document).ready(() => {
|
|
|
{title: '变更详情', colSpan: '1', rowSpan: '2', field: 'detail', hAlign: 0, width: 120, formatter: '@', readOnly: 'readOnly.isEdit'},
|
|
|
{title: '计量上限(%)', colSpan: '1', rowSpan: '2', field: 'delimit', hAlign: 2, width: 60, type: 'Number', readOnly: 'readOnly.isSettle2', visible: openChangeState},
|
|
|
{title: '原设计|数量', colSpan: '1|1', rowSpan: '|1', field: 'oamount2', hAlign: 2, width: 120, type: 'Number', readOnly: 'readOnly.isSettle', getValue: 'getValue.oamount2'},
|
|
|
- {title: '申请变更增(+)减(-)|数量', colSpan: '1|1', rowSpan: '|1', field: 'camount', hAlign: 2, width: 120, readOnly: 'readOnly.isSettle2', getValue: 'getValue.camount'},
|
|
|
+ {title: '申请变更增(+)减(-)|数量', colSpan: '1|1', rowSpan: '|1', field: 'camount', type: 'Number', hAlign: 2, width: 120, readOnly: 'readOnly.isSettle2', getValue: 'getValue.camount'},
|
|
|
// {title: '数量', colSpan: '1', rowSpan: '2', field: 'oamount', hAlign: 2, width: 80},
|
|
|
],
|
|
|
emptyRows: 0,
|
|
@@ -1904,7 +1904,7 @@ $(document).ready(() => {
|
|
|
}
|
|
|
select.spamount = ZhCalc.round(validText, findDecimal(select.unit)) || 0;
|
|
|
select.camount_expr = exprQuantity.expr;
|
|
|
- select.camount = validText;
|
|
|
+ select.camount = ZhCalc.round(validText, findDecimal(select.unit)) || 0;
|
|
|
cInfo.spamount = select.spamount;
|
|
|
cInfo.camount_expr = select.camount_expr;
|
|
|
cInfo.camount = validText;
|
|
@@ -1922,6 +1922,7 @@ $(document).ready(() => {
|
|
|
changeSpreadObj.refreshXmjData();
|
|
|
}
|
|
|
}
|
|
|
+ changeSpreadObj.loadExprToInput(changeSpreadSheet);
|
|
|
}, function () {
|
|
|
select.camount = orgValue;
|
|
|
select.camount_expr = orgExprValue;
|
|
@@ -2479,10 +2480,10 @@ $(document).ready(() => {
|
|
|
}
|
|
|
select.spamount = ZhCalc.round(validText, findDecimal(select.unit)) || 0;
|
|
|
select.camount_expr = exprQuantity.expr;
|
|
|
- select.camount = validText;
|
|
|
+ select.camount = ZhCalc.round(validText, findDecimal(select.unit)) || 0;
|
|
|
cInfo.spamount = select.spamount;
|
|
|
cInfo.camount_expr = select.camount_expr;
|
|
|
- cInfo.camount = validText;
|
|
|
+ cInfo.camount = ZhCalc.round(validText, findDecimal(select.unit)) || 0;
|
|
|
// console.log(select);
|
|
|
delete cInfo.waitingLoading;
|
|
|
|
|
@@ -2495,6 +2496,7 @@ $(document).ready(() => {
|
|
|
changeSpreadObj.calcOneSum(node);
|
|
|
changeSpreadObj.reloadRow(changeSpreadSheet, billIndex);
|
|
|
changeSpreadObj.countSum();
|
|
|
+ xmjSpreadObj.loadExprToInput(xmjSheet);
|
|
|
}, function () {
|
|
|
select.camount = orgValue;
|
|
|
select.camount_expr = orgExprValue;
|