Bläddra i källkod

feat: 合同报表审核状态

Tony Kang 2 veckor sedan
förälder
incheckning
11b04ca390
2 ändrade filer med 13 tillägg och 4 borttagningar
  1. 12 3
      app/controller/report_controller.js
  2. 1 1
      app/public/report/js/rpt_main.js

+ 12 - 3
app/controller/report_controller.js

@@ -1137,7 +1137,8 @@ module.exports = app => {
                 const stage_order = -1;
                 const stage_order = -1;
                 const sorder = -1;
                 const sorder = -1;
                 const stage_times = -1;
                 const stage_times = -1;
-                const stage_status = -1;
+                // const stage_status = -1;
+                const stage_status = 3; // 目前强制为通过,等后续审核逻辑完善后再改
                 const project_id = ctx.contract.project_id;
                 const project_id = ctx.contract.project_id;
                 // const { treeNodes, custCfg, commonArrs } = await this._createNodes(ctx, sourceTypeConst.sourceType.contract, project_id);
                 // const { treeNodes, custCfg, commonArrs } = await this._createNodes(ctx, sourceTypeConst.sourceType.contract, project_id);
                 const { treeNodes, custCfg, commonArrs, allTreeItems, allIndivTreeItems } = await this._createNodes(ctx, sourceTypeConst.sourceType.contract, project_id);
                 const { treeNodes, custCfg, commonArrs, allTreeItems, allIndivTreeItems } = await this._createNodes(ctx, sourceTypeConst.sourceType.contract, project_id);
@@ -1447,6 +1448,14 @@ module.exports = app => {
                         }
                         }
                     });
                     });
                     break;
                     break;
+                case -600: // 合同
+                    // const options = { spid: params.sp_id };
+                    // const contractAudit = await ctx.service.contractAudit.getList(options);
+                    // contractAudit.forEach(audit => {
+                    //     stgAudit.push({ aid: audit.uid, status: audit.audit_status, opinion: audit.opinion, end_time: audit.audit_time, order: audit.audit_order });
+                    // });
+                    // 暂未实现(2026-03-23)
+                    break;
                 default:
                 default:
                     break;
                     break;
             }
             }
@@ -1545,7 +1554,7 @@ module.exports = app => {
                     const payment = paymentDetailList[0];
                     const payment = paymentDetailList[0];
                     stageList.push({ id: params.stage_id, user_id: payment.uid, status: payment.status });
                     stageList.push({ id: params.stage_id, user_id: payment.uid, status: payment.status });
                 }
                 }
-            } else if ([-150, -300, -301, -302, -303, -400, -500].includes(params.stage_id)) {
+            } else if ([-150, -300, -301, -302, -303, -400, -500, -600].includes(params.stage_id)) {
                 // 变更令、预付款、材差相关的
                 // 变更令、预付款、材差相关的
                 stgAudit = [];
                 stgAudit = [];
                 stgAuditForOrg = [];
                 stgAuditForOrg = [];
@@ -1679,7 +1688,7 @@ module.exports = app => {
                     const payment = paymentDetailList[0];
                     const payment = paymentDetailList[0];
                     stageList.push({ id: params.stage_id, user_id: payment.uid, status: payment.status });
                     stageList.push({ id: params.stage_id, user_id: payment.uid, status: payment.status });
                 }
                 }
-            } else if ([-150, -300, -301, -302, -303, -400, -500].includes(params.stage_id)) {
+            } else if ([-150, -300, -301, -302, -303, -400, -500, -600].includes(params.stage_id)) {
                 stgAudit = [];
                 stgAudit = [];
                 stageFlow = [];
                 stageFlow = [];
                 await this._commonGetAudit(ctx, params, stgAudit, stageFlow);
                 await this._commonGetAudit(ctx, params, stgAudit, stageFlow);

+ 1 - 1
app/public/report/js/rpt_main.js

@@ -1556,7 +1556,7 @@ function getStageStatus() {
             return ppStatus
             return ppStatus
         } else return current_stage_status;
         } else return current_stage_status;
     } else {
     } else {
-        if ([-100, -200].includes(current_stage_id)) {
+        if ([-100, -200, -600].includes(current_stage_id)) {
             return 3
             return 3
         } else if ([-150, -300, -301, -302, -303].includes(current_stage_id)) {
         } else if ([-150, -300, -301, -302, -303].includes(current_stage_id)) {
             // return 3; // 临时的
             // return 3; // 临时的