From 1755192ff6533145a6ed82da31d9f7816bbe00f5 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 14 七月 2025 15:57:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index e4aac00..3aa58c5 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
@@ -54,8 +54,7 @@
style="margin-right: 30px; text-align: center; margin-bottom: 10px;"
>
<div>
- <span v-if="index === 0">鍙戣捣</span>
- <span v-else>瀹℃壒</span>
+ <span>瀹℃壒浜�</span>
鈫�
</div>
<el-select
@@ -160,6 +159,7 @@
});
const { form, rules } = toRefs(data);
const productOptions = ref([]);
+const currentApproveStatus = ref(0)
// 瀹℃壒浜鸿妭鐐圭浉鍏�
const approverNodes = ref([
@@ -192,6 +192,7 @@
// 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅骞惰缃儴闂↖D
form.value.approveDeptId = userStore.currentDeptId
if (operationType.value === 'edit') {
+ currentApproveStatus.value = row.approveStatus
approveProcessGetInfo({id: row.approveId,approveReason: '1'}).then(res => {
form.value = {...res.data}
// 鍙嶆樉瀹℃壒浜�
@@ -240,7 +241,7 @@
}
proxy.$refs.formRef.validate(valid => {
if (valid) {
- if (operationType.value === "add") {
+ if (operationType.value === "add" || currentApproveStatus.value == 3) {
approveProcessAdd(form.value).then(res => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeDia();
--
Gitblit v1.9.3