From 820048a1ce69a8164fd523aa39cabdab167e54db Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Mon, 26 Feb 2024 17:37:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E5=8D=95=E6=97=A5=E6=9C=9F=E9=83=A8=E5=88=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/plan/productionPrint.vue   | 127 +++++++++++++-----
 1 file changed, 92 insertions(+), 35 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 0667e5ff..26575868 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,11 +89,20 @@
         </tr>
         <tr>
           <td colspan="2">是否要工艺:</td>
-          <td>{{ getDictLabel(DICT_TYPE.HELI_COMMON_IS_OR_NOT, planData.hasCraft) }}</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>
+              <span v-if="!planData.craftStartDate">&nbsp;</span>
+            <span v-else>{{ formatDate(new Date(planData.craftStartDate), 'YYYY-MM-DD') }}</span>
+            </td>
           <td>结束日期</td>
-          <td>{{ formatDate(new Date(planData.craftEndDate), 'YYYY-MM-DD') }}</td>
+          <td>
+             <span v-if="!planData.craftEndDate">&nbsp;</span>
+            <span v-else>{{ formatDate(new Date(planData.craftEndDate), 'YYYY-MM-DD') }}</span>
+            </td>
           <td>负责人</td>
           <td colspan="2">{{ userInit.find((user) => user.id == planData.craftOwner)?.nickname }}</td>
         </tr>
@@ -126,16 +135,16 @@
             <td>{{equipInit.find((equip) => equip.id == item.equipId)?.name}} </td>
             <td>{{item.amount}} </td>
             <td>{{ item.compositionName }} </td>
-            <td > 
+            <td>
               <span v-if="!item.blankDate"> &nbsp;</span>
               <span v-else>{{ formatDate(new Date(item.blankDate), 'YYYY-MM-DD') }} </span>
-              </td>
+            </td>
             <td style="padding: 0 0">
               <div style="display: flex; flex-direction: column; justify-content: space-between;width: 100px">
-                 <span v-if="!item.twoDimDate" style="border-bottom: 1px solid #666">&nbsp;</span>
+                <span v-if="!item.twoDimDate" style="border-bottom: 1px solid #666">&nbsp;</span>
                 <span v-else style="border-bottom: 1px solid #666"> {{ formatDate(new Date(item.twoDimDate), 'YYYY-MM-DD') }} </span>
                 <span v-if="userInit.find((user) => user.id === item.twoDimOwner)?.nickname">{{ userInit.find((user) => user.id == item.twoDimOwner)?.nickname }}</span>
-                 <span v-else>&nbsp;</span>
+                <span v-else>&nbsp;</span>
               </div>
             </td>
             <td style="padding: 0 0">
@@ -178,14 +187,14 @@
             <td class="xh"> {{ index+1 }} </td>
             <td colspan="2"> {{ its.name }}</td>
 
-            <td colspan="2"> 
+            <td colspan="2">
               <span v-if="!its.startDate"> &nbsp;</span>
               <span v-else>{{formatDate(new Date(its.startDate), 'YYYY-MM-DD')}}</span>
-              </td>
+            </td>
             <td colspan="2">
               <span v-if="!its.endDate">&nbsp;</span>
               <span v-else>{{formatDate(new Date(its.endDate), 'YYYY-MM-DD')}} </span>
-              </td>
+            </td>
             <td>{{userInit.find((user) => user.id == its.owner)?.nickname}} </td>
             <td colspan="2"> {{its.description}}</td>
           </tr>
@@ -213,16 +222,35 @@
             <td colspan="3" style="width: 33%"> 审核/日期 </td>
             <td colspan="3" style="width: 33%"> 批准/日期 </td>
           </tr>
-         
+
           <tr>
-            <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>
+            <td colspan="4">
+              <span v-if="!planData.editorDate"> &nbsp;</span>
+              <span v-else>{{formatDate(new Date(planData.editorDate), 'YYYY-MM-DD')}}</span>
+            </td>
+            <td colspan="3">
+              <span v-if="!planData.auditDate"> &nbsp;</span>
+              <span v-else>{{formatDate(new Date(planData.auditDate), 'YYYY-MM-DD')}}</span>
+            </td>
+            <td colspan="3">
+              <span v-if="!planData.approveDate"> &nbsp;</span>
+              <span v-else>{{formatDate(new Date(planData.approveDate), 'YYYY-MM-DD')}}</span>
+            </td>
           </tr>
-           <tr>
-            <td colspan="4">{{ userInit.find((user) => user.id == planData.editor)?.nickname }}</td>
-              <td colspan="3">{{ userInit.find((user) => user.id == planData.auditor)?.nickname }}</td>
-              <td colspan="3">{{ userInit.find((user) => user.id == planData.approver)?.nickname }}</td>
+          <tr>
+            <td colspan="4">
+              <span v-if="!planData.editor"> &nbsp;</span>
+              <span v-else> {{ userInit.find((user) => user.id == planData.editor)?.nickname }}</span>
+            </td>
+            <td colspan="3">
+              <span v-if="!planData.auditor"> &nbsp;</span>
+              <span v-else> {{ userInit.find((user) => user.id == planData.auditor)?.nickname }}</span>
+
+            </td>
+            <td colspan="3">
+              <span v-if="!planData.approver"> &nbsp;</span>
+              <span v-else> {{ userInit.find((user) => user.id == planData.approver)?.nickname }}</span>
+            </td>
           </tr>
         </tbody>
       </table>
