设备保养领用备件时，提示报错问题修改

zhangwencui

5 天以前 72feb84c25814a27f0c88dda570f2b8e4b51d76e

设备保养领用备件时，提示报错问题修改

 src/views/equipmentManagement/upkeep/Form/MaintenanceModal.vue

@@ -1,77 +1,76 @@
<template>
  <FormDialog
    v-model="visible"
  <FormDialog v-model="visible"
    :title="'设备保养'"
    width="500px"
    @confirm="sendForm"
    @cancel="handleCancel"
    @close="handleClose"
  >
    <el-form :model="form" label-width="100px">
              @close="handleClose">
    <el-form :model="form"
             label-width="100px">
      <el-form-item label="实际保养人">
        <el-input
          v-model="form.maintenanceActuallyName"
          placeholder="请输入实际保养人"
        ></el-input>
        <el-input v-model="form.maintenanceActuallyName"
                  placeholder="请输入实际保养人"></el-input>
      </el-form-item>
      <el-form-item label="实际保养日期">
        <el-date-picker
          v-model="form.maintenanceActuallyTime"
        <el-date-picker v-model="form.maintenanceActuallyTime"
          placeholder="请选择实际保养日期"
          format="YYYY-MM-DD HH:mm:ss"
          value-format="YYYY-MM-DD HH:mm:ss"
          type="datetime"
          clearable
          style="width: 100%"
        />
                        style="width: 100%" />
      </el-form-item>
      <el-form-item label="保养状态">
        <el-select v-model="form.status">
          <el-option label="待保养" :value="0"></el-option>
          <el-option label="完结" :value="1"></el-option>
          <el-option label="失败" :value="2"></el-option>
          <el-option label="待保养"
                     :value="0"></el-option>
          <el-option label="完结"
                     :value="1"></el-option>
          <el-option label="失败"
                     :value="2"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="保养结果">
        <el-input
          v-model="form.maintenanceResult"
        <el-input v-model="form.maintenanceResult"
          placeholder="请输入保养结果"
          type="text" />
      </el-form-item>
      <el-form-item label="设备备件">
        <el-select v-model="form.sparePartsIds" :loading="loadingSparePartOptions" placeholder="请选择设备备件" multiple filterable>
          <el-option
              v-for="item in sparePartOptions"
        <el-select v-model="form.sparePartsIds"
                   :loading="loadingSparePartOptions"
                   placeholder="请选择设备备件"
                   multiple
                   filterable>
          <el-option v-for="item in sparePartOptions"
              :key="item.id"
              :label="item.name"
              :value="item.id"
          />
                     :value="item.id" />
        </el-select>
      </el-form-item>

      <el-form-item v-if="selectedSpareParts.length" label="领用数量">
      <el-form-item v-if="selectedSpareParts.length"
                    label="领用数量">
        <div style="width: 100%">
          <div
              v-for="item in selectedSpareParts"
          <div v-for="item in selectedSpareParts"
              :key="item.id"
              style="display: flex; align-items: center; gap: 10px; margin-bottom: 10px;"
          >
               style="display: flex; align-items: center; gap: 10px; margin-bottom: 10px;">
            <div style="flex: 1; min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
              {{ item.name }}
              <span v-if="item.quantity !== null && item.quantity !== undefined" style="color: #909399;">
              <span v-if="item.quantity !== null && item.quantity !== undefined"
                    style="color: #909399;">
                （库存：{{ item.quantity }}）
              </span>
            </div>
            <el-input-number
                v-model="sparePartQtyMap[item.id]"
            <el-input-number v-model="sparePartQtyMap[item.id]"
                :min="1"
                :max="item.quantity !== null && item.quantity !== undefined ? Number(item.quantity) : undefined"
                :step="1"
                controls-position="right"
                style="width: 180px"
            />
                             style="width: 180px" />
          </div>
        </div>
      </el-form-item>
      <el-form-item label="附件">
        <FileUpload v-model:file-list="form.storageBlobDTOs" />
      </el-form-item>
    </el-form>
  </FormDialog>
@@ -79,12 +78,13 @@

<script setup>
import FormDialog from "@/components/Dialog/FormDialog.vue";
  import FileUpload from "@/components/AttachmentUpload/file/index.vue";
import { addMaintenance } from "@/api/equipmentManagement/upkeep";
import useFormData from "@/hooks/useFormData";
import dayjs from "dayjs";
import useUserStore from "@/store/modules/user";
import { ElMessage } from "element-plus";
import {computed, ref} from "vue";
  import { computed, ref, nextTick, getCurrentInstance } from "vue";
import {getSparePartsList} from "@/api/equipmentManagement/spareParts.js";

defineOptions({
@@ -93,6 +93,7 @@

const emits = defineEmits(["ok"]);

  const { proxy } = getCurrentInstance();
// 保存计划保养记录的id
const planId = ref();
const visible = ref(false);
@@ -105,40 +106,43 @@
  maintenanceResult: undefined, // 保养结果
  status: 0, // 保养状态
  sparePartsIds: [],
    storageBlobDTOs: [],
});

