From f7d8fbf16b636c40c6003fcedfcc29fc08d76feb Mon Sep 17 00:00:00 2001
From: weicw1996 <weicw1996@qq.com>
Date: Sun, 18 Oct 2026 15:49:38 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E9=85=8D=E8=BD=BD=E5=80=99=E9=80=89?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8D=E5=86=8D=E6=8C=89=E8=BF=90=E8=BE=93?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E8=BF=87=E6=BB=A4=E5=B9=B6=E8=AE=A2=E6=AD=A3?=
 =?UTF-8?q?=E5=8F=AF=E9=85=8D=E8=BD=BD=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/element-ui.scss                    |  2 +-
 .../components/waybill-manage-page.vue        | 12 ++++----
 src/views/business/loading-manage.vue         | 29 ++-----------------
 3 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index d8f73fe..d01acd2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -622,7 +622,7 @@
   background: #fff;
 }
 
-// 合同管理新增/编辑弹窗（business-crud-page 封装 → avue-crud，弹窗带 avue-crud__dialog class）
+// 合同管理新增/编辑弹窗（avue-crud，弹窗带 avue-crud__dialog class）
 // 复刻 waybill-manage 方案：接近全屏、压过库内置 .avue-dialog 的 calc(100% - 200px)，
 // 并解开 body 的 200px 上限、抵消全局 footer 的 -30px 上移
 .contract-manage-dialog.el-dialog {
diff --git a/src/views/business/components/waybill-manage-page.vue b/src/views/business/components/waybill-manage-page.vue
index a700138..77529db 100644
--- a/src/views/business/components/waybill-manage-page.vue
+++ b/src/views/business/components/waybill-manage-page.vue
@@ -10403,7 +10403,7 @@ export default {
         this.$message.warning('请选择至少一条数据');
         return;
       }
-      // 可配载与否只看后端查询结果，前端不自行判状态与配载字段
+      // 可配载与否只看后端查询结果
       let loadableIds;
       try {
         const res = await getWaybillList(1, selectedIds.length, {
@@ -10419,9 +10419,9 @@ export default {
       if (rejectedRows.length) {
         const rejectedText = rejectedRows
           .map(row => {
-            const reason = this.roadLoadingRejectReason(row);
+            const reason = this.roadLoadingRejectReasonText(row);
             const no = row.waybillNo || row.id || '';
-            return reason ? `${no}（${reason}）` : `${no}`;
+            return `${no}（${reason}）`;
           })
           .join('、');
         this.$message.warning(`${rejectedText}；公路配载仅支持公路、待执行且未配载的运单`);
@@ -10447,12 +10447,12 @@ export default {
         },
       });
     },
-    // 仅用于给被后端判定为不可配载的运单配一句可读原因，不改判据
-    roadLoadingRejectReason(row = {}) {
+    // 只给后端判定为不可配载的运单生成可读原因，本身不参与准入判定
+    roadLoadingRejectReasonText(row = {}) {
       if (!this.waybillIsRoadTransport(row)) return '非公路运输';
       if (String(row.businessStatus || '') !== 'pending') return '状态不是待执行';
       if (row.loadingNo) return '已关联配载单';
-      return '';
+      return '运单数据可能已变化，请刷新后重试';
     },
   },
 };
diff --git a/src/views/business/loading-manage.vue b/src/views/business/loading-manage.vue
index 4fc368b..bf8ef81 100644
--- a/src/views/business/loading-manage.vue
+++ b/src/views/business/loading-manage.vue
@@ -1074,25 +1074,6 @@
                         </el-select>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="6">
-                      <el-form-item label="运输方式">
-                        <el-select
-                          v-model="candidateQuery.transportType"
-                          clearable
-                          filterable
-                          placeholder="请选择"
-                          :disabled="dialogMode === 'add'"
-                          @visible-change="visible => visible && loadTransportTypeOptions()"
-                        >
-                          <el-option
-                            v-for="item in transportTypeOptions"
-                            :key="item.value"
-                            :label="item.label"
-                            :value="item.value"
-                          />
-                        </el-select>
-                      </el-form-item>
-                    </el-col>
                   </template>
                   <el-col
                     :span="candidateSearchVisible ? 24 : 6"
@@ -1848,7 +1829,6 @@ import { normalizeMapSearchResults, searchAmapPlaceText } from '@/utils/map-sear
 import { parseRouteChangeContent } from '@/utils/route-change';
 
 const defaultTransportType = '';
-const defaultCandidateTransportType = '';
 const AMAP_KEY = '653b7cf105ad7fb8ec9b2f5198ade315';
 const AMAP_SECURITY_CODE = '5aab65c632e48ebae0d0e28f5b28e21a';
 const loadingCreateWaybillsStorageKey = 'loading-manage-create-waybills';
@@ -1889,7 +1869,6 @@ const createCandidateSearchForm = () => ({
   vehicleNo: '',
   carrierName: '',
   driverName: '',
-  transportType: defaultCandidateTransportType,
 });
 
 const createDialogForm = () => ({
@@ -3022,7 +3001,6 @@ export default {
       this.dialogMode = mode;
       this.dialogLoading = true;
       this.resetDialogData();
-      if (mode === 'add') this.candidateQuery.transportType = 'road';
       try {
         if (row?.id) {
           const res = await loadingApi.getDetail(row.id);
@@ -3046,7 +3024,6 @@ export default {
         } else {
           this.dialogForm = createDialogForm();
           this.candidateQuery = createCandidateSearchForm();
-          this.candidateQuery.transportType = 'road';
           await this.loadCandidateWaybills();
         }
       } finally {
@@ -3701,13 +3678,12 @@ export default {
       try {
         const query = {
           ...this.buildQueryParams(this.candidateQuery),
-          // 公路、待执行、未配载、非拒单的判定都在后端开关内，前端不再拼这些条件
+          // 公路、待执行、未配载的判定都在后端可配载开关内
+          // 该开关已把候选限定为公路，再按精确运输方式取值筛会漏掉「公路运输」这类历史写法
           loadableOnly: 1,
           // 仅查当前账户所属组织及子组织下的运单
           allDept: 0,
         };
-        // 可配载开关已按公路词表过滤，再带上新增模式筛选框的精确取值会漏掉「公路运输」这类历史写法
-        if (this.dialogMode === 'add') delete query.transportType;
         const res = await getWaybillList(
           this.candidatePage.currentPage,
           this.candidatePage.pageSize,
@@ -3726,7 +3702,6 @@ export default {
     },
     handleCandidateReset() {
       this.candidateQuery = createCandidateSearchForm();
-      if (this.dialogMode === 'add') this.candidateQuery.transportType = 'road';
       this.candidatePage.currentPage = 1;
       this.loadCandidateWaybills();
     },