@@ -297,15 +325,15 @@
               <td colspan="3"> 名称/编号 </td>
               <td> 设备型号 </td>
               <td> 数量 </td>
-              <td> 主要材料 </td>
-              <td> 毛坯日期 </td>
+              <td style="width:100px"> 主要材料 </td>
+              <td style="width:100px"> 毛坯日期 </td>
               <td> 2D/日期 </td>
               <td> 3D/日期 </td>
             </tr>
           </tbody>
           <tbody>
             <tr v-for="(item, idx) in formData.projectOrderSubs.slice(4)" :key="idx">
-              <td class="xh"> {{ idx+4 }} </td>
+              <td class="xh"> {{ idx+1 }} </td>
               <td colspan="3" style="padding: 0 0">
                 <div style="display: flex; flex-direction: column; justify-content: space-between">
                   <span style="border-bottom: 1px solid #666"> {{item.name}} </span>
@@ -316,17 +344,27 @@
               <td>{{equipInit.find((equip) => equip.id == item.equipId)?.name}} </td>
               <td>{{item.amount}} </td>
               <td>{{ item.compositionName }} </td>
-              <td style="width: 100px !important"> {{ formatDate(new Date(item.blankDate), 'YYYY-MM-DD') }} </td>
+              <td>
+                <span v-if="!item.blankDate"> &nbsp;</span>
+                <span v-else>{{ formatDate(new Date(item.blankDate), 'YYYY-MM-DD') }} </span>
+              </td>
               <td style="padding: 0 0">
-                <div style="display: flex; flex-direction: column; justify-content: space-between">
-                  <span style="border-bottom: 1px solid #666;width: 100px"> {{ formatDate(new Date(item.twoDimDate), 'YYYY-MM-DD') }} </span>
-                  <span>{{ userInit.find((user) => user.id == item.twoDimOwner)?.nickname }}</span>
+                <div style="display: flex; flex-direction: column; justify-content: space-between;width: 100px">
+                  <span v-if="!item.twoDimDate" style="border-bottom: 1px solid #666">&nbsp;</span>
+                  <span v-else style="border-bottom: 1px solid #666"> {{ formatDate(new Date(item.twoDimDate), 'YYYY-MM-DD') }} </span>
+                  <span v-if="userInit.find((user) => user.id === item.twoDimOwner)?.nickname">{{ userInit.find((user) => user.id == item.twoDimOwner)?.nickname }}</span>
+                  <span v-else>&nbsp;</span>
                 </div>
               </td>
               <td style="padding: 0 0">
                 <div style="display: flex; flex-direction: column; justify-content: space-between;width: 100px">
-                  <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>
+                  <span v-if="!item.threeDimDate" style="border-bottom: 1px solid #666">&nbsp;</span>
+
+                  <span v-else style="border-bottom: 1px solid #666"> {{ formatDate(new Date(item.threeDimDate), 'YYYY-MM-DD') }} </span>
+                  <span v-if="userInit.find((user) => user.id === item.threeDimOwner)?.nickname">
+                    {{ userInit.find((user) => user.id === item.threeDimOwner)?.nickname }}
+                  </span>
+                  <span v-else>&nbsp;</span>
                 </div>
               </td>
             </tr>
@@ -367,16 +405,35 @@
               <td colspan="3" style="width: 33%"> 审核/日期 </td>
               <td colspan="3" style="width: 33%"> 批准/日期 </td>
             </tr>
-           
+
             <tr>
-              <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>
+              <td colspan="4">
+                <span v-if="!planData.editorDate"> &nbsp;</span>
+                <span v-else>{{formatDate(new Date(planData.editorDate), 'YYYY-MM-DD')}}</span>
+              </td>
+              <td colspan="3">
+                <span v-if="!planData.auditDate"> &nbsp;</span>
+                <span v-else>{{formatDate(new Date(planData.auditDate), 'YYYY-MM-DD')}}</span>
+              </td>
+              <td colspan="3">
+                <span v-if="!planData.approveDate"> &nbsp;</span>
+                <span v-else>{{formatDate(new Date(planData.approveDate), 'YYYY-MM-DD')}}</span>
+              </td>
             </tr>
-             <tr>
-              <td colspan="4">{{ userInit.find((user) => user.id == planData.editor)?.nickname }}</td>
-              <td colspan="3">{{ userInit.find((user) => user.id == planData.auditor)?.nickname }}</td>
-              <td colspan="3">{{ userInit.find((user) => user.id == planData.approver)?.nickname }}</td>
+            <tr>
+              <td colspan="4">
+                <span v-if="!planData.editor"> &nbsp;</span>
+                <span v-else> {{ userInit.find((user) => user.id == planData.editor)?.nickname }}</span>
+              </td>
+              <td colspan="3">
+                <span v-if="!planData.auditor"> &nbsp;</span>
+                <span v-else> {{ userInit.find((user) => user.id == planData.auditor)?.nickname }}</span>
+
+              </td>
+              <td colspan="3">
+                <span v-if="!planData.approver"> &nbsp;</span>
+                <span v-else> {{ userInit.find((user) => user.id == planData.approver)?.nickname }}</span>
+              </td>
             </tr>
           </tbody>
         </table>