|
@@ -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;
|