浏览代码

台账审批、修订审批,计量审批,审批流程修改相关

MaiXinRong 10 月之前
父节点
当前提交
fcff15a3cf
共有 5 个文件被更改,包括 14 次插入9 次删除
  1. 4 3
      app/public/js/ledger.js
  2. 4 3
      app/public/js/stage_audit.js
  3. 1 0
      app/view/ledger/explode.ejs
  4. 1 0
      app/view/revise/info.ejs
  5. 4 3
      app/view/revise/info_modal.ejs

+ 4 - 3
app/public/js/ledger.js

@@ -4168,10 +4168,11 @@ $(document).ready(function() {
                     }
                     }
                     html.push('</div>');
                     html.push('</div>');
                     html.push('<div class="col-auto">');
                     html.push('<div class="col-auto">');
-                    // todo 添加会签或签时
-                    // html.push('<span class="badge badge-pill badge-primary badge-bg-small"><small></small></span>');
+                    if (data[0].audit_type !== auditType.key.common) {
+                        html.push(`<span class="badge badge-pill badge-${auditType.info[data[0].audit_type].class} badge-bg-small"><small>${auditType.info[data[0].audit_type].long}</small></span>`);
+                    }
                     if (shenpi_status === shenpiConst.sp_status.sqspr || (shenpi_status === shenpiConst.sp_status.gdzs && index+1 !== datas.length)) {
                     if (shenpi_status === shenpiConst.sp_status.sqspr || (shenpi_status === shenpiConst.sp_status.gdzs && index+1 !== datas.length)) {
-                        html.push('<a href="javascript: void(0)" class="text-danger pull-right">移除</a>');
+                        html.push('<a href="javascript: void(0)" class="text-danger pull-right ml-1">移除</a>');
                     }
                     }
                     html.push('</div>');
                     html.push('</div>');
                     html.push('</li>');
                     html.push('</li>');

+ 4 - 3
app/public/js/stage_audit.js

@@ -143,10 +143,11 @@ $(document).ready(function () {
                         }
                         }
                         html.push('</div>');
                         html.push('</div>');
                         html.push('<div class="col-auto">');
                         html.push('<div class="col-auto">');
-                        // todo 添加会签或签时
-                        // html.push('<span class="badge badge-pill badge-primary badge-bg-small"><small></small></span>');
+                        if (data[0].audit_type !== auditType.key.common) {
+                            html.push(`<span class="badge badge-pill badge-${auditType.info[data[0].audit_type].class} badge-bg-small"><small>${auditType.info[data[0].audit_type].long}</small></span>`);
+                        }
                         if (shenpi_status === shenpiConst.sp_status.sqspr || (shenpi_status === shenpiConst.sp_status.gdzs && index+1 !== datas.length)) {
                         if (shenpi_status === shenpiConst.sp_status.sqspr || (shenpi_status === shenpiConst.sp_status.gdzs && index+1 !== datas.length)) {
-                            html.push('<a href="javascript: void(0)" class="text-danger pull-right">移除</a>');
+                            html.push('<a href="javascript: void(0)" class="text-danger pull-right ml-1">移除</a>');
                         }
                         }
                         html.push('</div>');
                         html.push('</div>');
                         html.push('</li>');
                         html.push('</li>');

+ 1 - 0
app/view/ledger/explode.ejs

@@ -361,6 +361,7 @@
     const tenderInfo = JSON.parse(unescape('<%- escape(JSON.stringify(tenderInfo)) %>'));
     const tenderInfo = JSON.parse(unescape('<%- escape(JSON.stringify(tenderInfo)) %>'));
     const thousandth = <%- ctx.tender.info.display.thousandth %>;
     const thousandth = <%- ctx.tender.info.display.thousandth %>;
     const auditConst = JSON.parse('<%- JSON.stringify(auditConst) %>');
     const auditConst = JSON.parse('<%- JSON.stringify(auditConst) %>');
+    const auditType = JSON.parse('<%- JSON.stringify(auditType) %>');
     let attData = JSON.parse(unescape('<%- escape(JSON.stringify(attData)) %>'));
     let attData = JSON.parse(unescape('<%- escape(JSON.stringify(attData)) %>'));
     const whiteList = JSON.parse('<%- JSON.stringify(whiteList) %>');
     const whiteList = JSON.parse('<%- JSON.stringify(whiteList) %>');
     const measureType = JSON.parse('<%- JSON.stringify(measureType) %>');
     const measureType = JSON.parse('<%- JSON.stringify(measureType) %>');

+ 1 - 0
app/view/revise/info.ejs

@@ -261,4 +261,5 @@
     const settleStatus = JSON.parse('<%- JSON.stringify(settleStatus) %>');
     const settleStatus = JSON.parse('<%- JSON.stringify(settleStatus) %>');
     const tenderName = '<%- ctx.tender.name %>';
     const tenderName = '<%- ctx.tender.name %>';
     const reviseComplete = <%- ctx.revise.status === audit.status.checked %>;
     const reviseComplete = <%- ctx.revise.status === audit.status.checked %>;
+    const auditType = JSON.parse('<%- JSON.stringify(auditType) %>');
 </script>
 </script>

+ 4 - 3
app/view/revise/info_modal.ejs

@@ -747,10 +747,11 @@
                         }
                         }
                         html.push('</div>');
                         html.push('</div>');
                         html.push('<div class="col-auto">');
                         html.push('<div class="col-auto">');
-                        // todo 添加会签或签时
-                        // html.push('<span class="badge badge-pill badge-primary badge-bg-small"><small></small></span>');
+                        if (data[0].audit_type !== auditType.key.common) {
+                            html.push(`<span class="badge badge-pill badge-${auditType.info[data[0].audit_type].class} badge-bg-small"><small>${auditType.info[data[0].audit_type].long}</small></span>`);
+                        }
                         if (shenpi_status === shenpiConst.sp_status.sqspr || (shenpi_status === shenpiConst.sp_status.gdzs && index+1 !== datas.length)) {
                         if (shenpi_status === shenpiConst.sp_status.sqspr || (shenpi_status === shenpiConst.sp_status.gdzs && index+1 !== datas.length)) {
-                            html.push('<a href="javascript: void(0)" class="text-danger pull-right">移除</a>');
+                            html.push('<a href="javascript: void(0)" class="text-danger pull-right ml-1">移除</a>');
                         }
                         }
                         html.push('</div>');
                         html.push('</div>');
                         html.push('</li>');
                         html.push('</li>');