Browse Source

修复审批流程bug

ellisran 10 months ago
parent
commit
8786a3d077
3 changed files with 7 additions and 5 deletions
  1. 4 3
      app/controller/tender_controller.js
  2. 1 2
      app/public/js/shenpi.js
  3. 2 0
      app/view/tender/shenpi.ejs

+ 4 - 3
app/controller/tender_controller.js

@@ -943,8 +943,9 @@ module.exports = app => {
                 return { groupName: item.name, groupList };
             });
             // 获取固定审批流 or 固定终审
-            for (const sp of shenpiConst.sp_lc) {
-                sp.status = ctx.tender.info.shenpi ? ctx.tender.info.shenpi[sp.code] : shenpiConst.sp_status.sqspr;
+            const spConst = ctx.helper._.cloneDeep(shenpiConst);
+            for (const sp of spConst.sp_lc) {
+                sp.status = ctx.tender.info.shenpi ? ctx.tender.info.shenpi[sp.code] : spConst.sp_status.sqspr;
                 if (sp.status === shenpiConst.sp_status.gdspl) {
                     sp.groupList = await ctx.service.shenpiGroup.getGroupList(ctx.tender.id, sp.type) || [];
                     if (sp.groupList && sp.groupList.length > 0) {
@@ -975,7 +976,7 @@ module.exports = app => {
             const cooperationNum = await ctx.service.ledgerCooperation.count({ tid: ctx.tender.id, status: 1 });
 
             const renderData = {
-                shenpi: shenpiConst,
+                shenpi: spConst,
                 accountList,
                 accountGroup: accountGroupList,
                 tenders,

+ 1 - 2
app/public/js/shenpi.js

@@ -1135,16 +1135,15 @@ $(document).ready(function () {
         }
         console.log(prop);
         postData('/tender/' + cur_tenderid + '/shenpi/audit/save', prop, function (data) {
-            console.log(data);
             sp_lc[sp_type[code]].auditGroupList = data.group.auditGroupList || [];
             if (groupId) {
                 const index = sp_lc[sp_type[code]].groupList.findIndex(x => { return x.id === parseInt(groupId); });
                 sp_lc[sp_type[code]].groupList[index] = data.group;
             } else {
+                if (!sp_lc[sp_type[code]].groupList) sp_lc[sp_type[code]].groupList = [];
                 for (const g of sp_lc[sp_type[code]].groupList) {
                     g.is_select = 0;
                 }
-                if (!sp_lc[sp_type[code]].groupList) sp_lc[sp_type[code]].groupList = [];
                 sp_lc[sp_type[code]].groupList.push(data.group);
             }
             // 配置页面

+ 2 - 0
app/view/tender/shenpi.ejs

@@ -23,11 +23,13 @@
                                     <div class="form-group">
                                         <div class="form-group form-check">
                                             <% for (const st in shenpi.sp_status_list) { %>
+                                            <% if (shenpi.sp_status_list[st]) { %>
                                                 <div class="custom-control custom-checkbox custom-control-inline">
                                                     <input type="radio" class="custom-control-input" data-code="<%- sp.code %>" value="<%- shenpi.sp_status_list[st].status %>" name="<%- sp.code %>" id="<%- sp.code %>_<%- shenpi.sp_status_list[st].status %>" <%if (sp.status === shenpi.sp_status_list[st].status) { %>checked<% } %>>
                                                     <label class="custom-control-label" for="<%- sp.code %>_<%- shenpi.sp_status_list[st].status %>"><%- shenpi.sp_status_list[st].name %></label>
                                                 </div>
                                             <% } %>
+                                            <% } %>
                                         </div>
                                     </div>
                                     <% if (!shenpi.sp_status_list[sp.status]) console.log(sp) %>