ソースを参照

显示层级相关

MaiXinRong 2 年 前
コミット
3e64093774

+ 1 - 1
app/controller/tender_controller.js

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

+ 1 - 1
app/lib/rm/material.js

@@ -230,7 +230,7 @@ class ReportMemoryMaterial {
     }
 
     async getMaterialBills(tender_id, material_order, fields, showLevel) {
-        await this.ctx.service.tender.checkTender(tid);
+        await this.ctx.service.tender.checkTender(tender_id);
         const material = await this.ctx.service.material.getDataByCondition({tid: tender_id, order: material_order});
         if (!material) return [];
 

+ 1 - 1
app/public/js/tender_list.js

@@ -297,7 +297,7 @@ function recursiveGetTenderNodeHtml (node, arr, pid) {
     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>`
+        ? `<a href="javascirpt: void(0)" data-toggle="tooltip" data-placement="top" data-original-title="${node.visitor.join(',')}">${node.visitor.length}</a>`
         : '';
     html.push('<td style="width: 9%" class="text-center">', visitor, '</td>');
     // 创建时间