修复bug变更清单

app/public/js/change_information.js

@@ -753,6 +753,7 @@ $(document).ready(() => {
                         SpreadJsObj.loadSheetData(xmjSheet, SpreadJsObj.DataType.Data, []);
                         return;
                     }
+                    console.log(info);
                     changeSpreadObj.refreshXmjData();
                     if (!readOnly) changeSpreadObj.refreshActn();
                 }
@@ -1917,6 +1918,11 @@ $(document).ready(() => {
                 changeSpreadObj.calcOneSum(select);
                 changeSpreadObj.countSum();
                 changeSpreadObj.refreshActn();
+                if (SpreadJsObj.getSelectObject(changeSpreadSheet) === select) {
+                    if (select.children && select.children.length === 1) {
+                        changeSpreadObj.refreshXmjData();
+                    }
+                }
             }, function () {
                 select.camount = orgValue;
                 select.camount_expr = orgExprValue;
@@ -2017,6 +2023,7 @@ $(document).ready(() => {
             }
 
             const select = info.sheet.zh_data ? info.sheet.zh_data[info.row] : null;
+            console.log(info.sheet.zh_data);
             const cInfo = _.find(changeList, { id: select.id });
             if (!cInfo) {
                 toastr.error('数据错误，请刷新页面重试');
@@ -2114,18 +2121,28 @@ $(document).ready(() => {
             select[col.field] = validText;
             console.log(cInfo);
             delete cInfo.waitingLoading;
+            const children = info.sheet.zh_data;
 
             // 更新至服务器
             postData(window.location.pathname + '/save', { type:'update', updateData: cInfo }, function (result) {
                 SpreadJsObj.reLoadRowData(info.sheet, info.row);
                 const billIndex = _.indexOf(changeSpreadSheet.zh_data, node);
-                node.children = info.sheet.zh_data;
+                node.children = children;
                 if (node.children && node.children.length === 1) {
                     node[col.field] = validText;
+                    if (col.field === 'camount') {
+                        node.spamount = select.spamount;
+                        node.camount_expr = select.camount_expr;
+                    }
                 }
                 xmjSpreadObj.loadExprToInput();
                 changeSpreadObj.calcOneSum(node);
-                changeSpreadObj.reloadRow(changeSpreadSheet, billIndex);
+                console.log(node);
+                if (SpreadJsObj.getSelectObject(changeSpreadSheet) !== node) {
+                    SpreadJsObj.reLoadRowData(changeSpreadSheet, billIndex);
+                } else {
+                    changeSpreadObj.reloadRow(changeSpreadSheet, billIndex);
+                }
                 changeSpreadObj.countSum();
             }, function () {
                 select[col.field] = orgValue;
@@ -4742,6 +4759,9 @@ $(document).ready(() => {
         changeSpread.bind(spreadNS.Events.ClipboardPasted, changeSpreadObj.clipboardPasted);
         SpreadJsObj.addDeleteBind(changeSpread, changeSpreadObj.deletePress);
 
+        xmjSpreadObj.editStarting = function (e, info) {
+            xmjSpreadObj.billsNode = SpreadJsObj.getSelectObject(changeSpreadSheet);
+        };
         xmjSpreadObj.editEnded = function (e, info) {
             if (!info.sheet.zh_setting) {
                 SpreadJsObj.reLoadRowData(info.sheet, info.row);
@@ -4763,7 +4783,7 @@ $(document).ready(() => {
                 return;
             }
 
-            const node = SpreadJsObj.getSelectObject(changeSpreadSheet);
+            const node = xmjSpreadObj.billsNode;
             if (!node) {
                 toastr.error('数据错误，请选择清单节点后再试');
                 SpreadJsObj.reLoadRowData(info.sheet, info.row);
@@ -4967,7 +4987,7 @@ $(document).ready(() => {
             }
             return;
         };
-
+        xmjSpread.bind(spreadNS.Events.EditStarting, xmjSpreadObj.editStarting);
         xmjSpread.bind(spreadNS.Events.EditEnded, xmjSpreadObj.editEnded);
         xmjSpread.bind(spreadNS.Events.ClipboardPasted, xmjSpreadObj.clipboardPasted);
         SpreadJsObj.addDeleteBind(xmjSpread, xmjSpreadObj.deletePress);

app/service/material_audit.js

@@ -834,9 +834,9 @@ module.exports = app => {
                     await this.ctx.service.noticeAgain.addNoticeAgain(transaction, smsTypeConst.const.TC, {
                         pid: this.ctx.session.sessionProject.id,
                         tid: this.ctx.tender.id,
-                        uid: checkingAuditors.aid,
+                        uid: a.aid,
                         sp_type: 'material',
-                        sp_id: checkingAuditors.id,
+                        sp_id: a.id,
                         table_name: this.tableName,
                         template: wxConst.template.material,
                         wx_data: wechatData,