汇总表调整

app/lib/rptCustomData.js

@@ -18,9 +18,8 @@ const auditConst = require('../const/audit');
  *
  * define: {
  *     "title": "请选择汇总的标段", "type": "month/final/checked-final/stage",
- *    "defaultCompare": [1, 2, 3], // 结果按序 t_n_qty, t_n_tp
+ *    "defaultCompare": [1, 2, 3], // 结果按序 rn_qty, rn_tp
  *    "match": { "quality": [2, 3], "qty": "<0" }, // class根据变更类型过滤，qty根据数量过滤
- *    "selectCompare": [{ "key": "jl", "title": "驻地监理" }, ...] // 结果按key t_key_qty, t_key_tp
  *    "merge": true,
  * }
  * defaultCompare为默认选择的审批人，0为原报，1-N为1-N审
@@ -222,7 +221,7 @@ class jhHelper {
             let load = false;
             if (bills.pre_cd && bills.pre_cd.length > 0) load = true;
             for (const dc of gsDefine.defaultCompare) {
-                if (bills['t_' + dc + '_cd'] && bills['t_' + dc + '_cd'].length > 0) load = true;
+                if (bills['r' + dc + '_cd'] && bills['r' + dc + '_cd'].length > 0) load = true;
             }
             if (!load) continue;
             gsDefine.merge ? this._loadMergeResult(bills, this.prefixes) : this._loadResult(bills, this.prefixes);
@@ -243,7 +242,7 @@ class jhHelper {
         for (const dc of gsDefine.defaultCompare) {
             const auditor = auditors[dc];
             const auditorStage = await this.ctx.service.stagePos.getAuditorStageData2(tender.id, stage.id, auditor.times, auditor.order);
-            loadData.push({ data: auditorStage, fields: ['qc_qty', 'qc_tp'], prefix: `t_${dc}_`, relaId: 'pid' });
+            loadData.push({ data: auditorStage, fields: ['qc_qty', 'qc_tp'], prefix: `r${dc}_`, relaId: 'pid' });
         }
         helper.assignRelaData(billsData, loadData);
         // 计算截止本期
@@ -266,7 +265,7 @@ class jhHelper {
         for (const dc of gsDefine.defaultCompare) {
             const auditor = auditors[dc];
             const auditorStage = await this.ctx.service.stagePos.getAuditorStageData2(tender.id, stage.id, auditor.times, auditor.order);
-            loadData.push({ data: auditorStage, fields: ['qc_qty'], prefix: `t_${dc}_`, relaId: 'pid' });
+            loadData.push({ data: auditorStage, fields: ['qc_qty'], prefix: `r${dc}_`, relaId: 'pid' });
         }
         helper.assignRelaData(posData, loadData);
         posData.forEach(x => {
@@ -300,8 +299,8 @@ class jhHelper {
         const stageChangeDetail = await this.getCurChangeDetailData(tender.id, stage.id);
         for (const dc of gsDefine.defaultCompare) {
             const scd = helper.filterTimesOrderData(stageChangeDetail, ['lid', 'pid', 'cid', 'cbid'], auditors[dc].times, auditors[dc].order);
-            this._loadChangeDetail(billsIndex, scd, gsDefine, `t_${dc}_`);
-            this.prefixes.push(`t_${dc}_`);
+            this._loadChangeDetail(billsIndex, scd, gsDefine, `r${dc}_`);
+            this.prefixes.push(`r${dc}_`);
         }
         const finalChangeData = await this.getPreChangeDetailData(tender.id, stage.order);
         this._loadChangeDetail(billsIndex, finalChangeData, gsDefine, 'pre_');

sql/update.sql

@@ -24,3 +24,11 @@ CHANGE COLUMN `type` `type` TINYINT(1) NOT NULL DEFAULT '0' COMMENT '预付款
 
 ALTER TABLE `zh_advance_pay` 
 CHANGE COLUMN `type` `type` INT(1) NOT NULL DEFAULT '0' COMMENT '预付款类型，0为开工预付款，1为材料预付款，2位安全生产费预付款' ;
+
+-- 接口相关
+ALTER TABLE `zh_tender`
+ADD COLUMN `s2b_gxby_check`  tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '工序报验-检查计量' AFTER `copy_id`,
+ADD COLUMN `s2b_gxby_limit`  tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '限制上报' AFTER `s2b_gxby_check`,
+ADD COLUMN `s2b_dagl_check`  tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '档案管理-检查计量' AFTER `s2b_gxby_limit`,
+ADD COLUMN `s2b_dagl_limit`  tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '档案管理-限制上报' AFTER `s2b_dagl_check`;
+