Merge remote-tracking branch 'websoft/master'

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

@@ -9528,6 +9528,37 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+// 对齐 customer-archive 的 .archive-form 风格：label 固定宽折行 + 控件 250px
+.business-crud-page__task-form,
+.business-crud-page__freight-form,
+.business-crud-page__module-form,
+.business-crud-page__dispatch-item-form,
+.business-crud-page__match-form,
+.business-crud-page__transport-plan-import-form {
+  :deep(.el-form-item__label) {
+    flex: 0 0 calc(6em + 24px) !important;
+    width: calc(6em + 24px) !important;
+    height: auto;
+    white-space: normal !important;
+    word-break: break-all;
+    overflow-wrap: anywhere;
+    line-height: 18px;
+  }
+
+  :deep(.el-form-item) {
+    align-items: center;
+  }
+
+  :deep(.el-form-item__content > .el-input),
+  :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) {
+    width: 250px;
+    max-width: 100%;
+  }
+}
+
 .business-crud-page {
   &__field {
     width: 100%;

src/views/business/components/waybill-import-dialog.vue

@@ -33,7 +33,7 @@
 
   <el-dialog v-model="createVisible" title="新建导入" width="85%" append-to-body destroy-on-close class="waybill-import-create">
     <section class="waybill-import-create__form-panel">
-      <el-form ref="formRef" :model="form" :rules="rules" label-position="right" label-width="auto">
+      <el-form ref="formRef" :model="form" :rules="rules" label-position="right" label-width="auto" class="archive-form">
         <el-row :gutter="20"><el-col :span="6"><el-form-item label="项目" prop="projectId"><el-select v-model="form.projectId" filterable clearable placeholder="模糊查询后选择" @change="projectChange"><el-option v-for="item in projects" :key="item.id" :label="item.projectName" :value="item.id" /></el-select></el-form-item></el-col><el-col :span="6"><el-form-item label="客户" prop="customerName"><el-input v-model="form.customerName" disabled placeholder="自动带出" /></el-form-item></el-col><el-col :span="6"><el-form-item label="客户合同" prop="contractId"><el-select v-model="form.contractId" filterable clearable placeholder="自动带出"><el-option v-for="item in contracts" :key="item.id" :label="item.contractName" :value="item.id" /></el-select></el-form-item></el-col><el-col :span="6"><el-form-item label="承运类型" prop="carrierType"><el-select v-model="form.carrierType"><el-option label="承运商" value="承运商" /><el-option label="自运" value="自运" /><el-option label="网货平台" value="网货平台" /></el-select></el-form-item></el-col><el-col :span="6"><el-form-item label="承运商"><el-select v-model="form.carrierIds" multiple filterable placeholder="自动带出，多个需选择"><el-option v-for="item in carriers" :key="item.id" :label="item.name" :value="item.id" /></el-select></el-form-item></el-col><el-col :span="6"><el-form-item label="导入状态" prop="status"><el-select v-model="form.status"><el-option label="完成" value="completed" /><el-option label="进行中" value="processing" /></el-select></el-form-item></el-col><el-col :span="6"><el-form-item label="导入类型" prop="importType"><el-select v-model="form.importType"><el-option label="运单" value="waybill" /><el-option label="结算单" value="settlement" /></el-select></el-form-item></el-col><el-col :span="6"><el-form-item label="发货计划"><el-select v-model="form.planId" clearable filterable placeholder="请选择"><el-option v-for="item in plans" :key="item.id" :label="item.planName" :value="item.id" /></el-select></el-form-item></el-col></el-row>
         <el-form-item label="运单明细表" prop="file"><el-upload action="#" accept=".xls,.xlsx" :auto-upload="false" :limit="1" :file-list="files" :on-change="fileChange" :on-remove="fileRemove"><el-button type="primary">添加附件</el-button></el-upload><span class="waybill-import-create__file-tip">请上传运单明细表，仅支持 excel 格式</span><el-link type="primary" @click="downloadTemplate">下载模板</el-link></el-form-item>
       </el-form>

src/views/business/loading-manage.vue

@@ -378,7 +378,7 @@
           :disabled="dialogReadonly"
           label-position="right"
           label-width="auto"
-          class="loading-manage-dialog__form"
+          class="loading-manage-dialog__form archive-form"
         >
           <section-card title="筛选待配载运单">
             <template #extra>