同步标准清单代码

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,18 +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: libID});
-    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};
-    return {bills};
+    const bills = await stdBillsModel.find({ billsLibId }, '-_id').lean();
+    return { bills };
 }
 
 function getAttrs(field, datas){

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

@@ -71,12 +71,9 @@ var projectInfoObj = {
             if (data.property.valuationType === 'ration') {
                 $('#importSpan').show();
             }
-            if (!data.engineeringInfo.billsGuidance_lib || data.engineeringInfo.billsGuidance_lib.length === 0) {
-                $('#stdBillsGuidanceTab').addClass('disabled');
-            } else {
-                //打开预算项目时，右侧“清单规则”显示为“项目表”，打开工程量清单项目时，右侧“清单规则”显示为“清单范本”。
-                $('#stdBillsGuidanceTab').text(data.property.valuationType === 'bill' ? '项目表' : '清单范本');
-            }
+
+            //打开预算项目时，右侧“清单规则”显示为“项目表”，打开工程量清单项目时，右侧“清单规则”显示为“清单范本”。
+            $('#stdBillsGuidanceTab').text(data.property.valuationType === 'bill' ? '项目表' : '清单范本');
             //init decimal
             setDecimal(decimalObj, data.property.decimal);
             billsQuanDecimal.datas = data.property.billsQuantityDecimal || [billsDecimalView.angleDecimal];

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

@@ -975,7 +975,7 @@ const billsGuidance = (function () {
     function libInitSel(libID){
         //获取清单
         $.bootstrapLoading.start();
-        CommonAjax.post('/billsGuidance/api/getLibWithBills', {libID: libID}, function(rstData){
+        CommonAjax.post('/billsGuidance/api/getLibWithBills', {libID: libID, isGuidanceLib: false}, function(rstData){
             if(guideItem.workBook){
                 guideItem.workBook.destroy();
                 guideItem.workBook = null;