Bläddra i källkod

修复编办列设置极端情况下的bug

olym 8 år sedan
förälder
incheckning
2af241f939

+ 2 - 0
modules/users/models/engineering_lib_model.js

@@ -58,6 +58,8 @@ class EngineeringLibModel extends BaseModel {
     async addLib(valuationId, data) {
         if (data.main_tree_col) {
             data.main_tree_col = JSON.parse(data.main_tree_col);
+        } else {
+            delete data['main_tree_col'];
         }
 
         let result = false;

+ 0 - 11
modules/users/models/schemas/compilation.js

@@ -35,17 +35,6 @@ let childrenSchema = new Schema({
     // 类型
     type: {
         type: Number
-    },
-    // 列设置
-    main_tree_col: {
-        type: Schema.Types.Mixed,
-        default: {
-            "emptyRows":3,
-            "headRows":0,
-            "treeCol": 0,
-            "headRowHeight":[],
-            "cols":[]
-        }
     }
 });
 let modelSchema = {

+ 5 - 5
modules/users/models/schemas/engineering_lib.js

@@ -29,11 +29,11 @@ let modelSchema = {
     main_tree_col: {
         type: Schema.Types.Mixed,
         default: {
-            "emptyRows":3,
-            "headRows":0,
-            "treeCol": 0,
-            "headRowHeight":[],
-            "cols":[]
+            emptyRows: 3,
+            headRows: 0,
+            treeCol: 0,
+            headRowHeight: [],
+            cols:[]
         }
     },
     // 费率标准库

+ 7 - 2
web/users/js/compilation.js

@@ -234,14 +234,19 @@ function initCompilation() {
     let rationLibData = rationList === undefined ? [] : JSON.parse(rationList);
     let gljLibData = gljList === undefined ? [] : JSON.parse(gljList);
     let feeLibData = feeRateList === undefined ? [] : JSON.parse(feeRateList);
+    mainTreeCol = mainTreeCol === '' ? '' : JSON.parse(mainTreeCol);
+
     let artificialCoefficientData = artificialCoefficientList === undefined ? [] : JSON.parse(artificialCoefficientList);
 
     // 初始化 造价书列设置
     colSpread = TREE_SHEET_HELPER.createNewSpread($('#main-tree-col')[0]);
     let billsTemplateTree = idTree.createNew({id: 'ID', pid: 'ParentID', nid: 'NextSiblingID', rootId: -1});
+
     billsTemplateTree.loadDatas(JSON.parse(billsTemplateData));
-    TREE_SHEET_HELPER.loadSheetHeader(JSON.parse(mainTreeCol), colSpread.getActiveSheet());
-    TREE_SHEET_HELPER.showTreeData(JSON.parse(mainTreeCol), colSpread.getActiveSheet(), billsTemplateTree);
+    if (mainTreeCol !== '') {
+        TREE_SHEET_HELPER.loadSheetHeader(mainTreeCol, colSpread.getActiveSheet());
+        TREE_SHEET_HELPER.showTreeData(mainTreeCol, colSpread.getActiveSheet(), billsTemplateTree);
+    }
 
     if (billListData.length <= 0 || rationLibData.length <= 0 || gljLibData.length <= 0) {
         return false;