Merge branch 'dev' of http://192.168.1.41:3000/maixinrong/Calculation into dev

app/const/audit.js

@@ -32,6 +32,7 @@ const ledger = (function() {
         checked: 3, // 审批通过
         checkNo: 4, // 审批退回
         checkAgain: 6, // 重新审批 // 该状态仅可用于，终审退回时，修改原终审的审批状态，并同时新增一条新的终审审批中记录
+        checkSkip: 8, // 跳过
     };
 
     const statusString = [];
@@ -43,7 +44,7 @@ const ledger = (function() {
 
     const statusClass = [];
     statusClass[status.uncheck] = '';
-    statusClass[status.checking] = '';
+    statusClass[status.checking] = 'text-warning';
     statusClass[status.checked] = 'text-success';
     statusClass[status.checkNo] = 'text-warning';
     statusClass[status.checkAgain] = 'text-warning';
@@ -56,6 +57,7 @@ const ledger = (function() {
     auditString[status.checked] = '审批通过';
     auditString[status.checkNo] = '审批退回';
     auditString[status.checkAgain] = '重新审批';
+    auditString[status.checkSkip] = '审批通过';
     // 文字样式
     const auditStringClass = [];
     auditStringClass[status.uncheck] = '';
@@ -63,6 +65,7 @@ const ledger = (function() {
     auditStringClass[status.checked] = 'text-success';
     auditStringClass[status.checkNo] = 'text-warning';
     auditStringClass[status.checkAgain] = 'text-warning';
+    auditString[status.checkSkip] = 'text-success';
 
     // 金额概况
 
@@ -97,7 +100,7 @@ const revise = (function() {
 
     const statusClass = [];
     statusClass[status.uncheck] = '';
-    statusClass[status.checking] = '';
+    statusClass[status.checking] = 'text-warning';
     statusClass[status.checked] = 'text-success';
     statusClass[status.checkNo] = 'text-warning';
 
@@ -156,7 +159,7 @@ const stage = (function() {
     // 流程状态样式
     const statusClass = [];
     statusClass[status.uncheck] = '';
-    statusClass[status.checking] = '';
+    statusClass[status.checking] = 'text-warning';
     statusClass[status.checked] = 'text-success';
     statusClass[status.checkNo] = 'text-warning';
     statusClass[status.checkNoPre] = 'text-warning';
@@ -287,7 +290,7 @@ const settle = (function() {
     // 流程状态样式
     const statusClass = [];
     statusClass[status.uncheck] = '';
-    statusClass[status.checking] = '';
+    statusClass[status.checking] = 'text-warning';
     statusClass[status.checked] = 'text-success';
     statusClass[status.checkNo] = 'text-warning';
     statusClass[status.checkNoPre] = 'text-warning';
@@ -522,7 +525,7 @@ const material = (function() {
     // 流程状态样式
     const statusClass = [];
     statusClass[status.uncheck] = '';
-    statusClass[status.checking] = '';
+    statusClass[status.checking] = 'text-warning';
     statusClass[status.checked] = 'text-success';
     statusClass[status.checkNo] = 'text-warning';
     statusClass[status.checkNoPre] = 'text-warning';

app/service/ledger_audit.js

@@ -529,8 +529,8 @@ module.exports = app => {
                     return {
                         id: x.id,
                         status: x.audit_id === selfAuditor.audit_id ? auditConst.status.checkNo : auditConst.status.checkSkip,
-                        opinion: x.audit_id === selfAuditor.aid ? opinion : '',
-                        end_time: x.audit_id === selfAuditor.aid ? time : null,
+                        opinion: x.audit_id === selfAuditor.audit_id ? opinion : '',
+                        end_time: x.audit_id === selfAuditor.audit_id ? time : null,
                     };
                 });
                 await transaction.updateRows(this.tableName, updateAuditData);

app/view/ledger/explode_modal.ejs

@@ -473,13 +473,6 @@
     </div>
 </div>
 <% } %>
-
-<% if ((ctx.session.sessionUser.accountId === ctx.tender.data.user_id || ctx.session.sessionUser.is_admin) && (ctx.tender.data.ledger_status === auditConst.status.uncheck || ctx.tender.data.ledger_status === auditConst.status.checkNo)) { %>
-    <script>
-        const shenpi_status = <%- ctx.tender.info.shenpi.ledger %>;
-        const shenpiConst =  JSON.parse('<%- JSON.stringify(shenpiConst) %>');
-    </script>
-<% } %>
 <script>
     const cur_uid  = parseInt('<%- ctx.session.sessionUser.accountId %>');
     $('.sp-location-list').on('shown.bs.modal', function () {