const sparePartOptions = ref([])
const loadingSparePartOptions = ref(true)
const sparePartQtyMap = ref({})
  const sparePartOptions = ref([]);
  const loadingSparePartOptions = ref(true);
  const sparePartQtyMap = ref({});

const selectedSpareParts = computed(() => {
  const ids = Array.isArray(form.sparePartsIds) ? form.sparePartsIds : [];
  const set = new Set(ids.map((i) => String(i)));
  return (sparePartOptions.value || []).filter((p) => set.has(String(p.id)));
    const set = new Set(ids.map(i => String(i)));
    return (sparePartOptions.value || []).filter(p => set.has(String(p.id)));
});

const setForm = (data) => {
  const setForm = data => {
  form.maintenanceActuallyName =
    data.maintenanceActuallyName ?? userStore.nickName;
  form.maintenanceActuallyTime =
    data.maintenanceActuallyTime 
    form.maintenanceActuallyTime = data.maintenanceActuallyTime
      ? dayjs(data.maintenanceActuallyTime).format("YYYY-MM-DD HH:mm:ss")
      : dayjs().format("YYYY-MM-DD HH:mm:ss");
  form.maintenanceResult = data.maintenanceResult;
  form.status = 1; // 默认状态为完结
  // multiple 选择器要求数组；后端常返回 "1,2,3"
  if (Array.isArray(data?.sparePartsIds)) {
    form.sparePartsIds = data.sparePartsIds.map((v) => Number(v)).filter((v) => Number.isFinite(v));
      form.sparePartsIds = data.sparePartsIds
        .map(v => Number(v))
        .filter(v => Number.isFinite(v));
  } else if (typeof data?.sparePartsIds === "string") {
    form.sparePartsIds = data.sparePartsIds
        .split(",")
        .map((s) => Number(String(s).trim()))
        .filter((v) => Number.isFinite(v));
        .map(s => Number(String(s).trim()))
        .filter(v => Number.isFinite(v));
  } else if (typeof data?.sparePartsIds === "number") {
    form.sparePartsIds = [data.sparePartsIds];
  } else {
    form.sparePartsIds = [];
  }
    form.storageBlobDTOs = data.storageBlobVOs || [];
};

/**
@@ -155,11 +159,19 @@
          proxy?.$modal?.msgError?.("请填写备件领用数量");
          return;
        }
        const part = sparePartOptions.value.find((p) => String(p.id) === String(partId));
          const part = sparePartOptions.value.find(
            p => String(p.id) === String(partId)
          );
        const stock = part?.quantity;
        if (stock !== null && stock !== undefined && Number.isFinite(Number(stock))) {
          if (
            stock !== null &&
            stock !== undefined &&
            Number.isFinite(Number(stock))
          ) {
          if (qty > Number(stock)) {
            proxy?.$modal?.msgError?.(`备件「${part?.name || ""}」领用数量不能超过库存（${stock}）`);
              proxy?.$modal?.msgError?.(
                `备件「${part?.name || ""}」领用数量不能超过库存（${stock}）`
              );
            return;
          }
        }
@@ -170,12 +182,17 @@
      ...form,
      sparePartsIds: form.sparePartsIds ? form.sparePartsIds.join(",") : "",
      sparePartsQty: form.sparePartsIds
          ? form.sparePartsIds.map((id) => sparePartQtyMap.value?.[id] ?? 1).join(",")
          ? form.sparePartsIds
              .map(id => sparePartQtyMap.value?.[id] ?? 1)
              .join(",")
          : "",
      sparePartsUseList: form.sparePartsIds
          ? form.sparePartsIds.map((id) => ({ id, quantity: sparePartQtyMap.value?.[id] ?? 1 }))
          ? form.sparePartsIds.map(id => ({
              id,
              quantity: sparePartQtyMap.value?.[id] ?? 1,
            }))
          : [],
    }
      };
    const { code } = await addMaintenance(data);
    if (code == 200) {
      ElMessage.success("保养成功");
@@ -193,7 +210,7 @@
  loadingSparePartOptions.value = true;
  // 和备件管理页一致：/spareParts/listPage → res.data.records
  getSparePartsList({ current: 1, size: 1000 })
      .then((res) => {
      .then(res => {
        if (res.code === 200) {
          sparePartOptions.value = res?.data?.records || [];
        } else {
@@ -206,7 +223,7 @@
      .finally(() => {
        loadingSparePartOptions.value = false;
      });
}
  };

const handleCancel = () => {
  resetForm();
@@ -224,7 +241,7 @@
  planId.value = id; // 保存计划保养记录的id
  visible.value = true;
  await nextTick();
  fetchSparePartOptions()
    fetchSparePartOptions();
  setForm(row);
};