Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/public/js/stage.js

@@ -1825,6 +1825,7 @@ $(document).ready(() => {
         if (result.cooperation) {
             stageTree.loadPwd(result.cooperation, 'bills-p-' + userID + '-' + window.location.pathname.split('/')[2]);
             $('#cooperationCount').html(stageTree.pwd.length || '');
+            $('#cooperationCount').parent().show();
             reloadCooperationHtml();
         }
         // 加载部位明细

app/view/report/rpt_all_popup.ejs

@@ -462,9 +462,89 @@
     zTreeOprObj.iniFontCfgDom(CUST_CFG);
     buildCustRptCommon('report_cust_group_common', ORG_TOP_TREE_NODES[1], CUST_TREE_NODES.common, 'true');
     buildCustRptCommon('report_cust_group_individual', ORG_TOP_TREE_NODES[0], CUST_TREE_NODES.customize, 'false');
+    //buildTendersTree();
 
     function buildTendersTree() {
-        //
+        let sortedCat = [];
+        for (const cat of category) {
+            if (cat.level > 0) {
+                sortedCat.push(cat);
+            }
+        }
+        let treeCache = [];
+        //1. 选择用户已设置的分类
+        if (sortedCat.length > 0) {
+            sortedCat.sort(function(i1, i2){
+                return i1.level - i2.level;
+            });
+            const _createItems = function (parentItems, grpLv) {
+                if (grpLv < sortedCat.length) {
+                    let cat = sortedCat[grpLv];
+                    for (const nv of cat.value) {
+                        let item = {
+                            name: nv.value,
+                            id : nv.id,
+                            cid : nv.cid,
+                            items: []
+                        };
+                        parentItems.push(item);
+                        _createItems(item.items, grpLv + 1);
+                    }
+                }
+            }
+            _createItems(treeCache, 0);
+        }
+        //2. 建立treeNodes
+        for (const tender of tenders) {
+            if (tender.category && tender.category.length > 0) {
+                for (const cat of tender.category) {
+
+                }
+            }
+        }
+        //3. 把标段挂上去
+        let tmpCacheArr = []; //这个临时用来储存相应标段节点挂接信息
+        let _putTender = function (catLv, tender, parentItems) {
+            if (catLv < tender.category.length) {
+                let isSorted = false;
+                for (let sCat of sortedCat) {
+                    if (sCat.id === tender.category[catLv].cid && sCat.level > 0) {
+                        isSorted = true;
+                        break;
+                    }
+                }
+                if (isSorted) {
+                    for (const item of parentItems) {
+                        if (item.cid === tender.category[catLv].cid && item.id === tender.category[catLv].value) {
+                            if (item.items.length > 0) {
+                                //递归循环
+                                _putTender(catLv + 1, tender, item.items);
+                            } else {
+                                //就是这个了
+                                let tdItem = {
+                                    name: tender.value,
+                                    id : -1,
+                                    cid : -1,
+                                    prj_id: tender.id,
+                                    last_stage: -1,
+                                    signature: '',
+                                    items: []
+                                }; //标段节点
+                                //
+                                tmpCacheArr.push([item, tdItem]);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        for (const tender of tenders) {
+            _putTender(0, tender, treeCache);
+        }
+        for (const pairItem of tmpCacheArr) {
+            pairItem[0].items.push(pairItem[1]);
+        }
+        console.log(treeCache);
     }
 
     function searchAccount() {

app/view/stage/index.ejs

@@ -37,7 +37,7 @@
                     <a class="btn btn-sm btn-primary" href="javascript: void(0);" id="ledger-check2">数据检查</a>
                 </div>
                 <div class="d-inline-block">
-                    <a class="btn btn-sm btn-danger" href="#cooperation" data-toggle="modal" data-target="#cooperation">多人协同 <i class="fa fa-lock"></i> <span id="cooperationCount"></span></a>
+                    <a class="btn btn-sm btn-danger" href="#cooperation" data-toggle="modal" data-target="#cooperation" style="display: none;">多人协同 <i class="fa fa-lock"></i> <span id="cooperationCount"></span></a>
                 </div>
             </div>
             <div class="ml-auto">