显示至、插入定额bug

modules/all_models/compleGlj_glj.js

@@ -28,6 +28,11 @@ const comple_glj = new Schema({
     gljType: Number,
     model: Number,
     shortName: String,
+    //以下仅普通材料可用
+    grossWeightCoe: Number, //毛重系数
+    purchaseStorageRate: Number, //采购保管费率
+    offSiteTransportLossRate: Number, //场外运输损耗率
+    handlingLossRate: Number, //每增一次装卸损耗率
     component: [comple_gljComponent]
 }, {versionKey: false});
 

modules/all_models/std_glj.js

@@ -30,6 +30,7 @@ const std_glj = new Schema({
         type: Schema.Types.Mixed,
         default: {}
     },
+    model: Number,
     gljClass: Number,
     gljType: Number,
     shortName: String,

web/building_saas/main/html/main.html

@@ -106,14 +106,12 @@
                           <div class="dropdown-menu dropright" id="moreMenu">
                               <a id="displayA" href="javascript:void(0);" data-toggle="dropdown" class="dropdown-item dropdown-toggle"><i class="fa fa-list-ol"></i> 显示至...</a>
                               <div id="subDisplay" class="dropdown-menu dropdown-menu-left" style="min-width: 6.5rem; position: absolute; transform: translate3d(158px, 3px, 0px); top: 0px; left: 0px; will-change: transform;" x-placement="right-start">
-                                  <a class="dropdown-item btn-sm" href="javascript:void(0);" id="displayDXFY">大项费用</a>
-                                  <a class="dropdown-item btn-sm" href="javascript:void(0);"  id="displayFB1">一级分部</a>
-                                  <a class="dropdown-item btn-sm" href="javascript:void(0);" id="displayFB2">二级分部</a>
-                                  <a class="dropdown-item btn-sm" href="javascript:void(0);" id="displayFB3">三级分部</a>
-                                  <a class="dropdown-item btn-sm" href="javascript:void(0);"  id="displayFB4">四级分部</a>
-                                  <a class="dropdown-item btn-sm" href="javascript:void(0);"  id="displayFX">分项(清单)</a>
-                                  <a class="dropdown-item btn-sm" href="javascript:void(0);" id="displayZM">子目</a>
-                                  <a class="dropdown-item btn-sm" href="javascript:void(0);"  id="displayZD">最底层</a>
+                                  <a class="dropdown-item btn-sm" href="javascript:void(0);" id="displayX">项</a>
+                                  <a class="dropdown-item btn-sm" href="javascript:void(0);"  id="displayM">目</a>
+                                  <a class="dropdown-item btn-sm" href="javascript:void(0);" id="displayJ">节</a>
+                                  <a class="dropdown-item btn-sm" href="javascript:void(0);" id="displayXM">细目</a>
+                                  <a class="dropdown-item btn-sm" href="javascript:void(0);"  id="displayZDCXM">最底层细目</a>
+                                  <a class="dropdown-item btn-sm" href="javascript:void(0);"  id="displayDE">定额</a>
                               </div>
                               <a href="javascript:void(0);" id="ZLFB_btn" class="dropdown-item" data-placement="bottom"><i class="fa fa-retweet" aria-hidden="true"></i> 整理分部</a>
                               <% if (projectData.property.lockBills == true) { %>
@@ -313,7 +311,7 @@
                                       <div class="main-data-bottom ovf-hidden" style="display: none" id="comments">
                                           <textarea style="font-size: 0.9rem" class="form-control" rows="8" readonly=""></textarea>
                                       </div>
-                                      <div class="container-fluid main-data-bottom" id="qdjl" role="tabpanel">
+                                      <div class="container-fluid main-data-bottom ovf-hidden" id="qdjl" role="tabpanel">
                                           <div class="row p-0" style="background: #efefef">
                                               <div class="col-6 p-0">
                                                   <div id="qdjlTools" style="width: calc(100% - 5px); border-bottom: solid 1px lightgrey;">

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

@@ -2143,17 +2143,12 @@ $('#ZLFB_btn').click(function () {
 let displayLevel = function(nodes, depth, type){
     let refreshNodes = [];
     function getExpandedController(){
-        if(type === 'DXFY' || type === 'FB'){
-            if(type === 'FB'){
-                projectObj.project.mainTree.items[0].setExpanded(true);
-                refreshNodes.push(projectObj.project.mainTree.items[0]);
-            }
+        if(['X', 'M', 'J', 'XM'].includes(type)){//项、目、节、细目
             return  function expandedControl(nodes, depth){
-                let bType = type === 'FB' ? billType.FB : billType.DXFY;
                 for(let node of nodes){
                     let nodeDepth = node.depth();
                     if(nodeDepth <= depth){
-                        let expanded = nodeDepth === depth && !node.children[0] || nodeDepth < depth && node.children[0] && node.children[0].data.type === bType ? true : false;
+                        let expanded = nodeDepth === depth && !node.children[0] || nodeDepth < depth && node.children[0] && node.children[0].data.type === billType.BILL ? true : false;
                         node.setExpanded(expanded);
                         refreshNodes.push(node);
                         if(nodeDepth < depth){
@@ -2162,17 +2157,13 @@ let displayLevel = function(nodes, depth, type){
                     }
                 }
             }
-        }
-        else if(type === 'FX' || type === 'ZM' || type === 'ZD'){
+        } else {
             return  function expandedControl(nodes){
                 for(let node of nodes){
-                    if(type !== 'FX' || node.sourceType === projectObj.project.Bills.getSourceType()){
+                    if(node.sourceType === projectObj.project.Bills.getSourceType()){
                         let expanded = true;
-                        if(type === 'FX'){
-                            expanded =  !node.children[0] || node.children[0] && node.children[0].sourceType === projectObj.project.Bills.getSourceType() ? true : false;
-                        }
-                        else if(type === 'ZM'){
-                            expanded =  !node.children[0] || node.children[0] && node.children[0].sourceType !== projectObj.project.ration_glj.getSourceType() ? true : false;
+                        if(type === 'ZDCXM'){
+                            expanded = !node.children[0] || node.children[0] && node.children[0].sourceType !== projectObj.project.Ration.getSourceType() ? true : false;
                         }
                         node.setExpanded(expanded);
                         refreshNodes.push(node);
@@ -2224,36 +2215,29 @@ $('#moreMenu > a').mouseenter(function () {
    }
 });
 
-$('#displayDXFY').click(function () {
-   displayLevel(projectObj.project.mainTree.items, 0, 'DXFY')
-});
-//显示至一级分部
-$('#displayFB1').click(function () {
-   displayLevel(projectObj.project.mainTree.items[0].children, 1, 'FB');
-});
-//二级分部
-$('#displayFB2').click(function () {
-    displayLevel(projectObj.project.mainTree.items[0].children, 2, 'FB');
+//项
+$('#displayX').click(function () {
+   displayLevel(projectObj.project.mainTree.items, 1, 'X')
 });
-//三级分部
-$('#displayFB3').click(function () {
-    displayLevel(projectObj.project.mainTree.items[0].children, 3, 'FB');
+//目
+$('#displayM').click(function () {
+   displayLevel(projectObj.project.mainTree.items, 2, 'M');
 });
-//四级分部
-$('#displayFB4').click(function () {
-    displayLevel(projectObj.project.mainTree.items[0].children, 4, 'FB');
+//节
+$('#displayJ').click(function () {
+    displayLevel(projectObj.project.mainTree.items, 3, 'J');
 });
-//分项
-$('#displayFX').click(function () {
-    displayLevel(projectObj.project.mainTree.items, null, 'FX');
+//细目
+$('#displayXM').click(function () {
+    displayLevel(projectObj.project.mainTree.items, 4, 'XM');
 });
-//子目
-$('#displayZM').click(function () {
-    displayLevel(projectObj.project.mainTree.items, null, 'ZM');
+//最底层细目
+$('#displayZDCXM').click(function () {
+    displayLevel(projectObj.project.mainTree.items, null, 'ZDCXM');
 });
-//最底层
-$('#displayZD').click(function () {
-   displayLevel(projectObj.project.mainTree.roots, null, 'ZD');
+//定额
+$('#displayDE').click(function () {
+    displayLevel(projectObj.project.mainTree.items, null, 'DE');
 });
 
 $('#poj-set').on('show.bs.modal', function () {