Sfoglia il codice sorgente

山东接口导出工作内容问题

Tony Kang 2 anni fa
parent
commit
1213e32216

+ 2 - 1
modules/main/facade/project_facade.js

@@ -315,7 +315,8 @@ async function getBudgetSummayDatas(projectIDs, userID, compilationID, overWrite
     };
     return result;
   } catch (e) {
-    console.log(e.message)
+    // console.log(e.message)
+    console.log(e);
   }
 }
 

+ 2 - 1
modules/reports/controllers/rpt_controller.js

@@ -260,7 +260,8 @@ async function getAllPagesForOneRptCommonEx(user_id, rpt_params, outputType, cb)
                 cb('Have errors while on going...', null);
             }
         } catch(ex) {
-            //
+            console.log(ex);
+            cb('errors while on going...', null);
         }
     } else {
         cb('No report template was found!', null);

+ 7 - 1
web/building_saas/standard_interface/export/shandong_common.js

@@ -1402,12 +1402,18 @@ INTERFACE_EXPORT = (() => {
             mEstNode.children.push(mEstItemNode);
             let ttl = _getFee(bill);
             sum += ttl;
+            let jobContent = '';
+            if (bill.jobContent && bill.jobContent.length > 0) {
+              jobContent = bill.jobContent.toString();
+            } else {
+              jobContent = bill.jobContentText;
+            }
             let attrs = [
               {name: 'ItemNo', value: sno + 1},
               {name: 'Code', value: bill.code},
               {name: 'Number', value: bill.code},
               {name: 'Name', value: bill.name},
-              {name: 'Content', value: bill.jobContent.toString()},
+              {name: 'Content', value: jobContent},
               // {name: 'Sum', value: _getNumValueByExportKind(scMathUtil.roundForObj(ttl, 0)), type:TYPE.DECIMAL},
               {name: 'Sum', value: ttl, type:TYPE.DECIMAL},
               // {name: 'Sum', value: 0, type:TYPE.DECIMAL},