瀏覽代碼

TASK #3926 金额概况界面,期望在"上一流程审核时间"与"0号台账"之间增加"签约合同价"列,获取合同参数中的"签约合同价"金额

MaiXinRong 3 年之前
父節點
當前提交
d6e296a62b
共有 2 個文件被更改,包括 15 次插入6 次删除
  1. 2 0
      app/controller/tender_controller.js
  2. 13 6
      app/public/js/tender_list_info.js

+ 2 - 0
app/controller/tender_controller.js

@@ -178,6 +178,8 @@ module.exports = app => {
                 renderData.tenderList = await this.ctx.service.tender.getList(list_status, renderData.userPermission, this.ctx.session.sessionUser.is_admin);
 
                 for (const t of renderData.tenderList) {
+                    const tenderInfo = await this.ctx.service.tenderInfo.getTenderInfo(t.id);
+                    t.deal_tp = tenderInfo.deal_param.contractPrice;
                     if (t.ledger_status === auditConst.ledger.status.checked) {
                         t.lastStage = await this.ctx.service.stage.getLastestStage(t.id, true);
                         t.completeStage = await this.ctx.service.stage.getLastestCompleteStage(t.id);

+ 13 - 6
app/public/js/tender_list_info.js

@@ -201,6 +201,7 @@ function calculateParent(node) {
         node.yf_tp = 0;
         node.end_yf_tp = 0;
         node.advance_tp = 0;
+        node.deal_tp = 0;
         for (const c of node.children) {
             calculateParent(c);
             node.total_price = ZhCalc.add(node.total_price, c.total_price);
@@ -212,6 +213,7 @@ function calculateParent(node) {
             node.yf_tp = ZhCalc.add(node.yf_tp, c.yf_tp);
             node.end_yf_tp = ZhCalc.add(node.end_yf_tp, c.end_yf_tp);
             node.advance_tp = ZhCalc.add(node.advance_tp, c.advance_tp);
+            node.deal_tp = ZhCalc.add(node.deal_tp, c.deal_tp);
         }
     }
 }
@@ -300,7 +302,7 @@ function recursiveGetTenderNodeHtml (node, arr, pid) {
     const html = [];
     html.push('<tr pid="' + pid + '">');
     // 名称
-    html.push('<td style="width: 20%" class="in-' + node.level + '">');
+    html.push('<td style="width: 14%" class="in-' + node.level + '">');
     if (node.cid) {
         html.push('<span onselectstart="return false" style="{-moz-user-select:none}" class="fold-switch mr-1" title="收起" cid="'+ node.sort_id +'"><i class="fa fa-minus-square-o"></i></span> <i class="fa fa-folder-o"></i> ', node.name);
     } else {
@@ -312,7 +314,7 @@ function recursiveGetTenderNodeHtml (node, arr, pid) {
     }
     html.push('</td>');
     // 计量模式
-    html.push('<td style="width: 6%" class="text-center">');
+    html.push('<td style="width: 5%" class="text-center">');
     if (node.measure_type) {
         html.push(node.measure_type === measureType.tz.value ? '0号台账' : '工程量清单');
     }
@@ -330,11 +332,15 @@ function recursiveGetTenderNodeHtml (node, arr, pid) {
     }
     html.push('</td>');
     // 上一流程审批时间
-    html.push('<td style="width: 8%">');
+    html.push('<td style="width: 7%">');
     if (!node.cid && node.pre_flow) {
         html.push(node.pre_flow.name + ' ' + moment(node.pre_flow.time).format('YYYY-MM-DD'));
     }
     html.push('</td>');
+    // 签约合同价
+    html.push('<td style="width: 6%" class="text-right">');
+    html.push(node.deal_tp || '');
+    html.push('</td>');
     // 0号台账合同
     html.push('<td style="width: 6%" class="text-right">');
     html.push(node.total_price || '');
@@ -385,11 +391,12 @@ function getTenderTreeHtml () {
         const html = [];
         html.push('<table class="table table-hover table-bordered">');
         html.push('<thead style="position: fixed;left:56px;top: 34px;">', '<tr>');
-        html.push('<th class="text-center" style="width: 20%">', '标段名称', '</th>');
-        html.push('<th class="text-center" style="width: 6%">', '计量模式', '</th>');
+        html.push('<th class="text-center" style="width: 14%">', '标段名称', '</th>');
+        html.push('<th class="text-center" style="width: 5%">', '计量模式', '</th>');
         html.push('<th class="text-center" style="width: 6%">', '计量进度', '</th>');
         html.push('<th class="text-center" style="width: 6%">', '当前流程', '</th>');
-        html.push('<th class="text-center" style="width: 8%">', '上一流程审批时间', '</th>');
+        html.push('<th class="text-center" style="width: 7%">', '上一流程审批时间', '</th>');
+        html.push('<th class="text-center" style="width: 6%">', '签约合同价', '</th>');
         html.push('<th class="text-center" style="width: 6%">', '0号台账', '</th>');
         html.push('<th class="text-center" style="width: 6%">', '本期完成', '</th>');
         html.push('<th class="text-center" style="width: 6%">', '截止本期合同', '</th>');