From 9f8cf8f1987906af7fe0fa53dbc1ef4940ad29bf Mon Sep 17 00:00:00 2001
From: zengchenxi <chenximail_1@163.com>
Date: Wed, 21 Feb 2024 17:40:34 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E3=80=91=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processdesign/ProcessDesignDO.java        |  4 ++
 .../processdesign/ProcessDesignMapper.java    |  2 +-
 .../src/views/heli/processdesign/detail.vue   | 68 ++++++++++++++++++-
 3 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignDO.java
index fe2e146e..86b8c2c3 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignDO.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/processdesign/ProcessDesignDO.java
@@ -108,6 +108,10 @@ public class ProcessDesignDO extends BaseDO {
     @TableField(exist = false)
     private String threeDimOwnerName;
 
+    @TableField(exist = false)
+    private String projectSubName;
 
+    @TableField(exist = false)
+    private String projectSubCode;
 
 }
diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java
index 03e879d9..f014902b 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/processdesign/ProcessDesignMapper.java
@@ -6,7 +6,6 @@ import com.chanko.yunxi.mes.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.chanko.yunxi.mes.module.heli.controller.admin.processdesign.vo.ProcessDesignPageReqVO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.customer.CustomerDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.plan.PlanDO;
-import com.chanko.yunxi.mes.module.heli.dal.dataobject.plansub.PlanSubDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.processdesign.ProcessDesignDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO;
 import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO;
@@ -42,6 +41,7 @@ public interface ProcessDesignMapper extends BaseMapperX<ProcessDesignDO> {
                 .select("u1.nickname as projectOwnerName", "u2.nickname as craftOwnerName")
                 .select("b.blank_date as blankDate", "b.two_dim_date as twoDimDate", "b.three_dim_date as threeDimDate")
                 .select("u3.nickname as blankOwnerName", "u4.nickname as twoDimOwnerName", "u5.nickname as threeDimOwnerName")
+                .select("c.name as projectSubName", "b.project_sub_code as projectSubCode")
                 .leftJoin(PlanDO.class, "a", PlanDO::getId, ProcessDesignDO::getPlanId)
                 .leftJoin("project_plan_sub b on b.project_plan_id = t.plan_id and b.id = t.project_sub_id")
                 .leftJoin(ProjectOrderSubDO.class, "c", ProjectOrderSubDO::getId, ProcessDesignDO::getProjectSubId)
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue
index 0f362ec4..d61b8505 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/processdesign/detail.vue
@@ -53,7 +53,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row v-if="processDesignType == 'BLUEPRINT_FOUNDRY_TECHNOLOGY'">
           <el-col :span="6">
             <el-form-item label="是否要工艺" prop="hasCraft">
               {{ getDictLabel(DICT_TYPE.HELI_COMMON_IS_OR_NOT, formData.hasCraft) }}
@@ -75,6 +75,72 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row v-if="processDesignType == 'BLUEPRINT_3D'">
+          <el-col :span="6">
+            <el-form-item label="3D负责人" prop="threeDimOwnerName">
+              {{ formData.threeDimOwnerName }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="3D结束日期" prop="threeDimDate">
+              {{formatDate(formData.threeDimDate, 'YYYY-MM-DD')}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="子项目名称" prop="projectSubName">
+              {{formData.projectSubName}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="子项目编号" prop="projectSubCode">
+              {{formData.projectSubCode}}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="processDesignType == 'BLUEPRINT_2D'">
+          <el-col :span="6">
+            <el-form-item label="2D负责人" prop="twoDimOwnerName">
+              {{ formData.twoDimOwnerName }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="2D结束日期" prop="twoDimDate">
+              {{formatDate(formData.twoDimDate, 'YYYY-MM-DD')}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="子项目名称" prop="projectSubName">
+              {{formData.projectSubName}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="子项目编号" prop="projectSubCode">
+              {{formData.projectSubCode}}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="processDesignType == 'BLUEPRINT_WORKBLANK'">
+          <el-col :span="6">
+            <el-form-item label="毛坯负责人" prop="blankOwnerName">
+              {{ formData.blankOwnerName }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="毛坯结束日期" prop="blankDate">
+              {{formatDate(formData.blankDate, 'YYYY-MM-DD')}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="子项目名称" prop="projectSubName">
+              {{formData.projectSubName}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="子项目编号" prop="projectSubCode">
+              {{formData.projectSubCode}}
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-card>
       <!-- 表格类信息 -->
       <el-card class="hl-card-info">