resolve conflict For 80de98c785bf4b9cc413ed36f871747b32dfc3c6(merge on 4/27)

web/main/html/main.html

@@ -629,30 +629,6 @@
             data.flags.push({fieldName: 'isPartGather', flag: false});
         });*/
 
-<<<<<<< HEAD
-        project = PROJECT.createInit();
-        project.Bills.loadDatas(datas);
-        project.Rations.loadDatas(drawing_data);
-        project.loadMainTree();
-        //project.mainTree.loadDatas(project.Bills.tree, project.Rations.datas);
-
-        controller = TREE_SHEET_CONTROLLER.createInit(project.mainTree, billsSpread.getActiveSheet(), BillsGridSetting);
-        //controller = TREE_SHEET_CONTROLLER.createInit(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'));
-=======
         project = PROJECT.createNew();
         CommonAjax.post('/bills/getData', {projectId: scUrlUtil.GetQueryString('project')}, function (bills) {
             project.Bills.loadDatas(bills);
@@ -678,7 +654,6 @@
                 showButton(tree.selected && tree.selected.canDownMove(), $('#downMove'));
                 showButton(tree.selected ? true : false, $('#delete'));
             });
->>>>>>> bc0f5d2858a5b09273a8d6ed5620a4deb05293b2
         });
 
         $('#insert').click(function () {

web/main/js/models/bills.js

@@ -11,17 +11,10 @@ var Bills = {
             rootId: -1
         };
 
-<<<<<<< HEAD
-        // �û�����private����
-        var tools = {};
-
-        // ����ͨ��this���ʵ����ԣ�����Ӧ�ڴ˵�Ԫ�ⲿ����д�����
-=======
         // 用户定义private方法
         var tools = {};
 
         // 所有通过this访问的属性，都不应在此单元外部进行写入操作
->>>>>>> bc0f5d2858a5b09273a8d6ed5620a4deb05293b2
         var bills = function (proj) {
             this.project = proj;
             this.datas = null;
@@ -34,12 +27,6 @@ var Bills = {
             proj.registerModule(ModuleNames.bills, this);
         };
 
-<<<<<<< HEAD
-        // prototype���ڶ���public����
-        bills.prototype.loadDatas = function (datas) {
-            this.datas = datas;
-            // generate Fees & Flags Index��For View & Calculate
-=======
         // 从后台获取数据
         bills.prototype.pullData = function (){
             this.project.pullData(
@@ -62,7 +49,6 @@ var Bills = {
         bills.prototype.loadDatas = function (datas) {
             this.datas = datas;
             // generate Fees & Flags Index, For View & Calculate
->>>>>>> bc0f5d2858a5b09273a8d6ed5620a4deb05293b2
             this.datas.forEach(function (data) {
                 data.FeesIndex = {};
                 if (data.fees) {

web/main/js/models/project.js

@@ -2,13 +2,6 @@
  * Created by Mai on 2017/4/1.
  */
 var PROJECT = {
-<<<<<<< HEAD
-    createNew: function () {
-        // ����private����
-        var tools = {};
-
-        // ����ͨ��this���ʵ����ԣ�����Ӧ�ڴ˵�Ԫ�ⲿ����д�����
-=======
     createNew: function (projectID, userID) {
         // 定义private方法
         var tools = {
@@ -29,29 +22,17 @@ var PROJECT = {
         };
 
         // 所有通过this访问的属性，都不应在此单元外部进行写入操作
->>>>>>> bc0f5d2858a5b09273a8d6ed5620a4deb05293b2
         var project = function () {
             this.mainTree = cacheTree.createInit(this);
 
-<<<<<<< HEAD
-            this.Bills = Bills.createInit(this);
-            this.Rations = Rations.createInit(this);
-            this.GLJs = GLJs.createInit(this);
-=======
             this.Bills = Bills.createNew(this);
             this.Ration = Ration.createNew(this);
             this.GLJ = GLJ.createNew(this);
->>>>>>> bc0f5d2858a5b09273a8d6ed5620a4deb05293b2
-
 
             this.masterField = {ration: 'BillsID'};
         };
 
-<<<<<<< HEAD
-        // prototype���ڶ���public����
-=======
         // prototype用于定义public方法
->>>>>>> bc0f5d2858a5b09273a8d6ed5620a4deb05293b2
         project.prototype.modify = function (modifyDatas, callback) {
             // To Do
         };

web/templates/js/bills.js

@@ -33,12 +33,7 @@ $(document).ready(function () {
         });
     };
 
-<<<<<<< HEAD
-    var bills;
-    var tree = idTree.createInit({id: 'ID', pid: 'ParentID', nid: 'NextSiblingID', rootId: -1});
-=======
     var tree = idTree.createNew({id: 'ID', pid: 'ParentID', nid: 'NextSiblingID', rootId: -1, autoUpdate: true});
->>>>>>> bc0f5d2858a5b09273a8d6ed5620a4deb05293b2
     var billsSpread = new GC.Spread.Sheets.Workbook($('#billsSpread')[0], { sheetCount: 1 });
     var controller = TREE_SHEET_CONTROLLER.createInit(tree, billsSpread.getActiveSheet(), TEMPLATE_BILLS_SETTING);