diff --git a/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/approved/index.vue b/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/approved/index.vue index 2b8d59a2..7c3c00cf 100644 --- a/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/approved/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/approved/index.vue @@ -63,7 +63,7 @@ diff --git a/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/index.vue b/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/index.vue index bb468930..8ea66d79 100644 --- a/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/index.vue +++ b/oms_web/oms_vue/src/views/approve/finance/invoiceReceipt/index.vue @@ -77,7 +77,7 @@ diff --git a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue index c775702b..e3e29281 100644 --- a/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue +++ b/oms_web/oms_vue/src/views/inventory/outer/components/GenerateDeliveryForm.vue @@ -146,6 +146,7 @@ export default { }, methods: { open(productRow, outerForm) { + this.selectedSnList.length=0; this.reset(); this.productData = productRow; this.outerData = outerForm; @@ -166,12 +167,13 @@ export default { this.snList = response.rows; this.total = response.total; if (this.isInitialLoad) { + this.isInitialLoad = false; this.$nextTick(() => { if (this.$refs.snTable) { + this.$refs.snTable.clearSelection(); this.$refs.snTable.toggleAllSelection(); } }); - this.isInitialLoad = false; } }); }, diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectInfoController.java index eb96d783..c39f0259 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectInfoController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectInfoController.java @@ -105,7 +105,7 @@ public class VueProjectInfoController extends BaseController { return toAjax(projectInfoService.updateProjectInfo(projectInfo)); } @RequiresPermissions("sip:project:edit") - @Log(title = "项目管理", businessType = BusinessType.UPDATE) + @Log(title = "会审", businessType = BusinessType.UPDATE) @PutMapping("/joinTrial") public AjaxResult editJoinTrial(@RequestBody ProjectInfo projectInfo) { return toAjax(projectInfoService.editJoinTrial(projectInfo)); diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java index 5649c487..23b9cd3c 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/controller/vue/VueProjectOrderInfoController.java @@ -83,6 +83,7 @@ public class VueProjectOrderInfoController extends BaseController { ProjectOrderInfo projectOrderInfo = projectOrderInfoService.selectProjectOrderInfoById(id); mmap.put("projectOrderInfo", projectOrderInfo); mmap.put("user", ShiroUtils.getSysUser()); + //是否可修改文件 mmap.put("canUpdate", ProjectOrderInfo.OrderStatus.WAIT_COMMIT.getCode().equals(projectOrderInfo.getOrderStatus()) ||ProjectOrderInfo.OrderStatus.APPROVE_REJECT.getCode().equals(projectOrderInfo.getOrderStatus())); // boolean showFileFlag=!ProjectOrderInfo.OrderStatus.WAIT_COMMIT.getCode().equals(projectOrderInfo.getOrderStatus()) // && !ProjectOrderInfo.OrderStatus.APPROVE_REJECT.getCode().equals(projectOrderInfo.getOrderStatus()) @@ -92,15 +93,18 @@ public class VueProjectOrderInfoController extends BaseController { ProjectOrderFileLog fileLog = new ProjectOrderFileLog(); fileLog.setOrderId(projectOrderInfo.getId()); fileLog.setFileType(ProjectOrderFileLog.FileTypeEnum.CONTRACT_BAK.getCode()); + //信息备份数据 mmap.put("orderBakFile", projectOrderFileLogService.mapBakFile(fileLog)); Todo todo = new Todo(); todo.setBusinessKey(projectOrderInfo.getOrderCode()); List todoCompletedList = todoService.selectTodoCompletedList(todo); + //审批历史 mmap.put("approveLog", todoCompletedList); //判断商务角色 并且是产品或自己审批 boolean updateFlag = CollUtil.isNotEmpty(todoCompletedList) && ProjectOrderInfo.OrderStatus.WAIT_APPROVE.getCode().equals(projectOrderInfo.getOrderStatus()) ? ("产品经理".equals(todoCompletedList.get(0).getTaskName()) || "售前".equals(todoCompletedList.get(0).getTaskName())) : (boolean) mmap.get("canUpdate"); + //是否可修改文件 mmap.put("updateFile", (ShiroUtils.getSubject().hasRole("sale_assistant")||ShiroUtils.getSubject().hasRole("business")||ShiroUtils.getSubject().hasRole("marketing_promotion") ||ShiroUtils.getSysUser().isAdmin()) && updateFlag); mmap.put("uploadFinalFile", (ShiroUtils.getSubject().hasRole("business") || ShiroUtils.getSysUser().isAdmin()) && ProjectOrderInfo.OrderStatus.APPROVE_COMPLETE.getCode().equals(projectOrderInfo.getOrderStatus()));