fix bug

2026-07-27 17:19:36 +08:00
parent e50d1b8fda
commit 1c7532e0de
132 changed files with 7066 additions and 1241 deletions
@@ -59,6 +59,17 @@
          {{ row.vehicleNo }}
        </el-button>
      </template>
+      <template #vehicleNoForm>
+        <el-autocomplete
+          v-model="form.vehicleNo"
+          :fetch-suggestions="fetchVehicleOptions"
+          :disabled="boxType === 'view'"
+          clearable
+          :placeholder="vehicleNoPlaceholder"
+          value-key="value"
+          class="maintenance-plan-page__input"
+        />
+      </template>
      <template #mileage="{ row }">
        <span>{{ formatMileage(row.mileage, row.mileageUnit) }}</span>
      </template>
@@ -68,9 +79,27 @@
      <template #attachments="{ row }">
        <span>{{ formatAttachments(row.attachments) }}</span>
      </template>
+      <template #attachmentsForm>
+        <vehicle-attachment-upload
+          v-model="form.attachments"
+          :readonly="boxType === 'view'"
+          button-text="新增"
+          button-icon="el-icon-plus"
+          :show-tip="false"
+        />
+      </template>
+      <template #attachments-form>
+        <vehicle-attachment-upload
+          v-model="form.attachments"
+          :readonly="boxType === 'view'"
+          button-text="新增"
+          button-icon="el-icon-plus"
+          :show-tip="false"
+        />
+      </template>
    </avue-crud>
    <el-dialog title="保养记录数据导入" append-to-body v-model="excelBox" width="555px">
-      <avue-form :option="excelOption" v-model="excelForm" :upload-after="uploadAfter">
+      <avue-form :option="excelOption" v-model="excelForm">
        <template #excelTemplate>
          <el-button type="primary" @click="handleTemplate">
            点击下载<i class="el-icon-download el-icon--right"></i>
@@ -83,9 +112,12 @@

 <script>
 import { getList, getDetail, add, update, remove } from '@/api/vehicle/maintenance-plan';
+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';
+import { openImportDialog } from '@/utils/import-excel';
 import { formatUpdateUserName } from '@/utils/audit';
 import { getToken } from '@/utils/auth';
 import { mapGetters } from 'vuex';
@@ -116,13 +148,20 @@ export default {
        total: 0,
      },
      selectionList: [],
