Преглед на файлове

Merge remote-tracking branch 'origin/dev' into dev

ellisran преди 6 дни
родител
ревизия
24214c77ec
променени са 2 файла, в които са добавени 4 реда и са изтрити 3 реда
  1. 2 0
      app/public/css/main.css
  2. 2 3
      app/service/stage.js

+ 2 - 0
app/public/css/main.css

@@ -3894,6 +3894,8 @@ button.gy-stat:focus-visible{outline:2px solid var(--accent);outline-offset:3px}
 .inspection-detail-attachments-table td {
     overflow-wrap: break-word;
 }
+.inspection-detail-attachments-table thead th:first-child,
+.inspection-detail-attachments-table .inspection-attachment-row td:first-child,
 .inspection-detail-attachments-table thead th:nth-child(n+3),
 .inspection-detail-attachments-table .inspection-attachment-row td:nth-child(n+3) {
     text-align: center;

+ 2 - 3
app/service/stage.js

@@ -201,11 +201,10 @@ module.exports = app => {
                     stage.assist = ass;
                     stage.curOrder = stage.curAuditors[0].order;
                     // 会签,会签人审批通过时,只读,但是curOrder需按原来的取值
-                    if (stage.curAuditors[0].audit_type === auditType.key.and) {
+                    if (stage.curAuditors[0].audit_type === auditConst.auditType.key.and) {
                         stage.readOnly = !_.isEqual(stage.flowAuditorIds, stage.curAuditorIds);
                         stage.canCheck = true;
-                    } else if (stage.curAuditors[0].audit_type === auditType.key.union) {
-                        console.log(stage.relaAuditor);
+                    } else if (stage.curAuditors[0].audit_type === auditConst.auditType.key.union) {
                         stage.readOnly = stage.relaAuditor.status !== status.checking;
                         stage.canCheck = !stage.readOnly;
                     }