Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

liu

2026-09-03 a956b0ea73c9891a6e0e1325d093f6b63e3e8501

 src/views/erp/purchase/request/index.vue

@@ -17,6 +17,7 @@
  getApproveProcessList,
  getPurchaseRequestPage,
  submitPurchaseRequest,
  syncPurchaseRequestStatus,
} from '#/api/erp/purchase/request';
import { $t } from '#/locales';

@@ -145,11 +146,18 @@
    proxyConfig: {
      ajax: {
        query: async ({ page }, formValues) => {
          return await getPurchaseRequestPage({
          const result = await getPurchaseRequestPage({
            pageNo: page.currentPage,
            pageSize: page.pageSize,
            ...formValues,
          });
          const processingItems = (result.list || []).filter(
            (item) => item.status === 10 && item.processInstanceId,
          );
          if (processingItems.length > 0) {
            await syncPurchaseRequestStatus(processingItems);
          }
          return result;
        },
      },
    },
@@ -210,8 +218,8 @@
      <template #status="{ row }">
        <Tag v-if="row.status === 0" color="default">未提交</Tag>
        <Tag v-else-if="row.status === 10" color="processing">审批中</Tag>
        <Tag v-else-if="row.status === 20" color="success">审核通过</Tag>
        <Tag v-else-if="row.status === 30" color="error">审核不通过</Tag>
        <Tag v-else-if="row.status === 20" color="success">审批通过</Tag>
        <Tag v-else-if="row.status === 30" color="error">审批不通过</Tag>
        <Tag v-else-if="row.status === 40" color="warning">已取消</Tag>
      </template>
      <template #inStatus="{ row }">