Главная Обзор Помощь
Вход
maixinrong
/
Calculation
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

修复wapbug

ellisran 9 часов назад
Родитель
a4d2c4746f
Сommit
045a1b7e9a
3 измененных файлов с 22 добавлено и 12 удалено
Разделённый вид Показать статистику Diff
  1. 1 1
      app/service/quality_inspection_audit.js
  2. 1 1
      app/service/safe_inspection_audit.js
  3. 20 10
      app/view/wap/dashboard.ejs

+ 1 - 1
app/service/quality_inspection_audit.js
Просмотреть файл 

@@ -258,7 +258,7 @@ module.exports = app => {
 
                 '  FROM ?? AS ma' +
 
                 '  LEFT JOIN ?? AS m On ma.qiid = m.id' +
 
                 '  LEFT JOIN ?? As t On m.tid = t.id' +
 
-                '  LEFT JOIN ?? As ti On m.tid = ti.id' +
 
+                '  LEFT JOIN ?? As ti On m.tid = ti.tid' +
 
                 '  WHERE ma.`aid` = ? and (ma.`status` = ? OR ma.`status` = ?)' +
 
                 '  ORDER BY ma.`begin_time` DESC';
 
             const sqlParam = [this.tableName, this.ctx.service.qualityInspection.tableName, this.ctx.service.tender.tableName, this.ctx.service.tenderInfo.tableName, auditorId, auditConst.status.checking, auditConst.status.rectification];

+ 1 - 1
app/service/safe_inspection_audit.js
Просмотреть файл 

@@ -258,7 +258,7 @@ module.exports = app => {
 
                 '  FROM ?? AS ma' +
 
                 '  LEFT JOIN ?? AS m On ma.qiid = m.id' +
 
                 '  LEFT JOIN ?? As t On m.tid = t.id' +
 
-                '  LEFT JOIN ?? As ti On m.tid = ti.id' +
 
+                '  LEFT JOIN ?? As ti On m.tid = ti.tid' +
 
                 '  WHERE ma.`aid` = ? and (ma.`status` = ? OR ma.`status` = ?)' +
 
                 '  ORDER BY ma.`begin_time` DESC';
 
             const sqlParam = [this.tableName, this.ctx.service.safeInspection.tableName, this.ctx.service.tender.tableName, this.ctx.service.tenderInfo.tableName, auditorId, auditConst.status.checking, auditConst.status.rectification];

+ 20 - 10
app/view/wap/dashboard.ejs
Просмотреть файл 

@@ -21,6 +21,16 @@
 
     </style>
 
 </head>
 
 <body>
 
+    <%
 
+        function getBuildName(dealInfo) {
 
+            if (!dealInfo) return '';
 
+            try {
 
+                return JSON.parse(dealInfo).buildName || '';
 
+            } catch (err) {
 
+                return '';
 
+            }
 
+        }
 
+    %>
 
     <div class="container">
 
         <!--顶部-->
 
         <nav class="fixed-top bg-dark">
 
@@ -44,7 +54,7 @@
 
                 <% for (const audit of auditStages) { %>
 
                 <div class="card mb-3">
 
                     <div class="card-header d-flex justify-content-between">
 
-                        <span><%- JSON.parse(audit.deal_info).buildName %></span>
 
+                        <span><%- getBuildName(audit.deal_info) %></span>
 
                         <span class="badge badge-pill bg-new-stage text-new-stage">计量期</span>
 
                     </div>
 
                     <div class="bg-light p-2 px-3"><b><%- audit.name %></b></div>
 
@@ -72,7 +82,7 @@
 
                 <% for (const revise of auditRevise) { %>
 
                     <div class="card mb-3">
 
                         <div class="card-header d-flex justify-content-between">
 
-                            <span><%- JSON.parse(revise.deal_info).buildName %></span>
 
+                            <span><%- getBuildName(revise.deal_info) %></span>
 
                             <span class="badge badge-pill bg-new-revise text-new-revise">台账修订</span>
 
                         </div>
 
                         <div class="bg-light p-2 px-3"><b><%- revise.t_name %></b></div>
 
@@ -94,7 +104,7 @@
 
                 <% for (const change of auditChanges) { %>
 
                     <div class="card mb-3">
 
                         <div class="card-header d-flex justify-content-between">
 
-                            <span><%- JSON.parse(change.deal_info).buildName %></span>
 
+                            <span><%- getBuildName(change.deal_info) %></span>
 
                             <span class="badge badge-pill bg-new-change text-new-change">工程变更</span>
 
                         </div>
 
                         <div class="bg-light p-2 px-3"><b><%- change.name %></b></div>
 
@@ -117,7 +127,7 @@
 
                 <% for (const change of auditChangeProjects) { %>
 
                     <div class="card mb-3">
 
                         <div class="card-header d-flex justify-content-between">
 
-                            <span><%- JSON.parse(change.deal_info).buildName %></span>
 
+                            <span><%- getBuildName(change.deal_info) %></span>
 
                             <span class="badge badge-pill bg-new-changeProject text-new-changeProject">变更立项</span>
 
                         </div>
 
                         <div class="bg-light p-2 px-3"><b><%- change.t_name %></b></div>
 
@@ -139,7 +149,7 @@
 
                 <% for (const change of auditChangeApplys) { %>
 
                     <div class="card mb-3">
 
                         <div class="card-header d-flex justify-content-between">
 
-                            <span><%- JSON.parse(change.deal_info).buildName %></span>
 
+                            <span><%- getBuildName(change.deal_info) %></span>
 
                             <span class="badge badge-pill bg-new-changeApply text-new-changeApply">变更申请</span>
 
                         </div>
 
                         <div class="bg-light p-2 px-3"><b><%- change.t_name %></b></div>
 
@@ -161,7 +171,7 @@
 
                 <% for (const change of auditChangePlans) { %>
 
                     <div class="card mb-3">
 
                         <div class="card-header d-flex justify-content-between">
 
-                            <span><%- JSON.parse(change.deal_info).buildName %></span>
 
+                            <span><%- getBuildName(change.deal_info) %></span>
 
                             <span class="badge badge-pill bg-new-changePlan text-new-changePlan">变更方案</span>
 
                         </div>
 
                         <div class="bg-light p-2 px-3"><b><%- change.t_name %></b></div>
 
@@ -183,7 +193,7 @@
 
                 <% for (const advance of auditAdvance) { %>
 
                     <div class="card mb-3">
 
                         <div class="card-header d-flex justify-content-between">
 
-                            <span><%- JSON.parse(advance.deal_info).buildName %></span>
 
+                            <span><%- getBuildName(advance.deal_info) %></span>
 
                             <span class="badge badge-pill bg-new-advance text-new-advance">预付款</span>
 
                         </div>
 
                         <div class="bg-light p-2 px-3"><b><%- advance.name %></b></div>
 
@@ -207,7 +217,7 @@
 
                 <% for (const audit of auditMaterials) { %>
 
                     <div class="card mb-3">
 
                         <div class="card-header d-flex justify-content-between">
 
-                            <span><%- JSON.parse(audit.deal_info).buildName %></span>
 
+                            <span><%- getBuildName(audit.deal_info) %></span>
 
                             <span class="badge badge-pill bg-new-material text-new-material">材料调差</span>
 
                         </div>
 
                         <div class="bg-light p-2 px-3"><b><%- audit.name %></b></div>
 
@@ -235,7 +245,7 @@
 
                 <% for (const inspection of auditQualityInspections) { %>
 
                     <div class="card mb-3">
 
                             <div class="card-header d-flex justify-content-between">
 
-                                <span><%- JSON.parse(inspection.deal_info).buildName %></span>
 
+                                <span><%- getBuildName(inspection.deal_info) %></span>
 
                                 <span class="badge badge-pill bg-new-inspection text-new-inspection">质量巡检</span>
 
                             </div>
 
                             <div class="bg-light p-2 px-3"><b><%- inspection.t_name %></b></div>
 
@@ -256,7 +266,7 @@
 
                 <% for (const inspection of auditSafeInspections) { %>
 
                     <div class="card mb-3">
 
                         <div class="card-header d-flex justify-content-between">
 
-                            <span><%- JSON.parse(inspection.deal_info).buildName %></span>
 
+                            <span><%- getBuildName(inspection.deal_info) %></span>
 
                             <span class="badge badge-pill bg-new-inspection text-new-inspection">安全巡检</span>
 
                         </div>
 
                         <div class="bg-light p-2 px-3"><b><%- inspection.t_name %></b></div>