Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/service/change_audit.js

@@ -234,6 +234,15 @@ module.exports = app => {
             const list = await this.db.query(sql, sqlParam);
             return list;
         }
+        async getListGroupByTimesWithDetail(cid, times) {
+            const sql = 'SELECT *, pa.name, pa.company, pa.role, pa.mobile, pa.telephone FROM ' + this.tableName + ' ca ' +
+                '  Left Join ' + this.ctx.service.projectAccount.tableName + ' pa On ca.uid = pa.id' +
+                '  where id in (SELECT MAX(id) FROM ' + this.tableName +' WHERE cid = ? AND times = ? GROUP BY usite)' +
+                '  ORDER BY usite asc';
+            const sqlParam = [cid, times];
+            const list = await this.db.query(sql, sqlParam);
+            return list;
+        }
 
         /**
          * 获取比sort大的审批人列表

app/service/report.js

@@ -271,6 +271,9 @@ module.exports = app => {
                     case 'mem_change_bills':
                         rst[filter] = await service.reportMemory.getChangeBillsData(params.tender_id, params.stage_id, memFieldKeys[filter]);
                         break;
+                    case 'mem_change_audit':
+                        rst[filter] = await service.reportMemory.getChangeAuditData(params.tender_id, params.stage_id, memFieldKeys[filter]);
+                        break;
                     case 'mem_jh_im_change':
                         const jhHelper1 = new rptCustomData.jhHelper(this.ctx);
                         rst[filter] = await jhHelper1.convert(params.tender_id, params.stage_id, memFieldKeys[filter], customDefine.option);

app/service/report_memory.js

@@ -791,6 +791,16 @@ module.exports = app => {
 
         }
 
+        async _generateChangeAudit(tid) {
+            if (this.changeData.audit !== null) return;
+
+            this.changeData.audit = [];
+            for (const c of change) {
+                const changeAudit = await this.ctx.service.changeAudit.getListGroupByTimes(c.cid, c.times);
+                this.changeData.audit.push(...changeAudit);
+            }
+        }
+
         async getChangeData(tid, sid, fields) {
             try {
                 await this.ctx.service.tender.checkTender(tid);
@@ -813,6 +823,18 @@ module.exports = app => {
             }
         }
 
+        async getChangeAuditData(tid, sid, fields) {
+            try {
+                await this.ctx.service.tender.checkTender(tid);
+
+                await this._generateChange(tid);
+                await this._generateChangeAudit(tid);
+                return this.changeData.audit;
+            } catch (err) {
+                return [];
+            }
+        }
+
         async getStageJgcl(tid, sid, fields) {
             try {
                 await this.ctx.service.tender.checkTender(tid);

builder_report_index_define.js

@@ -305,6 +305,23 @@ const change_bills = {
         { name: '(空) 变更清单-本期使用', field: 'is_used', type: dataType.int },
     ],
 };
+const change_audit = {
+    name: '工程-审批人 列表(mem_change_audit)',
+    remark: '',
+    id: 73,
+    key: 'mem_change_audit',
+    prefix: '材料调差-选择期',
+    cols: [
+        { name: '变更令id', field: 'cid', type: dataType.str },
+        { name: '审批人id', field: 'uid', type: dataType.int },
+        { name: '姓名', field: 'name', type: dataType.str },
+        { name: '职称', field: 'jobs', type: dataType.str },
+        { name: '公司', field: 'company', type: dataType.str },
+        { name: '审批意见', field: 'sdesc', type: dataType.str },
+        { name: '审批时间', field: 'sin_time', type: dataType.str },
+        { name: '审批顺序', field: 'usort', type: dataType.str },
+    ],
+};
 // 期 - 清单
 const stage_bills = {
     name: '期-清单 数据表(mem_stage_bills)',
@@ -1364,6 +1381,11 @@ const materialGl = {
 
         { name: '创建时间', field: 'in_time', type: dataType.str },
         { name: '备注', field: 'remark', type: dataType.str },
+
+        { name: '税率', field: 'rate', type: dataType.int },
+
+        { name: '调差金额（材料税）', field: 'm_tax_tp', type: dataType.currency },
+        { name: '截止上期调差金额（材料税）', field: 'm_tax_pre_tp', type: dataType.currency },
     ],
 };
 const material_bills = {
@@ -2187,7 +2209,7 @@ const defines = [
     month_progress,
     stage_bills, stage_bills_compare,
     stage_jgcl, stage_bonus, stage_other, stage_safe_prod, stage_temp_land,
-    change, change_bills,
+    change, change_bills, change_audit,
     stage_pos, stage_pos_compare,
     stage_pay,
     stage_im_zl, stage_im_tz, stage_im_tz_bills,