Browse Source

标段列表,显示游客

MaiXinRong 2 years ago
parent
commit
14a8997d36
2 changed files with 18 additions and 11 deletions
  1. 1 0
      app/controller/tender_controller.js
  2. 17 11
      app/public/js/tender_list.js

+ 1 - 0
app/controller/tender_controller.js

@@ -193,6 +193,7 @@ 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) {
+                    t.visitor = await this.ctx.service.tenderTourist.getTourists(t.id);
                     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);

+ 17 - 11
app/public/js/tender_list.js

@@ -276,7 +276,7 @@ function recursiveGetTenderNodeHtml (node, arr, pid) {
     const html = [];
     html.push('<tr pid="' + pid + '">');
     // 名称
-    html.push('<td style="width: 45%" class="in-' + node.level + '">');
+    html.push('<td style="width: 40%" 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 {
@@ -288,15 +288,20 @@ function recursiveGetTenderNodeHtml (node, arr, pid) {
     }
     html.push('</td>');
     // 计量模式
-    html.push('<td style="width: 5%" class="text-center">');
+    html.push('<td style="width: 9%" class="text-center">');
     if (node.measure_type) {
         html.push(node.measure_type === measureType.tz.value ? '0号台账' : '工程量清单');
     }
     html.push('</td>');
     // 创建人
-    html.push('<td style="width: 10%" class="text-center">', node.user_name ? node.user_name : '', '</td>');
+    html.push('<td style="width: 9%" class="text-center">', node.user_name ? node.user_name : '', '</td>');
+    // 游客
+    const visitor = node.visitor && node.visitor.length > 0
+        ? `<a href="javascirpt: void(0)" data-toggle="tooltip" data-placement="top" data-original-title="${node.visitor.map(x => { return x.user_name}).join(',')}">${node.visitor.length}</a>`
+        : '';
+    html.push('<td style="width: 9%" class="text-center">', visitor, '</td>');
     // 创建时间
-    html.push('<td style="width: 15%">', node.create_time ? moment(node.create_time).format('YYYY-MM-DD HH:mm:ss') : '', '</td>');
+    html.push('<td style="width: 9%">', node.create_time ? moment(node.create_time).format('YYYY-MM-DD HH:mm:ss') : '', '</td>');
     // 计量模式
     // html.push('<td>');
     // if (node.measure_type) {
@@ -304,13 +309,13 @@ function recursiveGetTenderNodeHtml (node, arr, pid) {
     // }
     // html.push('</td>');
     // 计量期数
-    html.push('<td style="width: 10%" class="text-center">');
+    html.push('<td style="width: 9%" class="text-center">');
     if (!node.cid) {
         html.push(node.lastStage ? '第' + node.lastStage.order + '期' : '台账');
     }
     html.push('</td>');
     // 审批状态
-    html.push('<td style="width: 20%">');
+    html.push('<td style="width: 15%">');
     html.push(node.lastStage ? auditConst.stage.statusString[node.lastStage.status] : auditConst.ledger.statusString[node.ledger_status]);
     html.push(node.status_users ? '(' + node.status_users + ')' : '');
     html.push('</td>');
@@ -329,11 +334,12 @@ function getTenderTreeHtml () {
         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: 40%">', '标段名称', tenderListOrder.getOrderButton('name'), '</th>');
-        html.push('<th class="text-center" style="width: 10%">', '计量模式', '</th>');
-        html.push('<th class="text-center" style="width: 10%">', '创建人', '</th>');
-        html.push('<th class="text-center" style="width: 10%">', '创建时间', tenderListOrder.getOrderButton('create_time'), '</th>');
-        html.push('<th class="text-center" style="width: 10%">', '计量期数', '</th>');
-        html.push('<th class="text-center" style="width: 20%">', '审批状态', '</th>');
+        html.push('<th class="text-center" style="width: 9%">', '计量模式', '</th>');
+        html.push('<th class="text-center" style="width: 9%">', '创建人', '</th>');
+        html.push('<th class="text-center" style="width: 9%">', '游客', '</th>');
+        html.push('<th class="text-center" style="width: 9%">', '创建时间', tenderListOrder.getOrderButton('create_time'), '</th>');
+        html.push('<th class="text-center" style="width: 9%">', '计量期数', '</th>');
+        html.push('<th class="text-center" style="width: 15%">', '审批状态', '</th>');
         html.push('</tr>', '</thead>');
         parentId = 0;
         for (const t of tenderTree) {