Browse Source

流程信息的操作按钮展示问题处理

杨治明 9 months ago
parent
commit
29076e404b

+ 2 - 1
tc-service/tap-task/src/main/java/com/minto/app/task/manager/TaskColApproval.java

@@ -88,7 +88,8 @@ public class TaskColApproval implements ColApproval {
             auditRelId = colSummary.getServiceId();
             colId = colSummary.getId()+"";
         }
-        return "/task/showAuditInfo/"+type+"?auditRelId="+auditRelId+"&colId="+colId;
+        Long requestColId = ReqUtil.getLong(WebUtil.getRequest(), "colId");
+        return "/task/showAuditInfo/"+type+"?auditRelId="+auditRelId+"&colId="+colId+"&doIt="+(requestColId!=null);
     }
 
     @Override

+ 2 - 0
tip-front/src/main/java/com/minto/app/task/controller/TaskController.java

@@ -9331,6 +9331,7 @@ public class TaskController extends BaseController {
         List<Map<String,Object>> maps = Lists.newArrayList();
 
         Long colId = ReqUtil.getLong(request, "colId");
+        Boolean doIt = ReqUtil.getBoolean(request, "doIt");
 
         if(auditType == ColEnum.ColAuditType.Report.getKey() ||
                 auditType == ColEnum.ColAuditType.ReportCollect.getKey() ||
@@ -9473,6 +9474,7 @@ public class TaskController extends BaseController {
         }
         mav.addObject("beans", maps);
         mav.addObject("auditType", auditType);
+        mav.addObject("doIt", doIt);
         return mav;
     }
 

+ 1 - 1
tip-front/src/main/webapp/WEB-INF/pages/apps/task/taskAuditInfo.html

@@ -66,7 +66,7 @@
                             <td data-th-text="${bean['processDetail']}"></td>
                             <td data-th-text="${bean['faq']}"></td>
                             <td data-th-text="${bean['endDate']}"></td>
-                            <td data-th-if="${bean['colState']} == 1">
+                            <td data-th-if="${bean['colState'] == 1 && !doIt }" >
                                 <button @click.stop="editThisMessage"
                                         data-th-data-id="${bean.id}"
                                         type="button"

+ 1 - 1
tip-front/src/main/webapp/tc_suite/collaboration/js/col.js

@@ -1435,7 +1435,7 @@ col.doIndex.advancePOSave = function(code, editApi) {
         var auditType = $("#auditType").val() ? $("#auditType").val() : $("#tempAuditType").val();
 
         if(auditType == 2){
-            doActionUrl+='/m=batchSendBack'
+            doActionUrl+='?m=batchSendBack'
             $.dialog({
                 autoOpen: false,
                 modal: true,