Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

app/public/js/stage.js

@@ -209,9 +209,9 @@ $(document).ready(() => {
                     {title: '变更令号', field: 'p_code', width: 100, formatter: '@', readOnly: true, hAlign: 0, },
                     {title: '名称', field: 'name', width: 120, formatter: '@', readOnly: true, hAlign: 0,},
                     {title: '变更部位', field: 'b_bwmx', width: 100, formatter: '@', readOnly: true, hAlign: 0,},
-                    //{title: '总数量', field: 'b_amount', width: 60, formatter: '@', readOnly: true, hAlign: 2, },
-                    {title: '可变更数量', field: 'vamount', width: 60, readOnly: true, hAlign: 2, getValue: function (data) {return data.vamount ? data.vamount + '' : '0';}},
-                    {title: '本期计量', field: 'uamount', width: 60, formatter: '@', hAlign: 2, type: 'Number', },
+                    //{title: '总数量', field: 'b_amount', width: 60, readOnly: true, hAlign: 2, },
+                    {title: '可变更数量', field: 'vamount', width: 60, readOnly: true, hAlign: 2, type: 'Number', getValue: function (data) {return data.vamount ? data.vamount + '' : '0';}},
+                    {title: '本期计量', field: 'uamount', width: 60, hAlign: 2, type: 'Number', },
                 ],
                 emptyRows: 0,
                 headRows: 1,