打开项目后，拉取项目清单数据

modules/main/controllers/bills_controller.js

@@ -19,7 +19,6 @@ module.exports = {
             }
         });
     },
-
     updateBills: function(req, res){
         var data = JSON.parse(req.body.data);
         billsData.updateBills(data, function(err, message, errList){

test/tmp_data/bills_grid_setting.js

@@ -5,7 +5,7 @@ var BillsGridSetting = {
     cols: [
         {
             head: {
-                titleNames: ['编号'],
+                titleNames: ['项目编码'],
                 spanCols: [1],
                 spanRows: [2],
                 vAlign: [1, 1],
@@ -13,33 +13,16 @@ var BillsGridSetting = {
                 font: '9px Arial'
             },
             data: {
-                field: 'Code',
+                field: 'code',
                 vAlign: 1,
                 hAlign: 0,
                 font: '9px Arial'
             },
-            width: 150
-        },
-        {
-            head: {
-                titleNames: ['清单编号'],
-                spanCols: [1],
-                spanRows: [2],
-                vAlign: [1, 1],
-                hAlign: [1, 1],
-                font: '9px Arial'
-            },
-            data: {
-                field: 'B_Code',
-                vAlign: 1,
-                hAlign: 0,
-                font: '9px Arial'
-            },
-            width: 100
+            width: 200
         },
         {
             head: {
-                titleNames: ['名称'],
+                titleNames: ['项目名称'],
                 spanCols: [1],
                 spanRows: [2],
                 vAlign: [1, 1],
@@ -47,7 +30,7 @@ var BillsGridSetting = {
                 font: '9px Arial'
             },
             data: {
-                field: 'Name',
+                field: 'name',
                 vAlign: 1,
                 hAlign: 0,
                 font: '9px Arial'
@@ -64,7 +47,7 @@ var BillsGridSetting = {
                 font: '9px Arial'
             },
             data: {
-                field: 'Units',
+                field: 'unit',
                 vAlign: 1,
                 hAlign: 1,
                 font: '9px Arial'

web/main/html/main.html

@@ -534,6 +534,7 @@
     <!-- view -->
     <script type="text/javascript" src="web/main/js/main_ajax.js"></script>
     <script type="text/javascript" src="web/main/js/main.js"></script>
+    <script type="text/javascript" src="/public/web/common_ajax.js"></script>
     <SCRIPT type="text/javascript">
   		<!--
   		var setting = {
@@ -615,7 +616,7 @@
         billsSpread.options.scrollbarMaxAlign = true;
 
         // For Test
-        datas.forEach(function (data) {
+        /*datas.forEach(function (data) {
             data.fees = [];
             data.fees.push({fieldName: 'labour', unitFee: '1', totalFee: '2', tenderUnitFee: '3', tenderTotalFee: '4'});
             data.flags = [];
@@ -626,30 +627,33 @@
             data.fees.push({fieldName: 'machine', unitFee: '5', totalFee: '6', tenderUnitFee: '7', tenderTotalFee: '8'});
             data.flags = [];
             data.flags.push({fieldName: 'isPartGather', flag: false});
-        });
+        });*/
 
         project = PROJECT.createNew();
-        project.Bills.loadDatas(datas);
-        project.Rations.loadDatas(drawing_data);
-        project.loadMainTree();
-        //project.mainTree.loadDatas(project.Bills.tree, project.Rations.datas);
+        CommonAjax.post('/bills/getBills', {}, function (bills) {
+            project.Bills.loadDatas(bills);
+            project.Rations.loadDatas([]);
+            //project.Rations.loadDatas(drawing_data);
+            project.loadMainTree();
 
-        controller = TREE_SHEET_CONTROLLER.createNew(project.mainTree, billsSpread.getActiveSheet(), BillsGridSetting);
-        //controller = TREE_SHEET_CONTROLLER.createNew(project.Bills.tree, billsSpread.getActiveSheet(), BillsGridSetting);
-        controller.showTreeData();
-        controller.bind('refreshBaseActn', function (tree) {
-            var showButton = function (show, btn) {
-                if (show) {
-                    btn.show();
-                } else {
-                    btn.hide();
-                }
-            };
-            showButton(tree.selected && tree.selected.canUpLevel(), $('#upLevel'));
-            showButton(tree.selected && tree.selected.canDownLevel(), $('#downLevel'));
-            showButton(tree.selected && tree.selected.canUpMove(), $('#upMove'));
-            showButton(tree.selected && tree.selected.canDownMove(), $('#downMove'));
-            showButton(tree.selected ? true : false, $('#delete'));
+            controller = TREE_SHEET_CONTROLLER.createNew(project.mainTree, billsSpread.getActiveSheet(), BillsGridSetting);
+            //controller = TREE_SHEET_CONTROLLER.createNew(project.Bills.tree, billsSpread.getActiveSheet(), BillsGridSetting);
+
+            controller.showTreeData();
+            controller.bind('refreshBaseActn', function (tree) {
+                var showButton = function (show, btn) {
+                    if (show) {
+                        btn.show();
+                    } else {
+                        btn.hide();
+                    }
+                };
+                showButton(tree.selected && tree.selected.canUpLevel(), $('#upLevel'));
+                showButton(tree.selected && tree.selected.canDownLevel(), $('#downLevel'));
+                showButton(tree.selected && tree.selected.canUpMove(), $('#upMove'));
+                showButton(tree.selected && tree.selected.canDownMove(), $('#downMove'));
+                showButton(tree.selected ? true : false, $('#delete'));
+            });
         });
 
         $('#insert').click(function () {

web/main/js/models/bills.js

@@ -11,10 +11,10 @@ var Bills = {
             rootId: -1
         };
 
-        // 用户定义private方法
+        // 鐢ㄦ埛瀹氫箟private鏂规硶
         var tools = {};
 
-        // 所有通过this访问的属性，都不应在此单元外部进行写入操作
+        // 所有通过this访问的属性，都不应在此单元外部进行写入操作
         var bills = function (proj) {
             this.project = proj;
             this.datas = null;
@@ -26,19 +26,23 @@ var Bills = {
             }
         };
 
-        // prototype用于定义public方法
+        // prototype鐢ㄤ簬瀹氫箟public鏂规硶
         bills.prototype.loadDatas = function (datas) {
             this.datas = datas;
-            // generate Fees & Flags Index，For View & Calculate
+            // generate Fees & Flags Index, For View & Calculate
             this.datas.forEach(function (data) {
                 data.FeesIndex = {};
-                data.fees.forEach(function (fee) {
-                    data.FeesIndex[fee.fieldName] = fee;
-                });
+                if (data.fees) {
+                    data.fees.forEach(function (fee) {
+                        data.FeesIndex[fee.fieldName] = fee;
+                    });
+                }
                 data.FlagsIndex = {};
-                data.flags.forEach(function (flag) {
-                    data.FlagsIndex[flag.fieldName] = flag;
-                });
+                if (data.flags) {
+                    data.flags.forEach(function (flag) {
+                        data.FlagsIndex[flag.fieldName] = flag;
+                    });
+                }
             });
             // datas load to Tree
             this.tree.loadDatas(this.datas);