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

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

@@ -80,17 +80,28 @@
         <div class="order-info">
           <div style="display: flex;">
           <span style="width: 210px;">订单编号：{{ printData.purchaseNo }}</span>
-          <span style="margin-left:20px; width: 150px;">订单日期：{{ formatDate(printData.ordDate) }}</span>
+          <span style="margin-left:20px; width: 170px;">订单日期：{{ formatDate(printData.ordDate) }}</span>
           <span style="margin-left:20px;width: 150px">供应商：{{ printData.supplierName }}</span>
          </div>
          <div style="display: flex;">
-          <span style="margin-left:20px;width: 100px">联系人：{{ printData.contactName }}</span>
+          <span style="margin-left:20px;width: 110px">联系人：{{ printData.contactName }}</span>
           <span style="margin-left:20px;width: 150px">电话：{{ printData.contactMobile }}</span>
           </div>
          
         </div>
       </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: 7%;"/>
+    <col style="width: 8%;"/>
+    <col style="width: 9%;"/>
+    <col style="width: 9%;"/>
+    <col style="width: 7%;"/>
+  </colgroup>
   <thead>
     <tr>
       <th>子项目编号</th>
@@ -105,26 +116,27 @@
     </tr>
   </thead>
   <tbody>
-    <tr v-for="(item, index) in printData.purchaseOrderNoDetailList" :key="index">
+  <tr v-for="(item, index) in 17" :key="index">
-      <td>{{ item.projectSubCode }}</td>
+    <td>{{ printData.purchaseOrderNoDetailList[index]?.projectSubCode || '' }}</td>
-      <td>{{ item.boomName }}</td>
+    <td>{{ printData.purchaseOrderNoDetailList[index]?.boomName ? limitTo20Chars(printData.purchaseOrderNoDetailList[index].boomName) : '' }}</td>
-      <td>{{ item.matCode }}</td>
+    <td>{{ printData.purchaseOrderNoDetailList[index]?.matCode || '' }}</td>
-      <td>{{ item.compositionName }}</td>
+    <td>{{ printData.purchaseOrderNoDetailList[index]?.compositionName || '' }}</td>
-      <td>{{ item.purchaseAmount }}</td>
+    <td>{{ printData.purchaseOrderNoDetailList[index]?.purchaseAmount || '' }}</td>
-      <td>{{ item.boomSpec }}</td>
+    <td>{{ printData.purchaseOrderNoDetailList[index]?.boomSpec || '' }}</td>
-      <td>{{ formatDate(item.requireTime) }}</td>
+    <td>{{ printData.purchaseOrderNoDetailList[index]?.requireTime ? formatDate(printData.purchaseOrderNoDetailList[index].requireTime) : '' }}</td>
-      <td>{{ formatDate(item.arriveTime) }}</td>
+    <td>{{ printData.purchaseOrderNoDetailList[index]?.arriveTime ? formatDate(printData.purchaseOrderNoDetailList[index].arriveTime) : '' }}</td>
-      <td>{{ item.estimatedPrice }}</td>
+    <td>{{ printData.purchaseOrderNoDetailList[index]?.estimatedPrice || '' }}</td>
-    </tr>
+  </tr>
-  </tbody>
+</tbody>
+
 </table>
 <div class="order-info" style="margin-top: 10px;border-bottom: 1px solid #ccc;padding-bottom: 10px;">
   <div style="display: flex;">
-         <span >交货地址：</span>
+         <span >交货地址：{{ printData.deliveryAddress }}</span>
 
   </div>
     <div style="display: flex; padding-right: 10%;">
-         <span style="margin-left:20px;width: 80px">邮编：</span>
+         <span style="margin-left:20px;width: 100px">邮编：{{ printData.postalCode }}</span>
    <span style="margin-left:20px;width: 150px">接收人：{{ printData.username }}</span>
       <span style="margin-left:20px;width: 150px">电话：{{ printData.userMobile }}</span>
         </div>
@@ -133,7 +145,7 @@
         <div class="stamp-info" style="display: flex;justify-content: space-between;">
 
           <div style="display: flex;flex-direction: column;">
-             <span >买方：</span>
+             <span >买方：{{ printData.buyer }}</span>
               <span style="margin-top: 20px;">签字/盖章</span>
 
           </div>
@@ -281,7 +293,7 @@ function doPrint() {
           body {
             font-family: Arial, sans-serif;
             margin: 10px;
-            font-size: 14px;
+            font-size: 12px;
           }
           .print-content {
             width: 100%;
@@ -316,6 +328,8 @@ function doPrint() {
             border: 1px solid #ddd;
             padding: 5px;
             text-align: center;
+            height: 20px;         /* 设置固定高度 */
+            line-height: 20px;    /* 垂直居中 */
           }
           .print-table th {
             background-color: #f5f5f5;
@@ -344,6 +358,11 @@ function doPrint() {
   }
    
 }
+
+function limitTo20Chars(input) {
+  if (typeof input !== 'string') return '';
+  return input.length > 20 ? input.slice(0, 20) : input;
+}
 const printLoading = ref(false)
 
 const isPrint = async () => {
@@ -434,6 +453,8 @@ const getList = async () => {
   padding: 6px 8px;
   text-align: center;
   font-size: 13px !important;
+  height: 30px;         /* 设置固定高度 */
+  line-height: 30px;    /* 垂直居中 */
 
 }
 

mes-ui/mini-app/src/pages/messageNotification/components/dataItem.vue

@@ -206,8 +206,6 @@ const onRefresherrefresh = async () => {
 
       .statusLabel {
         font-size: 28rpx;
-        font-weight: 500;
-        color: #333333;
         margin-right: 20rpx;
       }
       .read-btn {

mes-ui/mini-app/src/services/constants.ts

@@ -9,5 +9,5 @@
 // export const serviceDomain = 'https://nxhs.cjyx.cc'
  // export const serviceDomain = 'https://star.hz-hl.com'
 // export const serviceDomain = 'http://222.71.165.187:9010'
- export const serviceDomain = 'http://localhost:8080'
+ // export const serviceDomain = 'http://localhost:8080'
-// export const serviceDomain = 'https://nxhs.cjyx.cc'
+export const serviceDomain = 'https://nxhs.cjyx.cc'