diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakePageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakePageReqVO.java index e983cac..2096379 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakePageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/purchaseordermake/vo/PurchaseOrderMakePageReqVO.java @@ -26,7 +26,7 @@ public class PurchaseOrderMakePageReqVO extends PageParam { private Boolean purchaseType; @Schema(description = "采购物类型,1物料,2加工件", example = "1") - private Boolean goodsType; + private Integer goodsType; @Schema(description = "结算币种", example = "2") private Integer currencyType; @@ -41,7 +41,7 @@ public class PurchaseOrderMakePageReqVO extends PageParam { private BigDecimal actualPrice; @Schema(description = "单据状态,0 待送审,1已送审,2已审核,3已打回 ,默认是1", example = "2") - private Boolean status; + private Integer status; @Schema(description = "送审人", example = "17514") private Long submitUserId; @@ -79,7 +79,12 @@ public class PurchaseOrderMakePageReqVO extends PageParam { @Schema(description = "项目名称", example = "芋艿") private String projectName; + @Schema(description = "子项目名称", example = "芋艿") + private String projectSubName; + @Schema(description = "项目名称简码") private String projectNameSim; + @Schema(description = "供应商名称") + private String supplierName; } \ No newline at end of file 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 d415167..0a47eff 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 @@
@@ -114,7 +114,8 @@ const formData = ref({ boomItemRemoveList: [], matBoomDOList: [], matItemRemoveList: [], - attachments: [] + attachments: [], + type: query.type }) const formRef = ref() // 表单 Ref 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 c0cb59c..4332e49 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 @@ -21,12 +21,12 @@