Bills & Ration, comments

public/web/tree_sheet/tree_sheet_controller.js

@@ -118,6 +118,9 @@ var TREE_SHEET_CONTROLLER = {
         }
 
         controller.prototype.setTreeSelected = function (node) {
+            if (this.event.beforeTreeSelectedChange) {
+                this.event.beforeTreeSelectedChange(this.tree.selected);
+            }
             this.tree.selected = node;
             if (this.event.refreshBaseActn) {
                 this.event.refreshBaseActn(this.tree);
@@ -135,6 +138,7 @@ var TREE_SHEET_CONTROLLER = {
     },
     eventName: {
         refreshBaseActn: 'refreshBaseActn',
+        beforeTreeSelectedChange: 'beforeTreeSelectedChange',
         treeSelectedChanged: 'treeSelectedChanged',
         cellDoubleClick: 'cellDoubleClick'
     }

web/building_saas/main/html/main.html

@@ -147,10 +147,10 @@
                                       <a class="nav-link" id="linkJSCX" data-toggle="tab" href="#subSpread" role="tab">计算程序</a>
                                   </li>
                                   <li class="nav-item">
-                                      <a class="nav-link" id="linkFXSM" data-toggle="tab" href="#subSpread" role="tab">分项说明</a>
+                                      <a class="nav-link" id="linkFXSM" data-toggle="tab" href="#fxComments" role="tab">分项说明</a>
                                   </li>
                                   <li class="nav-item">
-                                      <a class="nav-link" id="linkDESM" data-toggle="tab" href="#subSpread" role="tab">定额说明</a>
+                                      <a class="nav-link" id="linkDESM" data-toggle="tab" href="#rationComments" role="tab">定额说明</a>
                                   </li>
                                   <li class="nav-item">
                                       <a class="nav-link" id="linkTZJNR" data-toggle="tab" href="#subSpread" role="tab">特征及内容</a>
@@ -158,9 +158,15 @@
                               </ul>
                               <!-- Tab panes -->
                               <div class="tab-content" id="tabCon">
-                                  <div class="tab-pane active" id="gl" role="tabpanel">
+                                  <div class="tab-pane active" id="subItems" role="tabpanel">
                                       <div class="main-data-bottom ovf-hidden" id="subSpread" style="display: none">
                                       </div>
+                                      <div class="main-data-bottom ovf-hidden" style="display: none" id="fxComments">
+                                          <textarea class="form-control"  rows="8"></textarea>
+                                      </div>
+                                      <div class="main-data-bottom ovf-hidden" style="display: none" id="rationComments">
+                                          <textarea class="form-control"  rows="8"></textarea>
+                                      </div>
                                       <div id="tzjnrCon" class="main-data-bottom">
                                           <div class="main-data-bottom ovf-hidden" style="width: 40%; float: left;" id="jobSpread">
                                           </div>
@@ -503,9 +509,6 @@
     <!--<script src="/lib/spreadjs/views/common/gc.spread.common.10.0.0.min.js" type="text/javascript"></script>-->
     <script src="/lib/spreadjs/views/plugins/gc.spread.views.gridlayout.10.0.0.min.js" type="text/javascript"></script>
     <!--<script src="/lib/spreadjs/views/locale/gc.spread.views.dataview.locale.zh-CN.10.0.0.min.js" type="text/javascript"></script>-->
-    <script>GC.Spread.Views.LicenseKey = "559432293813965#A0y3iTOzEDOzkjMyMDN9UTNiojIklkI1pjIEJCLi4TPB9mM5AFNTd4cvZ7SaJUVy3CWKtWYXx4VVhjMpp7dYNGdx2ia9sEVlZGOTh7NRlTUwkWR9wEV4gmbjBDZ4ElR8N7cGdHVvEWVBtCOwIGW0ZmeYVWVr3mI0IyUiwCMzETN8kzNzYTM0IicfJye&Qf35VfiEzRwEkI0IyQiwiIwEjL6ByUKBCZhVmcwNlI0IiTis7W0ICZyBlIsIyNyMzM5ADI5ADNwcTMwIjI0ICdyNkIsIibj9SbvNmL4N7bjRnch56ciojIz5GRiwiI8+Y9sWY9QmZ0Jyp96uL9v6L0wap9biY9qiq95q197Wr9g+89iojIh94Wiqi";</script>
-
-
     <!-- Model -->
     <script type="text/javascript" src="/web/building_saas/main/js/models/main_consts.js"></script>
     <script type="text/javascript" src="/web/building_saas/main/js/models/project.js"></script>

web/building_saas/main/js/views/project_view.js

@@ -7,6 +7,11 @@ var projectObj = {
     mainSpread: null,
     mainController: null,
     gljSpreed:null,
+    beforeMainTreeSelectedChange: function (node) {
+        if (node) {
+            subViewObj.saveComments(node);
+        }
+    },
     checkCommonField: function (editingText, colSetting) {
         let value;
         if (colSetting.data.decimal) {
@@ -163,7 +168,9 @@ var projectObj = {
                 that.project.calcProgram = new CalcProgram(that.project);
                 that.project.calcProgram.compileAllTemps();
 
+                that.mainController.bind(TREE_SHEET_CONTROLLER.eventName.beforeTreeSelectedChange, that.beforeMainTreeSelectedChange);
                 that.mainController.bind(TREE_SHEET_CONTROLLER.eventName.treeSelectedChanged, function (node) {
+                    subViewObj.loadComments(node);
                     gljOprObj.showDataIfRationSelect(node);
 
                     // CSL.2017.07.25

web/building_saas/main/js/views/sub_view.js

@@ -8,7 +8,7 @@ contentOprObj.buildSheet($("#jobSpread")[0]);
 characterOprObj.buildSheet($("#itemSpread")[0]);
 $("#tzjnrCon").hide();
 $("#subSpread").show();
-var subSpread = sheetCommonObj.createSpread($("#subSpread")[0], 7);
+var subSpread = sheetCommonObj.createSpread($("#subSpread")[0], 5);
 subSpread.getSheet(4).name('JSCX');
 
 pageCCOprObj.active = false;
@@ -93,26 +93,6 @@ $("#linkJSCX").click(function(){        // 计算程序
     };
 });
 
-$("#linkFXSM").click(function(){
-    $("#tzjnrCon").hide();
-    $("#subSpread").show();
-    pageCCOprObj.active = false;
-    refreshSubSpread();
-    subSpread.setActiveSheetIndex(5);
-    // for test
-    subSpread.getActiveSheet().setValue(0, 0, "分项说明");
-});
-
-$("#linkDESM").click(function(){
-    $("#tzjnrCon").hide();
-    $("#subSpread").show();
-    pageCCOprObj.active = false;
-    refreshSubSpread();
-    subSpread.setActiveSheetIndex(6);
-    // for test
-    subSpread.getActiveSheet().setValue(0, 0, "定额说明");
-});
-
 //特征及内容
 $("#linkTZJNR").click(function () {
     $("#subSpread").hide();
@@ -141,4 +121,41 @@ function refreshSubSpread(){
     else{
         subSpread.refresh();
     }
-}
+}
+
+let subViewObj = {
+    linkTabClick: function () {
+        $("#subItems").children().hide();
+        $($(this).attr('href')).show();
+    },
+    loadComments: function (node) {
+        let select = node;
+        if (select && select.sourceType === projectObj.project.Bills.getSourceType()) {
+            $('#fxComments>textarea').val(select.data.comments).removeAttr('readOnly');
+        } else {
+            $('#fxComments>textarea').val('').attr('readOnly', true);
+        }
+        if (select && select.sourceType === projectObj.project.Ration.getSourceType()) {
+            $('#rationComments>textarea').val(select.data.comments).removeAttr('readOnly');
+        } else {
+            $('#rationComments>textarea').val('').attr('readOnly', true);
+        }
+    },
+    saveComments: function (node) {
+        let select = node;
+        if (select.sourceType === projectObj.project.Bills.getSourceType()) {
+            let text = $('#fxComments>textarea').val();
+            if (select.data.comments !== text) {
+                projectObj.project.Bills.updateField(select.source, 'comments', text);
+            }
+        } else if (select.sourceType === projectObj.project.Ration.getSourceType()) {
+            let text = $('#rationComments>textarea').val();
+            if (select.data.comments !== text) {
+                projectObj.project.Ration.updateField(select.source, 'comments', text);
+            }
+        }
+    }
+}
+
+$("#linkFXSM").click(subViewObj.linkTabClick);
+$("#linkDESM").click(subViewObj.linkTabClick);