fix bug

src/option/business/process-config.js

@@ -85,6 +85,7 @@ export const option = {
       type: 'number',
       min: 0,
       max: 999,
+      formatter: row => (Number(row.defaultFinishDays) === -1 ? '' : row.defaultFinishDays),
       span: 12,
       minWidth: 170,
       addDisplay: false,

src/option/vehicle/annual-inspection-record.js

@@ -29,6 +29,12 @@ export const shipInspectionTypeDic = [
   { label: '其他', value: '其他' },
 ];
 
+export const passengerTypeLevelDic = [
+  { label: '一级', value: '一级' },
+  { label: '二级', value: '二级' },
+  { label: '其他', value: '其他' },
+];
+
 export const option = {
   height: 'auto',
   calcHeight: 32,
@@ -128,10 +134,11 @@ export const option = {
     {
       label: '客车类型及等级',
       prop: 'passengerTypeLevel',
+      type: 'select',
+      dicData: passengerTypeLevelDic,
       minWidth: 150,
       span: 12,
-      placeholder: '请输入',
+      placeholder: '请选择',
-      rules: [{ max: 50, message: '最多 50 个字符', trigger: 'blur' }],
     },
     {
       label: '检测评定单位',

src/option/vehicle/equipment-ledger.js

@@ -42,11 +42,12 @@ export const option = {
       prop: 'vehicleType',
       type: 'radio',
       dicData: vehicleTypeDic,
+      formslot: true,
       value: '车辆',
       search: true,
       searchOrder: 3,
       span: 24,
-      order: 1,
+      order: 11,
       minWidth: 110,
       rules: [{ required: true, message: '请选择车船类型', trigger: 'change' }],
     },
@@ -58,9 +59,9 @@ export const option = {
       search: true,
       searchOrder: 4,
       span: 12,
-      order: 2,
+      order: 10,
       minWidth: 140,
-      rules: [{ required: true, message: '请输入车牌号/船号', trigger: 'blur' }],
+      rules: [{ required: true, message: '请选择车牌号/船号', trigger: 'change' }],
     },
     {
       label: '设备号',
@@ -69,7 +70,7 @@ export const option = {
       search: true,
       searchOrder: 2,
       span: 12,
-      order: 3,
+      order: 9,
       minWidth: 150,
       rules: [{ required: true, message: '设备编号由系统生成', trigger: 'blur' }],
     },
@@ -77,7 +78,7 @@ export const option = {
       label: '设备名称',
       prop: 'equipmentName',
       span: 12,
-      order: 4,
+      order: 8,
       minWidth: 150,
       rules: [
         { required: true, message: '请输入设备名称', trigger: 'blur' },
@@ -92,14 +93,14 @@ export const option = {
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD',
       span: 12,
-      order: 8,
+      order: 4,
       minWidth: 130,
     },
     {
       label: '设备品牌',
       prop: 'equipmentBrand',
       span: 12,
-      order: 5,
+      order: 7,
       minWidth: 130,
       rules: [{ max: 50, message: '最多 50 个字符', trigger: 'blur' }],
     },
@@ -117,7 +118,7 @@ export const option = {
       label: '规格型号',
       prop: 'specificationModel',
       span: 12,
-      order: 7,
+      order: 5,
       minWidth: 150,
       rules: [{ max: 100, message: '最多 100 个字符', trigger: 'blur' }],
     },
@@ -127,7 +128,7 @@ export const option = {
       type: 'textarea',
       minRows: 2,
       span: 24,
-      order: 10,
+      order: 2,
       minWidth: 180,
       overHidden: true,
       rules: [{ max: 200, message: '最多 200 个字符', trigger: 'blur' }],
@@ -170,7 +171,7 @@ export const option = {
       label: '原厂设备号',
       prop: 'originalEquipmentNo',
       span: 12,
-      order: 9,
+      order: 3,
       hide: true,
       rules: [{ max: 100, message: '最多 100 个字符', trigger: 'blur' }],
     },
@@ -180,7 +181,8 @@ export const option = {
       slot: true,
       formslot: true,
       span: 24,
-      order: 11,
+      order: 1,
+      minWidth: 100,
       hide: true,
     },
     {

src/option/vehicle/mileage-record.js

@@ -12,11 +12,6 @@ const validateNonNegative = (rule, value, callback) => {
   }
 };
 
-export const vehicleTypeDic = [
-  { label: '车辆', value: '车辆' },
-  { label: '船舶', value: '船舶' },
-];
-
 export const option = {
   height: 'auto',
   calcHeight: 32,
@@ -43,18 +38,7 @@ export const option = {
   menuFixed: 'right',
   column: [
     {
-      label: '车船类型',
+      label: '车牌号',
-      prop: 'vehicleType',
-      type: 'radio',
-      dicData: vehicleTypeDic,
-      value: '车辆',
-      search: true,
-      searchSpan: 6,
-      minWidth: 110,
-      rules: [{ required: true, message: '请选择车船类型', trigger: 'change' }],
-    },
-    {
-      label: '车牌号/船号',
       prop: 'vehicleNo',
       slot: true,
       formslot: true,
@@ -62,7 +46,7 @@ export const option = {
       searchSpan: 6,
       minWidth: 130,
       rules: [
-        { required: true, message: '请输入车牌号/船号', trigger: 'blur' },
+        { required: true, message: '请输入车牌号', trigger: 'blur' },
         { max: 30, message: '最多 30 个字符', trigger: 'blur' },
       ],
     },
@@ -106,19 +90,6 @@ export const option = {
       slot: true,
       rules: [{ validator: validateNonNegative, trigger: 'blur' }],
     },
-    {
-      label: '里程单位',
-      prop: 'mileageUnit',
-      type: 'select',
-      dicData: [
-        { label: '公里', value: '公里' },
-        { label: '海里', value: '海里' },
-      ],
-      value: '公里',
-      hide: true,
-      display: false,
-      search: false,
-    },
     {
       label: '备注',
       prop: 'remark',

src/option/vehicle/oil-electric-record.js

@@ -46,6 +46,8 @@ export const option = {
     {
       label: '卡号',
       prop: 'cardNo',
+      span: 12,
+      order: 1,
       minWidth: 150,
       rules: [{ max: 30, message: '最多 30 个字符', trigger: 'blur' }],
     },
@@ -56,6 +58,7 @@ export const option = {
       type: 'datetime',
       format: 'YYYY-MM-DD HH:mm',
       valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      span: 12,
       minWidth: 170,
       rules: [{ required: true, message: '请选择交易时间', trigger: 'click' }],
     },
@@ -66,6 +69,8 @@ export const option = {
       dicData: vehicleTypeDic,
       value: '车辆',
       search: true,
+      span: 24,
+      order: 2,
       minWidth: 110,
       rules: [{ required: true, message: '请选择车船类型', trigger: 'change' }],
     },

src/views/base/airport-master.vue

@@ -82,7 +82,7 @@
           filterable
           :loading="districtLoading"
           :disabled="!form.cityCode"
-          :placeholder="form.cityCode ? '请选择区县' : '请先选择城市'"
+          placeholder="请选择 所属区县"
           style="width: 100%"
           @change="handleDistrictChange"
         >

src/views/base/port-terminal.vue

@@ -1255,6 +1255,7 @@ export default {
         '港口码头主数据',
         () => {
           this.loadPortOptions();
+          this.onLoad(this.page, this.query);
         }
       );
     },

src/views/base/railway-station.vue

@@ -82,7 +82,7 @@
           filterable
           :loading="districtLoading"
           :disabled="!form.cityCode"
-          :placeholder="form.cityCode ? '请选择区县' : '请先选择城市'"
+          placeholder="请选择 所属区县"
           style="width: 100%"
           @change="handleDistrictChange"
         >

src/views/business/contract-manage.vue

@@ -2365,10 +2365,16 @@ export default {
   &__descriptions {
     :deep(.el-descriptions__label) {
       display: inline-block;
+      width: 96px;
       min-width: 96px;
+      max-width: 96px;
+      box-sizing: border-box;
       padding-right: 12px;
       color: #606266;
+      line-height: 18px;
       text-align: right;
+      white-space: normal;
+      word-break: break-all;
     }
 
     :deep(.el-descriptions__content) {

src/views/business/process-config.vue

@@ -851,9 +851,14 @@ export default {
           submitRow[key] = submitRow[key].trim();
         }
       });
-      submitRow.defaultFinishDays = submitRow.defaultFinishDays
+      const defaultFinishDays = submitRow.defaultFinishDays;
-        ? Number(submitRow.defaultFinishDays)
+      submitRow.defaultFinishDays =
-        : undefined;
+        defaultFinishDays === undefined ||
+        defaultFinishDays === null ||
+        defaultFinishDays === '' ||
+        Number(defaultFinishDays) === -1
+          ? ''
+          : Number(defaultFinishDays);
       return submitRow;
     },
     validateRow(row) {
@@ -946,7 +951,12 @@ export default {
         return;
       }
       api.getDetail(row.id).then(res => {
-        this.form = res.data.data || {};
+        const detail = res.data.data || {};
+        this.form = {
+          ...detail,
+          defaultFinishDays:
+            Number(detail.defaultFinishDays) === -1 ? '' : detail.defaultFinishDays ?? '',
+        };
         this.selectedProjectId = this.form.projectIds ? String(this.form.projectIds) : '';
         this.ensureSelectedProjectOption();
         this.parseNodeConfig(this.form);

src/views/transportCapacity/components/ship-ledger.vue

@@ -16,7 +16,14 @@
       <section-card title="证书附件" class="ship-ledger__section">
         <div class="ship-ledger__images">
           <div v-for="item in imageFields" :key="item.prop" class="ship-ledger__image-item">
-            <el-image v-if="shipDetail[item.prop]" :src="shipDetail[item.prop]" :preview-src-list="imageUrls" preview-teleported fit="cover" />
+            <el-image
+              v-if="shipDetail[item.prop]"
+              :src="shipDetail[item.prop]"
+              :preview-src-list="imageUrls"
+              :initial-index="item.previewIndex"
+              preview-teleported
+              fit="cover"
+            />
             <el-empty v-else :image-size="36" description="暂无附件" />
             <span>{{ item.label }}</span>
           </div>
@@ -68,7 +75,21 @@ export default {
   data() { return { detailLoading: false, tableLoading: false, shipDetail: {}, activeTab: 'insurance', records: [], page: { current: 1, size: 10, total: 0 } }; },
   computed: {
     tabs() { return tabConfigs; }, activeConfig() { return tabConfigs.find(item => item.name === this.activeTab) || tabConfigs[0]; }, activeColumns() { return this.activeConfig.columns; },
-    imageFields() { return [['船舶所有权证书', 'ownershipCertImage'], ['内河船舶安全与环保证书', 'safetyCertImage'], ['船舶国籍证书', 'nationalityCertImage'], ['最低安全配员证书', 'safeManningCertImage'], ['船舶营业运输证', 'businessTransportCertImage'], ['光船租赁登记证书', 'leaseContractImage']].map(([label, prop]) => ({ label, prop })); },
+    imageFields() {
+      let previewIndex = 0;
+      return [
+        ['船舶所有权证书', 'ownershipCertImage'],
+        ['内河船舶安全与环保证书', 'safetyCertImage'],
+        ['船舶国籍证书', 'nationalityCertImage'],
+        ['最低安全配员证书', 'safeManningCertImage'],
+        ['船舶营业运输证', 'businessTransportCertImage'],
+        ['光船租赁登记证书', 'leaseContractImage'],
+      ].map(([label, prop]) => {
+        const item = { label, prop, previewIndex };
+        if (this.shipDetail[prop]) previewIndex += 1;
+        return item;
+      });
+    },
     imageUrls() { return this.imageFields.map(item => this.shipDetail[item.prop]).filter(Boolean); },
     sections() { const s = this.shipDetail; return [
       { title: '船舶基本信息', items: [['船舶所属组织', 'organizationName'], ['船名', 'shipName'], ['安放龙骨日期/建造完工日期', 'constructionDate'], ['总长(m)', 'totalLength'], ['船宽(m)', 'shipWidth'], ['型深(m)', 'moldedDepth'], ['最大船高(m)', 'maxShipHeight'], ['空载吃水(t)', 'lightDraft'], ['满载吃水(t)', 'fullLoadDraft'], ['航区', 'navigationArea']] },

src/views/vehicle/equipment-ledger.vue

@@ -51,15 +51,33 @@
           row.vehicleNo
         }}</el-link>
       </template>
+      <template #vehicleTypeForm>
+        <span v-if="boxType === 'view'">{{ form.vehicleType || '' }}</span>
+        <el-radio-group v-else v-model="form.vehicleType" @change="handleVehicleTypeChange">
+          <el-radio value="车辆">车辆</el-radio>
+          <el-radio value="船舶">船舶</el-radio>
+        </el-radio-group>
+      </template>
       <template #vehicleNoForm>
-        <el-autocomplete
+        <el-select
           v-model="form.vehicleNo"
           :disabled="boxType === 'view'"
-          :fetch-suggestions="fetchVehicleOptions"
+          :loading="vehicleOptionsLoading"
           :placeholder="vehicleNoPlaceholder"
           clearable
-          value-key="value"
+          filterable
+          remote
+          :remote-method="loadVehicleOptions"
+          class="equipment-ledger-page__vehicle-select"
+          @visible-change="handleVehicleSelectVisible"
+        >
+          <el-option
+            v-for="item in vehicleOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
           />
+        </el-select>
       </template>
       <template #equipmentCodeForm>
         <el-input v-model="form.equipmentCode" disabled />
@@ -68,10 +86,10 @@
         <span>{{ formatAttachments(row.attachments) }}</span>
       </template>
       <template #attachmentsForm>
-        <vehicle-attachment-upload v-model="form.attachments" :readonly="boxType === 'view'" />
+        <vehicle-attachment-table v-model="form.attachments" :readonly="boxType === 'view'" />
       </template>
       <template #attachments-form>
-        <vehicle-attachment-upload v-model="form.attachments" :readonly="boxType === 'view'" />
+        <vehicle-attachment-table v-model="form.attachments" :readonly="boxType === 'view'" />
       </template>
     </avue-crud>
     <empty-pagination
@@ -107,12 +125,16 @@ import { getDictionary } from '@/api/system/dictbiz';
 import { getToken } from '@/utils/auth';
 import { openImportDialog } from '@/utils/import-excel';
 import { downloadXls } from '@/utils/util';
+import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue';
 import { mapGetters } from 'vuex';
 import { excelOption, option } from '@/option/vehicle/equipment-ledger';
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 
 export default {
+  components: {
+    VehicleAttachmentTable,
+  },
   data() {
     return {
       form: {},
@@ -121,6 +143,9 @@ export default {
       excelBox: false,
       excelForm: {},
       boxType: '',
+      vehicleOptions: [],
+      vehicleOptionsLoading: false,
+      vehicleOptionsRequestId: 0,
       option,
       excelOption,
       data: [],
@@ -171,19 +196,34 @@ export default {
         );
       });
     },
-    fetchVehicleOptions(queryString, callback) {
+    handleVehicleTypeChange() {
+      this.form.vehicleNo = '';
+      this.vehicleOptions = [];
+      this.loadVehicleOptions('');
+    },
+    handleVehicleSelectVisible(visible) {
+      if (visible && !this.vehicleOptions.length) this.loadVehicleOptions('');
+    },
+    loadVehicleOptions(queryString = '') {
       const isShip = this.form.vehicleType === '船舶';
       const request = isShip ? getShipList : getVehicleList;
       const params = isShip ? { shipIdentifierNo: queryString } : { plateNo: queryString };
+      const requestId = ++this.vehicleOptionsRequestId;
+      this.vehicleOptionsLoading = true;
       request(1, 20, params)
         .then(res => {
-          callback(
+          if (requestId !== this.vehicleOptionsRequestId) return;
-            (res.data.data.records || []).map(item => ({
+          const values = (res.data.data.records || [])
-              value: isShip ? item.shipIdentifierNo || item.shipName : item.plateNo,
+            .map(item => (isShip ? item.shipIdentifierNo : item.plateNo))
-            }))
+            .filter(Boolean);
-          );
+          this.vehicleOptions = [...new Set(values)].map(value => ({ label: value, value }));
         })
-        .catch(() => callback([]));
+        .catch(() => {
+          if (requestId === this.vehicleOptionsRequestId) this.vehicleOptions = [];
+        })
+        .finally(() => {
+          if (requestId === this.vehicleOptionsRequestId) this.vehicleOptionsLoading = false;
+        });
     },
     formatAttachments(value) {
       if (!value) return '';
@@ -254,6 +294,8 @@ export default {
       if (type === 'add') {
         getNextEquipmentCode().then(res => {
           this.form = { vehicleType: '车辆', equipmentCode: res.data.data };
+          this.vehicleOptions = [];
+          this.loadVehicleOptions('');
           done();
         });
         return;
@@ -264,6 +306,8 @@ export default {
             ...res.data.data,
             attachments: this.parseAttachments(res.data.data.attachments),
           };
+          this.vehicleOptions = [];
+          this.loadVehicleOptions(this.form.vehicleNo || '');
           done();
         });
         return;
@@ -335,6 +379,10 @@ export default {
 
 <style lang="scss" scoped>
 .equipment-ledger-page {
+  &__vehicle-select {
+    width: 100%;
+  }
+
   :deep(.el-table th .cell),
   :deep(.el-table td .cell) {
     white-space: nowrap;

src/views/vehicle/maintenance-plan.vue

@@ -59,6 +59,13 @@
           {{ row.vehicleNo }}
         </el-button>
       </template>
+      <template #vehicleTypeForm>
+        <span v-if="boxType === 'view'">{{ form.vehicleType || '' }}</span>
+        <el-radio-group v-else v-model="form.vehicleType" @change="handleVehicleTypeChange">
+          <el-radio value="车辆">车辆</el-radio>
+          <el-radio value="船舶">船舶</el-radio>
+        </el-radio-group>
+      </template>
       <template #vehicleNoForm>
         <el-autocomplete
           v-model="form.vehicleNo"
@@ -102,7 +109,11 @@
         </el-input>
       </template>
       <template #nextMaintenanceMileageForm>
+        <span
+          v-if="boxType === 'view' && isUnsetNextMaintenanceMileage(form.nextMaintenanceMileage)"
+        ></span>
         <el-input
+          v-else
           v-model="form.nextMaintenanceMileage"
           :disabled="boxType === 'view'"
           inputmode="decimal"
@@ -116,7 +127,7 @@
         <span>{{ formatMileage(row.mileage, row.mileageUnit) }}</span>
       </template>
       <template #nextMaintenanceMileage="{ row }">
-        <span>{{ formatMileage(row.nextMaintenanceMileage, row.mileageUnit) }}</span>
+        <span>{{ formatNextMaintenanceMileage(row.nextMaintenanceMileage, row.mileageUnit) }}</span>
       </template>
       <template #attachments="{ row }">
         <span>{{ formatAttachments(row.attachments) }}</span>
@@ -227,6 +238,7 @@ export default {
               { label: '车辆', value: '车辆' },
               { label: '船舶', value: '船舶' },
             ],
+            formslot: true,
             value: '车辆',
             search: true,
             span: 24,
@@ -546,6 +558,13 @@ export default {
       if (value === undefined || value === null || value === '') return '';
       return `${Math.max(Number(value), 0)} ${unit || '公里'}`;
     },
+    isUnsetNextMaintenanceMileage(value) {
+      return Number(value) === -1;
+    },
+    formatNextMaintenanceMileage(value, unit) {
+      if (this.isUnsetNextMaintenanceMileage(value)) return '';
+      return this.formatMileage(value, unit);
+    },
     formatAttachments(value) {
       if (!value) return '';
       if (Array.isArray(value)) return `${value.length} 个`;

src/views/vehicle/mileage-record.vue

@@ -60,16 +60,16 @@
         </el-button>
       </template>
       <template #previousMonthMileage="{ row }">
-        <span>{{ formatMileage(row.previousMonthMileage, row.mileageUnit) }}</span>
+        <span>{{ formatMileage(row.previousMonthMileage) }}</span>
       </template>
       <template #currentMonthMileage="{ row }">
-        <span>{{ formatMileage(row.currentMonthMileage, row.mileageUnit) }}</span>
+        <span>{{ formatMileage(row.currentMonthMileage) }}</span>
       </template>
       <template #monthlyMileage="{ row }">
-        <span>{{ formatMileage(row.monthlyMileage, row.mileageUnit) }}</span>
+        <span>{{ formatMileage(row.monthlyMileage) }}</span>
       </template>
       <template #totalMileage="{ row }">
-        <span>{{ formatMileage(row.totalMileage, row.mileageUnit) }}</span>
+        <span>{{ formatMileage(row.totalMileage) }}</span>
       </template>
       <template #vehicleNoForm>
         <el-autocomplete
@@ -77,7 +77,7 @@
           :fetch-suggestions="fetchVehicleOptions"
           :disabled="Boolean(form.id)"
           clearable
-          :placeholder="vehicleNoPlaceholder"
+          placeholder="输入车牌号模糊查询选择"
           value-key="value"
           class="mileage-record-page__input"
         />
@@ -176,7 +176,6 @@
 <script>
 import { add, getDetail, getList, remove, update } from '@/api/vehicle/mileage-record';
 import { getList as getVehicleList } from '@/api/transportCapacity/transport-vehicle';
-import { getList as getShipList } from '@/api/transportCapacity/transport-ship';
 import { getDeptTree } from '@/api/system/dept';
 import { exportBlob } from '@/api/common';
 import { downloadXls } from '@/utils/util';
@@ -234,9 +233,6 @@ export default {
         editBtn: this.hasPermission('mileage_record_edit'),
       };
     },
-    vehicleNoPlaceholder() {
-      return this.form.vehicleType === '船舶' ? '输入船号模糊查询选择' : '输入车牌号模糊查询选择';
-    },
     ids() {
       const ids = [];
       this.selectionList.forEach(ele => {
@@ -245,42 +241,10 @@ export default {
       return ids.join(',');
     },
   },
-  watch: {
-    'form.vehicleType': {
-      handler(value) {
-        this.updateVehicleTypeDisplays(value || '车辆');
-      },
-      immediate: true,
-    },
-  },
   methods: {
     hasPermission(code) {
       return this.isAdmin || this.validData(this.permission[code], false);
     },
-    updateVehicleTypeDisplays(vehicleType) {
-      const isShip = vehicleType === '船舶';
-      const unit = isShip ? '海里' : '公里';
-      const vehicleTypeColumn = this.findColumn(this.option.column, 'vehicleType');
-      const labelMap = {
-        previousMonthMileage: isShip ? '上月统计航程数' : '上月统计里程数',
-        currentMonthMileage: isShip ? '本月统计航程数' : '本月统计里程数',
-        monthlyMileage: isShip ? '本月航行航程数' : '本月行驶里程数',
-        totalMileage: isShip ? '累计航程数' : '累计行驶里程数',
-        totalMileageStart: isShip ? '累计航程' : '累计行驶里程',
-        totalMileageEnd: isShip ? '累计航程数结束值' : '累计行驶里程数结束值',
-      };
-      Object.keys(labelMap).forEach(prop => {
-        const column = this.findColumn(this.option.column, prop);
-        column.label = labelMap[prop];
-      });
-      vehicleTypeColumn.disabled = Boolean(this.form.id);
-      const unitColumn = this.findColumn(this.option.column, 'mileageUnit');
-      unitColumn.value = unit;
-      this.form.mileageUnit = unit;
-      if (!this.form.id && this.form.vehicleNo) {
-        this.form.vehicleNo = '';
-      }
-    },
     initDeptTree() {
       getDeptTree(this.userInfo.tenantId).then(res => {
         const column = this.findColumn(this.option.column, 'createDept');
@@ -288,26 +252,18 @@ export default {
       });
     },
     fetchVehicleOptions(queryString, callback) {
-      const vehicleType = this.form.vehicleType || '车辆';
+      getVehicleList(1, 20, { plateNo: queryString })
-      const request = vehicleType === '船舶' ? getShipList : getVehicleList;
-      const params =
-        vehicleType === '船舶' ? { shipIdentifierNo: queryString } : { plateNo: queryString };
-      request(1, 20, params)
         .then(res => {
           const records = res.data.data.records || [];
-          callback(
+          callback(records.map(item => ({ value: item.plateNo })));
-            records.map(item => ({
-              value: vehicleType === '船舶' ? item.shipIdentifierNo || item.shipName : item.plateNo,
-            }))
-          );
         })
         .catch(() => callback([]));
     },
-    formatMileage(value, unit) {
+    formatMileage(value) {
       if (this.isEmpty(value)) {
         return '';
       }
-      return `${value} ${unit || '公里'}`;
+      return `${value} 公里`;
     },
     formatAttachments(value) {
       if (!value) return '';
@@ -356,13 +312,10 @@ export default {
     },
     normalizeRow(row) {
       const values = { ...row };
-      values.vehicleType = values.vehicleType || '车辆';
+      values.vehicleType = '车辆';
-      values.mileageUnit = values.vehicleType === '船舶' ? '海里' : '公里';
+      values.mileageUnit = '公里';
       if (values.vehicleNo) {
-        values.vehicleNo =
+        values.vehicleNo = values.vehicleNo.trim().toUpperCase();
-          values.vehicleType === '船舶'
-            ? values.vehicleNo.trim()
-            : values.vehicleNo.trim().toUpperCase();
       }
       const previousMonthMileage = this.toNumber(values.previousMonthMileage);
       const currentMonthMileage = this.toNumber(values.currentMonthMileage);
@@ -391,12 +344,11 @@ export default {
       return true;
     },
     validateRow(row) {
-      const isShip = row.vehicleType === '船舶';
       const mileageFields = [
-        ['previousMonthMileage', isShip ? '上月统计航程数' : '上月统计里程数'],
+        ['previousMonthMileage', '上月统计里程数'],
-        ['currentMonthMileage', isShip ? '本月统计航程数' : '本月统计里程数'],
+        ['currentMonthMileage', '本月统计里程数'],
-        ['monthlyMileage', isShip ? '本月航行航程数' : '本月行驶里程数'],
+        ['monthlyMileage', '本月行驶里程数'],
-        ['totalMileage', isShip ? '累计航程数' : '累计行驶里程数'],
+        ['totalMileage', '累计行驶里程数'],
       ];
       if (!mileageFields.every(([prop, label]) => this.validateMileage(row[prop], label))) {
         return false;
@@ -411,11 +363,7 @@ export default {
         monthlyMileage !== null &&
         this.toMoney(currentMonthMileage - previousMonthMileage) !== this.toMoney(monthlyMileage)
       ) {
-        this.$message.warning(
+        this.$message.warning('本月行驶里程数应等于本月统计里程数减去上月统计里程数');
-          isShip
-            ? '本月航行航程数应等于本月统计航程数减去上月统计航程数'
-            : '本月行驶里程数应等于本月统计里程数减去上月统计里程数'
-        );
         return false;
       }
       if (
@@ -423,9 +371,7 @@ export default {
         currentMonthMileage !== null &&
         totalMileage < currentMonthMileage
       ) {
-        this.$message.warning(
+        this.$message.warning('累计行驶里程数应大于等于本月统计里程数');
-          isShip ? '累计航程数应大于等于本月统计航程数' : '累计行驶里程数应大于等于本月统计里程数'
-        );
         return false;
       }
       return true;
@@ -502,16 +448,14 @@ export default {
       if (type === 'add') {
         this.form.vehicleType = '车辆';
         this.form.mileageUnit = '公里';
-        this.updateVehicleTypeDisplays(this.form.vehicleType);
       }
       if (['edit', 'view'].includes(type)) {
         getDetail(this.form.id).then(res => {
           const detail = res.data.data;
           detail.attachments = this.parseAttachments(detail.attachments);
-          detail.vehicleType = detail.vehicleType || this.form.vehicleType || '车辆';
+          detail.vehicleType = '车辆';
-          detail.mileageUnit = detail.vehicleType === '船舶' ? '海里' : '公里';
+          detail.mileageUnit = '公里';
           this.form = detail;
-          this.updateVehicleTypeDisplays(detail.vehicleType);
         });
       }
       done();
@@ -591,7 +535,10 @@ export default {
       };
     },
     buildQuery(params = {}) {
-      return normalizeSearchRangeParams({ ...params, ...this.query }, createTimeRangeMap);
+      return normalizeSearchRangeParams(
+        { ...params, ...this.query, vehicleType: '车辆' },
+        createTimeRangeMap
+      );
     },
     handleTemplate() {
       exportBlob(