预处理，加载协作数据相关

app/lib/rpt_data_analysis.js

@@ -1510,6 +1510,18 @@ const loadCooperationData = {
         return '';
 
     },
+    _findCooperation(relaId, stageCooperation, auditor) {
+        if (!stageCooperation) return null;
+        if (relaId.length > 0) {
+            for (const id of relaId) {
+                const c = stageCooperation.find(x => { return x.ledger_id == id; });
+                if (c) return c;
+            }
+            return null;
+        }
+        return null;
+
+    },
     _completeSign(auditor) {
         if (!auditor || !auditor.end_time) return '';
         return auditor.sign_path ? 'public/upload/sign/' + auditor.sign_path : '';
@@ -1537,9 +1549,11 @@ const loadCooperationData = {
             const bills = data.mem_stage_bills.find(x => { return x.id === d.lid; });
             const relaId = bills ? bills.full_path.split('-').reverse() : [];
 
-            d.cooperation = [];
+            d.cooperation = [], d.company = [];
             for (const [i, sa] of data.stage_audit.entries()) {
+                const co = this._findCooperation(relaId, stageCooperation[i], sa);
                 d.cooperation.push(this._findSign(relaId, stageCooperation[i], sa));
+                d.company.push(co ? co.company : '');
             }
 
             if (finish) {
@@ -1548,6 +1562,7 @@ const loadCooperationData = {
                         d['co_sign' + (i + 1)] = d.cooperation[cs] || this._completeSign(data.stage_audit[cs]);
                         d['co_opinion' + (i + 1)] = data.stage_audit[cs].opinion || '';
                         d['co_time' + (i + 1)] = data.stage_audit[cs].end_time;
+                        d['co_company' + (i + 1)] = d.company[cs] || data.stage_audit[cs].name;
                     }
                 }
             }

builder_report_index_define.js

@@ -60,6 +60,7 @@ const ledger_cooperation = {
         { name: '台账id', field: 'ledger_id', type: dataType.int },
         { name: '密码', field: 'pwd', type: dataType.str },
         { name: '签字地址', field: 'sign_path', type: dataType.str },
+        { name: '单位/协作人名称', field: 'company', type: dataType.str },
     ],
 };
 // 其他台账
@@ -909,13 +910,17 @@ const stage_im_zl = {
         { name: '审批时间2', field: 'co_time2', type: dataType.time },
         { name: '审批时间3', field: 'co_time3', type: dataType.time },
         { name: '审批时间4', field: 'co_time4', type: dataType.time },
-        { name: '审批意见1', field: 'co_opinion1', type: dataType.time },
-        { name: '审批意见2', field: 'co_opinion2', type: dataType.time },
-        { name: '审批意见3', field: 'co_opinion3', type: dataType.time },
-        { name: '审批意见4', field: 'co_opinion4', type: dataType.time },
+        { name: '审批意见1', field: 'co_opinion1', type: dataType.str },
+        { name: '审批意见2', field: 'co_opinion2', type: dataType.str },
+        { name: '审批意见3', field: 'co_opinion3', type: dataType.str },
+        { name: '审批意见4', field: 'co_opinion4', type: dataType.str },
         { name: '单位工程', field: 'dwgc', type: dataType.str },
         { name: '分部工程', field: 'fbgc', type: dataType.str },
         { name: '分项工程', field: 'fxgc', type: dataType.str },
+        { name: '单位/协同人姓名1', field: 'co_company1', type: dataType.str },
+        { name: '单位/协同人姓名2', field: 'co_company2', type: dataType.str },
+        { name: '单位/协同人姓名3', field: 'co_company3', type: dataType.str },
+        { name: '单位/协同人姓名4', field: 'co_company4', type: dataType.str },
     ],
 };
 const stage_im_tz = {
@@ -968,6 +973,10 @@ const stage_im_tz = {
         { name: '单位工程', field: 'dwgc', type: dataType.str },
         { name: '分部工程', field: 'fbgc', type: dataType.str },
         { name: '分项工程', field: 'fxgc', type: dataType.str },
+        { name: '单位/协同人姓名1', field: 'co_company1', type: dataType.str },
+        { name: '单位/协同人姓名2', field: 'co_company2', type: dataType.str },
+        { name: '单位/协同人姓名3', field: 'co_company3', type: dataType.str },
+        { name: '单位/协同人姓名4', field: 'co_company4', type: dataType.str },
     ],
 };
 const stage_im_tz_bills = {