浏览代码

安全巡检待办页功能补齐

ellisran 2 周之前
父节点
当前提交
d5e8273fe0

+ 20 - 5
app/controller/dashboard_controller.js

@@ -41,6 +41,7 @@ module.exports = app => {
             const allAuditStageAss = await ctx.service.stageAuditAss.getAuditStageAss(ctx.session.sessionUser.accountId);
             const allAuditFinancials = await ctx.service.financialPayAudit.getAuditFinancial(ctx.session.sessionUser.accountId);
             const allAuditInspections = await ctx.service.qualityInspectionAudit.getAuditInspection(ctx.session.sessionUser.accountId);
+            const allAuditSafeInspections = await ctx.service.safeInspectionAudit.getAuditInspection(ctx.session.sessionUser.accountId);
             const pa = await ctx.service.projectAccount.getDataById(ctx.session.sessionUser.accountId);
             const auditShenpiTenders = await ctx.service.ledgerAudit.getDonesByAudit(ctx.session.sessionUser.accountId);
             const auditShenpiStages = await ctx.service.stageAudit.getDonesByAudit(ctx.session.sessionUser.accountId);
@@ -54,6 +55,7 @@ module.exports = app => {
             const auditShenpiPayment = await ctx.service.paymentDetailAudit.getDonesByAudit(ctx.session.sessionUser.accountId);
             const auditShenpiFinancial = await ctx.service.financialPayAudit.getDonesByAudit(ctx.session.sessionUser.accountId);
             const auditShenpiInspection = await ctx.service.qualityInspectionAudit.getDonesByAudit(ctx.session.sessionUser.accountId);
+            const auditShenpiSafeInspection = await ctx.service.safeInspectionAudit.getDonesByAudit(ctx.session.sessionUser.accountId);
             const dashboardStatus = {
                 all: 0,
                 dashboard: 0,
@@ -72,6 +74,7 @@ module.exports = app => {
                     payment: 0,
                     financial: 0,
                     inspection: 0,
+                    safeInspection: 0,
                 },
             };
             let noticeList = [];
@@ -101,8 +104,10 @@ module.exports = app => {
                 noticeList.push(...ctx.helper.addKeyValue4ObjArray(spPayment, 'shenpi_type', 'payment'));
                 const spFinancial = subProject.page_show.openFinancial ? ctx.helper._.filter(auditShenpiFinancial, { spid: subProject.id }) : [];
                 noticeList.push(...ctx.helper.addKeyValue4ObjArray(spFinancial, 'shenpi_type', 'financial'));
-                const spInspection = subProject.page_show.quality ? ctx.helper._.filter(auditShenpiInspection, { spid: subProject.id }) : [];
+                const spInspection = subProject.page_show.qualityInspection ? ctx.helper._.filter(auditShenpiInspection, { spid: subProject.id }) : [];
                 noticeList.push(...ctx.helper.addKeyValue4ObjArray(spInspection, 'shenpi_type', 'inspection'));
+                const spSafeInspection = subProject.page_show.safeInspection ? ctx.helper._.filter(auditShenpiSafeInspection, { spid: subProject.id }) : [];
+                noticeList.push(...ctx.helper.addKeyValue4ObjArray(spInspection, 'shenpi_type', 'safe_inspection'));
             }
             const noticeDayList = [];
             noticeList = ctx.helper._.orderBy(noticeList, ['shenpi_time'], ['desc']);
@@ -138,6 +143,8 @@ module.exports = app => {
             dashboardShenpis.push(...auditFinancials);
             const auditInspections = await this.auditSet(ctx, allAuditInspections, subProjects, dashboardStatus, 'inspection');
             dashboardShenpis.push(...auditInspections);
+            const auditSafeInspections = await this.auditSet(ctx, allAuditSafeInspections, subProjects, dashboardStatus, 'safeInspection');
+            dashboardShenpis.push(...auditSafeInspections);
             // console.log(ctx.helper._.orderBy(dashboardShenpis, ['start_audit', 'shenpi_time'], ['desc', 'desc']));
             const projectData = await ctx.service.project.getDataById(ctx.session.sessionProject.id);
             // 获取销售人员数据
@@ -272,9 +279,13 @@ module.exports = app => {
                             calcTime = t.fpcstatus !== auditConst[type].status.checkNo ? t.begin_time : t.end_time;
                             break;
                         case 'inspection':
-                            if (!sp.page_show.quality) closeType = true;
+                            if (!sp.page_show.qualityInspection) closeType = true;
                             calcTime = t.status !== auditConst[type].status.checkNo ? t.begin_time : t.end_time;
                             break;
+                        case 'safeInspection':
+                            if (!sp.page_show.safeInspection) closeType = true;
+                            calcTime = t.status !== auditConst.inspection.status.checkNo ? t.begin_time : t.end_time;
+                            break;
                         default:
                             closeType = true;
                     }
@@ -320,7 +331,8 @@ module.exports = app => {
             const auditPayments = ctx.subProject.page_show.openPayment ? await ctx.service.paymentDetailAudit.getAuditPayment(ctx.session.sessionUser.accountId, ctx.subProject.id) : [];
             const auditStageAss = await ctx.service.stageAuditAss.getAuditStageAss(ctx.session.sessionUser.accountId, ctx.subProject.id);
             const auditFinancials = ctx.subProject.page_show.openFinancial ? await ctx.service.financialPayAudit.getAuditFinancial(ctx.session.sessionUser.accountId, ctx.subProject.id) : [];
-            const auditInspections = ctx.subProject.page_show.quality ? await ctx.service.qualityInspectionAudit.getAuditInspection(ctx.session.sessionUser.accountId, ctx.subProject.id) : [];
+            const auditInspections = ctx.subProject.page_show.qualityInspection ? await ctx.service.qualityInspectionAudit.getAuditInspection(ctx.session.sessionUser.accountId, ctx.subProject.id) : [];
+            const auditSafeInspections = ctx.subProject.page_show.safeInspection ? await ctx.service.safeInspectionAudit.getAuditInspection(ctx.session.sessionUser.accountId, ctx.subProject.id) : [];
             const pa = await ctx.service.projectAccount.getDataById(ctx.session.sessionUser.accountId);
             const noticeList = await ctx.service.noticePush.getNotice(ctx.session.sessionProject.id, pa.id, ctx.subProject.id);
             const projectData = await ctx.service.project.getDataById(ctx.session.sessionProject.id);
@@ -350,7 +362,8 @@ module.exports = app => {
             if (ctx.subProject.page_show.openChangePlan) shenpi_count.push({ count: await ctx.service.changePlanAudit.getCountByChecked(ctx.session.sessionUser.accountId, ctx.subProject.id), name: '变更方案' });
             if (ctx.subProject.page_show.openMaterial) shenpi_count.push({ count: await ctx.service.materialAudit.getCountByChecked(ctx.session.sessionUser.accountId, ctx.subProject.id), name: '材料调差' });
             if (ctx.subProject.page_show.openFinancial) shenpi_count.push({ count: await ctx.service.financialPayAudit.getCountByChecked(ctx.session.sessionUser.accountId, ctx.subProject.id), name: '资金支付' });
-            if (ctx.subProject.page_show.quality) shenpi_count.push({ count: await ctx.service.qualityInspectionAudit.getCountByChecked(ctx.session.sessionUser.accountId, ctx.subProject.id), name: '质量巡检' });
+            if (ctx.subProject.page_show.qualityInspection) shenpi_count.push({ count: await ctx.service.qualityInspectionAudit.getCountByChecked(ctx.session.sessionUser.accountId, ctx.subProject.id), name: '质量巡检' });
+            if (ctx.subProject.page_show.safeInspection) shenpi_count.push({ count: await ctx.service.safeInspectionAudit.getCountByChecked(ctx.session.sessionUser.accountId, ctx.subProject.id), name: '安全巡检' });
             // shenpi_count.push({ count: await ctx.service.advanceAudit.getCountByChecked(ctx.session.sessionUser.accountId), name: '预付款' });
             const total_count = ctx.app._.sumBy(shenpi_count, 'count');
             const shenpi_lastime = [
@@ -364,7 +377,8 @@ module.exports = app => {
                 ctx.subProject.page_show.openChangePlan ? await ctx.service.changePlanAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId, ctx.subProject.id) : null,
                 ctx.subProject.page_show.openMaterial ? await ctx.service.materialAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId, ctx.subProject.id) : null,
                 ctx.subProject.page_show.openFinancial ? await ctx.service.financialPayAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId, ctx.subProject.id) : null,
-                ctx.subProject.page_show.quality ? await ctx.service.qualityInspectionAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId, ctx.subProject.id) : null,
+                ctx.subProject.page_show.qualityInspection ? await ctx.service.qualityInspectionAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId, ctx.subProject.id) : null,
+                ctx.subProject.page_show.safeInspection ? await ctx.service.safeInspectionAudit.getLastEndTimeByChecked(ctx.session.sessionUser.accountId, ctx.subProject.id) : null,
             ];
             const last_time = ctx.app._.max(shenpi_lastime);
             // console.log(ctx.app._.max(shenpi_lastime), ctx.helper.calcDayNum(last_time));
@@ -382,6 +396,7 @@ module.exports = app => {
                 auditStageAss,
                 auditFinancials,
                 auditInspections,
+                auditSafeInspections,
                 shenpi_count,
                 total_count,
                 last_day: ctx.helper.calcDayNum(last_time),

+ 4 - 5
app/service/safe_inspection.js

@@ -185,10 +185,10 @@ module.exports = app => {
                     case auditConst.filter.status.uncheck: // 待上报(所有的)PS:取未上报,退回,修订的变更令
                         sql =
                             'SELECT a.* FROM ?? AS a WHERE ' +
-                            'a.uid = ? AND a.tid = ? AND (a.status = ? OR a.status = ?)';
+                            'a.tid = ? AND (a.status = ? OR a.status = ?)' +
+                            (this.ctx.session.sessionUser.is_admin || this.ctx.permission.safe_inspection.view_all ? '' : ' AND a.uid = ' + this.ctx.session.sessionUser.accountId);
                         sqlParam = [
                             this.tableName,
-                            this.ctx.session.sessionUser.accountId,
                             tid,
                             auditConst.status.uncheck,
                             auditConst.status.checkNo,
@@ -272,11 +272,10 @@ module.exports = app => {
                     return result6[0].count;
                 case auditConst.filter.status.uncheck: // 待上报(所有的)PS:取未上报,退回的变更立项
                     const sql2 =
-                        'SELECT count(*) AS count FROM ?? AS a WHERE ' +
-                        'a.uid = ? AND a.tid = ? AND (a.status = ? OR a.status = ?)';
+                        'SELECT count(*) AS count FROM ?? AS a WHERE a.tid = ? AND (a.status = ? OR a.status = ?)' +
+                        (this.ctx.session.sessionUser.is_admin || this.ctx.permission.safe_inspection.view_all ? '' : ' AND a.uid = ' + this.ctx.session.sessionUser.accountId);
                     const sqlParam2 = [
                         this.tableName,
-                        this.ctx.session.sessionUser.accountId,
                         tid,
                         auditConst.status.uncheck,
                         auditConst.status.checkNo,

+ 42 - 10
app/view/dashboard/index.ejs

@@ -72,15 +72,18 @@
                                     <% if (ctx.subProject.page_show.openFinancial && auditFinancials.length !== 0) { %>
                                         <option value="11">资金支付(<%- auditFinancials.length %>)</option>
                                     <% } %>
-                                    <% if (ctx.subProject.page_show.quality && auditInspections.length !== 0) { %>
+                                    <% if (ctx.subProject.page_show.qualityInspection && auditInspections.length !== 0) { %>
                                         <option value="12">质量巡检(<%- auditInspections.length %>)</option>
                                     <% } %>
+                                    <% if (ctx.subProject.page_show.safeInspection && auditSafeInspections.length !== 0) { %>
+                                        <option value="13">安全巡检(<%- auditSafeInspections.length %>)</option>
+                                    <% } %>
                                 </select>
                             </div>
                         </div>
                         <div class="card-body p-0">
                             <div class="contant-height-one">
-                                <% if (auditTenders.length !== 0 || auditRevise.length !== 0 || auditStages.length !== 0 || auditChanges.length !== 0 || auditMaterial.length !== 0 || auditAdvance.length !== 0 || auditChangeProject.length !== 0 || auditChangeApply.length !== 0 || auditChangePlan.length !== 0 || auditPayments.length !== 0 || auditStageAss.length !== 0 || auditFinancials.length !== 0 || auditInspections.length !== 0) { %>
+                                <% if (auditTenders.length !== 0 || auditRevise.length !== 0 || auditStages.length !== 0 || auditChanges.length !== 0 || auditMaterial.length !== 0 || auditAdvance.length !== 0 || auditChangeProject.length !== 0 || auditChangeApply.length !== 0 || auditChangePlan.length !== 0 || auditPayments.length !== 0 || auditStageAss.length !== 0 || auditFinancials.length !== 0 || auditInspections.length !== 0 || auditSafeInspections.length !== 0) { %>
                                 <style>
                                     #doing-list td {
                                         word-wrap:break-word;
@@ -311,9 +314,9 @@
                                             </tr>
                                         <% } %>
                                         <% for (const acp of auditInspections) { %>
-                                            <tr data-type="9">
+                                            <tr data-type="12">
                                                 <td><span class="bg-new-inspection text-new-inspection badge text-width">质量巡检</span></td>
-                                                <td><a href="/sp/<%- acp.spid %>/quality/tender/<%- acp.tid %>/info"><%- acp.name %></a> <a href="/sp/<%- acp.spid %>/quality/tender/<%- acp.tid %>/inspection/<%- acp.qiid %>/information"><%- acp.mcode %></a></td>
+                                                <td><a href="/sp/<%- acp.spid %>/quality/tender/<%- acp.tid %>/inspection"><%- acp.name %></a> <a href="/sp/<%- acp.spid %>/quality/tender/<%- acp.tid %>/inspection/<%- acp.qiid %>/information"><%- acp.mcode %></a></td>
                                                 <td>巡检</td>
                                                 <td><%- (
                                                             acp.mstatus !== acInspection.status.checkNo
@@ -323,6 +326,19 @@
                                                 <td><a href="/sp/<%- acp.spid %>/quality/tender/<%- acp.tid %>/inspection/<%- acp.qiid %>/information" class="btn btn-sm btn-table <% if (acp.mstatus === acInspection.status.checkNo) { %>btn-outline-warning text-warning<% } else { %>btn-outline-primary<% } %>" role="button"><% if (acp.mstatus !== acInspection.status.checkNo) { %>审批<% } else { %>重新上报<% } %></a></td>
                                             </tr>
                                         <% } %>
+                                        <% for (const acp of auditSafeInspections) { %>
+                                            <tr data-type="13">
+                                                <td><span class="bg-new-inspection text-new-inspection badge text-width">安全巡检</span></td>
+                                                <td><a href="/sp/<%- acp.spid %>/safe/tender/<%- acp.tid %>/inspection"><%- acp.name %></a> <a href="/sp/<%- acp.spid %>/safe/tender/<%- acp.tid %>/inspection/<%- acp.qiid %>/information"><%- acp.mcode %></a></td>
+                                                <td>巡检</td>
+                                                <td><%- (
+                                                            acp.mstatus !== acInspection.status.checkNo
+                                                                    ? (acp.begin_time ? ctx.moment(acp.begin_time).format('YYYY/MM/DD HH:mm') : '')
+                                                                    : (acp.end_time ? ctx.moment(acp.end_time).format('YYYY/MM/DD HH:mm') : '')
+                                                    ) %></td>
+                                                <td><a href="/sp/<%- acp.spid %>/safe/tender/<%- acp.tid %>/inspection/<%- acp.qiid %>/information" class="btn btn-sm btn-table <% if (acp.mstatus === acInspection.status.checkNo) { %>btn-outline-warning text-warning<% } else { %>btn-outline-primary<% } %>" role="button"><% if (acp.mstatus !== acInspection.status.checkNo) { %>审批<% } else { %>重新上报<% } %></a></td>
+                                            </tr>
+                                        <% } %>
                                     </tbody>
                                 </table>
                                 <% } else { %>
@@ -423,8 +439,11 @@
                                     <% if (ctx.subProject.page_show.openFinancial) { %>
                                         <option value="11">资金支付</option>
                                     <% } %>
-                                    <% if (ctx.subProject.page_show.quality) { %>
-                                        <option value="13">质量巡检</option>
+                                    <% if (ctx.subProject.page_show.qualityInspection) { %>
+                                        <option value="12">质量巡检</option>
+                                    <% } %>
+                                    <% if (ctx.subProject.page_show.safeInspection) { %>
+                                        <option value="13">安全巡检</option>
                                     <% } %>
                                 </select>
                             </div>
@@ -552,10 +571,20 @@
                                                     <td class="<%- acFinancial.statusClass[notice.status] %>"><%- acFinancial.statusString[notice.status] %></td>
                                                     <td><%- notice.opinion ? notice.opinion : '' %></td>
                                                 </tr>
-                                            <% } else if(notice.type === pushType.inspection && ctx.subProject.page_show.quality) { %>
-                                                <tr data-type="13">
+                                            <% } else if(notice.type === pushType.inspection && ctx.subProject.page_show.qualityInspection) { %>
+                                                <tr data-type="12">
                                                     <td><span class="bg-new-inspection text-new-inspection badge text-width">质量巡检</span></td>
-                                                    <td><a href="/tender/<%- notice.tid %>"><%- notice.name %></a> <a href="/sp/<%- notice.spid %>/quality/tender/<%- notice.tid %>/inspection/<%- notice.qiid %>/information"><%- notice.c_code %></a></td>
+                                                    <td><a href="/sp/<%- notice.spid %>/quality/tender/<%- notice.tid %>/inspection"><%- notice.name %></a> <a href="/sp/<%- notice.spid %>/quality/tender/<%- notice.tid %>/inspection/<%- notice.qiid %>/information"><%- notice.c_code %></a></td>
+                                                    <td><%- notice.su_name %><%- (notice.su_role ? '-' + notice.su_role : '') %></td>
+                                                    <td><%- ctx.helper.dateTran(notice.create_time, 'YYYY/MM/DD HH:mm') %></td>
+                                                    <td>巡检</td>
+                                                    <td class="<%- acInspection.statusClass[notice.status] %>"><%- acInspection.statusString[notice.status] %></td>
+                                                    <td><%- notice.opinion ? notice.opinion : '' %></td>
+                                                </tr>
+                                            <% } else if(notice.type === pushType.safeInspection && ctx.subProject.page_show.safeInspection) { %>
+                                                <tr data-type="13">
+                                                    <td><span class="bg-new-inspection text-new-inspection badge text-width">安全巡检</span></td>
+                                                    <td><a href="/sp/<%- notice.spid %>/safe/tender/<%- notice.tid %>/inspection"><%- notice.name %></a> <a href="/sp/<%- notice.spid %>/safe/tender/<%- notice.tid %>/inspection/<%- notice.qiid %>/information"><%- notice.c_code %></a></td>
                                                     <td><%- notice.su_name %><%- (notice.su_role ? '-' + notice.su_role : '') %></td>
                                                     <td><%- ctx.helper.dateTran(notice.create_time, 'YYYY/MM/DD HH:mm') %></td>
                                                     <td>巡检</td>
@@ -699,9 +728,12 @@
             <% if (ctx.subProject.page_show.openFinancial) { %>
             'rgba(58, 88, 50,'+ transparentCount +')',
             <% } %>
-            <% if (ctx.subProject.page_show.quality) { %>
+            <% if (ctx.subProject.page_show.qualityInspection) { %>
             'rgba(158, 58, 80,'+ transparentCount +')',
             <% } %>
+            <% if (ctx.subProject.page_show.safeInspection) { %>
+            'rgba(158, 8, 80,'+ transparentCount +')',
+            <% } %>
         ],
         tooltip: {
             trigger: 'item'

+ 23 - 1
app/view/dashboard/workspace.ejs

@@ -136,6 +136,9 @@
                                             <% if (dashboardStatus.shenpi.inspection !== 0) { %>
                                                 <option value="inspection">质量巡检(<%- dashboardStatus.shenpi.inspection %>)</option>
                                             <% } %>
+                                            <% if (dashboardStatus.shenpi.safeInspection !== 0) { %>
+                                                <option value="safeInspection">安全巡检(<%- dashboardStatus.shenpi.safeInspection %>)</option>
+                                            <% } %>
                                         </select>
                                     </div>
                                 </div>
@@ -413,7 +416,7 @@
                                                         </tr>
                                                     <% } else if (db.shenpi_type === 'inspection') { %>
                                                         <% const am = db; %>
-                                                        <tr data-type="material">
+                                                        <tr data-type="inspection">
                                                             <% if (am.start_audit === 2) { %><td class="text-center text-danger"><i class="fa fa-exclamation-triangle"></i></td><% } else if (am.start_audit === 1) { %><td class="text-center text-warning"><i class="fa fa-bell"></i></td><% } else { %><td></td><% } %>
                                                             <td><span class="bg-new-inspection text-new-inspection badge text-width">质量巡检</span></td>
                                                             <td><a href="/sp/<%- am.spid %>/dashboard"><%- am.sp_name %></a></td>
@@ -426,6 +429,21 @@
                                                                 ) %></td>
                                                             <td><a href="/sp/<%- am.spid %>/quality/tender/<%- am.tid %>/inspection/<%- am.qiid %>/information" class="btn btn-sm btn-table <% if (am.mstatus === acInspection.status.checkNo) { %>btn-outline-warning text-warning<% } else { %>btn-outline-primary<% } %>" role="button"><% if (am.mstatus !== acInspection.status.checkNo) { %>审批<% } else { %>重新上报<% } %></a></td>
                                                         </tr>
+                                                    <% } else if (db.shenpi_type === 'safeInspection') { %>
+                                                        <% const am = db; %>
+                                                        <tr data-type="safeInspection">
+                                                            <% if (am.start_audit === 2) { %><td class="text-center text-danger"><i class="fa fa-exclamation-triangle"></i></td><% } else if (am.start_audit === 1) { %><td class="text-center text-warning"><i class="fa fa-bell"></i></td><% } else { %><td></td><% } %>
+                                                            <td><span class="bg-new-inspection text-new-inspection badge text-width">安全巡检</span></td>
+                                                            <td><a href="/sp/<%- am.spid %>/dashboard"><%- am.sp_name %></a></td>
+                                                            <td><a href="/sp/<%- am.spid %>/safe/tender/<%- am.tid %>/inspection"><%- am.name %></a> <a href="/sp/<%- am.spid %>/safe/tender/<%- am.tid %>/inspection/<%- am.qiid %>/information"><%- am.mcode %></a></td>
+                                                            <td>巡检</td>
+                                                            <td><%- (
+                                                                        am.mstatus !== acInspection.status.checkNo
+                                                                                ? (am.begin_time ? ctx.moment(am.begin_time).format('YYYY/MM/DD HH:mm') : '')
+                                                                                : (am.end_time ? ctx.moment(am.end_time).format('YYYY/MM/DD HH:mm') : '')
+                                                                ) %></td>
+                                                            <td><a href="/sp/<%- am.spid %>/safe/tender/<%- am.tid %>/inspection/<%- am.qiid %>/information" class="btn btn-sm btn-table <% if (am.mstatus === acInspection.status.checkNo) { %>btn-outline-warning text-warning<% } else { %>btn-outline-primary<% } %>" role="button"><% if (am.mstatus !== acInspection.status.checkNo) { %>审批<% } else { %>重新上报<% } %></a></td>
+                                                        </tr>
                                                     <% } %>
                                                 <% } %>
                                                 </tbody>
@@ -854,6 +872,10 @@
                                         html.push(`<li class="list-group-item">
                                             <span class="${acInspection.auditStringClass[n.status]}">${acInspection.auditString[n.status]}</span> <a href="/sp/${n.spid}/quality/tender/${n.id}/inspection/${n.qiid}/information" target="_blank">${n.name}</a> 质量巡检 ${n.code}<span class="float-right">${moment(new Date(n.shenpi_time)).format('HH:mm:ss')}</span></li>`);
                                         break;
+                                    case 'safeInspection':
+                                        html.push(`<li class="list-group-item">
+                                            <span class="${acInspection.auditStringClass[n.status]}">${acInspection.auditString[n.status]}</span> <a href="/sp/${n.spid}/safe/tender/${n.id}/inspection/${n.qiid}/information" target="_blank">${n.name}</a> 安全巡检 ${n.code}<span class="float-right">${moment(new Date(n.shenpi_time)).format('HH:mm:ss')}</span></li>`);
+                                        break;
                                     default: continue;
                                 }
                             }

+ 4 - 2
app/view/quality/inspection.ejs

@@ -66,14 +66,16 @@
                 <table class="table table-bordered">
                     <thead class="text-center">
                     <tr>
-                        <th width="13%" id="sort_change">编号</th><th width="5%">部位</th>
+                        <th width="13%" id="sort_change">编号</th>
+<!--                        <th width="5%">部位</th>-->
                         <th width="10%">检查项目</th><th width="25%">检查情况</th><th width="13%">处理要求及措施</th>
                         <th width="10%">检查日期</th><th width="7%">附件</th><th width="13%">状态</th>
                     </tr>
                     </thead>
                     <tbody id="changeList">
                     <% for (const c of inspectionList) { %>
-                        <tr><td><a href="/sp/<%- ctx.subProject.id %>/quality/tender/<%- ctx.tender.id %>/inspection/<%- c.id %>/information"><%- c.code %></a></td><td></td>
+                        <tr><td><a href="/sp/<%- ctx.subProject.id %>/quality/tender/<%- ctx.tender.id %>/inspection/<%- c.id %>/information"><%- c.code %></a></td>
+<!--                            <td></td>-->
                             <td><%- c.check_item %></td>
                             <td><%- c.check_situation %></td>
                             <td><%- c.action %></td>

+ 4 - 2
app/view/safe/inspection.ejs

@@ -66,14 +66,16 @@
                 <table class="table table-bordered">
                     <thead class="text-center">
                     <tr>
-                        <th width="13%" id="sort_change">编号</th><th width="5%">部位</th>
+                        <th width="13%" id="sort_change">编号</th>
+<!--                        <th width="5%">部位</th>-->
                         <th width="10%">检查项目</th><th width="25%">检查情况</th><th width="13%">处理要求及措施</th>
                         <th width="10%">检查日期</th><th width="7%">附件</th><th width="13%">状态</th>
                     </tr>
                     </thead>
                     <tbody id="changeList">
                     <% for (const c of inspectionList) { %>
-                        <tr><td><a href="/sp/<%- ctx.subProject.id %>/safe/tender/<%- ctx.tender.id %>/inspection/<%- c.id %>/information"><%- c.code %></a></td><td></td>
+                        <tr><td><a href="/sp/<%- ctx.subProject.id %>/safe/tender/<%- ctx.tender.id %>/inspection/<%- c.id %>/information"><%- c.code %></a></td>
+<!--                            <td></td>-->
                             <td><%- c.check_item %></td>
                             <td><%- c.check_situation %></td>
                             <td><%- c.action %></td>