Merge remote-tracking branch 'websoft/master'

# Conflicts:
#	src/views/business/contract-manage-change.vue

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

@@ -13573,7 +13573,9 @@ export default {
   :deep(.el-form-item__content > .el-select),
   :deep(.el-form-item__content > .el-cascader),
   :deep(.el-form-item__content > .el-input-number),
-  :deep(.el-form-item__content > .el-date-editor) {
+  :deep(.el-form-item__content > .el-date-editor),
+  :deep(.el-form-item__content > .el-autocomplete),
+  :deep(.el-form-item__content > .el-autocomplete > .el-input) {
     width: 250px;
     max-width: 100%;
   }
@@ -13644,7 +13646,7 @@ export default {
   &__shipping-title,
   &__goods-title,
   &__task-title {
-    min-width: 100%;
+    //min-width: 100%;
   }
 
   &__shipping-route-action {
@@ -13891,7 +13893,7 @@ export default {
       );
     gap: 8px;
     align-items: center;
-    width: 100%;
+    width:98%;
 
     :deep(.el-input),
     :deep(.el-select),
@@ -13945,7 +13947,9 @@ export default {
   }
 
   &__dispatch-shipping-form &__route-address-row {
-    grid-template-columns: 260px minmax(280px, 1fr) 58px minmax(160px, 220px) 72px minmax(
+    // 地址列用 minmax(0, 1fr)：窗口较窄时地址输入框自动收窄，
+    // 避免各列最小宽度合计超出弹窗宽度，把右侧联系方式挤出弹窗。
+    grid-template-columns: 260px minmax(0, 1fr) 58px minmax(160px, 220px) 72px minmax(
         160px,
         220px
       );