diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index ba36bf8..3f34d3f 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -135,15 +135,15 @@
return
}
}
- // 主管
+ // 直接主管
else if (approverConfig.value.settype === 2) {
- // if (!approverConfig.value.tempExamineMode) {
- // ElMessage({
- // message: '请选择审批方式',
- // type: 'warning',
- // })
- // return
- // }
+ if (!approverConfig.value.tempExamineMode) {
+ ElMessage({
+ message: '请选择审批方式',
+ type: 'warning',
+ })
+ return
+ }
}
// 连续多级主管
else if (approverConfig.value.settype === 7) {
@@ -318,7 +318,7 @@
-->
- 审批终点
+ {{ approverConfig.settype === 6 ? '审批人' : '审批终点' }}
@@ -339,10 +339,10 @@
-
+
多人审批时采用的审批方式
-
+
会签(需所有审批人同意)
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index ba36bf8..3f34d3f 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -135,15 +135,15 @@
return
}
}
- // 主管
+ // 直接主管
else if (approverConfig.value.settype === 2) {
- // if (!approverConfig.value.tempExamineMode) {
- // ElMessage({
- // message: '请选择审批方式',
- // type: 'warning',
- // })
- // return
- // }
+ if (!approverConfig.value.tempExamineMode) {
+ ElMessage({
+ message: '请选择审批方式',
+ type: 'warning',
+ })
+ return
+ }
}
// 连续多级主管
else if (approverConfig.value.settype === 7) {
@@ -318,7 +318,7 @@
-->
- 审批终点
+ {{ approverConfig.settype === 6 ? '审批人' : '审批终点' }}
@@ -339,10 +339,10 @@
-
+
多人审批时采用的审批方式
-
+
会签(需所有审批人同意)
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a8cf308..a47602f 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -42,14 +42,17 @@
}
}
else if (nodeConfig.settype == 2) { // 直接主管
- // const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
- // if (nodeConfig.examineMode == 1) {
- // return level
- // }
- // else if (nodeConfig.examineMode == 2) {
- // return `${level}会签`
- // }
- return '直接主管'
+ let approvalStr = ''
+ if (nodeConfig.examineMode == 1) {
+ approvalStr = '(依次审批)'
+ }
+ else if (nodeConfig.examineMode == 2) {
+ approvalStr = '(会签)'
+ }
+ else if (nodeConfig.examineMode == 3) {
+ approvalStr = '(或签)'
+ }
+ return `直接主管${approvalStr}`
}
else if (nodeConfig.settype == 6) {
let approvalStr = ''