From 1cbc705d7c226c7ad2ed1846d5137ff1a781ec41 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Sat, 17 Feb 2024 20:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=20?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

生产计划 状态修改
---
 .../module/heli/controller/admin/plan/vo/PlanRespVO.java | 2 +-
 mes-ui/mes-ui-admin-vue3/src/views/heli/plan/detail.vue  | 9 ++++++---
 mes-ui/mes-ui-admin-vue3/src/views/heli/plan/edit.vue    | 9 ++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

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 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产状态" prop="planStatus">
-              <el-input class="!w-265px" v-model="formData.planStatus" disabled value="未开始" />
+            <el-form-item label="生产状态" prop="status">
+              <el-select v-model="formData.status" placeholder="生产状态" clearable class="!w-265px" disabled >
+                        <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)"
+                          :key="dict.value" :label="dict.label" :value="dict.value" />
+                      </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -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 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产状态" prop="planStatus">
-              <el-input class="!w-265px" v-model="formData.planStatus" disabled value="未开始" />
+            <el-form-item label="生产状态" prop="status">
+              <el-select v-model="formData.status" placeholder="生产状态" clearable class="!w-265px" disabled >
+                        <el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_PROJECT_PLAN_STATUS)"
+                          :key="dict.value" :label="dict.label" :value="dict.value" />
+                      </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -459,7 +462,7 @@ const formData = ref({
   approver: undefined,
   approveDate: undefined,
   description: undefined,
-  status: 1,
+  status: undefined,
   createTime: undefined,
   operateLogs: [],
   projectOrderSubs: [],