瀏覽代碼

feat: 清单规则工程内容下标问题

vian 1 年之前
父節點
當前提交
a9f03e1dcb
共有 2 個文件被更改,包括 7 次插入5 次删除
  1. 3 2
      web/maintain/bills_lib/html/qingdan.html
  2. 4 3
      web/maintain/bills_lib/scripts/db_controller.js

+ 3 - 2
web/maintain/bills_lib/html/qingdan.html

@@ -951,8 +951,9 @@
                     sheet.setValue(i, 2, sheetBillsDatas.datasIdx['rowIdx'+ i].name);
                     sheet.setValue(i, 3, sheetBillsDatas.datasIdx['rowIdx'+ i].unit);
                     sheet.setValue(i, 4, sheetBillsDatas.datasIdx['rowIdx'+ i].ruleText);
-                    sheet.setValue(i, 5, sheetBillsDatas.datasIdx['rowIdx'+ i].engineering);
-                    sheet.setValue(i, 6, sheetBillsDatas.datasIdx['rowIdx'+ i].fixedFlag);
+                    sheet.setValue(i, 5, sheetBillsDatas.datasIdx['rowIdx'+ i].engineerContent);
+                    sheet.setValue(i, 6, sheetBillsDatas.datasIdx['rowIdx'+ i].engineering);
+                    sheet.setValue(i, 7, sheetBillsDatas.datasIdx['rowIdx'+ i].fixedFlag);
                 }
                 else {
                     sheet.clear(i, 0, 1, sheet.getColumnCount(), GC.Spread.Sheets.SheetArea.viewport,GC.Spread.Sheets.StorageType.data);

+ 4 - 3
web/maintain/bills_lib/scripts/db_controller.js

@@ -1132,9 +1132,10 @@ var tools = {
             for (let i = 0; i < controller.tree.items.length; i++) {
                 let kind = sheet.getValue(i, 0), code = sheet.getValue(i, 1), name = sheet.getValue(i, 2),
                     unit = sheet.getValue(i, 3), ruleText = sheet.getValue(i, 4),
-                    engineering = sheet.getValue(i, 5),
-                    fixedFlag = sheet.getValue(i, 6);
-                let data = { kind: kind, code: code, name: name, unit: unit, ruleText: ruleText, engineering: engineering, fixedFlag: fixedFlag, rowIdx: i };
+                    engineerContent = sheet.getValue(i, 5),
+                    engineering = sheet.getValue(i, 6),
+                    fixedFlag = sheet.getValue(i, 7);
+                let data = { kind: kind, code: code, name: name, unit: unit, ruleText: ruleText, engineerContent, engineering: engineering, fixedFlag: fixedFlag, rowIdx: i };
                 sheetDatas.datas.push(data);
                 sheetDatas.datasIdx['rowIdx' + i] = data;
             }