diff --git a/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java b/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java index e4f0930..084353c 100644 --- a/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java +++ b/snow-admin/src/main/java/com/snow/web/controller/flowable/FlowController.java @@ -53,6 +53,7 @@ public class FlowController extends BaseController { AppForm appFrom = appFormService.getAppFrom(task.getProcessInstanceId()); mmap.put("appFrom", appFrom); mmap.put("taskId", taskId); + mmap.put("processInstanceId", task.getProcessInstanceId()); return task.getFormKey(); } @@ -118,7 +119,7 @@ public class FlowController extends BaseController { historicTaskInstanceDTO.setProcessInstanceId(processInstanceId); //historicTaskInstanceDTO.setProcessStatus(1); List historicTaskInstanceList= flowableService.getHistoricTaskInstanceNoPage(historicTaskInstanceDTO); - AppForm appFrom = appFormService.getAppFromBySerializable(processInstanceId); + AppForm appFrom = appFormService.getAppFrom(processInstanceId); modelMap.put("historicTaskInstanceList",historicTaskInstanceList); modelMap.put("processInstanceId",processInstanceId); modelMap.put("busVarUrl",appFrom.getBusVarUrl()); diff --git a/snow-admin/src/main/java/com/snow/web/controller/system/PurchaseOrderController.java b/snow-admin/src/main/java/com/snow/web/controller/system/PurchaseOrderController.java index 2fb19f3..d0ee427 100644 --- a/snow-admin/src/main/java/com/snow/web/controller/system/PurchaseOrderController.java +++ b/snow-admin/src/main/java/com/snow/web/controller/system/PurchaseOrderController.java @@ -82,7 +82,7 @@ public class PurchaseOrderController extends BaseController } /** - * 导出采购单主表列表 + * 导出采购单主表列表detail */ @RequiresPermissions("system:purchaseOrder:export") @Log(title = "采购单主表", businessType = BusinessType.EXPORT) @@ -198,7 +198,7 @@ public class PurchaseOrderController extends BaseController BeanUtils.copyProperties(newPurchaseOrderMain,purchaseOrderForm); purchaseOrderForm.setBusinessKey(purchaseOrderMain.getOrderNo()); purchaseOrderForm.setStartUserId(String.valueOf(sysUser.getUserId())); - purchaseOrderForm.setBusVarJson(JSON.toJSONString(purchaseOrderForm)); + // purchaseOrderForm.setBusVarJson(JSON.toJSONString(purchaseOrderForm)); purchaseOrderForm.setClassPackName(PurchaseOrderForm.class.getCanonicalName()); purchaseOrderForm.setBusVarUrl("/system/purchaseOrder/detail"); ProcessInstance processInstance = flowableService.startProcessInstanceByAppForm(purchaseOrderForm); diff --git a/snow-admin/src/main/java/com/snow/web/controller/system/SysOaLeaveController.java b/snow-admin/src/main/java/com/snow/web/controller/system/SysOaLeaveController.java index 33cb3be..efecc0d 100644 --- a/snow-admin/src/main/java/com/snow/web/controller/system/SysOaLeaveController.java +++ b/snow-admin/src/main/java/com/snow/web/controller/system/SysOaLeaveController.java @@ -173,9 +173,7 @@ public class SysOaLeaveController extends BaseController BeanUtils.copyProperties(sysOaLeave,sysOaLeaveForm); sysOaLeaveForm.setBusinessKey(newSysOaLeave.getLeaveNo()); sysOaLeaveForm.setStartUserId(String.valueOf(sysUser.getUserId())); - sysOaLeaveForm.setBusVarJson(com.alibaba.fastjson.JSON.toJSONString(sysOaLeaveForm)); - sysOaLeaveForm.setClassPackName(SysOaLeaveForm.class.getCanonicalName()); - sysOaLeaveForm.setBusVarUrl("/system/leave/leaveDetail"); + sysOaLeaveForm.setBusVarUrl("/system/leave/detail"); ProcessInstance processInstance = flowableService.startProcessInstanceByAppForm(sysOaLeaveForm); //提交 CompleteTaskDTO completeTaskDTO=new CompleteTaskDTO(); @@ -207,16 +205,6 @@ public class SysOaLeaveController extends BaseController return prefix + "/detail"; } - /** - * 请假单详情 - */ - @GetMapping("/leaveDetail") - public String leaveDetail(@RequestParam("processInstanceId") String processInstanceId, ModelMap mmap) - { - SysOaLeaveForm appFrom = appFormService.getAppFromBySerializable(processInstanceId); - mmap.put("sysOaLeave", appFrom); - return prefix + "/leaveDetail"; - } /** * 删除请假单 */ diff --git a/snow-admin/src/main/resources/templates/flow/myStartProcess.html b/snow-admin/src/main/resources/templates/flow/myStartProcess.html index c82258a..2d4fb55 100644 --- a/snow-admin/src/main/resources/templates/flow/myStartProcess.html +++ b/snow-admin/src/main/resources/templates/flow/myStartProcess.html @@ -39,12 +39,9 @@ \ No newline at end of file diff --git a/snow-admin/src/main/resources/templates/main_v1.html b/snow-admin/src/main/resources/templates/main_v1.html index fc5ce59..ba90de5 100644 --- a/snow-admin/src/main/resources/templates/main_v1.html +++ b/snow-admin/src/main/resources/templates/main_v1.html @@ -195,7 +195,7 @@ formatter: function(value, row, index) { var actions = []; actions.push('处理 '); - actions.push('流程图'); + /*actions.push('流程图');*/ return actions.join(''); } }] @@ -211,7 +211,7 @@ function getProcessDiagram(processInstanceId) { var preViewUrl=prefix+'/getProcessDiagram?processInstanceId='+processInstanceId; - $.modal.openTab("流程图", preViewUrl); + $.modal.open("流程图", preViewUrl,500,500); } diff --git a/snow-admin/src/main/resources/templates/system/file/file.html b/snow-admin/src/main/resources/templates/system/file/file.html index 99e6875..cb9e253 100644 --- a/snow-admin/src/main/resources/templates/system/file/file.html +++ b/snow-admin/src/main/resources/templates/system/file/file.html @@ -11,32 +11,14 @@
  • - +
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • +
  •  搜索  重置 @@ -47,12 +29,6 @@
- - 添加 - - - 修改 - 删除 @@ -89,7 +65,7 @@ }, { field: 'key', - title: '文件的唯一索引' + title: 'key' }, { field: 'name', @@ -105,22 +81,17 @@ }, { field: 'url', - title: '文件访问链接' - }, - { - field: 'remark', - title: '备注' - }, - { - field: 'isDelete', - title: '逻辑删除' + title: '文件访问链接', + formatter: function(value, row, index) { + + return ''+value+'' + } }, { title: '操作', align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('编辑 '); actions.push('删除'); return actions.join(''); } diff --git a/snow-admin/src/main/resources/templates/system/leave/hrFinishTask.html b/snow-admin/src/main/resources/templates/system/leave/hrFinishTask.html index 5786a77..f279435 100644 --- a/snow-admin/src/main/resources/templates/system/leave/hrFinishTask.html +++ b/snow-admin/src/main/resources/templates/system/leave/hrFinishTask.html @@ -17,6 +17,8 @@

+ +

请假信息

@@ -48,6 +50,10 @@
+

流程图

+
+ +

填写信息

@@ -71,6 +77,12 @@ \ No newline at end of file diff --git a/snow-admin/src/main/resources/templates/system/purchaseOrder/checkDetail.html b/snow-admin/src/main/resources/templates/system/purchaseOrder/checkDetail.html index 9a096d4..f0b5b98 100644 --- a/snow-admin/src/main/resources/templates/system/purchaseOrder/checkDetail.html +++ b/snow-admin/src/main/resources/templates/system/purchaseOrder/checkDetail.html @@ -13,6 +13,7 @@
+
@@ -70,6 +71,10 @@

+

流程图

+
+ +

填写信息

@@ -104,6 +109,11 @@