Browse Source

清单模板debug

zhongzewei 7 years ago
parent
commit
835371256d
2 changed files with 2 additions and 1 deletions
  1. 1 1
      modules/users/models/bills_template_model.js
  2. 1 0
      web/users/js/col_setting.js

+ 1 - 1
modules/users/models/bills_template_model.js

@@ -50,7 +50,7 @@ class BillsTemplateModel extends BaseModel {
             for (let data of datas) {
                 data.data.valuationId = valuationId;
                 data.data.engineering = engineering;
-                let condition = {valuationId: valuationId, ID: data.data.ID}, result;
+                let condition = {valuationId: valuationId, engineering: engineering, ID: data.data.ID}, result;
                 if (data.type === 'update') {
                     result = await this.db.update(condition, data.data);
                     if (result === undefined || result.ok ===undefined || !result.ok) {

+ 1 - 0
web/users/js/col_setting.js

@@ -215,6 +215,7 @@ let ColSettingObj = {
         }
     },
     getActualCellRange: function (cellRange, rowCount, columnCount) {
+        let spreadNS = GC.Spread.Sheets;
         if (cellRange.row == -1 && cellRange.col == -1) {
             return new spreadNS.Range(0, 0, rowCount, columnCount);
         }