Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/business/process-config.vue

src/views/business/components/business-crud-page.vue

@@ -12704,10 +12704,9 @@ export default {
 
   &__contract-expiry-search {
     display: flex;
-    order: -1;
     align-items: center;
     gap: 8px;
-    margin-right: auto;
+    margin-left: auto;
     min-width: 0;
 
     :deep(.el-select) {
@@ -14232,7 +14231,7 @@ export default {
     min-width: 56px;
     height: 22px;
     margin: 0 14px;
-    border-bottom: 3px solid #303133;
+    border-bottom: 4px solid #e4e7ed;
   }
 
   &__transport-plan-waybill-card {
@@ -14337,7 +14336,7 @@ export default {
 
   &__waybill-summary-grid {
     display: grid;
-    grid-template-columns: repeat(4, minmax(130px, 1fr)) minmax(360px, 2fr);
+    grid-template-columns: repeat(4, minmax(130px, 1fr)) minmax(420px, 2.5fr);
     gap: 16px 24px;
   }
 
@@ -14410,9 +14409,9 @@ export default {
     &::before {
       flex: 1;
       order: 2;
-      height: 2px;
+      height: 4px;
       content: '';
-      background: #606266;
+      background: #e4e7ed;
     }
 
     b.end {