From bc2a6c8098bfa7034da6f314cfed7e2cc467f48d Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Sun, 18 Feb 2024 13:58:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE=E5=8F=98=E6=9B=B4=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

生产计划 增加项目变更日期
---
 .../controller/admin/plan/vo/PlanRespVO.java  |   4 +
 .../heli/dal/dataobject/plan/PlanDO.java      |   4 +
 .../src/views/heli/plan/add.vue               |  59 +++---
 .../src/views/heli/plan/detail.vue            |  64 ++++---
 .../src/views/heli/plan/edit.vue              | 172 ++++++++++--------
 sql/v1.3.0/1.structure.sql                    |   7 +-
 6 files changed, 176 insertions(+), 134 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 0c4a5a38..e65b384b 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
@@ -128,6 +128,10 @@ public class PlanRespVO {
     @ExcelProperty("项目变更次数")
     private Integer changeNum;
 
+    @Schema(description = "项目变更日期")
+    @ExcelProperty("项目变更日期")
+    private LocalDateTime changeLastDate;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plan/PlanDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plan/PlanDO.java
index 4b49a576..f8edc385 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plan/PlanDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/plan/PlanDO.java
@@ -102,6 +102,10 @@ public class PlanDO extends BaseDO {
      * 项目变更次数
      */
     private Integer changeNum;
+    /**
+     * 项目变更日期
+     */
+    private String changeLastDate;
 
     @TableField(exist = false)
     private String projectCode;
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/add.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/add.vue
index 5ff1a534..b3e5bf78 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/add.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/add.vue
@@ -12,6 +12,7 @@
         <el-row>
           <el-col :span="24">
             <el-row>
+
               <el-col :span="6">
                 <el-row>
                   <el-col :span="24">
@@ -48,15 +49,22 @@
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="编制人" prop="editor">
-                      <el-input class="!w-265px" placeholder="编制人" v-model="formData.editor"  />
+                    <el-form-item label="计划编制人" prop="editor">
+                      <el-input class="!w-265px" placeholder="计划编制人" v-model="formData.editor"  />
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="编制日期" prop="editorDate">
-                      <el-date-picker class="!w-265px" v-model="formData.editorDate" type="date" value-format="x" placeholder="编制日期" />
+                    <el-form-item label="计划编制日期" prop="editorDate">
+                      <el-date-picker class="!w-265px" v-model="formData.editorDate" type="date" value-format="x" placeholder="计划编制日期" />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="80">
+                    <el-form-item label="备注" prop="description" >
+                      <el-input class="!w-713px" type="textarea" v-model="formData.description" show-word-limit maxlength="200"  />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -98,15 +106,15 @@
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="审核人" prop="auditor">
-                      <el-input class="!w-265px" placeholder="审核人" v-model="formData.auditor" />
+                    <el-form-item label="计划审核人" prop="auditor">
+                      <el-input class="!w-265px" placeholder="计划审核人" v-model="formData.auditor" />
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="审核日期" prop="auditDate">
-                      <el-date-picker class="!w-265px" v-model="formData.auditDate" type="date" value-format="x" placeholder="审核日期" />
+                    <el-form-item label="计划审核日期" prop="auditDate">
+                      <el-date-picker class="!w-265px" v-model="formData.auditDate" type="date" value-format="x" placeholder="计划审核日期" />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -149,15 +157,22 @@
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="批准人" prop="approver">
-                      <el-input class="!w-265px" placeholder="批准人"  v-model="formData.approver"/>
+                    <el-form-item label="计划批准人" prop="approver">
+                      <el-input class="!w-265px" placeholder="计划批准人"  v-model="formData.approver"/>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="计划批准日期" prop="approveDate">
+                      <el-date-picker class="!w-265px" v-model="formData.approveDate" type="date" value-format="x" placeholder="计划批准日期" />
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="批准日期" prop="approveDate">
-                      <el-date-picker class="!w-265px" v-model="formData.approveDate" type="date" value-format="x" placeholder="批准日期" />
+                    <el-form-item label="生产状态" prop="status" >
+                      <el-input class="!w-265px"  v-model="formData.status" disabled value="未开始" />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -202,6 +217,13 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="项目变更日期" prop="changeLastDate">
+                      <el-date-picker class="!w-265px" v-model="formData.changeLastDate" type="date" value-format="x" placeholder="项目变更日期" disabled/>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
                 <el-row>
                   <el-col :span="24">
                     <el-form-item label="项目变更次数" prop="changeNum">
@@ -214,19 +236,6 @@
             </el-row>
           </el-col>
         </el-row>
-
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="备注" prop="description" >
-              <el-input class="!w-713px" type="textarea" v-model="formData.description" show-word-limit maxlength="200"  />
-            </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>
-          </el-col>
-        </el-row>
       </el-card>
     </el-form>
     <div class="text-center hl-footer">
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 8f37dc8b..8ce55cfe 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
@@ -48,16 +48,24 @@
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="编制人" prop="editor">
-                      <el-input disabled class="!w-265px" placeholder="编制人" v-model="formData.editor" />
+                    <el-form-item label="计划编制人" prop="editor">
+                      <el-input disabled class="!w-265px" placeholder="计划编制人" v-model="formData.editor" />
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="编制日期" prop="editorDate">
+                    <el-form-item label="计划编制日期" prop="editorDate">
                       <el-date-picker disabled class="!w-265px" v-model="formData.editorDate" type="date" value-format="x"
-                        placeholder="编制日期" />
+                        placeholder="计划编制日期" />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="80">
+                    <el-form-item label="备注" prop="description">
+                      <el-input disabled class="!w-713px" type="textarea" v-model="formData.description" show-word-limit
+                        maxlength="200" />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -99,16 +107,16 @@
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="审核人" prop="auditor">
-                      <el-input disabled class="!w-265px" placeholder="审核人" v-model="formData.auditor" />
+                    <el-form-item label="计划审核人" prop="auditor">
+                      <el-input disabled class="!w-265px" placeholder="计划审核人" v-model="formData.auditor" />
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="审核日期" prop="auditDate">
+                    <el-form-item label="计划审核日期" prop="auditDate">
                       <el-date-picker disabled class="!w-265px" v-model="formData.auditDate" type="date" value-format="x"
-                        placeholder="审核日期" />
+                        placeholder="计划审核日期" />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -153,16 +161,26 @@
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="批准人" prop="approver">
-                      <el-input disabled class="!w-265px" placeholder="批准人" v-model="formData.approver" />
+                    <el-form-item label="计划批准人" prop="approver">
+                      <el-input disabled class="!w-265px" placeholder="计划批准人" v-model="formData.approver" />
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="批准日期" prop="approveDate">
+                    <el-form-item label="计划批准日期" prop="approveDate">
                       <el-date-picker disabled class="!w-265px" v-model="formData.approveDate" type="date" value-format="x"
-                        placeholder="批准日期" />
+                        placeholder="计划批准日期" />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <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>
@@ -210,6 +228,13 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="项目变更日期" prop="changeLastDate">
+                      <el-date-picker class="!w-265px" v-model="formData.changeLastDate" type="date" value-format="x" placeholder="项目变更日期" disabled/>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
                 <el-row>
                   <el-col :span="24">
                     <el-form-item label="项目变更次数" prop="changeNum">
@@ -223,21 +248,6 @@
           </el-col>
         </el-row>
 
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="备注" prop="description">
-              <el-input disabled class="!w-713px" type="textarea" v-model="formData.description" show-word-limit maxlength="200" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <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>
       </el-card>
 
       <el-card class="hl-card-info">
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 6e5928e9..c70cba7b 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
@@ -12,6 +12,7 @@
         <el-row>
           <el-col :span="24">
             <el-row>
+
               <el-col :span="6">
                 <el-row>
                   <el-col :span="24">
@@ -48,16 +49,24 @@
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="编制人" prop="editor">
-                      <el-input class="!w-265px" placeholder="编制人" v-model="formData.editor" />
+                    <el-form-item label="计划编制人" prop="editor">
+                      <el-input class="!w-265px" placeholder="计划编制人" v-model="formData.editor" />
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="编制日期" prop="editorDate">
+                    <el-form-item label="计划编制日期" prop="editorDate">
                       <el-date-picker class="!w-265px" v-model="formData.editorDate" type="date" value-format="x"
-                        placeholder="编制日期" />
+                        placeholder="计划编制日期" />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="80">
+                    <el-form-item label="备注" prop="description">
+                      <el-input class="!w-713px" type="textarea" v-model="formData.description" show-word-limit
+                        maxlength="200" />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -99,16 +108,16 @@
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="审核人" prop="auditor">
-                      <el-input class="!w-265px" placeholder="审核人" v-model="formData.auditor" />
+                    <el-form-item label="计划审核人" prop="auditor">
+                      <el-input class="!w-265px" placeholder="计划审核人" v-model="formData.auditor" />
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="审核日期" prop="auditDate">
+                    <el-form-item label="计划审核日期" prop="auditDate">
                       <el-date-picker class="!w-265px" v-model="formData.auditDate" type="date" value-format="x"
-                        placeholder="审核日期" />
+                        placeholder="计划审核日期" />
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -153,16 +162,26 @@
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="批准人" prop="approver">
-                      <el-input class="!w-265px" placeholder="批准人" v-model="formData.approver" />
+                    <el-form-item label="计划批准人" prop="approver">
+                      <el-input class="!w-265px" placeholder="计划批准人" v-model="formData.approver" />
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row>
                   <el-col :span="24">
-                    <el-form-item label="批准日期" prop="approveDate">
+                    <el-form-item label="计划批准日期" prop="approveDate">
                       <el-date-picker class="!w-265px" v-model="formData.approveDate" type="date" value-format="x"
-                        placeholder="批准日期" />
+                        placeholder="计划批准日期" />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <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>
@@ -210,6 +229,14 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="项目变更日期" prop="changeLastDate">
+                      <el-date-picker class="!w-265px" v-model="formData.changeLastDate" type="date" value-format="x"
+                        placeholder="项目变更日期" disabled />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
                 <el-row>
                   <el-col :span="24">
                     <el-form-item label="项目变更次数" prop="changeNum">
@@ -223,21 +250,6 @@
           </el-col>
         </el-row>
 
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="备注" prop="description">
-              <el-input class="!w-713px" type="textarea" v-model="formData.description" show-word-limit maxlength="200" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="6">
-            <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>
       </el-card>
 
       <el-card class="hl-card-info">
@@ -251,12 +263,13 @@
                 v-loading="subFormLoading" label-width="0">
                 <el-table :data="formData.projectOrderSubs" class="hl-table">
                   <el-table-column label="序号" type="index" width="80" fixed />
-                  <el-table-column prop="name" label="子项目名称" min-width="120" align="center" fixed/>
-                  <el-table-column prop="projectSubShortName"  min-width="150" align="center" :rules="subFormRules.projectSubShortName" >
-                    <template #header>子项目简称</template>
+                  <el-table-column prop="name" label="子项目名称" min-width="120" align="center" fixed />
+                  <el-table-column prop="projectSubShortName" min-width="150" align="center">
+                    <template #header><span class="hl-table_header">*</span>子项目简称</template>
                     <template #default="{ row, $index }">
-                      <el-form-item :prop="`${$index}.projectSubShortName`" class="mb-0px!">
-                        <el-input v-model="row.projectSubShortName" placeholder="子项目简称" @change="(name)=>handleSubCode(row,name)" />
+                      <el-form-item :prop="`${$index}.projectSubShortName`" :rules="subFormRules.projectSubShortName" class="mb-0px!">
+                        <el-input v-model="row.projectSubShortName" placeholder="子项目简称"
+                          @change="(name) => handleSubCode(row, name)" />
                       </el-form-item>
                     </template>
                   </el-table-column>
@@ -264,8 +277,9 @@
                   <el-table-column prop="mouldId" align="center" min-width="120">
                     <template #header> 模具类型 </template>
                     <template #default="scope">
-                      <el-form-item :prop="`${scope.$index}.mouldId`"  class="mb-0px!">
-                        <el-select v-model="scope.row.mouldId" clearable placeholder="下拉选择" @change="(mid)=>handleMouldType(scope,mid)" style="width: 100%">
+                      <el-form-item :prop="`${scope.$index}.mouldId`" class="mb-0px!">
+                        <el-select v-model="scope.row.mouldId" clearable placeholder="下拉选择"
+                          @change="(mid) => handleMouldType(scope, mid)" style="width: 100%">
                           <el-option v-for="dict in mouldTypeList" :key="dict.id" :label="dict.name" :value="dict.id" />
                         </el-select>
                       </el-form-item>
@@ -274,7 +288,7 @@
                   <el-table-column prop="equipId" align="center" min-width="120">
                     <template #header> 设备信息 </template>
                     <template #default="scope">
-                      <el-form-item :prop="`${scope.$index}.equipId`"  class="mb-0px!">
+                      <el-form-item :prop="`${scope.$index}.equipId`" class="mb-0px!">
                         <el-select v-model="scope.row.equipId" clearable placeholder="下拉选择" style="width: 100%">
                           <el-option v-for="dict in scope.row.equipList" :key="dict.id" :label="dict.name"
                             :value="dict.id" />
@@ -380,7 +394,7 @@
                   </template>
                 </el-table-column>
                 <el-table-column min-width="150" align="center">
-                  <template #header>  责任人 </template>
+                  <template #header> 责任人 </template>
                   <template #default="{ row, $index }">
                     <el-form-item :prop="`${$index}.owner`" class="mb-0px!">
                       <el-input v-model="row.owner" placeholder="责任人" />
@@ -414,8 +428,8 @@
                     {{ getDictLabel(DICT_TYPE.SYSTEM_OPERATE_TYPE, scope.row.type) }}
                   </template>
                 </el-table-column>
-                <el-table-column prop="userNickname" label="操作人" align="center"  />
-                <el-table-column label="操作时间" align="center" prop="startTime" width="220"  :formatter="dateFormatter" />
+                <el-table-column prop="userNickname" label="操作人" align="center" />
+                <el-table-column label="操作时间" align="center" prop="startTime" width="220" :formatter="dateFormatter" />
               </el-table>
             </el-card>
           </el-col>
@@ -432,7 +446,7 @@
 <script setup lang="ts">
 import { inject } from 'vue'
 import { getIntDictOptions, getStrDictOptions, getDictLabel, DICT_TYPE } from '@/utils/dict'
-import { betweenDay, formatDate,dateFormatter } from '@/utils/formatTime'
+import { betweenDay, formatDate, dateFormatter } from '@/utils/formatTime'
 import { Search, Plus } from '@element-plus/icons-vue'
 import ProjectOrderDialog from '@/views/heli/plan/projectOrderDialog.vue'
 import * as PlanApi from '@/api/heli/plan'
@@ -474,7 +488,7 @@ const formData = ref({
   projectOrderSubs: [],
   projectPlanSubs: [],
   craftInfos: [],
-  craftContent:undefined
+  craftContent: undefined
 })
 const formRules = reactive({
   projectCode: [{ required: true, message: '项目编号不能为空', trigger: 'blur' }],
@@ -506,13 +520,13 @@ const handleSelectedProjectOrder = (arr: ProjectOrderVO[]) => {
   }
 }
 
-const handleSubCode = (row,name) =>{
-  row.projectSubCode = formData.value.projectCode+'-'+customerInit.value.code + '-'+ name
+const handleSubCode = (row, name) => {
+  row.projectSubCode = name.length==0?"" : (formData.value.projectCode + '-' + customerInit.value.code + '-' + name)
 }
 
-const handleMouldType = async (scope,mid) => {
+const handleMouldType = async (scope, mid) => {
   // 获得设备信息下拉列表
-  scope.row.equipList = equipInit.value.filter( rg => rg.mould_type_id == mid)
+  scope.row.equipList = equipInit.value.filter(rg => rg.mould_type_id == mid)
 }
 
 const submitForm = async () => {
@@ -526,17 +540,17 @@ const submitForm = async () => {
     data.craftContent = JSON.stringify(data.craftInfos)
 
     await PlanApi.updatePlan(data)
-    formData.value.projectOrderSubs.forEach(item=>{
+    formData.value.projectOrderSubs.forEach(item => {
       var subData = item as unknown as PlanSubApid.PlanSubVo
       subData.projectId = item.projectOrderId
       subData.projectPlanId = formData.value.id
       subData.projectSubShortName = item.projectSubShortName
       subData.projectSubCode = item.projectSubCode
       subData.projectSubId = item.id
-      if(item.planSubId == undefined){
+      if (item.planSubId == undefined) {
         subData.id = 0
         PlanSubApi.createPlanSub(subData)
-      }else{
+      } else {
         subData.id = item.planSubId
         PlanSubApi.updatePlanSub(subData)
       }
@@ -550,42 +564,42 @@ const submitForm = async () => {
   }
 }
 
-const handleInitPlanSub = async ()=>{
+const handleInitPlanSub = async () => {
   // 项目子项列表
   formData.value.projectOrderSubs =
     await ProjectOrderApi.getProjectOrderSubListByProjectOrderId(formData.value.projectId)
 
   // 生产计划子项列表
   const queryParams = reactive({
-      pageNo: 1,
-      pageSize: 99,
-      projectPlanId: query.id
-    })
+    pageNo: 1,
+    pageSize: 99,
+    projectPlanId: query.id
+  })
 
   formData.value.projectPlanSubs =
     (await PlanSubApi.getPlanSubPage(queryParams)).list
 
-    formData.value.projectOrderSubs.forEach( item =>{
-      if(formData.value.projectPlanSubs.filter(sub=>sub.projectSubId == item.id).length>0){
-        var subTemp = formData.value.projectPlanSubs.find(sub=>sub.projectSubId == item.id)
-        item.planSubId = subTemp.id
-        item.projectPlanId = subTemp.projectPlanId
-        item.projectId = subTemp.projectId
-        item.projectSubId = subTemp.projectSubId
-        item.projectSubShortName = subTemp.projectSubShortName
-        item.projectSubCode = subTemp.projectSubCode
-        item.mouldId = subTemp.mouldId
-        item.equipId = subTemp.equipId
-        item.blankDate = subTemp.blankDate
-        item.blankOwner = subTemp.blankOwner
-        item.twoDimDate = subTemp.twoDimDate
-        item.twoDimOwner = subTemp.twoDimOwner
-        item.threeDimDate = subTemp.threeDimDate
-        item.threeDimOwner = subTemp.threeDimOwner
-        item.equipList = equipInit.value.filter( rg => rg.mould_type_id == subTemp.mouldId)
-      }
-
-    })
+  formData.value.projectOrderSubs.forEach(item => {
+    if (formData.value.projectPlanSubs.filter(sub => sub.projectSubId == item.id).length > 0) {
+      var subTemp = formData.value.projectPlanSubs.find(sub => sub.projectSubId == item.id)
+      item.planSubId = subTemp.id
+      item.projectPlanId = subTemp.projectPlanId
+      item.projectId = subTemp.projectId
+      item.projectSubId = subTemp.projectSubId
+      item.projectSubShortName = subTemp.projectSubShortName
+      item.projectSubCode = subTemp.projectSubCode
+      item.mouldId = subTemp.mouldId
+      item.equipId = subTemp.equipId
+      item.blankDate = subTemp.blankDate
+      item.blankOwner = subTemp.blankOwner
+      item.twoDimDate = subTemp.twoDimDate
+      item.twoDimOwner = subTemp.twoDimOwner
+      item.threeDimDate = subTemp.threeDimDate
+      item.threeDimOwner = subTemp.threeDimOwner
+      item.equipList = equipInit.value.filter(rg => rg.mould_type_id == subTemp.mouldId)
+    }
+
+  })
 }
 
 const equipInit = ref()
@@ -626,14 +640,14 @@ onMounted(async () => {
   }
   formData.value.operateLogs = (await getOperateLogPage(logParams)).list
 
-  if(formData.value.craftContent == null) {
+  if (formData.value.craftContent == null) {
     formData.value.craftInfos = []
-  
-    getIntDictOptions(DICT_TYPE.HELI_CRAFT).forEach(dict =>{
-      formData.value.craftInfos.push({id:dict.value,name:dict.label,startDate:'',endDate:'',owner:'',description:''})
+
+    getIntDictOptions(DICT_TYPE.HELI_CRAFT).forEach(dict => {
+      formData.value.craftInfos.push({ id: dict.value, name: dict.label, startDate: '', endDate: '', owner: '', description: '' })
     })
-  }else{
-    formData.value.craftInfos = eval( formData.value.craftContent)
+  } else {
+    formData.value.craftInfos = eval(formData.value.craftContent)
   }
 })
 </script>
diff --git a/sql/v1.3.0/1.structure.sql b/sql/v1.3.0/1.structure.sql
index 7920039d..ad2b44de 100644
--- a/sql/v1.3.0/1.structure.sql
+++ b/sql/v1.3.0/1.structure.sql
@@ -82,8 +82,8 @@ CREATE TABLE `project_plan` (
                                 `craft_start_date` datetime DEFAULT NULL COMMENT '工艺开始日期',
                                 `craft_end_date` datetime DEFAULT NULL COMMENT '工艺结束日期',
                                 `craft_content` varchar(1024) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '工艺流程数组信息[{''id'':1,''sdate'':'''',''edate'':'''',''owner'':'''',''description'':''''}]',
-                                `editor` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '编辑人',
-                                `editor_date` datetime DEFAULT NULL COMMENT '编辑日期',
+                                `editor` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '编制人',
+                                `editor_date` datetime DEFAULT NULL COMMENT '编制日期',
                                 `auditor` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '审核人',
                                 `audit_date` datetime DEFAULT NULL COMMENT '审核日期',
                                 `approver` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '批准人',
@@ -91,6 +91,7 @@ CREATE TABLE `project_plan` (
                                 `description` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注',
                                 `status` tinyint(1) DEFAULT '1' COMMENT '状态,1未开始，2生产中，3已完成，4已终止 ，默认是1',
                                 `change_num` int(11) DEFAULT NULL COMMENT '项目变更次数',
+                                `change_last_date` datetime DEFAULT NULL COMMENT '项目变更日期',
                                 `creator` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '创建者',
                                 `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
                                 `updater` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT '' COMMENT '更新者',
@@ -123,4 +124,4 @@ CREATE TABLE `project_plan_sub` (
                                     `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
                                     `tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号',
                                     PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='生产计划子项目表';
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='生产计划子项目表';
\ No newline at end of file