补充定额库，新增人材机更改

web/building_saas/complementary_glj_lib/js/glj.js

@@ -114,7 +114,7 @@ let repositoryGljObj = {
         let me = this;
         let distType;
         let distTypeTree = {
-            prefix : 'gljType',
+            prefix: 'gljType',
             distTypes: {},
             comboDatas: [],
             distTypesArr: []
@@ -124,24 +124,20 @@ let repositoryGljObj = {
                 data: typeData,
                 children: [],
                 parent: null
-            };
-            if(allowGljType.includes(typeData.ID)){
-                distTypeTree.distTypes[distTypeTree.prefix + typeData.ID] = typeObj;
-                distTypeTree.distTypesArr.push(typeObj);
             }
+            distTypeTree.distTypes[distTypeTree.prefix + typeData.ID] = typeObj;
+            distTypeTree.distTypesArr.push(typeObj);
         });
         gljDistType.forEach(function (typeData) {
-            if(allowGljType.includes(typeData.ID)){
-                distType = distTypeTree.distTypes[distTypeTree.prefix + typeData.ID];
-                let parent = distTypeTree.distTypes[distTypeTree.prefix + typeData.ParentID];
-                if(parent){
-                    distType.parent = parent;
-                    parent.children.push(distType);
-                }
+            distType = distTypeTree.distTypes[distTypeTree.prefix + typeData.ID];
+            let parent = distTypeTree.distTypes[distTypeTree.prefix + typeData.ParentID];
+            if (parent) {
+                distType.parent = parent;
+                parent.children.push(distType);
             }
         });
         distTypeTree.distTypesArr.forEach(function (distTypeObj) {
-            if(distTypeObj.data.fullName !== '材料' && distTypeObj.data.fullName !== '机械'){
+            if (distTypeObj.data.fullName !== '材料' && distTypeObj.data.fullName !== '机械') {
                 distTypeTree.comboDatas.push({text: distTypeObj.data.fullName, value: distTypeObj.data.ID});
             }
         });
@@ -1128,7 +1124,7 @@ let repositoryGljObj = {
         // }
     },
     updateRationBasePrcRq: function (basePrcArr) {
-        CommonAjax.post('complementartGlj/api/updateRationBasePrc', {basePrcArr: basePrcArr}, function (rstData) {
+        CommonAjax.post('/complementartGlj/api/updateRationBasePrc', {basePrcArr: basePrcArr}, function (rstData) {
         });
     },
   /*  getRationGljIds: function (repId) {

web/building_saas/complementary_ration_lib/html/dinge.html

@@ -518,12 +518,13 @@
             </div>
             <div class="modal-body" style="padding-left: 0; padding-right: 3px; margin-left: 0;">
                 <div style="width: 36%; float: left;">
+                    &nbsp;
+                    <input type="radio" class="glj-radio" name="glj" value="stdGljs">标准&nbsp;&nbsp;
+                    <input type="radio" class="glj-radio" name="glj" value="complementaryGljs">补充&nbsp;&nbsp;
                     <div  class="modal-auto-height" id="gljSelTreeDiv" style="overflow: hidden">
-                        <!--<div class="print-list">-->
                         <div style="width: 100%; height: 100%; overflow: auto">
                             <ul id="selGljTree" class="ztree"></ul>
                         </div>
-                        <!--</div>-->
                     </div>
                 </div>
                 <div style="width: 64%; padding-left: 3px; float: left;">
@@ -531,9 +532,9 @@
                         <div class="col-12" id="gljRadios">
                             <div class="row">
                                 <div class="col-7" style="margin-top: 5px;">
-                                    <input type="radio" class="glj-radio" name="glj" value="allGljs">所有&nbsp;&nbsp;
+                                  <!--  <input type="radio" class="glj-radio" name="glj" value="allGljs">所有&nbsp;&nbsp;
                                     <input type="radio" class="glj-radio" name="glj" value="stdGljs">标准&nbsp;&nbsp;
-                                    <input type="radio" class="glj-radio" name="glj" value="complementaryGljs">补充&nbsp;&nbsp;
+                                    <input type="radio" class="glj-radio" name="glj" value="complementaryGljs">补充&nbsp;&nbsp;-->
                                 </div>
                                 <div class="input-group col-5" style="margin-bottom: 5px;">
                                     <input type="text" class="form-control form-control-sm" placeholder="请输入筛选编码或名称" value="" id="gljSearchKeyword">

web/building_saas/complementary_ration_lib/js/gljSelect.js

@@ -39,7 +39,7 @@ let gljSelOprObj = {
             delete glj.ID;
         }
     },
-    /*getSelGljItems: function(stdGljLibId, callback) {
+    getSelGljItems: function(stdGljLibId, callback) {
         let me = this;
         CommonAjax.post('/complementartGlj/api/getGljItems', {stdGljLibId: stdGljLibId}, function (rstData) {
             me.stdGljList = rstData.stdGljs;
@@ -61,18 +61,33 @@ let gljSelOprObj = {
                 callback();
             }
         });
-    },*/
+    },
+    initClassTree: function (type, treeData) {
+        let me = this;
+        if (me.treeObj) {
+            me.treeObj.destroy();
+            me.parentNodeIds = {};
+        }
+        zTreeHelper.createTree(treeData, gljSelTreeOprObj.setting, "selGljTree", me);
+        let rootNode = me.treeObj.getNodes()[0];
+        if(rootNode && rootNode.isParent && rootNode.isFirstNode){
+            me.rootNode = rootNode;
+        }
+        if(me.rootNode){
+            me.treeObj.selectNode(me.rootNode);
+            if ((me.stdGljList && me.stdGljList.length > 0) ||
+                (me.complementaryGljList && me.complementaryGljList.length > 0)) {
+                gljSelTreeOprObj.setting.callback.onClick(null, 'selGljTree', me.rootNode);
+            }
+        }
+    },
     getGljClassTree: function (gljLibId, callback) {
-        console.log('enter2');
         let me = this;
-        let url = '/complementartGlj/api/getGljTree';
+        let url = '/complementartGlj/api/getMixedTree';
         let postData = {gljLibId: gljLibId};
         let sucFunc = function (rstData) {
-            zTreeHelper.createTree(rstData, gljSelTreeOprObj.setting, "selGljTree", gljSelOprObj);
-            let rootNode = gljSelOprObj.treeObj.getNodes()[0];
-            if(rootNode && rootNode.isParent && rootNode.isFirstNode){
-                gljSelOprObj.rootNode = rootNode;
-            }
+            me.treeData = rstData;
+            me.initClassTree('std', me.treeData.std);
             gljSelOprObj.buildSheet($('#gljSelSheet')[0]);
             if(callback){
                 callback();
@@ -167,13 +182,13 @@ let gljSelOprObj = {
         if(typeof $("input[name='glj']:checked")[0] !== 'undefined'){
             $("input[name='glj']:checked")[0].checked = false;
         }
-        $("input[value = 'allGljs']")[0].checked = true;
-        me.radiosSelected = 'allGljs';
-        //初始为所有工料机
+        $("input[value = 'stdGljs']")[0].checked = true;
+        me.radiosSelected = 'stdGljs';
+        //初始为标准工料机
         me.showGljList = [];
-        if(me.radiosSelected === 'allGljs'){
+        if(me.radiosSelected === 'stdGljs'){
             me.setShowGljList(me.stdGljList, true);
-            me.setShowGljList(me.complementaryGljList, true);
+            //me.setShowGljList(me.complementaryGljList, true);
             me.sortGlj(me.showGljList);
         }
     },
@@ -220,6 +235,11 @@ let gljSelOprObj = {
     radiosChange: function () {
         let me = gljSelOprObj;
         $('.glj-radio').change(function () {
+            if($(this).val() === 'stdGljs') {
+                me.initClassTree('std', me.treeData.std);
+            } else {
+                me.initClassTree('comple', me.treeData.comple);
+            }
             me.filterDatasAndShow();
         });
     },

web/building_saas/complementary_ration_lib/js/ration_glj.js

@@ -136,11 +136,7 @@ var rationGLJOprObj = {
                                 //默认radio所有工料机
                                 gljSelOprObj.initRadio();
                                 gljSelOprObj.gljCurTypeId = null;
-                                //默认点击树根节点
-                                if(gljSelOprObj.rootNode){
-                                    gljSelOprObj.treeObj.selectNode(gljSelOprObj.rootNode);
-                                    gljSelTreeOprObj.setting.callback.onClick(null, 'componentTree', gljSelOprObj.rootNode);
-                                }
+                                gljSelOprObj.initClassTree('std', gljSelOprObj.treeData.std);
                                 //弹出窗口
                                 $('#selGlj').modal('show');
                             }},

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

@@ -1094,6 +1094,7 @@ var gljOprObj = {
                 distTypeTree.comboDatas.push({text: distTypeObj.data.fullName, value: distTypeObj.data.ID});
             }
         });
+        console.log(distTypeTree);
         return distTypeTree;
     },
     doInsertGLJ: function () {