1. 合同支付，往期添加的合同支付项，无公式情况下，本期金额应可编辑

2. 本期计量台账，计量bug

app/controller/stage_controller.js

@@ -206,7 +206,7 @@ module.exports = app => {
                 if (data.pos) {
                     responseData.data = await ctx.service.stagePos.updateStageData(data.pos);
                 } else if (data.bills) {
-                    responseData.data.bills = await ctx.service.stageBills.updateStageData(data.bills);
+                    responseData.data.curStageData = await ctx.service.stageBills.updateStageData(data.bills);
                 }
                 ctx.body = responseData;
             } catch (err) {

app/public/js/path_tree.js

@@ -1110,7 +1110,8 @@ const createNewPathTree = function (type, setting) {
         loadPostStageData(data) {
             let result, parents = [];
             if (data.bills) {
-                this._updateData(data.bills);
+                result = this._updateData(data.bills);
+                this._getNodesParents(parents, result);
             }
             if (data.curStageData) {
                 result = this._updateStageData(data.curStageData);

app/public/js/stage.js

@@ -460,7 +460,7 @@ $(document).ready(() => {
                 billsData[col.field] = col.type === 'Number' ? parseFloat(info.editingText) : info.editingText;
 
                 postData(window.location.href + '/update', { bills: billsData }, function (data) {
-                    const nodes = stageTree.loadPostStageData(data.bills);
+                    const nodes = stageTree.loadPostStageData(data);
                     stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes);
                 });
             }
@@ -506,7 +506,7 @@ $(document).ready(() => {
                 }
                 if (datas.length > 0) {
                     postData(window.location.href + '/update', {bills: datas}, function (result) {
-                        const nodes = stageTree.loadPostStageData(result.bills);
+                        const nodes = stageTree.loadPostStageData(result);
                         stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes);
                     });
                 }
@@ -562,10 +562,9 @@ $(document).ready(() => {
                         datas.push(data);
                     }
                 }
-                console.log(datas);
                 if (datas.length > 0) {
                     postData(window.location.href + '/update', { bills: datas }, function (data) {
-                        const nodes = stageTree.loadPostStageData(data.bills);
+                        const nodes = stageTree.loadPostStageData(data);
                         stageTreeSpreadObj.refreshTreeNodes(slSpread.getActiveSheet(), nodes.concat(filterNodes));
                     });
                 } else {

app/public/js/stage_pay.js

@@ -102,7 +102,7 @@ $(document).ready(() => {
                 return readOnly || (payCol.readOnly.isSpecial(data) || payCol.readOnly.isOld(data));
             },
             tp: function (data) {
-                return data.ptype === 2 || data.ptype === 4 || payCol.readOnly.isOld(data);
+                return data.ptype === 2 || data.ptype === 4 || (payCol.readOnly.isOld(data) && data.expr);
             },
             sprice: function (data) {
                 return payCol.readOnly.isSpecial(data) || payCol.readOnly.isOld(data);