✨ MK公开页、预结算体验优化、地图选址与认证密码规则完善

src/views/settlement/receivable-payable-detail.vue

@@ -1153,28 +1153,16 @@ export default {
         minWidth: 130,
         align: 'right',
       };
-      const dynamicColumns = this.isPayable
-        ? [
-            {
-              label: '运输费',
-              prop: 'tableFreightAmount',
-              feeSummaryType: 'freight',
-              minWidth: 130,
-              align: 'right',
-            },
-            otherFeeColumn,
-          ]
-        : [
-            ...this.tableFeeItemNames.map((name, index) => ({
-              label: name,
-              prop: `tableFeeItem${index}`,
-              feeItemName: name,
-              dynamic: true,
-              minWidth: 130,
-              align: 'right',
-            })),
-            otherFeeColumn,
-          ];
+      const dynamicColumns = [
+        {
+          label: '运输费',
+          prop: 'tableFreightAmount',
+          feeSummaryType: 'freight',
+          minWidth: 130,
+          align: 'right',
+        },
+        otherFeeColumn,
+      ];
       if (totalIndex < 0) return [...columns, ...dynamicColumns];
       columns.splice(totalIndex, 0, ...dynamicColumns);
       return columns;
@@ -1498,7 +1486,7 @@ export default {
         const res = await api.getList(this.page.current, this.page.size, params);
         const data = this.unwrapPage(res);
         this.rows = (data.records || []).map(this.decorateRow);
-        this.tableFeeItemNames = this.isPayable ? [] : this.collectFeeItemNames(this.rows);
+        this.tableFeeItemNames = [];
         this.page.total = data.total || 0;
       } finally {
         this.loading = false;
@@ -1738,7 +1726,7 @@ export default {
           });
           const adjusted = {
             ...item,
-            transportQuantity: Number(item.transportQuantity || 0),
+            transportQuantity: this.normalizeAdjustTransportQuantity(item),
             mileage:
               item.mileage === null || item.mileage === undefined || Number(item.mileage) === -1
                 ? null
@@ -1767,6 +1755,21 @@ export default {
     feeSourceLabel(value) {
       return ['手动录入', '手动添加', '手工录入'].includes(value) ? '手动录入' : '自动生成';
     },
+    normalizeAdjustTransportQuantity(item = {}) {
+      const value = item.transportQuantity;
+      if (value === undefined || value === null || value === '' || Number(value) === -1) {
+        return '';
+      }
+      const element = item.billingFactor;
+      // 按车辆/固定金额生成时运输量会被写成占位 1，调整弹窗无实际运输量时不展示
+      if (
+        (element === '按车辆' || element === '固定金额（整单一口价）') &&
+        Number(value) === 1
+      ) {
+        return '';
+      }
+      return Number(value);
+    },
     adjustBillingTypes(row) {
       return ADJUST_BILLING_TYPE_MAP[row.billingFactor] || [];
     },
@@ -1894,7 +1897,12 @@ export default {
             model: row.model,
             billingFactor: row.billingFactor,
             billingType: row.billingType,
-            transportQuantity: row.transportQuantity,
+            transportQuantity:
+              row.transportQuantity === '' ||
+              row.transportQuantity === null ||
+              row.transportQuantity === undefined
+                ? null
+                : Number(row.transportQuantity),
             priceUnit: row.priceUnit,
             unitPrice: row.unitPrice,
             mileage: row.mileage,