+      boxType: '',
      option: {
        height: 'auto',
        calcHeight: 32,
-        dialogWidth: 980,
+        dialogWidth: 960,
+        labelPosition: 'right',
+        labelWidth: 'auto',
+        searchLabelWidth: 160,
        tip: false,
        searchShow: true,
-        searchMenuSpan: 6,
+        searchMenuSpan: 24,
+        searchIcon: true,
+        searchIndex: 8,
+        searchMenuPosition: 'right',
        border: true,
        index: true,
        viewBtn: true,
@@ -141,6 +180,8 @@ export default {
            ],
            value: '车辆',
            search: true,
+            span: 24,
+            change: ({ value }) => this.handleVehicleTypeChange(value || '车辆'),
            rules: [{ required: true, message: '请选择车船类型', trigger: 'change' }],
          },
          {
@@ -149,6 +190,8 @@ export default {
            slot: true,
            search: true,
            minWidth: 130,
+            span: 12,
+            placeholder: '输入车牌号/船号查询选择',
            rules: [
              { required: true, message: '请输入车牌号/船号', trigger: 'blur' },
              { max: 30, message: '最多 30 个字符', trigger: 'blur' },
@@ -157,6 +200,8 @@ export default {
          {
            label: '保养人',
            prop: 'maintainer',
+            span: 12,
+            placeholder: '请输入',
            rules: [{ max: 20, message: '最多 20 个字符', trigger: 'blur' }],
          },
          {
@@ -166,6 +211,8 @@ export default {
            format: 'YYYY-MM-DD HH:mm:ss',
            valueFormat: 'YYYY-MM-DD HH:mm:ss',
            minWidth: 170,
+            span: 12,
+            placeholder: '请选择',
            rules: [{ required: true, message: '请选择保养时间', trigger: 'click' }],
          },
          {
@@ -175,6 +222,9 @@ export default {
            precision: 2,
            minWidth: 130,
            slot: true,
+            span: 12,
+            append: '公里',
+            placeholder: '请输入',
            rules: [{ validator: validateNonNegative, trigger: 'blur' }],
          },
          {
@@ -187,11 +237,14 @@ export default {
            ],
            value: '公里',
            hide: true,
+            display: false,
          },
          {
            label: '保养项目',
            prop: 'maintenanceItem',
            minWidth: 160,
+            span: 12,
+            placeholder: '请输入',
            rules: [{ max: 100, message: '最多 100 个字符', trigger: 'blur' }],
          },
          {
@@ -199,6 +252,9 @@ export default {
            prop: 'cost',
            type: 'number',
            precision: 2,
+            append: '元',
+            span: 12,
+            placeholder: '请输入',
            rules: [
              { required: true, message: '请输入费用', trigger: 'blur' },
              { validator: validateNonNegative, trigger: 'blur' },
@@ -207,12 +263,16 @@ export default {
          {
            label: '店名',
            prop: 'storeName',
+            span: 12,
+            placeholder: '请输入',
            rules: [{ max: 50, message: '最多 50 个字符', trigger: 'blur' }],
          },
          {
            label: '联系电话',
            prop: 'contactPhone',
            minWidth: 150,
+            span: 12,
+            placeholder: '请输入',
            rules: [{ max: 20, message: '最多 20 个字符', trigger: 'blur' }],
          },
          {
@@ -221,6 +281,7 @@ export default {
            minWidth: 180,
            overHidden: true,
            span: 24,
+            placeholder: '地图选址',
            rules: [{ max: 100, message: '最多 100 个字符', trigger: 'blur' }],
          },
          {
@@ -230,6 +291,8 @@ export default {
            format: 'YYYY-MM-DD HH:mm:ss',
            valueFormat: 'YYYY-MM-DD HH:mm:ss',
            minWidth: 170,
+            span: 12,
+            placeholder: '请选择',
          },
          {
            label: '下次保养里程/航程',
@@ -238,34 +301,29 @@ export default {
            precision: 2,
            minWidth: 170,
            slot: true,
+            span: 12,
+            append: '公里',
+            placeholder: '请输入',
            rules: [{ validator: validateNonNegative, trigger: 'blur' }],
          },
-          {
-            label: '附件',
-            prop: 'attachments',
-            type: 'upload',
-            listType: 'text',
-            multiple: true,
-            accept: '.jpg,.jpeg,.png,.pdf',
-            propsHttp: {
-              res: 'data',
-              url: 'link',
-              name: 'name',
-            },
-            action: '/blade-resource/oss/endpoint/put-file',
-            span: 24,
-            minWidth: 100,
-            slot: true,
-          },
          {
            label: '备注',
            prop: 'remark',
            type: 'textarea',
-            minRows: 4,
+            minRows: 5,
            span: 24,
            hide: true,
+            placeholder: '请输入',
            rules: [{ max: 500, message: '最多 500 个字符', trigger: 'blur' }],
          },
+          {
+            label: '附件',
+            prop: 'attachments',
+            span: 24,
+            minWidth: 100,
+            slot: true,
+            formslot: true,
+          },
          {
            label: '创建时间',
            prop: 'createTime',
@@ -341,6 +399,7 @@ export default {
        ],
      },
      excelOption: {
+        labelPosition: 'right',
        submitBtn: false,
        emptyBtn: false,
        column: [
@@ -385,6 +444,9 @@ export default {
        editBtn: this.hasPermission('maintenance_plan_edit'),
      };
    },
+    vehicleNoPlaceholder() {
+      return this.form.vehicleType === '船舶' ? '输入船号模糊查询选择' : '输入车牌号模糊查询选择';
+    },
    ids() {
      let ids = [];
      this.selectionList.forEach(ele => {
@@ -397,6 +459,41 @@ export default {
    hasPermission(code) {
      return this.isAdmin || this.validData(this.permission[code], false);
    },
+    handleVehicleTypeChange(vehicleType) {
+      this.updateVehicleType(vehicleType);
+      if (!this.form.id && this.form.vehicleNo) {
+        this.form.vehicleNo = '';
+      }
+    },
+    updateVehicleType(vehicleType) {
+      const mileageUnit = vehicleType === '船舶' ? '海里' : '公里';
+      const mileageColumn = this.findColumn(this.option.column, 'mileage');
+      const nextMaintenanceMileageColumn = this.findColumn(
+        this.option.column,
+        'nextMaintenanceMileage'
+      );
+      const mileageUnitColumn = this.findColumn(this.option.column, 'mileageUnit');
+      mileageColumn.append = mileageUnit;
+      nextMaintenanceMileageColumn.append = mileageUnit;
+      mileageUnitColumn.value = mileageUnit;
+      this.form.mileageUnit = mileageUnit;
+    },
+    fetchVehicleOptions(queryString, callback) {
+      const vehicleType = this.form.vehicleType || '车辆';
+      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(
+            records.map(item => ({
+              value: vehicleType === '船舶' ? item.shipIdentifierNo || item.shipName : item.plateNo,
+            }))
+          );
+        })
+        .catch(() => callback([]));
+    },
    formatMileage(value, unit) {
      if (value === undefined || value === null || value === '') return '';
      return `${Math.max(Number(value), 0)} ${unit || '公里'}`;
@@ -409,12 +506,20 @@ export default {
        const attachments = JSON.parse(value);
        return Array.isArray(attachments) ? `${attachments.length} 个` : '1 个';
      } catch (error) {
-        return value
-          .split(',')
-          .map(item => item.trim())
-          .filter(Boolean).length + ' 个';
+        return (
+          value
+            .split(',')
+            .map(item => item.trim())
+            .filter(Boolean).length + ' 个'
+        );
      }
    },
+    isEmpty(value) {
+      return value === undefined || value === null || value === '';
+    },
+    toNumber(value) {
+      return this.isEmpty(value) ? null : Number(value);
+    },
    parseAttachments(value) {
      if (!value || Array.isArray(value)) return value;
      if (typeof value !== 'string') return [];
@@ -440,14 +545,31 @@ export default {
    },
    normalizeRow(row) {
      const values = { ...row };
-      if (!values.mileageUnit) {
-        values.mileageUnit = values.vehicleType === '船舶' ? '海里' : '公里';
-      }
+      values.vehicleType = values.vehicleType || '车辆';
+      values.mileageUnit = values.vehicleType === '船舶' ? '海里' : '公里';
      values.attachments = this.stringifyAttachments(values.attachments);
      return values;
    },
+    validateRow(row) {
+      const mileage = this.toNumber(row.mileage);
+      const nextMaintenanceMileage = this.toNumber(row.nextMaintenanceMileage);
+      if (
+        mileage !== null &&
+        nextMaintenanceMileage !== null &&
+        nextMaintenanceMileage <= mileage
+      ) {
+        this.$message.warning('下次保养里程/航程应大于本次里程/航程数');
+        return false;
+      }
+      return true;
+    },
    rowSave(row, done, loading) {
-      add(this.normalizeRow(row)).then(
+      const values = this.normalizeRow(row);
+      if (!this.validateRow(values)) {
+        loading();
+        return;
+      }
+      add(values).then(
        () => {
          this.onLoad(this.page);
          this.$message({ type: 'success', message: '操作成功!' });
@@ -460,7 +582,12 @@ export default {
      );
    },
    rowUpdate(row, index, done, loading) {
-      update(this.normalizeRow(row)).then(
+      const values = this.normalizeRow(row);
+      if (!this.validateRow(values)) {
+        loading();
+        return;
+      }
+      update(values).then(
        () => {
          this.onLoad(this.page);
          this.$message({ type: 'success', message: '操作成功!' });
@@ -502,11 +629,20 @@ export default {
        });
    },
    beforeOpen(done, type) {
+      this.boxType = type;
+      if (type === 'add') {
+        this.form.vehicleType = '车辆';
+        this.form.mileageUnit = '公里';
+        this.updateVehicleType(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 || '车辆';
+          detail.mileageUnit = detail.vehicleType === '船舶' ? '海里' : '公里';
          this.form = detail;
+          this.updateVehicleType(detail.vehicleType);
        });
      }
      done();
@@ -551,12 +687,7 @@ export default {
        });
    },
    handleImport() {
-      this.excelBox = true;
-    },
-    uploadAfter(res, done) {
-      this.excelBox = false;
-      this.onLoad(this.page);
-      done();
+      openImportDialog(this, '保养记录');
    },
    handleExport() {
      this.$confirm('是否导出保养记录数据?', '提示', {
@@ -565,7 +696,10 @@ export default {
        type: 'warning',
      }).then(() => {
        NProgress.start();
-        exportBlob('/blade-transport/maintenance-plan/export-maintenance-plan', this.buildExportParams())
+        exportBlob(
+          '/blade-transport/maintenance-plan/export-maintenance-plan',
+          this.buildExportParams()
+        )
          .then(res => {
            downloadXls(res.data, `保养记录${this.$dayjs().format('YYYY-MM-DD HH:mm:ss')}.xlsx`);
          })
@@ -583,7 +717,9 @@ export default {
    },
    handleTemplate() {
      exportBlob(
-        `/blade-transport/maintenance-plan/export-template?${this.website.tokenHeader}=${getToken()}`
+        `/blade-transport/maintenance-plan/export-template?${
+          this.website.tokenHeader
+        }=${getToken()}`
      ).then(res => {
        downloadXls(res.data, '保养记录模板.xlsx');
      });
@@ -598,5 +734,9 @@ export default {
  :deep(.el-table td .cell) {
    white-space: nowrap;
  }
+
+  &__input {
+    width: 100%;
+  }
 }
 </style>