diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/plan/vo/PlanRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/plan/vo/PlanRespVO.java index 5b501712..0c4a5a38 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/plan/vo/PlanRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/plan/vo/PlanRespVO.java @@ -122,7 +122,7 @@ public class PlanRespVO { @Schema(description = "状态,1未开始,2生产中,3已完成,4已终止 ,默认是1", example = "2") @ExcelProperty("状态,1未开始,2生产中,3已完成,4已终止 ,默认是1") - private Boolean status; + private Integer status; @Schema(description = "项目变更次数") @ExcelProperty("项目变更次数") diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue index df90386c..a70da8eb 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue @@ -230,8 +230,11 @@ - - + + + + @@ -458,7 +461,7 @@ const formData = ref({ approver: undefined, approveDate: undefined, description: undefined, - status: 1, + status: undefined, createTime: undefined, operateLogs: [], projectOrderSubs: [], diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue index e3f728f3..f55f4eb1 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue @@ -230,8 +230,11 @@ - - + + + + @@ -459,7 +462,7 @@ const formData = ref({ approver: undefined, approveDate: undefined, description: undefined, - status: 1, + status: undefined, createTime: undefined, operateLogs: [], projectOrderSubs: [],