|
@@ -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);
|
|
|
}
|