+
-
+
+
多人审批时采用的审批方式
-
+
会签（需所有审批人同意）
@@ -259,18 +283,25 @@
审批终点
-
- -->
+
+
+
- + + + + + {{ nodeConfig.type === 1 ? '' : '' }} + + {{ nodeConfig.nodeName }} + +
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a4cc107..1c428d3 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -41,17 +41,23 @@
}
}
}
- 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}会签`
- }
+ 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 '直接主管'
}
else if (nodeConfig.settype == 7) {
- return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
+ // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
+ return `从直接主管到第${nodeConfig.directorLevel}个层级主管（连续多级审批）`
+ }
+ else if (nodeConfig.settype == 4) {
+ // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
+ return '审批人自选'
}
},
dealStr(str: any, obj: any) {
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..ed89a1c 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -50,7 +50,8 @@
approverConfig.value.nodeUserList = [] // 人员列表
approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
- approverConfig.value.noHanderAction = '' // 审批人为空时
+ // approverConfig.value.noHanderAction = '' // 审批人为空时
+ approverConfig.value.noHanderAction = '1' // 审批人为空时(暂时默认已通过)
approverConfig.value.directorLevel = '' // 主管
approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
}
@@ -115,6 +116,27 @@
}
// 主管
else if (approverConfig.value.settype === 2) {
+ // if (!approverConfig.value.tempExamineMode) {
+ // ElMessage({
+ // message: '请选择审批方式',
+ // type: 'warning',
+ // })
+ // return
+ // }
+ }
+ // 连续多级主管
+ else if (approverConfig.value.settype === 7) {
+ // if (!approverConfig.value.examineEndDirectorLevel) {
+ if (!approverConfig.value.directorLevel) {
+ ElMessage({
+ message: '请选择审批终点',
+ type: 'warning',
+ })
+ return
+ }
+ }
+ // 审批人自选
+ else if (approverConfig.value.settype === 4) {
if (!approverConfig.value.tempExamineMode) {
ElMessage({
message: '请选择审批方式',
@@ -123,23 +145,13 @@
return
}
}
- // 连续多级主管
- else if (approverConfig.value.settype === 7) {
- if (!approverConfig.value.examineEndDirectorLevel) {
- ElMessage({
- message: '请选择审批终点',
- type: 'warning',
- })
- return
- }
- }
- if (!approverConfig.value.noHanderAction) {
- ElMessage({
- message: '审批人为空的选项不能为空',
- type: 'warning',
- })
- return
- }
+ // if (!approverConfig.value.noHanderAction) {
+ // ElMessage({
+ // message: '审批人为空的选项不能为空',
+ // type: 'warning',
+ // })
+ // return
+ // }
// console.log('pppppppp', decisionItem.value)
@@ -158,7 +170,6 @@
// })
// return
// }
-
// 把审批设置反应在流程图里面
approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
// 保存设置
@@ -171,6 +182,10 @@
closeDrawer()
}
+function change(a: any) {
+ console.log(a)
+}
+
onMounted(() => {
const getDecisionItem = window.sessionStorage.getItem('decisionItem')
const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
@@ -196,11 +211,20 @@
指定角色
-
+
+
+ 直接主管
+
+
+ 连续多级主管
+
+
+ 审批人自选
@@ -225,7 +249,7 @@
-
+
-
+
+
多人审批时采用的审批方式
-
+
会签（需所有审批人同意）
@@ -259,18 +283,25 @@
审批终点
-
- -->
+
+
+
- + + + + + {{ nodeConfig.type === 1 ? '' : '' }} + + {{ nodeConfig.nodeName }} + +
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a4cc107..1c428d3 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -41,17 +41,23 @@
}
}
}
- 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}会签`
- }
+ 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 '直接主管'
}
else if (nodeConfig.settype == 7) {
- return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
+ // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
+ return `从直接主管到第${nodeConfig.directorLevel}个层级主管（连续多级审批）`
+ }
+ else if (nodeConfig.settype == 4) {
+ // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
+ return '审批人自选'
}
},
dealStr(str: any, obj: any) {
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 2a00bf3..eb32232 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -45,12 +45,12 @@
return res.data
}
onMounted(async () => {
- let max = 0 // 审批主管最大层级
+ const max = 6 // 审批主管最大层级
// 获取此用户的审批主管的最大层级
- getDirectorLevel(user.id).then((res) => {
- max = res.data.level
- })
+ // getDirectorLevel(user.id).then((res) => {
+ // max = res.data.level
+ // })
window.sessionStorage.setItem('maxLevel', `${max}`)
nextTick(async () => {
let data
@@ -76,7 +76,8 @@
selectRange: '',
directorLevel: '',
examineMode: '',
- noHanderAction: '',
+ // noHanderAction: '',
+ noHanderAction: 1, // 审批人为空值默认自动通过（暂定）
examineEndDirectorLevel: '',
ccSelfSelectFlag: '',
conditionList: [],
@@ -96,7 +97,6 @@
flowPermission.value = flows // 发起人
directorMaxLevel.value = max // 用户主管最大层级数
workFlowDef.value = works // 流程基本信息
- console.log('9090909090909090', workFlowDef.value.decisionItem)
window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
@@ -137,11 +137,20 @@
}
}
+// 统计是否有连续多级主管的审批存在
+const countMulti = ({ childNode }: any) => {
+ if (childNode) {
+ const { settype, directorLevel } = childNode
+ if (settype == 7) {
+ return directorLevel
+ }
+ reErr(childNode)
+ }
+}
+
// 保存流程图
const saveSet = async (type: string, getRowData: any) => {
if (type === 'edit') { // 编辑
- console.log('000000000', getRowData)
-
processConfig.value.formId = props.getRowData.formId // 已有formid
processConfig.value.formName = getRowData.business // 表单名称、关联业务
processConfig.value.formDesc = getRowData.formDesc // 描述
@@ -192,6 +201,11 @@
background: 'rgba(255, 255, 255, 0.8)',
})
+ const tempDirectorLevel = countMulti(processConfig.value.nodeConfig)
+ if (tempDirectorLevel) {
+ processConfig.value.nodeConfig.directorLevel = tempDirectorLevel
+ }
+
if (!props.isAddProcess) {
processConfig.value.flowPermission = flowPermission.value // 编辑时不允许改发起人
const res = await editProcess(processConfig.value)
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6fdad69..ed89a1c 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -50,7 +50,8 @@
approverConfig.value.nodeUserList = [] // 人员列表
approverConfig.value.tempExamineMode = '' // 审批方式（会签、或签、逐级审批）
approverConfig.value.examineMode = '' // 传参审批方式（会签、或签、逐级审批）
- approverConfig.value.noHanderAction = '' // 审批人为空时
+ // approverConfig.value.noHanderAction = '' // 审批人为空时
+ approverConfig.value.noHanderAction = '1' // 审批人为空时(暂时默认已通过)
approverConfig.value.directorLevel = '' // 主管
approverConfig.value.examineEndDirectorLevel = '' // 连续多级主管
}
@@ -115,6 +116,27 @@
}
// 主管
else if (approverConfig.value.settype === 2) {
+ // if (!approverConfig.value.tempExamineMode) {
+ // ElMessage({
+ // message: '请选择审批方式',
+ // type: 'warning',
+ // })
+ // return
+ // }
+ }
+ // 连续多级主管
+ else if (approverConfig.value.settype === 7) {
+ // if (!approverConfig.value.examineEndDirectorLevel) {
+ if (!approverConfig.value.directorLevel) {
+ ElMessage({
+ message: '请选择审批终点',
+ type: 'warning',
+ })
+ return
+ }
+ }
+ // 审批人自选
+ else if (approverConfig.value.settype === 4) {
if (!approverConfig.value.tempExamineMode) {
ElMessage({
message: '请选择审批方式',
@@ -123,23 +145,13 @@
return
}
}
- // 连续多级主管
- else if (approverConfig.value.settype === 7) {
- if (!approverConfig.value.examineEndDirectorLevel) {
- ElMessage({
- message: '请选择审批终点',
- type: 'warning',
- })
- return
- }
- }
- if (!approverConfig.value.noHanderAction) {
- ElMessage({
- message: '审批人为空的选项不能为空',
- type: 'warning',
- })
- return
- }
+ // if (!approverConfig.value.noHanderAction) {
+ // ElMessage({
+ // message: '审批人为空的选项不能为空',
+ // type: 'warning',
+ // })
+ // return
+ // }
// console.log('pppppppp', decisionItem.value)
@@ -158,7 +170,6 @@
// })
// return
// }
-
// 把审批设置反应在流程图里面
approverConfig.value.error = !$func.setApproverStr(approverConfig.value)
// 保存设置
@@ -171,6 +182,10 @@
closeDrawer()
}
+function change(a: any) {
+ console.log(a)
+}
+
onMounted(() => {
const getDecisionItem = window.sessionStorage.getItem('decisionItem')
const getNoticeStarter = window.sessionStorage.getItem('noticeStarter')
@@ -196,11 +211,20 @@
指定角色
-
+
+
+ 直接主管
+
+
+ 连续多级主管
+
+
+ 审批人自选
@@ -225,7 +249,7 @@
-
+
-
+
+
多人审批时采用的审批方式
-
+
会签（需所有审批人同意）
@@ -259,18 +283,25 @@
审批终点
-
- -->
+
+
+
- + + + + + {{ nodeConfig.type === 1 ? '' : '' }} + + {{ nodeConfig.nodeName }} + +
diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts
index a4cc107..1c428d3 100644
--- a/src/plugins/preload.ts
+++ b/src/plugins/preload.ts
@@ -41,17 +41,23 @@
}
}
}
- 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}会签`
- }
+ 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 '直接主管'
}
else if (nodeConfig.settype == 7) {
- return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
+ // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
+ return `从直接主管到第${nodeConfig.directorLevel}个层级主管（连续多级审批）`
+ }
+ else if (nodeConfig.settype == 4) {
+ // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
+ return '审批人自选'
}
},
dealStr(str: any, obj: any) {
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 2a00bf3..eb32232 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -45,12 +45,12 @@
return res.data
}
onMounted(async () => {
- let max = 0 // 审批主管最大层级
+ const max = 6 // 审批主管最大层级
// 获取此用户的审批主管的最大层级
- getDirectorLevel(user.id).then((res) => {
- max = res.data.level
- })
+ // getDirectorLevel(user.id).then((res) => {
+ // max = res.data.level
+ // })
window.sessionStorage.setItem('maxLevel', `${max}`)
nextTick(async () => {
let data
@@ -76,7 +76,8 @@
selectRange: '',
directorLevel: '',
examineMode: '',
- noHanderAction: '',
+ // noHanderAction: '',
+ noHanderAction: 1, // 审批人为空值默认自动通过（暂定）
examineEndDirectorLevel: '',
ccSelfSelectFlag: '',
conditionList: [],
@@ -96,7 +97,6 @@
flowPermission.value = flows // 发起人
directorMaxLevel.value = max // 用户主管最大层级数
workFlowDef.value = works // 流程基本信息
- console.log('9090909090909090', workFlowDef.value.decisionItem)
window.sessionStorage.setItem('decisionItem', `${workFlowDef.value.decisionItem}`)
window.sessionStorage.setItem('noticeStarter', `${workFlowDef.value.noticeStarter}`)
@@ -137,11 +137,20 @@
}
}
+// 统计是否有连续多级主管的审批存在
+const countMulti = ({ childNode }: any) => {
+ if (childNode) {
+ const { settype, directorLevel } = childNode
+ if (settype == 7) {
+ return directorLevel
+ }
+ reErr(childNode)
+ }
+}
+
// 保存流程图
const saveSet = async (type: string, getRowData: any) => {
if (type === 'edit') { // 编辑
- console.log('000000000', getRowData)
-
processConfig.value.formId = props.getRowData.formId // 已有formid
processConfig.value.formName = getRowData.business // 表单名称、关联业务
processConfig.value.formDesc = getRowData.formDesc // 描述
@@ -192,6 +201,11 @@
background: 'rgba(255, 255, 255, 0.8)',
})
+ const tempDirectorLevel = countMulti(processConfig.value.nodeConfig)
+ if (tempDirectorLevel) {
+ processConfig.value.nodeConfig.directorLevel = tempDirectorLevel
+ }
+
if (!props.isAddProcess) {
processConfig.value.flowPermission = flowPermission.value // 编辑时不允许改发起人
const res = await editProcess(processConfig.value)
diff --git a/src/views/tested/device/info/components/detail.vue b/src/views/tested/device/info/components/detail.vue
index 4d6bb4e..0ccc170 100644
--- a/src/views/tested/device/info/components/detail.vue
+++ b/src/views/tested/device/info/components/detail.vue
@@ -147,7 +147,7 @@
-