标准清单相关

modules/std_billsGuidance_lib/controllers/libController.js

@@ -23,6 +23,7 @@ class BillsGuideLibController extends BaseController{
             callback(req, res, 0, '', rst);
         }
         catch(err){
+            console.log(err);
             callback(req, res, 1, err, null);
         }
     }

modules/std_billsGuidance_lib/facade/facades.js

@@ -32,16 +32,17 @@ async function getBillsGuideLibs(findData) {
 
 
 async function getLibWithBills(libID){
-    let guidanceLib = await getBillsGuideLibs({ID: libID});
+    /*let guidanceLib = await getBillsGuideLibs({ID: libID});
     if(guidanceLib.length === 0){
         throw '不存在此指引库！';
-    }
-    let billsLib = await stdBillsLibModel.findOne({billsLibId: guidanceLib[0].billsLibId});
+    }*/
+    let billsLib = await stdBillsLibModel.findOne({billsLibId: libID});
     if(!billsLib){
         throw '引用的清单规则库不存在！';
     }
     let bills = await stdBillsModel.find({billsLibId: billsLib.billsLibId}, '-_id');
-    return {guidanceLib: guidanceLib[0], bills};
+    //return {guidanceLib: guidanceLib[0], bills};
+    return {bills};
 }
 
 function getAttrs(field, datas){

web/building_saas/main/js/views/std_billsGuidance_lib.js

@@ -14,7 +14,6 @@ let doAfterLoadGuidance = null;
 const billsGuidance = (function () {
     //更新类型
     const updateType = {update: 'update', create: 'create'};
-    let currentLib = null;
     //库类型
     const libType = {'guidance': 1, 'elf': 2}; //清单指引、清单精灵
     const libSel = $('#stdBillsGuidanceLibSelect');
@@ -920,13 +919,12 @@ const billsGuidance = (function () {
             }
         });
     }
-    //初始选择清单指引库
+    //初始选择标准清单
     //@param {Number}libID @return {void}
     function libInitSel(libID){
         //获取清单
         $.bootstrapLoading.start();
         CommonAjax.post('/billsGuidance/api/getLibWithBills', {libID: libID}, function(rstData){
-            currentLib = rstData.guidanceLib;
             if(guideItem.workBook){
                 guideItem.workBook.destroy();
                 guideItem.workBook = null;
@@ -944,7 +942,7 @@ const billsGuidance = (function () {
                 $.bootstrapLoading.end();
             };
             //获取清单库中的工作内容和项目特征
-            initJobAndCharacter(rstData.guidanceLib.billsLibId, callback);
+            initJobAndCharacter(libID, callback);
         }, function () {
             $.bootstrapLoading.end();
         });
@@ -977,12 +975,7 @@ const billsGuidance = (function () {
             $('#billsGuidance_items').height(height / 2);
         }
         let modules = [bills];
-        if(currentLib.type && currentLib.type === libType.elf){
-            modules.push(elfItem);
-        }
-        else {
-            modules.push(guideItem);
-        }
+        modules.push(elfItem);
         initWorkBooks(modules);
 
     }
@@ -1013,7 +1006,7 @@ const billsGuidance = (function () {
         //打开清单指引库
         $('#stdBillsGuidanceTab').click(function () {
             if(libSel.children().length === 0 && !$(this).hasClass('disabled')){
-                initLibs(projectInfoObj.projectInfo.engineeringInfo.billsGuidance_lib);
+                initLibs(projectInfoObj.projectInfo.engineeringInfo.bill_lib);
             }
         });
         //更改清单指引库