Merge branch 'main' of http://120.48.141.82:3000/licq/heli-mes

mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/detail.vue

@@ -101,7 +101,7 @@
           <div style="display: flex;">
           <span style="width: 210px;">订单编号：{{ printData.purchaseNo }}</span>
           <span style="margin-left:20px; width: 170px;">订单日期：{{ formatDate(printData.ordDate) }}</span>
-          <span style="margin-left:20px;width: 150px">供应商：{{ printData.supplierName }}</span>
+          <span style="margin-left:20px;width: 250px">供应商：{{ printData.supplierName }}</span>
          </div>
          <div style="display: flex;">
           <span style="margin-left:20px;width: 110px">联系人：{{ printData.contactName }}</span>
@@ -113,17 +113,17 @@
       <table class="print-table">
         <colgroup>
 <col style="width: 4%;" />
-<col style="width: 14%;" />
-<col style="width: 4%;" />
 <col style="width: 15%;" />
+<col style="width: 4%;" />
+<col style="width: 16%;" />
 <col style="width: 7%;" />
 <col style="width: 4%;" />
-<col style="width: 7%;" />
+<col style="width: 9%;" />
 <col style="width: 8%;" />
-<col style="width: 8%;" />
-<col style="width: 7%;" />
 <col style="width: 6%;" />
 <col style="width: 7%;" />
+<col style="width: 7%;" />
+<col style="width: 4%;" />
 
   </colgroup>
   <thead>
@@ -131,15 +131,15 @@
       <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>
@@ -147,24 +147,21 @@
     <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]?.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]?.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]?.unitPrice || '' }}</td>
     <td>{{ printData.purchaseOrderNoDetailList[index]?.estimatedPrice || '' }}</td>
+    <td></td>
 
   </tr>
    <tr>
-      <td colspan="8"></td>
+      <td colspan="9"></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>

mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorderno/managementdetail.vue

@@ -81,7 +81,7 @@
           <div style="display: flex;">
           <span style="width: 210px;">订单编号：{{ printData.purchaseNo }}</span>
           <span style="margin-left:20px; width: 170px;">订单日期：{{ formatDate(printData.ordDate) }}</span>
-          <span style="margin-left:20px;width: 150px">供应商：{{ printData.supplierName }}</span>
+          <span style="margin-left:20px;width: 250px">供应商：{{ printData.supplierName }}</span>
          </div>
          <div style="display: flex;">
           <span style="margin-left:20px;width: 110px">联系人：{{ printData.contactName }}</span>