From 00b39b070bc27921e519b12d04555028577dbbaf Mon Sep 17 00:00:00 2001 From: zhy <1969009954@qq.com> Date: Wed, 25 Jun 2025 04:18:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E9=87=87=E8=B4=AD=E5=8D=95?= =?UTF-8?q?=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseOrderMakeController.java | 12 ++ .../vo/PurchaseOrderMakeRespVO.java | 6 +- .../vo/PurchaseOrderMakeSaveReqVO.java | 165 +++++++++--------- .../PurchaseOrderMakeDetailDO.java | 8 - .../PurchaseOrderMakeDetailMapper.java | 3 +- .../PartPurchaseOrderService.java | 25 +++ .../PartPurchaseOrderServiceImpl.java | 61 +++++++ .../PurchaseOrderMakeDetailServiceImpl.java | 1 - .../src/api/heli/partpurchaseorder/index.ts | 20 ++- .../views/heli/partpurchasecheck/detail.vue | 37 +++- .../views/heli/partpurchasecheck/index.vue | 29 ++- 11 files changed, 261 insertions(+), 106 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/PurchaseOrderMakeController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/PurchaseOrderMakeController.java index 218cfcb..f0a57bc 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/PurchaseOrderMakeController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/PurchaseOrderMakeController.java @@ -107,4 +107,16 @@ public class PurchaseOrderMakeController { return success(pageResult); } + @PutMapping("/updatePartCheck") + @Operation(summary = "更新采购审批通过状态") + public CommonResult updatePartCheck(@RequestParam("id") Long id) { + return success(partPurchaseOrderService.updatePartCheckStatus(id)); + } + + @PutMapping("/updatePartCheckNo") + @Operation(summary = "更新采购审批驳回状态") + public CommonResult updatePartCheckNo(@Valid @RequestBody PurchaseOrderMakeSaveReqVO updateReqVO) { + return success(partPurchaseOrderService.updatePartCheckStatusNo(updateReqVO)); + } + } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakeRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakeRespVO.java index 3c341e9..ce5dc65 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakeRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakeRespVO.java @@ -28,11 +28,11 @@ public class PurchaseOrderMakeRespVO { @Schema(description = "采购单类型，1按物料需求计划采购，2备库采购", example = "1") @ExcelProperty("采购单类型，1按物料需求计划采购，2备库采购") - private Boolean purchaseType; + private Integer purchaseType; @Schema(description = "采购物类型，1物料，2加工件", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @ExcelProperty("采购物类型，1物料，2加工件") - private Boolean goodsType; + private Integer goodsType; @Schema(description = "结算币种", example = "2") @ExcelProperty("结算币种") @@ -52,7 +52,7 @@ public class PurchaseOrderMakeRespVO { @Schema(description = "单据状态,0 待送审，1已送审，2已审核，3已打回 ，默认是1", example = "2") @ExcelProperty("单据状态,0 待送审，1已送审，2已审核，3已打回 ，默认是1") - private Boolean status; + private Integer status; @Schema(description = "送审人", example = "17514") @ExcelProperty("送审人") diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakeSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakeSaveReqVO.java index be4046a..cea2251 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakeSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakeSaveReqVO.java @@ -1,81 +1,84 @@ -package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; -import java.util.*; -import java.math.BigDecimal; -import org.springframework.format.annotation.DateTimeFormat; -import java.time.LocalDateTime; - -@Schema(description = "管理后台 - 采购单主新增/修改 Request VO") -@Data -public class PurchaseOrderMakeSaveReqVO { - - @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "29741") - private Long id; - - @Schema(description = "采购单号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "采购单号不能为空") - private String purchaseNo; - - @Schema(description = "采购合同号") - private String contractNo; - - @Schema(description = "采购单类型，1按物料需求计划采购，2备库采购", example = "1") - private Boolean purchaseType; - - @Schema(description = "采购物类型，1物料，2加工件", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "采购物类型，1物料，2加工件不能为空") - private Boolean goodsType; - - @Schema(description = "结算币种", example = "2") - private Integer currencyType; - - @Schema(description = "税率") - private Integer taxRatio; - - @Schema(description = "暂估价金额", example = "13902") - private BigDecimal estimatedPrice; - - @Schema(description = "实际价金额", example = "14735") - private BigDecimal actualPrice; - - @Schema(description = "单据状态,0 待送审，1已送审，2已审核，3已打回 ，默认是1", example = "2") - private Boolean status; - - @Schema(description = "送审人", example = "17514") - private Long submitUserId; - - @Schema(description = "送审时间") - private LocalDateTime submitTime; - - @Schema(description = "审核人") - private Long auditor; - - @Schema(description = "审核时间") - private LocalDateTime auditTime; - - @Schema(description = "备注", example = "随便") - private String description; - - @Schema(description = "订单id", example = "14178") - private Long projectId; - - @Schema(description = "生产计划id", example = "707") - private Long projectPlanId; - - @Schema(description = "客户id", example = "20356") - private Long customerId; - - @Schema(description = "客户简称") - private String brief; - - @Schema(description = "项目名称", example = "芋艿") - private String projectName; - - @Schema(description = "项目名称简码") - private String projectNameSim; - -} \ No newline at end of file +package com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; +import java.util.*; +import java.math.BigDecimal; +import org.springframework.format.annotation.DateTimeFormat; +import java.time.LocalDateTime; + +@Schema(description = "管理后台 - 采购单主新增/修改 Request VO") +@Data +public class PurchaseOrderMakeSaveReqVO { + + @Schema(description = "自增字段，唯一", requiredMode = Schema.RequiredMode.REQUIRED, example = "29741") + private Long id; + + @Schema(description = "采购单号", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "采购单号不能为空") + private String purchaseNo; + + @Schema(description = "采购合同号") + private String contractNo; + + @Schema(description = "采购单类型，1按物料需求计划采购，2备库采购", example = "1") + private Boolean purchaseType; + + @Schema(description = "采购物类型，1物料，2加工件", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "采购物类型，1物料，2加工件不能为空") + private Boolean goodsType; + + @Schema(description = "结算币种", example = "2") + private Integer currencyType; + + @Schema(description = "税率") + private Integer taxRatio; + + @Schema(description = "暂估价金额", example = "13902") + private BigDecimal estimatedPrice; + + @Schema(description = "实际价金额", example = "14735") + private BigDecimal actualPrice; + + @Schema(description = "单据状态,0 待送审，1已送审，2已审核，3已打回 ，默认是1", example = "2") + private Boolean status; + + @Schema(description = "送审人", example = "17514") + private Long submitUserId; + + @Schema(description = "送审时间") + private LocalDateTime submitTime; + + @Schema(description = "审核人") + private Long auditor; + + @Schema(description = "审核时间") + private LocalDateTime auditTime; + + @Schema(description = "备注", example = "随便") + private String description; + + @Schema(description = "订单id", example = "14178") + private Long projectId; + + @Schema(description = "生产计划id", example = "707") + private Long projectPlanId; + + @Schema(description = "客户id", example = "20356") + private Long customerId; + + @Schema(description = "客户简称") + private String brief; + + @Schema(description = "项目名称", example = "芋艿") + private String projectName; + + @Schema(description = "项目名称简码") + private String projectNameSim; + + @Schema(description = "驳回原因") + private String reason; + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java index 6e83205..d8a7a53 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/purchaseordermakedetail/PurchaseOrderMakeDetailDO.java @@ -34,7 +34,6 @@ public class PurchaseOrderMakeDetailDO extends BaseDO { */ @TableId private Long id; - /** * 采购单id */ @@ -47,9 +46,6 @@ public class PurchaseOrderMakeDetailDO extends BaseDO { * 零件名称 */ private String boomName; - - @TableField(exist = false) - private String boomCode; /** * 规格型号 */ @@ -94,13 +90,10 @@ public class PurchaseOrderMakeDetailDO extends BaseDO { * 供应商id */ private Long supplierId; - @TableField(exist = false) - private String supplierName; /** * 物料需求计划id */ private Long projectMaterialPlanId; - private Long materialId; /** * 物料需求计划子项目id */ @@ -128,7 +121,6 @@ public class PurchaseOrderMakeDetailDO extends BaseDO { /** * 订单状态 未生成/已生成 1/2 */ - @TableField( "order_status") private Integer orderStatus; /** * 子项目编码 diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java index b633147..100f4d6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/purchaseordermakedetail/PurchaseOrderMakeDetailMapper.java @@ -40,7 +40,6 @@ public interface PurchaseOrderMakeDetailMapper extends BaseMapperX pageResult = selectJoinPage(pageReqVO, PartPurchaseOrderPageRespVO.class, query); return pageResult; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderService.java index 33c97b3..7826278 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderService.java @@ -4,6 +4,7 @@ import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PartPurchaseOrderPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PartPurchaseOrderPageRespVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PurchaseOrderMakePageReqVO; +import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PurchaseOrderMakeSaveReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermakedetail.vo.PurchaseOrderMakeDetailRespVO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermake.PurchaseOrderMakeDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermakedetail.PurchaseOrderMakeDetailDO; @@ -31,4 +32,28 @@ public interface PartPurchaseOrderService { * @return 零件采购订单生成信息提交 */ boolean submit(List list); + + /** + * 获得零件采购单审批分页 + * + * @param pageReqVO 分页查询 + * @return 零件采购单审批分页 + */ + PageResult getPartPurchaseOrderCheckPage(PartPurchaseOrderPageReqVO pageReqVO); + + /** + * 更新采购单审批状态为通过 + * + * @param id + * @return 更新采购单审批状态 + */ + boolean updatePartCheckStatus(Long id); + + /** + * 更新采购单审批状态为驳回 + * + * @param id + * @return 更新采购单审批状态 + */ + boolean updatePartCheckStatusNo(PurchaseOrderMakeSaveReqVO updateReqVO); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java index 191bdcb..e5ae36c 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/partpurchaseorder/PartPurchaseOrderServiceImpl.java @@ -1,14 +1,20 @@ package com.chanko.yunxi.mes.module.heli.service.partpurchaseorder; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.chanko.yunxi.mes.framework.common.pojo.PageResult; import com.chanko.yunxi.mes.framework.common.util.object.BeanUtils; +import com.chanko.yunxi.mes.framework.mybatis.core.query.QueryWrapperX; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PartPurchaseOrderPageReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PartPurchaseOrderPageRespVO; +import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermake.vo.PurchaseOrderMakeSaveReqVO; import com.chanko.yunxi.mes.module.heli.controller.admin.purchaseordermakedetail.vo.PurchaseOrderMakeDetailRespVO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.materialplanboom.MaterialPlanBoomDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermake.PurchaseOrderMakeDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordermakedetail.PurchaseOrderMakeDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderno.PurchaseOrderNoDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.serialnumber.SerialNumberDO; +import com.chanko.yunxi.mes.module.heli.dal.mysql.materialplanboom.MaterialPlanBoomMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordermake.PurchaseOrderMakeMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseordermakedetail.PurchaseOrderMakeDetailMapper; import com.chanko.yunxi.mes.module.heli.dal.mysql.purchaseorderno.PurchaseOrderNoMapper; @@ -39,6 +45,8 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ private PurchaseOrderNoDetailMapper purchaseOrderNoDetailMapper; @Resource private SerialNumberService serialNumberService; + @Resource + private MaterialPlanBoomMapper materialPlanBoomMapper; @Override public PageResult getPartPurchaseOrderPage(PartPurchaseOrderPageReqVO pageReqVO) { @@ -90,4 +98,57 @@ public class PartPurchaseOrderServiceImpl implements PartPurchaseOrderService{ return true; } + + @Override + public PageResult getPartPurchaseOrderCheckPage(PartPurchaseOrderPageReqVO pageReqVO) { + return null; + } + + @Override + public boolean updatePartCheckStatus(Long id) { + PurchaseOrderMakeDO purchaseOrderMakeDO = new PurchaseOrderMakeDO(); + purchaseOrderMakeDO.setId(id); + purchaseOrderMakeDO.setStatus(2); + purchaseOrderMakeMapper.updateById(purchaseOrderMakeDO); + + List materialPlanBoomDOs= materialPlanBoomMapper.selectList("project_purchase_order_make_id", id); + materialPlanBoomDOs.forEach(materialPlanBoomDO -> { + MaterialPlanBoomDO materialPlanBoom = new MaterialPlanBoomDO(); + materialPlanBoom.setId(materialPlanBoomDO.getId()); + materialPlanBoom.setMplanStatus(2); + materialPlanBoomMapper.updateById(materialPlanBoom); + }); + return true; + } + + @Override + public boolean updatePartCheckStatusNo(PurchaseOrderMakeSaveReqVO updateReqVO) { + PurchaseOrderMakeDO purchaseOrderMakeDO = new PurchaseOrderMakeDO(); + purchaseOrderMakeDO.setId(updateReqVO.getId()); + purchaseOrderMakeDO.setStatus(3); + purchaseOrderMakeDO.setDeleted(true); + purchaseOrderMakeMapper.updateById(purchaseOrderMakeDO); + + List list= purchaseOrderMakeDetailMapper.selectList("purchase_order_id", updateReqVO.getId()); + list.forEach(detailDO -> { + PurchaseOrderNoDetailDO purchaseOrderNoDetailDO = new PurchaseOrderNoDetailDO(); + purchaseOrderNoDetailDO.setId(detailDO.getPurchaseOrderNoDetailId()); + purchaseOrderNoDetailDO.setDeleted(true); + purchaseOrderNoDetailMapper.updateById(purchaseOrderNoDetailDO); + }); + + List materialPlanBoomDOs= materialPlanBoomMapper.selectList("project_purchase_order_make_id", updateReqVO.getId()); + materialPlanBoomDOs.forEach(materialPlanBoom -> { + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id", materialPlanBoom.getId()) + .set("mplan_status", 3) + .set("project_purchase_order_make_id", null) + .set("purchase_no", null) + .set("project_purchase_order_make_detail_id", null) + .set("rej_remark", updateReqVO.getReason()); + materialPlanBoomMapper.update(updateWrapper); + }); + + return true; + } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordermakedetail/PurchaseOrderMakeDetailServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordermakedetail/PurchaseOrderMakeDetailServiceImpl.java index 8154cf8..b0cd4a7 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordermakedetail/PurchaseOrderMakeDetailServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/purchaseordermakedetail/PurchaseOrderMakeDetailServiceImpl.java @@ -91,7 +91,6 @@ public class PurchaseOrderMakeDetailServiceImpl implements PurchaseOrderMakeDeta pd.setPurchaseOrderId(purchaseOrderNoDO.getId()); pd.setBoomDetailId(pmd.getBoomDetailId()); pd.setBoomName(pmd.getBoomName()); - pd.setMaterialId(pmd.getMaterialId()); pd.setBoomSpec(pmd.getBoomSpec()); pd.setBoomUnit(pmd.getBoomUnit()); pd.setComposition(pmd.getComposition()); diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/partpurchaseorder/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/partpurchaseorder/index.ts index 8df3216..66a2484 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/partpurchaseorder/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/partpurchaseorder/index.ts @@ -16,7 +16,7 @@ export interface PartPurchaseOrderVO { description: string } -// 查询零件采购订单计划分页 +// 获取零件采购订单生成分页 export const getPartPage = async (params) => { return await request.get({ url: `/heli/purchase-order-make/getPartPurchaseOrderPage`, params }) } @@ -25,7 +25,23 @@ export const submitForm = async (data) => { return await request.post({ url: `/heli/purchase-order-no/submit`, data }) } -// 查询采购单主分页 +// 获取零件采购单审批分页 +export const getPartCheckPage = async (params) => { + return await request.get({ url: `/heli/purchase-order-make/page`, params }) +} + +// 查询采购单主 export const getPurchaseOrderMake = async (id: number) => { return await request.get({ url: `/heli/purchase-order-make/get?id=` + id }) } + +// 更新采购单主批准 +export const updatePurchaseOrderMake = async (id: number) => { + return await request.put({ url: `/heli/purchase-order-make/updatePartCheck?id=` + id }) +} + +// 更新采购单主驳回 +export const updatePurchaseOrderMakeNo = async (params) => { + return await request.put({ url: `/heli/purchase-order-make/updatePartCheckNo`, params }) +} + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/detail.vue index 376d126..e15738b 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/detail.vue @@ -60,8 +60,8 @@
- 批 准 - 驳 回 + 批 准 + 驳 回
@@ -87,7 +87,8 @@ import { useTagsViewStore } from '@/store/modules/tagsView' import MaterialSelect from '@/views/heli/hlvuestyle/materialSelect.vue' import booms from './boom.vue' import * as PartPurchaseOrderApi from "@/api/heli/partpurchaseorder"; -import {getPartPage} from "@/api/heli/partpurchaseorder"; +import { ElMessageBox } from 'element-plus' +import { ref } from 'vue' const reload: any = inject('reload') const { t } = useI18n() // 国际化 @@ -122,10 +123,40 @@ const loading = ref(true) // 列表的加载中 const total = ref(0) // 列表的总页数 const subBoomFormLoading = ref(false) const subBoomFormRef = ref() +const updateParams = reactive({ + id: formData.value.id, + reason: undefined +}) +const approve = async (contractNo: string) => { + await PartPurchaseOrderApi.updatePurchaseOrderMake(formData.value.id) +} +const handleReject = async () => { + try { + const { value, action } = await ElMessageBox.prompt('请输入驳回原因', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + inputPattern: /.+/, // 至少输入一个字符 + inputErrorMessage: '内容不能为空' + }) + if (action === 'confirm') { + reject(value) // 将输入内容传入 reject 方法 + } + } catch (err) { + // 用户点击取消或输入不合法时会进入这里 + console.log('操作取消或输入无效') + } +} +// 假设这是你要调用的 reject 方法 +const reject = async(reason) => { + console.log('驳回原因:', reason) + updateParams.reason = reason + // 这里可以执行提交驳回逻辑 + await PartPurchaseOrderApi.updatePurchaseOrderMakeNo(updateParams) +} const closeForm = async () => { diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue index 3917910..c0cb59c 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/partpurchasecheck/index.vue @@ -48,27 +48,43 @@ - + + + - + + + @@ -88,6 +104,7 @@ import {DICT_TYPE, getIntDictOptions} from '@/utils/dict' import { dateFormatter1} from '@/utils/formatTime' import * as MaterialPlanApi from '@/api/heli/materialplan' import * as PartPurchaseOrderApi from "@/api/heli/partpurchaseorder"; +import {getPartCheckPage} from "@/api/heli/partpurchaseorder"; defineOptions({ name: 'MaterialPlan' }) @@ -125,7 +142,7 @@ const exportLoading = ref(false) // 导出的加载中 const getList = async () => { loading.value = true try { - const data = await PartPurchaseOrderApi.getPartPage(queryParams) + const data = await PartPurchaseOrderApi.getPartCheckPage(queryParams) list.value = data.list total.value = data.total } finally {