From 7763f23f3224a0f609c4c483351edd656b0dfb26 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 16:49:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/mes/pd/project/index.vue | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/views/mes/pd/project/index.vue b/src/views/mes/pd/project/index.vue
index 05c74ce..a62fab5 100644
--- a/src/views/mes/pd/project/index.vue
+++ b/src/views/mes/pd/project/index.vue
@@ -1,4 +1,6 @@
<script lang="ts" setup>
+import { automaticApproval } from '#/store/audit-policy';
+import { submitPdProjectApproval } from '#/api/mes/pd/project';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { MesPdProjectApi } from '#/api/mes/pd/project';
@@ -83,10 +85,17 @@
/** 鎻愪氦瀹℃壒 - 鍏堣幏鍙栨祦绋嬪垪琛� */
async function handleSubmit(row: MesPdProjectApi.Project) {
const hideLoading = message.loading({
- content: '鑾峰彇瀹℃壒娴佺▼...',
+ content: automaticApproval.value ? '姝e湪鎻愪氦鐢熸晥...' : '鑾峰彇瀹℃壒娴佺▼...',
duration: 0,
});
try {
+ if (automaticApproval.value) {
+ await submitPdProjectApproval(row.id!, 'pd_project_approve');
+ hideLoading();
+ message.success('宸叉彁浜ょ敓鏁�');
+ handleRefresh();
+ return;
+ }
const processList = await getPdProjectApproveProcessList();
hideLoading();
if (!processList || processList.length === 0) {
@@ -94,6 +103,7 @@
return;
}
// 鎵撳紑娴佺▼閫夋嫨寮圭獥
+
processModalApi.setData({ id: row.id, processList }).open();
} catch {
hideLoading();
@@ -259,7 +269,7 @@
{
label: '褰掓。',
type: 'link',
- auth: ['mes:pd-project:archive'],
+ auth: ['mes:pd-project:update'],
ifShow: row.status === MesPdProjectStatusEnum.PENDING_ARCHIVE,
popConfirm: {
title: '纭褰掓。锛熷綊妗e悗灏嗙敓鎴愬彴璐﹁褰曪紝浠诲姟涓嶅彲鍐嶄慨鏀广��',
--
Gitblit v1.9.3