From 32e9fe81351fe7380fbaec976d496437f442ffe9 Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Mon, 19 Feb 2024 17:51:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=20?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E9=A1=B5=E9=9D=A2=20=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

生产计划 打印页面 首页数据加载
---
 .../src/views/heli/plan/productionPrint.vue   | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/productionPrint.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/productionPrint.vue
index cd03f2b3..8478fbbd 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/productionPrint.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/plan/productionPrint.vue
@@ -89,7 +89,7 @@
         </tr>
         <tr>
           <td colspan="2">是否要工艺:</td>
-          <td>{{ getDictLabel(DICT_TYPE.HELI_COMMON_IS_OR_NOT, planData.property) }}</td>
+          <td>{{ getDictLabel(DICT_TYPE.HELI_COMMON_IS_OR_NOT, planData.hasCraft) }}</td>
           <td>开始日期</td>
           <td>{{ formatDate(new Date(planData.craftStartDate), 'YYYY-MM-DD') }}</td>
           <td>结束日期</td>
@@ -120,23 +120,23 @@
               <div style="display: flex; flex-direction: column; justify-content: space-between">
                 <span style="border-bottom: 1px solid #666"> {{item.name}} </span>
                 <span v-if="!item.projectSubShortName">&nbsp;</span>
-                <span v-else>{{item.projectSubShortName}}</span>
+                <span v-else>{{ formData.code+'-'+formData.customer.code+'-'+ item.projectSubShortName}}</span>
               </div>
             </td>
-            <td>{{item.compositionName}} </td>
+            <td>{{equipInit.find((equip) => equip.id == item.equipId)?.name}} </td>
             <td>{{item.amount}} </td>
-            <td>{{ `H13` }} </td>
-            <td> {{ `2024/1/15` }} </td>
+            <td>{{ item.compositionName }} </td>
+            <td> {{ formatDate(new Date(item.blankDate), 'YYYY-MM-DD') }} </td>
             <td style="padding: 0 0">
               <div style="display: flex; flex-direction: column; justify-content: space-between">
-                <span style="border-bottom: 1px solid #666"> {{ `2024/1/15` }} </span>
-                <span>{{ `name` }}</span>
+                <span style="border-bottom: 1px solid #666"> {{ formatDate(new Date(item.twoDimDate), 'YYYY-MM-DD') }} </span>
+                <span>{{ userInit.find((user) => user.id == item.twoDimOwner)?.nickname }}</span>
               </div>
             </td>
             <td style="padding: 0 0">
               <div style="display: flex; flex-direction: column; justify-content: space-between">
-                <span style="border-bottom: 1px solid #666"> {{ `2024/1/15` }} </span>
-                <span>{{ `name` }}</span>
+                <span style="border-bottom: 1px solid #666"> {{ formatDate(new Date(item.threeDimDate), 'YYYY-MM-DD') }} </span>
+                <span>{{ userInit.find((user) => user.id == item.threeDimOwner)?.nickname }}</span>
               </div>
             </td>
           </tr>
@@ -170,7 +170,7 @@
 
             <td colspan="2"> {{formatDate(new Date(its.startDate), 'YYYY-MM-DD')}}</td>
             <td colspan="2">{{formatDate(new Date(its.endDate), 'YYYY-MM-DD')}} </td>
-            <td>{{its.owner}} </td>
+            <td>{{userInit.find((user) => user.id == its.owner)?.nickname}} </td>
             <td colspan="2"> {{its.description}}</td>
           </tr>
         </tbody>
@@ -203,9 +203,9 @@
             <td colspan="3">{{formData.approveUserName}}</td>
           </tr>
           <tr>
-            <td colspan="4">{{formatDate(new Date(formData.createTime), 'YYYY-MM-DD')}}</td>
-            <td colspan="3">{{formatDate(new Date(formData.auditTime), 'YYYY-MM-DD')}}</td>
-            <td colspan="3">{{formatDate(new Date(formData.approveTime), 'YYYY-MM-DD')}}</td>
+            <td colspan="4">{{formatDate(new Date(planData.editorDate), 'YYYY-MM-DD')}}</td>
+            <td colspan="3">{{formatDate(new Date(planData.auditDate), 'YYYY-MM-DD')}}</td>
+            <td colspan="3">{{formatDate(new Date(planData.approveDate), 'YYYY-MM-DD')}}</td>
           </tr>
         </tbody>
       </table>
@@ -358,6 +358,7 @@
 </template>
 <script setup lang="ts">
 // import { ref, reactive } from 'vue'
+import * as EquipApi from '@/api/heli/equip'
 import * as UserApi from '@/api/system/user'
 import * as PlanApi from '@/api/heli/plan'
 import * as PlanSubApi from '@/api/heli/plansub'
@@ -537,8 +538,11 @@ const planData = ref({
   craftContent: undefined
 })
 const userInit = ref()
+const equipInit = ref()
 /** 打开弹窗 */
 const open = async (id: number) => {
+  // 设备信息下拉列表数据
+  equipInit.value = await EquipApi.getSimpList()
   //用户列表数据
   userInit.value = await UserApi.getSimpleUserList()
   //图片处理
@@ -559,16 +563,17 @@ const open = async (id: number) => {
   resetForm()
   // 生产计划数据
   planData.value = await PlanApi.getPlan(id)
-  // 生产计划子项目数据
-  await handleInitPlanSub(id)
-  // 生产计划工艺数据
-  await handleCraftInfo()
+
 
   formData.value = await ProjectOrderApi.getProjectOrder(planData.value.projectId)
   // 子项列表
   formData.value.projectOrderSubs = await ProjectOrderApi.getProjectOrderSubListByProjectOrderId(
     planData.value.projectId
   )
+  // 生产计划子项目数据
+  await handleInitPlanSub(id)
+  // 生产计划工艺数据
+  await handleCraftInfo()
   formData.value.customer = await getCustomer(formData.value.customerId)
   // 操作日志查询 并筛选审核/批准信息
   let logParams = {