liu
3 天以前 91eff4781fa4142d1f62d30a0fa1de5cae424eaf
src/views/wls/stocktaking/task/index.vue
@@ -3,10 +3,10 @@
import type { MesWmStockTakingTaskApi } from '#/api/mes/wm/stocktaking/task';
import { ref } from 'vue';
import { useRouter } from 'vue-router';
import { Page, useVbenModal } from '@vben/common-ui';
import { MesWmStockTakingTaskStatusEnum } from '@vben/constants';
import { useUserStore } from '@vben/stores';
import { downloadFileFromBlobPart } from '@vben/utils';
import { Button, message } from 'ant-design-vue';
@@ -16,7 +16,7 @@
  cancelStockTaking,
  deleteStockTaking,
  exportStockTaking,
  getStockTakingApproveProcessList,
  getStockTakingApproverIds,
  getStockTakingPage,
  submitStockTakingApproval,
} from '#/api/mes/wm/stocktaking/task';
@@ -26,25 +26,70 @@
} from '#/api/wls/stocktaking/task/line';
import { $t } from '#/locales';
import ProcessSelectModal from '#/views/wls/components/process-select-modal.vue';
import { useGridColumns, useGridFormSchema } from './data';
import AuditModal from './modules/audit-modal.vue';
import Form from './modules/form.vue';
const router = useRouter();
const userStore = useUserStore();
const currentUserId = userStore.userInfo?.id; // 当前登录用户 ID,用于审核人权限判断
/** 审批配置中该业务的审核人编号集合,决定「审核 / 审核不通过」按钮是否展示 */
const approverIds = ref<number[]>([]);
/** 拉取审核人集合;失败时保持为空(按钮不展示),不阻断列表加载 */
async function loadApproverIds() {
  try {
    approverIds.value = (await getStockTakingApproverIds()) ?? [];
  } catch {
    approverIds.value = [];
  }
}
/**
 * 本轮盘点结果审批是否已提交、正在等待审核
 *
 * 任务状态「盘点中」同时承载盘点中与结果审批中两个阶段:
 * reviewTime 非空且 reviewerId 为空表示结果已提交、等待审核;
 * 审核不通过后 reviewerId 非空,任务回到可重新提交结果审批的状态。
 */
function isResultApprovalPending(row: MesWmStockTakingTaskApi.StockTakingTask) {
  return !row.reviewerId && !!row.reviewTime;
}
/** 当前登录用户是否为该业务的审核人,且结果审批已提交等待审核 */
function canAudit(row: MesWmStockTakingTaskApi.StockTakingTask) {
  return (
    row.status === MesWmStockTakingTaskStatusEnum.APPROVING &&
    isResultApprovalPending(row) &&
    !!currentUserId &&
    approverIds.value.includes(currentUserId)
  );
}
/** 是否可提交结果审批:盘点中且本轮结果审批尚未提交 */
function canSubmitApproval(
  row: MesWmStockTakingTaskApi.StockTakingTask,
) {
  return (
    row.status === MesWmStockTakingTaskStatusEnum.APPROVING &&
    !isResultApprovalPending(row)
  );
}
const [FormModal, formModalApi] = useVbenModal({
  connectedComponent: Form,
  destroyOnClose: true,
});
const [ProcessModal, processModalApi] = useVbenModal({
  connectedComponent: ProcessSelectModal,
const [AuditModalComp, auditModalApi] = useVbenModal({
  connectedComponent: AuditModal,
  destroyOnClose: true,
});
/** 刷新表格 */
/** 刷新表格与审核人集合 */
function handleRefresh() {
  gridApi.query();
  loadApproverIds();
}
/** 创建盘点任务 */
@@ -67,41 +112,24 @@
  formModalApi.setData({ formType: 'submit', id: row.id }).open();
}
/** 提交结果审批 - 先获取流程列表 */
/** 提交结果审批 - 审核人由「系统管理 - 审批配置」统一指定,此处无需选择 */
async function handleSubmitApproval(row: MesWmStockTakingTaskApi.StockTakingTask) {
  const hideLoading = message.loading({
    content: '获取审批流程...',
    content: '正在提交结果审批...',
    duration: 0,
  });
  try {
    const processList = await getStockTakingApproveProcessList();
    hideLoading();
    if (!processList || processList.length === 0) {
      message.warning('暂无可用审批流程,请先配置 BPM 流程');
      return;
    }
    processModalApi
      .setData({
        id: row.id,
        processList,
        submitFn: submitStockTakingApproval,
      })
      .open();
  } catch {
    await submitStockTakingApproval(row.id!);
    message.success('提交结果审批成功');
    handleRefresh();
  } finally {
    hideLoading();
  }
}
/** 查看审批详情 */
function handleProcessDetail(row: MesWmStockTakingTaskApi.StockTakingTask) {
  if (!row.processInstanceId) {
    message.warning('该任务尚未提交结果审批');
    return;
  }
  router.push({
    name: 'BpmProcessInstanceDetail',
    query: { id: row.processInstanceId },
  });
/** 审核 - 通过 / 不通过 */
function handleAudit(row: MesWmStockTakingTaskApi.StockTakingTask, pass: boolean) {
  auditModalApi.setData({ pass, row }).open();
}
/** 取消盘点任务 */
@@ -198,11 +226,15 @@
});
const StatusEnum = MesWmStockTakingTaskStatusEnum;
// 进入页面即拉取审核人集合,用于控制审核按钮显隐
loadApproverIds();
</script>
<template>
  <Page auto-content-height><FormModal @success="handleRefresh" />
    <ProcessModal @success="handleRefresh" />
  <Page auto-content-height>
    <FormModal @success="handleRefresh" />
    <AuditModalComp @success="handleRefresh" />
    <Grid table-title="盘点任务列表">
      <template #toolbar-tools>
@@ -279,15 +311,31 @@
              label: '提交结果审批',
              type: 'link',
              auth: ['mes:wm-stock-taking-task:update'],
              ifShow: row.status === StatusEnum.APPROVING,
              onClick: handleSubmitApproval.bind(null, row),
              // 盘点中且本轮结果审批尚未提交时才可提交
              ifShow: canSubmitApproval(row),
              // 审核人由审批配置统一指定,提交前仅二次确认,不再弹选流程框
              popConfirm: {
                title: '确认提交结果审批?提交后由审批配置中指定的审核人处理。',
                confirm: handleSubmitApproval.bind(null, row),
              },
            },
            {
              label: '查看审批',
              label: '审核',
              type: 'link',
              auth: ['mes:wm-stock-taking-task:query'],
              ifShow: row.status === StatusEnum.APPROVING,
              onClick: handleProcessDetail.bind(null, row),
              icon: ACTION_ICON.AUDIT,
              auth: ['mes:wm-stock-taking-task:audit'],
              // 仅「结果审批中 + 当前登录用户在审批配置的审核人名单内」才显示
              ifShow: canAudit(row),
              onClick: handleAudit.bind(null, row, true),
            },
            {
              label: '审核不通过',
              type: 'link',
              danger: true,
              auth: ['mes:wm-stock-taking-task:audit'],
              // 同上,与「审核」成对出现
              ifShow: canAudit(row),
              onClick: handleAudit.bind(null, row, false),
            },
            {
              label: '取消',