Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/detail.vue

mes-ui/mes-ui-admin-vue3/src/styles/cus.scss

@@ -11,7 +11,7 @@
 * {
   font-size: 18px !important;
   box-sizing: border-box;
-  .el-form-item__error{
+  .el-form-item__error {
     font-size: 14px !important;
   }
 }
@@ -22,13 +22,13 @@
   .el-card__header {
     background-color: #f7f8fa;
     padding: var(--hl-padding);
-    .card-header{
+    .card-header {
       span {
         font-size: 20px !important;
       }
       display: flex;
       justify-content: space-between;
-      align-items:center ;
+      align-items: center;
     }
     span {
       font-size: 20px !important;
@@ -78,7 +78,6 @@
   }
 }
 
-
 .hl-card-info {
   box-shadow: none !important;
   border: none !important;
@@ -108,19 +107,35 @@
     }
   }
 }
-.hl-incard{
+.hl-incard {
   margin-bottom: 20px;
   padding: 0 20px;
 }
 
-.hl-addbutton{
+.hl-addbutton {
   margin: 10px 0px 10px 0px !important;
 }
 
-.hl-footer{
+.hl-footer {
   margin: 30px 0;
 }
-
+.abstatus {
-
+  position: absolute;
-
+  right: 80px;
-
+  top: 20px;
+  z-index: 999;
+  img {
+    width: 150px;
+  }
+  .shipments {
+    display: flex;
+    align-items: center;
+    width: 450px;
+    justify-content: space-between;
+    .shipmentsfont {
+      font-size: 35px !important;
+      font-weight: 500;
+      color: red;
+    }
+  }
+}