From 2db14bf06170d1bebe45a67930032923c35e0094 Mon Sep 17 00:00:00 2001
From: BinBin Song <songbinbin@bluepulse.cn>
Date: Fri, 27 Jun 2025 08:56:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/purchaseorderno/detail.vue | 88 +++++++++++--------
 1 file changed, 49 insertions(+), 39 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/detail.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/detail.vue
index 9019edd..be1ad5f 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/detail.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/detail.vue
@@ -112,71 +112,81 @@
       </div>
       <table class="print-table">
         <colgroup>
-    <col style="width: 19%;"/>
-    <col style="width: 25%;"/>
-    <col style="width: 8%;"/>
-    <col style="width: 8%;"/>
-    <col style="width: 9%;"/>
-    <col style="width: 8%;"/>
-    <col style="width: 8%;"/>
-    <col style="width: 8%;"/>
-    <col style="width: 7%;"/>
+<col style="width: 4%;" />
+<col style="width: 14%;" />
+<col style="width: 4%;" />
+<col style="width: 15%;" />
+<col style="width: 7%;" />
+<col style="width: 4%;" />
+<col style="width: 7%;" />
+<col style="width: 8%;" />
+<col style="width: 8%;" />
+<col style="width: 7%;" />
+<col style="width: 6%;" />
+<col style="width: 7%;" />
+
   </colgroup>
   <thead>
     <tr>
+      <th>序号</th>
       <th>子项目编号</th>
-      <th>零件名称</th>
+      <th>件号</th>
+      <th>标准件名称</th>
+      <th>物料编码</th>
       <th>材料</th>
-      <th>数量</th>
+      <th>规格型号</th>
       <th>要求完成日期</th>
-      <th>技术要求</th>
-      <th>理论重量</th>
-      <th>价格(元)</th>
-      <th>备注</th>
-
+      <th>计划到货日期</th>
+      <th>采购数量</th>
+      <th>单价(元)</th>
+      <th>总价格(元)</th>
     </tr>
   </thead>
   <tbody>
   <tr v-for="(item, index) in 17" :key="index">
+    <td>{{ index + 1 }}</td>
     <td>{{ printData.purchaseOrderNoDetailList[index]?.projectSubCode || '' }}</td>
+   <td>{{ printData.purchaseOrderNoDetailList[index]?.blueprintNo || '' }}</td>
+
     <td>{{ printData.purchaseOrderNoDetailList[index]?.boomName ? limitTo20Chars(printData.purchaseOrderNoDetailList[index].boomName) : '' }}</td>
-    <td>{{ printData.purchaseOrderNoDetailList[index]?.compositionName || '' }}</td>
-    <td>{{ printData.purchaseOrderNoDetailList[index]?.purchaseAmount || '' }}</td>
-    <td>{{ printData.purchaseOrderNoDetailList[index]?.requireTime ? formatDate(printData.purchaseOrderNoDetailList[index].requireTime) : '' }}</td>
-    <td>{{ printData.purchaseOrderNoDetailList[index]?.description || '' }}</td>
-    <td>{{ printData.purchaseOrderNoDetailList[index]?.theWeight || '' }}</td>
-    <td>{{ printData.purchaseOrderNoDetailList[index]?.estimatedPrice || '' }}</td>
+    <td>{{ printData.purchaseOrderNoDetailList[index]?.matCode || '' }}</td>
     <td></td>
 
+    <td>{{ printData.purchaseOrderNoDetailList[index]?.boomSpec || '' }}</td>
+    <td>{{ printData.purchaseOrderNoDetailList[index]?.requireTime ? formatDate(printData.purchaseOrderNoDetailList[index].requireTime) : '' }}</td>
+    <td>{{ printData.purchaseOrderNoDetailList[index]?.arriveTime ? formatDate(printData.purchaseOrderNoDetailList[index].arriveTime) : '' }}</td>
+    <td>{{ printData.purchaseOrderNoDetailList[index]?.purchaseAmount || '' }}</td>
+    <td>{{ printData.purchaseOrderNoDetailList[index]?.unitPrice || '' }}</td>
+    <td>{{ printData.purchaseOrderNoDetailList[index]?.estimatedPrice || '' }}</td>
+
   </tr>
+   <tr>
+      <td colspan="8"></td>
+      <td style="font-weight: bold;">合计</td>
+      <td style="font-weight: bold;">{{ printData.purchaseAmountSum }}</td>
+      <td></td>
+      <td style="font-weight: bold;">{{ printData.estimatedPriceSum }}</td>
+    </tr>
 </tbody>
 
 </table>
 <div class="order-info" style="margin-top: 10px;border-bottom: 1px solid #ccc;padding-bottom: 10px;">
-  <div style="display: flex;">
+  <div style="display: flex;width: 40%;">
          <span >交货地址：{{ printData.deliveryAddress }}</span>
 
   </div>
-    <div style="display: flex; padding-right: 10%;">
-         <span style="margin-left:20px;width: 100px">邮编：{{ printData.postalCode }}</span>
-   <span style="margin-left:20px;width: 150px">接收人：{{ printData.username }}</span>
+  <div style="display: flex;width: 20%;justify-content: center;">
+        <span style="margin-left:20px;width: 120px">审核：{{ printData.auditorName }}</span>
+        <span style="margin-left:20px;width: 120px">签字区</span>
+
+  </div>
+    <div style="display: flex; width: 40%;justify-content: right;">
+    <span style="margin-left:20px;width: 130px">接收人：{{ printData.username }}</span>
       <span style="margin-left:20px;width: 150px">电话：{{ printData.userMobile }}</span>
         </div>
         </div>
 
-        <div class="stamp-info" style="display: flex;justify-content: space-between;">
-
-          <div style="display: flex;flex-direction: column;">
-             <span >买方：{{ printData.buyer }}</span>
-              <span style="margin-top: 20px;">签字/盖章</span>
-
-          </div>
-             <div style="display: flex;flex-direction: column;padding-right: 20%;">
-             <span >卖方：{{ printData.supplierName }}</span>
-              <span style="margin-top: 20px;">签字/盖章</span>
-
-          </div>
-        </div>
+     
     </div>
     <template #footer>
       <el-button @click="printDialogVisible = false">关闭</el-button>