Browse Source

修复变更清单切换排序导致可删除bug

ellisran 1 year atrás
parent
commit
4392a59477
2 changed files with 6 additions and 2 deletions
  1. 4 1
      app/public/js/change_information_set.js
  2. 2 1
      app/service/change.js

+ 4 - 1
app/public/js/change_information_set.js

@@ -1911,7 +1911,10 @@ $(document).ready(() => {
                     $('.order_text').text('插入');
                     changeOrder = newChangeOrder;
                 }
-                changeList = result;
+                changeList = result.changeList;
+                changeUsedData = result.usedList;
+                SpreadJsObj.initSpreadSettingEvents(changeSpreadSetting, changeCol);
+                SpreadJsObj.initSheet(changeSpreadSheet, changeSpreadSetting);
                 SpreadJsObj.loadSheetData(changeSpreadSheet, SpreadJsObj.DataType.Data, changeList);
                 changeSpreadObj.makeSjsFooter();
                 changeSpreadObj.resetXmjSpread(SpreadJsObj.getSelectObject(changeSpreadSheet));

+ 2 - 1
app/service/change.js

@@ -784,7 +784,8 @@ module.exports = app => {
                 };
                 await transaction.update(this.tableName, postData, options);
                 await transaction.commit();
-                result = changeList;
+                result = { changeList,
+                    usedList: await this.ctx.service.stageChange.getFinalUsedData(this.ctx.tender.id, this.ctx.change.cid) };
             } catch (error) {
                 await transaction.rollback();
                 result = false;