diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java index 8723683..43151e8 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java @@ -457,10 +457,8 @@ public class ProcessController { purchaseAmount.setBudgetCostId(amountForm.budgetCostId); purchaseAmount.setAmountCurrent(amountForm.amountCurrent); - if (form.getStatus() == ProcessStatus.to_be_audit) { - // 提交时该次数量条目生效,撤回的时候 取消该状态 - purchaseAmount.setSubmit(true); - } + // 提交时该次数量条目生效,撤回的时候 取消该状态 + purchaseAmount.setSubmit(form.getStatus() == ProcessStatus.to_be_audit); entityManager.persist(purchaseAmount); @@ -570,13 +568,7 @@ public class ProcessController { purchaseAmount.setAmount(amountForm.amount); purchaseAmount.setBudgetCostId(amountForm.budgetCostId); purchaseAmount.setAmountCurrent(amountForm.amountCurrent); - - // TODO 提交模式才计算 剩余 - if (form.getStatus() == ProcessStatus.to_be_audit) { - // 当前的必须填写 - Assert.notNull(amountForm.amountCurrent, "合同明细填写不完整"); - purchaseAmount.setSubmit(true); - } + purchaseAmount.setSubmit(form.getStatus() == ProcessStatus.to_be_audit); if (amountForm.amountId != null) { // 更新了某个ID的数据就不删除了 diff --git a/src/main/resources/templates/admin/business/process-completed.ftl b/src/main/resources/templates/admin/business/process-completed.ftl index c385ca6..9ca7205 100644 --- a/src/main/resources/templates/admin/business/process-completed.ftl +++ b/src/main/resources/templates/admin/business/process-completed.ftl @@ -431,19 +431,24 @@ 'Content-Type': 'application/json', }, body: JSON.stringify(form), - }).then(res => res.json()) - .then(data => { - this.page = { - data: data.content, - size: data.size, - current: data.number + 1, - total: data.totalElements - } - }) - .catch(err => { - this.$message.error('查询失败'); - }) - .finally(() => loading.close()) + }).then(checkStatus).then(parseJSON).then(data => { + this.page = { + data: data.content, + size: data.size, + current: data.number + 1, + total: data.totalElements + } + }).catch(({ response }) => { + if (response) { + parseJSON(response) + .then(json => { + this.$message.error(json.message || "查询失败") + }) + } + else { + this.$message.error("查询失败") + } + }).finally(() => loading.close()) }, handlePageChange(val) {