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/approvalDia.vue | 1
src/layout/components/Sidebar/index.vue | 3
src/views/collaborativeApproval/approvalProcess/index.vue | 10 ++-
src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue | 5 -
src/layout/components/Settings/index.vue | 123 ++++++++++++++++++++--------------------
5 files changed, 72 insertions(+), 70 deletions(-)
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index e107218..b4796f3 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -1,66 +1,66 @@
<template>
<el-drawer v-model="showSettings" direction="rtl" size="300px">
- <div class="setting-drawer-title">
- <h3 class="drawer-title">涓婚椋庢牸璁剧疆</h3>
- </div>
- <div class="setting-drawer-block-checbox">
- <div
- class="setting-drawer-block-checbox-item"
- @click="handleTheme('theme-dark')"
- >
- <img src="@/assets/images/dark.svg" alt="dark" />
- <div
- v-if="sideTheme === 'theme-dark'"
- class="setting-drawer-block-checbox-selectIcon"
- style="display: block"
- >
- <i aria-label="鍥炬爣: check" class="anticon anticon-check">
- <svg
- viewBox="64 64 896 896"
- data-icon="check"
- width="1em"
- height="1em"
- :fill="theme"
- aria-hidden="true"
- focusable="false"
- class
- >
- <path
- d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"
- />
- </svg>
- </i>
- </div>
- </div>
- <div
- class="setting-drawer-block-checbox-item"
- @click="handleTheme('theme-light')"
- >
- <img src="@/assets/images/light.svg" alt="light" />
- <div
- v-if="sideTheme === 'theme-light'"
- class="setting-drawer-block-checbox-selectIcon"
- style="display: block"
- >
- <i aria-label="鍥炬爣: check" class="anticon anticon-check">
- <svg
- viewBox="64 64 896 896"
- data-icon="check"
- width="1em"
- height="1em"
- :fill="theme"
- aria-hidden="true"
- focusable="false"
- class
- >
- <path
- d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"
- />
- </svg>
- </i>
- </div>
- </div>
- </div>
+<!-- <div class="setting-drawer-title">-->
+<!-- <h3 class="drawer-title">涓婚椋庢牸璁剧疆</h3>-->
+<!-- </div>-->
+<!-- <div class="setting-drawer-block-checbox">-->
+<!-- <div-->
+<!-- class="setting-drawer-block-checbox-item"-->
+<!-- @click="handleTheme('theme-dark')"-->
+<!-- >-->
+<!-- <img src="@/assets/images/dark.svg" alt="dark" />-->
+<!-- <div-->
+<!-- v-if="sideTheme === 'theme-dark'"-->
+<!-- class="setting-drawer-block-checbox-selectIcon"-->
+<!-- style="display: block"-->
+<!-- >-->
+<!-- <i aria-label="鍥炬爣: check" class="anticon anticon-check">-->
+<!-- <svg-->
+<!-- viewBox="64 64 896 896"-->
+<!-- data-icon="check"-->
+<!-- width="1em"-->
+<!-- height="1em"-->
+<!-- :fill="theme"-->
+<!-- aria-hidden="true"-->
+<!-- focusable="false"-->
+<!-- class-->
+<!-- >-->
+<!-- <path-->
+<!-- d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"-->
+<!-- />-->
+<!-- </svg>-->
+<!-- </i>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div-->
+<!-- class="setting-drawer-block-checbox-item"-->
+<!-- @click="handleTheme('theme-light')"-->
+<!-- >-->
+<!-- <img src="@/assets/images/light.svg" alt="light" />-->
+<!-- <div-->
+<!-- v-if="sideTheme === 'theme-light'"-->
+<!-- class="setting-drawer-block-checbox-selectIcon"-->
+<!-- style="display: block"-->
+<!-- >-->
+<!-- <i aria-label="鍥炬爣: check" class="anticon anticon-check">-->
+<!-- <svg-->
+<!-- viewBox="64 64 896 896"-->
+<!-- data-icon="check"-->
+<!-- width="1em"-->
+<!-- height="1em"-->
+<!-- :fill="theme"-->
+<!-- aria-hidden="true"-->
+<!-- focusable="false"-->
+<!-- class-->
+<!-- >-->
+<!-- <path-->
+<!-- d="M912 190h-69.9c-9.8 0-19.1 4.5-25.1 12.2L404.7 724.5 207 474a32 32 0 0 0-25.1-12.2H112c-6.7 0-10.4 7.7-6.3 12.9l273.9 347c12.8 16.2 37.4 16.2 50.3 0l488.4-618.9c4.1-5.1.4-12.8-6.3-12.8z"-->
+<!-- />-->
+<!-- </svg>-->
+<!-- </i>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<div class="drawer-item">
<span>涓婚棰滆壊</span>
<span class="comp-style">
@@ -146,7 +146,6 @@
"#81D8D0",
"#E85827",
"#008C8C",
- "#002FA7",
"#F9DC24",
"#B05923",
"#003153",
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 0732505..33b2e85 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -37,7 +37,8 @@
if (settingsStore.isDark) {
return 'var(--sidebar-bg)'
}
- return sideTheme.value === 'theme-dark' ? variables.menuBg : variables.menuLightBg
+ // 娴呰壊涓婚鏃讹紝鐩存帴鐢ㄤ富棰樿壊
+ return sideTheme.value === 'theme-dark' ? variables.menuBg : settingsStore.theme
})
// 鑾峰彇鑿滃崟鏂囧瓧棰滆壊
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 9d5c19c..847f4c4 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -158,7 +158,6 @@
const { form } = toRefs(data);
// 鑺傜偣鏍囬
const getNodeTitle = (index, len) => {
- if (index === 0) return '鍙戣捣';
if (index === len - 1) return '缁撴潫';
return '瀹℃壒';
};
diff --git a/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue b/src/views/collaborativeApproval/approvalProcess/components/infoFormDia.vue
index 570f363..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
@@ -179,7 +178,6 @@
const openDialog = (type, row) => {
operationType.value = type;
dialogFormVisible.value = true;
- currentApproveStatus.value = row.approveStatus
userListNoPageByTenantId().then((res) => {
userList.value = res.data;
});
@@ -194,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}
// 鍙嶆樉瀹℃壒浜�
diff --git a/src/views/collaborativeApproval/approvalProcess/index.vue b/src/views/collaborativeApproval/approvalProcess/index.vue
index c2b4fc8..9398a1b 100644
--- a/src/views/collaborativeApproval/approvalProcess/index.vue
+++ b/src/views/collaborativeApproval/approvalProcess/index.vue
@@ -69,6 +69,8 @@
return "瀹℃牳涓�";
} else if (params == 2) {
return "瀹℃牳瀹屾垚";
+ } else if (params == 4) {
+ return "宸查噸鏂版彁浜�";
} else {
return '涓嶉�氳繃';
}
@@ -78,8 +80,10 @@
return "warning";
} else if (params == 1) {
return "primary";
- } else if (params == 2) {
+ } else if (params == 2) {
return "success";
+ } else if (params == 4) {
+ return "";
} else {
return 'danger';
}
@@ -132,7 +136,7 @@
clickFun: (row) => {
openForm("edit", row);
},
- disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1
+ disabled: (row) => row.approveStatus == 2 || row.approveStatus == 1 || row.approveStatus == 4
},
{
name: "瀹℃牳",
@@ -140,7 +144,7 @@
clickFun: (row) => {
openApprovalDia("approval", row);
},
- disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveStatus == 3 || row.approveUserCurrentId !== userStore.id
+ disabled: (row) => row.approveUserCurrentId == null || row.approveStatus == 2 || row.approveStatus == 3 || row.approveStatus == 4 || row.approveUsercurrentId !== userStore.id
},
{
name: "璇︽儏",
--
Gitblit v1.9.3