Bläddra i källkod

多余的k(在pm_facade)

TonyKang 6 år sedan
förälder
incheckning
b390c1c1ce
2 ändrade filer med 10 tillägg och 6 borttagningar
  1. 1 1
      modules/pm/facade/pm_facade.js
  2. 9 5
      test/unit/reports/test_tpl_05.js

+ 1 - 1
modules/pm/facade/pm_facade.js

@@ -631,7 +631,7 @@ async function getSummaryInfoByTender(tenderID, summaryType) {
             if(summaryInfo[t.ID]){
                 summaryInfo[t.ID]['name'] = t.name ? t.name : '';
                 summaryList.push(summaryInfo[t.ID]);
-            }k
+            }
         }
     }
     else {

+ 9 - 5
test/unit/reports/test_tpl_05.js

@@ -90,11 +90,15 @@ test('测试 - 模板05汇总表: ', function (t) {
                         }
                     });
                 } else  if (promiseArr[1] !== null) {
-                    promiseArr[1].then(function (rst) {
-                        rawDataObj.Segment = rst.parent;
-                        rawDataObj.SegmentDetail = rst.subList;
-                        buildPageData(t, rawDataObj, rptDataUtil, rptTpl);
-                    });
+                    try {
+                        promiseArr[1].then(function (rst) {
+                            rawDataObj.Segment = rst.parent;
+                            rawDataObj.SegmentDetail = rst.subList;
+                            buildPageData(t, rawDataObj, rptDataUtil, rptTpl);
+                        });
+                    } catch (ex) {
+                        console.log(ex);
+                    }
                 } else {
                     buildPageData(t, rawDataObj, rptDataUtil, rptTpl);
                 }