diff --git a/base-fast/src/main/java/com/boge/modules/contract/controller/ContractController.java b/base-fast/src/main/java/com/boge/modules/contract/controller/ContractController.java index 05f954c..86dff5b 100644 --- a/base-fast/src/main/java/com/boge/modules/contract/controller/ContractController.java +++ b/base-fast/src/main/java/com/boge/modules/contract/controller/ContractController.java @@ -1,6 +1,7 @@ package com.boge.modules.contract.controller; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.boge.common.publisher.EventPublisher; import com.boge.common.publisher.EventType; @@ -118,5 +119,17 @@ public class ContractController { return R.ok(); } + /** + * 审核 + */ + @RequestMapping("/approval") + //@RequiresPermissions("flow:contract:delete") + public R approval(Integer contractId,String status,String approval){ + contractService.update(new LambdaUpdateWrapper() + .set(ContractEntity::getStatus,status) + .set(ContractEntity::getApproval,approval) + .eq(ContractEntity::getContractId,contractId)); + return R.ok(); + } } diff --git a/base-fast/src/main/java/com/boge/modules/contract/entity/ContractEntity.java b/base-fast/src/main/java/com/boge/modules/contract/entity/ContractEntity.java index 3ecaddd..81f1987 100644 --- a/base-fast/src/main/java/com/boge/modules/contract/entity/ContractEntity.java +++ b/base-fast/src/main/java/com/boge/modules/contract/entity/ContractEntity.java @@ -129,9 +129,10 @@ public class ContractEntity implements Serializable { */ private String annex; /** - * 审核状态1待审核2审核完毕3.审核驳回' + * 审核状态0草稿1待审核2审核完毕3.审核驳回' */ private String status; + private String approval; /** * 备注' */ diff --git a/base-fast/src/main/java/com/boge/modules/price/controller/PriceController.java b/base-fast/src/main/java/com/boge/modules/price/controller/PriceController.java index 187f4ff..947cd7d 100644 --- a/base-fast/src/main/java/com/boge/modules/price/controller/PriceController.java +++ b/base-fast/src/main/java/com/boge/modules/price/controller/PriceController.java @@ -2,6 +2,8 @@ package com.boge.modules.price.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.boge.common.publisher.EventPublisher; import com.boge.common.publisher.EventType; import com.boge.common.utils.CodeUtil; @@ -113,4 +115,17 @@ public class PriceController { return R.ok(); } + /** + * 审核 + */ + @RequestMapping("/approval") + //@RequiresPermissions("flow:contract:delete") + public R approval(Integer priceId,String status,String approval){ + priceService.update(new LambdaUpdateWrapper() + .set(PriceEntity::getStatus,status) + .set(PriceEntity::getApproval,approval) + .eq(PriceEntity::getPriceId,priceId)); + return R.ok(); + } + } diff --git a/base-fast/src/main/java/com/boge/modules/price/entity/PriceEntity.java b/base-fast/src/main/java/com/boge/modules/price/entity/PriceEntity.java index bd0f939..7a289de 100644 --- a/base-fast/src/main/java/com/boge/modules/price/entity/PriceEntity.java +++ b/base-fast/src/main/java/com/boge/modules/price/entity/PriceEntity.java @@ -79,7 +79,14 @@ public class PriceEntity implements Serializable { * 备注 */ private String remarks; + /** + * 审核状态 + */ private String status; + /** + * 审核说明 + */ + private String approval; /** * 附件ids */ @@ -106,4 +113,6 @@ public class PriceEntity implements Serializable { */ private String pay; + + } diff --git a/base-vue/src/views/modules/contract/approval.vue b/base-vue/src/views/modules/contract/approval.vue new file mode 100644 index 0000000..0a0f8db --- /dev/null +++ b/base-vue/src/views/modules/contract/approval.vue @@ -0,0 +1,590 @@ + + + + + diff --git a/base-vue/src/views/modules/contract/contract.vue b/base-vue/src/views/modules/contract/contract.vue index 93468f0..d096326 100644 --- a/base-vue/src/views/modules/contract/contract.vue +++ b/base-vue/src/views/modules/contract/contract.vue @@ -107,12 +107,32 @@ fixed="right" header-align="center" align="center" - width="150" + width="200" label="操作"> @@ -127,6 +147,7 @@ + @@ -134,6 +155,7 @@