update

gulpfile.js

@@ -81,7 +81,7 @@ function minify(options) {
     if(options.jspaths){
         return gulp.src(options.jspaths)
             .pipe($.plumber())
-           // .pipe(uglify())
+            .pipe(uglify())
             .pipe($.concat(options.concatName+"."+version+".js"))
             .pipe(gulp.dest(scriptsDest));
     }
@@ -110,7 +110,7 @@ function inject(options) {
 
 function htmlmin(options) {
     return gulp.src(options.htmlDest+'/*.html')
-    //  .pipe($.htmlmin({collapseWhitespace: true}))
+        .pipe($.htmlmin({collapseWhitespace: true}))
         .pipe(gulp.dest(options.htmlDest));
 }
 

web/building_saas/glj/html/glj_index.html

@@ -21,7 +21,7 @@
             <div class="bottom-content">
                 <ul class="nav nav-tabs" role="tablist">
                     <li class="nav-item">
-                        <a class="nav-link active" data-toggle="tab" data-name="ration" href="#de" role="tab">相关定额</a>
+                        <a class="nav-link active" data-toggle="tab" data-name="ration" href="#glj_de" role="tab">相关定额</a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link" data-toggle="tab" data-name="mix-ratio" href="#ph" role="tab">配合比表</a>
@@ -32,7 +32,7 @@
                 </ul>
                 <!-- Tab panes -->
                 <div class="tab-content">
-                    <div class="tab-pane active" id="de" role="tabpanel">
+                    <div class="tab-pane active" id="glj_de" role="tabpanel">
                         <div class="main-data-bottom ovf-hidden">
                             相关定额
                         </div>

web/building_saas/main/js/main.js

@@ -14,6 +14,8 @@ $(function () {
 
     $('#tab_zaojiashu').on('shown.bs.tab', function (e) {
         $(e.relatedTarget.hash).removeClass('active');
+        $("#subItems").addClass('active');
+
         // do something
     });
 

web/building_saas/main/js/views/glj_view.js

@@ -582,6 +582,9 @@ var gljOprObj = {
         details=_.sortBy(details,'seq');
         sheetCommonObj.showData(this.detailSheet,this.detailSetting,details);
         this.detailData = details;
+        if(MainTreeCol.readOnly.forQuantifyDetail(node)){
+            this.detailSheet.getRange(-1,0,-1,this.detailSetting.header.length).locked(true);
+        }
     },
     clearSheetData:function () {
         sheetCommonObj.showData(this.sheet,this.setting,[]);

web/building_saas/main/js/views/main_tree_col.js

@@ -50,6 +50,9 @@ let MainTreeCol = {
         },
         forTotalFee: function (node) {
             return MainTreeCol.readOnly.non_bills(node) || MainTreeCol.readOnly.billsParent(node) || (MainTreeCol.readOnly.leafBillsWithDetail(node));
+        },
+        forQuantifyDetail:function (node) {
+            return !(node.sourceType==ModuleNames.ration||!MainTreeCol.readOnly.billsParent(node));
         }
     },
     cellType: {