“标准清单”读取后端费用定额的“标准清单”的设置

modules/std_billsGuidance_lib/controllers/libController.js

@@ -18,8 +18,8 @@ class BillsGuideLibController extends BaseController{
     //获取清单指引库和该库引用的清单
     async getLibWithBills(req, res){
         try{
-            let data = JSON.parse(req.body.data);
-            let rst = await billsGuidanceFacade.getLibWithBills(data.libID);
+            const { libID, isGuidanceLib } = JSON.parse(req.body.data);
+            const rst = await billsGuidanceFacade.getLibWithBills(libID, isGuidanceLib);
             callback(req, res, 0, '', rst);
         }
         catch(err){

modules/std_billsGuidance_lib/facade/facades.js

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

web/building_saas/main/js/views/project_info.js

@@ -53,14 +53,9 @@ var projectInfoObj = {
     },
     showProjectInfo: function (data) {
         if (data) {
-            if (!data.engineeringInfo.billsGuidance_lib || data.engineeringInfo.billsGuidance_lib.length === 0) {
-                $('#stdBillsGuidanceTab').addClass('disabled');
-            } else {
-                // 清单子界面的模块：清单指引、清单精灵
-                for (let billsGuidanceLib of data.engineeringInfo.billsGuidance_lib) {
-                    BillsSub.switchModule(billsGuidanceLib.type);
-                }
-
+            // 清单子界面的模块：清单指引、清单精灵
+            for (let billsGuidanceLib of data.engineeringInfo.billsGuidance_lib) {
+                BillsSub.switchModule(billsGuidanceLib.type);
             }
             //init decimal
             setDecimal(decimalObj, data.property.decimal);

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

@@ -12,7 +12,6 @@
 let doAfterLoadGuidance = null;
 
 const billsGuidance = (function () {
-    let currentLib = null;
     const libSel = $('#stdBillsGuidanceLibSelect');
     //工作内容
     let stdBillsJobData = [];
@@ -387,8 +386,7 @@ const billsGuidance = (function () {
     function libInitSel(libID){
         //获取清单
         $.bootstrapLoading.start();
-        CommonAjax.post('/billsGuidance/api/getLibWithBills', {libID: libID}, function(rstData){
-            currentLib = rstData.guidanceLib;
+        CommonAjax.post('/billsGuidance/api/getLibWithBills', {libID: libID, isGuidanceLib: false}, function(rstData){
             initViews();
             let callback = function () {
                 initTree(bills, bills.workBook.getActiveSheet(), bills.treeSetting, rstData.bills);
@@ -398,7 +396,7 @@ const billsGuidance = (function () {
                 $.bootstrapLoading.end();
             };
             //获取清单库中的工作内容和项目特征
-            initJobAndCharacter(rstData.guidanceLib.billsLibId, callback);
+            initJobAndCharacter(+libID, callback);
         }, function () {
             $.bootstrapLoading.end();
         });
@@ -460,7 +458,7 @@ const billsGuidance = (function () {
         //打开清单指引库
         $('#stdBillsGuidanceTab').click(function () {
             if(libSel.children().length === 0 && !$(this).hasClass('disabled')){
-                initLibs(projectObj.project.projectInfo.engineeringInfo.billsGuidance_lib);
+                initLibs(projectObj.project.projectInfo.engineeringInfo.bill_lib);
             }
         });
         //更改清单指引库