修复：完善基础资料页异步与提交保护

2026-07-27 06:07:17 +08:00
parent 2d2b3cf6c6
commit d0fa20afe8
8 changed files with 617 additions and 120 deletions
@@ -36,7 +36,7 @@

    <el-alert v-if="loadError" :title="loadError" type="error" :closable="false" show-icon class="mb8" />
    <el-table v-loading="loading" empty-text="暂无数据" :data="siteList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" :selectable="isRowSelectable" width="55" align="center" />
+      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="现场ID" prop="siteId" align="center" />
      <el-table-column label="客户ID" prop="customerId" align="center" />
      <el-table-column label="现场编码" prop="siteCode" align="center" :show-overflow-tooltip="true" />
@@ -53,7 +53,7 @@
          <el-button link type="primary" icon="User" @click="handleAssign(scope.row)" v-hasPermi="['master:site:assign']">分配</el-button>
          <el-button
            v-if="proxy.$auth.hasPermiAnd(['master:site:query', 'master:site:edit'])"
-            link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['master:site:edit']"
+            link type="primary" icon="Edit" :disabled="detailLoading" @click="handleUpdate(scope.row)" v-hasPermi="['master:site:edit']"
          >修改</el-button>
          <el-button
            v-if="scope.row.canRemove === true"
@@ -68,7 +68,16 @@
      v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList"
    />

-    <el-dialog v-model="open" :title="title" width="min(560px, 92vw)" append-to-body>
+    <el-dialog
+      v-model="open"
+      :title="title"
+      width="min(560px, 92vw)"
+      append-to-body
+      :close-on-click-modal="!submitLoading"
+      :close-on-press-escape="!submitLoading"
+      :show-close="!submitLoading"
+      :before-close="handleDialogBeforeClose"
+    >
      <el-alert v-if="formError" :title="formError" type="error" :closable="false" show-icon class="mb8" />
      <el-form ref="siteRef" :model="form" :rules="rules" label-width="90px">
        <el-form-item label="客户ID" prop="customerId">
@@ -112,7 +121,8 @@ import { addSite, delSite, getSite, listSite, updateSite } from "@/api/master/si
 const { proxy } = getCurrentInstance();
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
 const siteList = ref([]);
-const ids = ref([]);
+const selectedIds = ref([]);
+const removableIds = ref([]);
 const selectedRows = ref([]);
 const assignDialogRef = ref();
 const loading = ref(false);
@@ -125,6 +135,8 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
+let listGeneration = 0;
+let detailGeneration = 0;

 function validateRequiredText(rule, value, callback) {
  const labels = { siteCode: "现场编码", siteName: "现场名称" };
@@ -154,43 +166,89 @@ const data = reactive({
 });
 const { form, queryParams, rules } = toRefs(data);

+function isCurrentListRequest(listContext) {
+  return listContext.generation === listGeneration;
+}
 function getList() {
+  const listContext = {
+    generation: ++listGeneration,
+    query: { ...queryParams.value }
+  };
  loading.value = true;
  loadError.value = "";
-  listSite(queryParams.value).then((response) => {
+  listSite(listContext.query).then((response) => {
+    if (!isCurrentListRequest(listContext)) {
+      return;
+    }
    siteList.value = response.rows;
    total.value = response.total;
  }).catch(() => {
+    if (!isCurrentListRequest(listContext)) {
+      return;
+    }
    siteList.value = [];
    total.value = 0;
    loadError.value = "客户现场列表加载失败，请稍后重试";
-  }).finally(() => { loading.value = false; });
+  }).finally(() => {
+    if (!isCurrentListRequest(listContext)) {
+      return;
+    }
+    loading.value = false;
+  });
 }
 function reset() {
  formError.value = "";
  form.value = { siteId: undefined, customerId: undefined, siteCode: "", siteName: "", address: "", status: "0", remark: "" };
  proxy.resetForm("siteRef");
 }
-function cancel() { open.value = false; reset(); }
+function invalidateDetailRequest() {
+  detailGeneration += 1;
+  detailLoading.value = false;
+}
+function isCurrentDetailRequest(detailContext) {
+  return detailContext.generation === detailGeneration;
+}
+function cancel() {
+  if (submitLoading.value) return;
+  invalidateDetailRequest();
+  open.value = false;
+  reset();
+}
+function handleDialogBeforeClose(done) {
+  if (submitLoading.value) return;
+  invalidateDetailRequest();
+  reset();
+  done();
+}
 function handleQuery() { queryParams.value.pageNum = 1; getList(); }
 function resetQuery() { proxy.resetForm("queryRef"); handleQuery(); }
-function isRowSelectable(row) {
-  return row.canRemove === true;
-}
 function handleSelectionChange(selection) {
-  selectedRows.value = selection.filter((item) => item.canRemove === true);
-  ids.value = selection
+  selectedRows.value = selection;
+  selectedIds.value = selection.map((item) => item.siteId);
+  removableIds.value = selection
    .filter((item) => item.canRemove === true)
    .map((item) => item.siteId);
-  single.value = ids.value.length !== 1;
-  multiple.value = ids.value.length === 0;
+  single.value = selectedIds.value.length !== 1;
+  multiple.value = removableIds.value.length === 0;
+}
+function handleAdd() {
+  invalidateDetailRequest();
+  reset();
+  title.value = "新增客户现场";
+  open.value = true;
 }
-function handleAdd() { reset(); title.value = "新增客户现场"; open.value = true; }
 function handleUpdate(row = {}) {
  reset();
-  const siteId = row.siteId || ids.value[0];
+  const siteId = row.siteId || selectedIds.value[0];
+  const detailContext = {
+    generation: ++detailGeneration,
+    resourceId: siteId
+  };
  detailLoading.value = true;
-  getSite(siteId).then((response) => {
+  getSite(detailContext.resourceId).then((response) => {
+    if (!isCurrentDetailRequest(detailContext)) {
+      return;
+    }
    const detail = response.data;
    form.value = {
      siteId: detail.siteId,
@@ -204,8 +262,16 @@ function handleUpdate(row = {}) {
    title.value = "修改客户现场";
    open.value = true;
  }).catch(() => {
+    if (!isCurrentDetailRequest(detailContext)) {
+      return;
+    }
    loadError.value = "客户现场详情加载失败，请稍后重试";
-  }).finally(() => { detailLoading.value = false; });
+  }).finally(() => {
+    if (!isCurrentDetailRequest(detailContext)) {
+      return;
+    }
+    detailLoading.value = false;
+  });
 }
 function handleAssign(row = {}) {
  if (!row.siteId) row = selectedRows.value[0];
@@ -257,7 +323,7 @@ function submitUpdate() {
  });
 }
 function handleDelete(row) {
-  const targetIds = row?.siteId ? (row.canRemove === true ? [row.siteId] : []) : ids.value;
+  const targetIds = row?.siteId ? (row.canRemove === true ? [row.siteId] : []) : removableIds.value;
  if (!targetIds.length) { proxy.$modal.msgWarning("请选择允许删除的客户现场"); return; }
  proxy.$modal.confirm(`是否确认删除现场编号为“${targetIds.join(",")}”的数据项？`).then(() =>
    delSite(targetIds.join(","))