diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts index 1baf447..a8cf308 100644 --- a/src/plugins/preload.ts +++ b/src/plugins/preload.ts @@ -52,8 +52,17 @@ return '直接主管' } else if (nodeConfig.settype == 6) { - // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管` - return `第${nodeConfig.directorLevel}层级主管` + let approvalStr = '' + if (nodeConfig.examineMode == 1) { + approvalStr = '（依次审批）' + } + else if (nodeConfig.examineMode == 2) { + approvalStr = '（会签）' + } + else if (nodeConfig.examineMode == 3) { + approvalStr = '（或签）' + } + return `第${nodeConfig.directorLevel}层级主管${approvalStr}` } else if (nodeConfig.settype == 7) { // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管` diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts index 1baf447..a8cf308 100644 --- a/src/plugins/preload.ts +++ b/src/plugins/preload.ts @@ -52,8 +52,17 @@ return '直接主管' } else if (nodeConfig.settype == 6) { - // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管` - return `第${nodeConfig.directorLevel}层级主管` + let approvalStr = '' + if (nodeConfig.examineMode == 1) { + approvalStr = '（依次审批）' + } + else if (nodeConfig.examineMode == 2) { + approvalStr = '（会签）' + } + else if (nodeConfig.examineMode == 3) { + approvalStr = '（或签）' + } + return `第${nodeConfig.directorLevel}层级主管${approvalStr}` } else if (nodeConfig.settype == 7) { // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管` diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts index 1252370..e56acc8 100644 --- a/src/router/modules/laboratory.ts +++ b/src/router/modules/laboratory.ts @@ -164,41 +164,41 @@ }, ], }, - { - path: '/labStatement', - component: Layout, - redirect: '/labStatement/list', - name: 'LabStatement', - meta: { - title: '报表管理', - icon: 'ep:key', - auth: '/lab/statement', - }, - children: [ - { - path: 'list', - name: 'LabStatementList', - component: () => import('@/views/laboratory/statement/environment/list.vue'), - meta: { - title: '环境记录单', - auth: '/lab/statement/environmentList', - icon: 'ep:key', - }, - }, - { - path: '/labStatement/:type/:id?', - name: 'LabStatementDetail', - component: () => import('@/views/laboratory/statement/environment/detail.vue'), - meta: { - title: '环境记录单', - icon: 'ep:key', - sidebar: false, - breadcrumb: true, - activeMenu: '/labStatement/list', - }, - }, - ], - }, + // { + // path: '/labStatement', + // component: Layout, + // redirect: '/labStatement/list', + // name: 'LabStatement', + // meta: { + // title: '报表管理', + // icon: 'ep:key', + // auth: '/lab/statement', + // }, + // children: [ + // { + // path: 'list', + // name: 'LabStatementList', + // component: () => import('@/views/laboratory/statement/environment/list.vue'), + // meta: { + // title: '环境记录单', + // auth: '/lab/statement/environmentList', + // icon: 'ep:key', + // }, + // }, + // { + // path: '/labStatement/:type/:id?', + // name: 'LabStatementDetail', + // component: () => import('@/views/laboratory/statement/environment/detail.vue'), + // meta: { + // title: '环境记录单', + // icon: 'ep:key', + // sidebar: false, + // breadcrumb: true, + // activeMenu: '/labStatement/list', + // }, + // }, + // ], + // }, // 系统管理 { path: '/labSystem', diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts index 1baf447..a8cf308 100644 --- a/src/plugins/preload.ts +++ b/src/plugins/preload.ts @@ -52,8 +52,17 @@ return '直接主管' } else if (nodeConfig.settype == 6) { - // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管` - return `第${nodeConfig.directorLevel}层级主管` + let approvalStr = '' + if (nodeConfig.examineMode == 1) { + approvalStr = '（依次审批）' + } + else if (nodeConfig.examineMode == 2) { + approvalStr = '（会签）' + } + else if (nodeConfig.examineMode == 3) { + approvalStr = '（或签）' + } + return `第${nodeConfig.directorLevel}层级主管${approvalStr}` } else if (nodeConfig.settype == 7) { // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管` diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts index 1252370..e56acc8 100644 --- a/src/router/modules/laboratory.ts +++ b/src/router/modules/laboratory.ts @@ -164,41 +164,41 @@ }, ], }, - { - path: '/labStatement', - component: Layout, - redirect: '/labStatement/list', - name: 'LabStatement', - meta: { - title: '报表管理', - icon: 'ep:key', - auth: '/lab/statement', - }, - children: [ - { - path: 'list', - name: 'LabStatementList', - component: () => import('@/views/laboratory/statement/environment/list.vue'), - meta: { - title: '环境记录单', - auth: '/lab/statement/environmentList', - icon: 'ep:key', - }, - }, - { - path: '/labStatement/:type/:id?', - name: 'LabStatementDetail', - component: () => import('@/views/laboratory/statement/environment/detail.vue'), - meta: { - title: '环境记录单', - icon: 'ep:key', - sidebar: false, - breadcrumb: true, - activeMenu: '/labStatement/list', - }, - }, - ], - }, + // { + // path: '/labStatement', + // component: Layout, + // redirect: '/labStatement/list', + // name: 'LabStatement', + // meta: { + // title: '报表管理', + // icon: 'ep:key', + // auth: '/lab/statement', + // }, + // children: [ + // { + // path: 'list', + // name: 'LabStatementList', + // component: () => import('@/views/laboratory/statement/environment/list.vue'), + // meta: { + // title: '环境记录单', + // auth: '/lab/statement/environmentList', + // icon: 'ep:key', + // }, + // }, + // { + // path: '/labStatement/:type/:id?', + // name: 'LabStatementDetail', + // component: () => import('@/views/laboratory/statement/environment/detail.vue'), + // meta: { + // title: '环境记录单', + // icon: 'ep:key', + // sidebar: false, + // breadcrumb: true, + // activeMenu: '/labStatement/list', + // }, + // }, + // ], + // }, // 系统管理 { path: '/labSystem', diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue index ad5d290..159b7f3 100644 --- a/src/views/system/process/addProcess.vue +++ b/src/views/system/process/addProcess.vue @@ -19,7 +19,7 @@ formID: '', // formID desc: '', // 流程描述 decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝 - noticeStarter: '', // 审批结果是否通知发起人 + noticeStarter: '0', // 审批结果是否通知发起人 }) const decisionItemList = ref([]) // 可选决策项 const noticeStarterList = ref([]) // 可选决策项 @@ -161,7 +161,7 @@ - + diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts index 1baf447..a8cf308 100644 --- a/src/plugins/preload.ts +++ b/src/plugins/preload.ts @@ -52,8 +52,17 @@ return '直接主管' } else if (nodeConfig.settype == 6) { - // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管` - return `第${nodeConfig.directorLevel}层级主管` + let approvalStr = '' + if (nodeConfig.examineMode == 1) { + approvalStr = '（依次审批）' + } + else if (nodeConfig.examineMode == 2) { + approvalStr = '（会签）' + } + else if (nodeConfig.examineMode == 3) { + approvalStr = '（或签）' + } + return `第${nodeConfig.directorLevel}层级主管${approvalStr}` } else if (nodeConfig.settype == 7) { // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管` diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts index 1252370..e56acc8 100644 --- a/src/router/modules/laboratory.ts +++ b/src/router/modules/laboratory.ts @@ -164,41 +164,41 @@ }, ], }, - { - path: '/labStatement', - component: Layout, - redirect: '/labStatement/list', - name: 'LabStatement', - meta: { - title: '报表管理', - icon: 'ep:key', - auth: '/lab/statement', - }, - children: [ - { - path: 'list', - name: 'LabStatementList', - component: () => import('@/views/laboratory/statement/environment/list.vue'), - meta: { - title: '环境记录单', - auth: '/lab/statement/environmentList', - icon: 'ep:key', - }, - }, - { - path: '/labStatement/:type/:id?', - name: 'LabStatementDetail', - component: () => import('@/views/laboratory/statement/environment/detail.vue'), - meta: { - title: '环境记录单', - icon: 'ep:key', - sidebar: false, - breadcrumb: true, - activeMenu: '/labStatement/list', - }, - }, - ], - }, + // { + // path: '/labStatement', + // component: Layout, + // redirect: '/labStatement/list', + // name: 'LabStatement', + // meta: { + // title: '报表管理', + // icon: 'ep:key', + // auth: '/lab/statement', + // }, + // children: [ + // { + // path: 'list', + // name: 'LabStatementList', + // component: () => import('@/views/laboratory/statement/environment/list.vue'), + // meta: { + // title: '环境记录单', + // auth: '/lab/statement/environmentList', + // icon: 'ep:key', + // }, + // }, + // { + // path: '/labStatement/:type/:id?', + // name: 'LabStatementDetail', + // component: () => import('@/views/laboratory/statement/environment/detail.vue'), + // meta: { + // title: '环境记录单', + // icon: 'ep:key', + // sidebar: false, + // breadcrumb: true, + // activeMenu: '/labStatement/list', + // }, + // }, + // ], + // }, // 系统管理 { path: '/labSystem', diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue index ad5d290..159b7f3 100644 --- a/src/views/system/process/addProcess.vue +++ b/src/views/system/process/addProcess.vue @@ -19,7 +19,7 @@ formID: '', // formID desc: '', // 流程描述 decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝 - noticeStarter: '', // 审批结果是否通知发起人 + noticeStarter: '0', // 审批结果是否通知发起人 }) const decisionItemList = ref([]) // 可选决策项 const noticeStarterList = ref([]) // 可选决策项 @@ -161,7 +161,7 @@ - + diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue index 1165f46..71dfc20 100644 --- a/src/views/system/process/detailProcess.vue +++ b/src/views/system/process/detailProcess.vue @@ -21,7 +21,7 @@ formID: '', // formID desc: '', // 流程描述 decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝 - noticeStarter: '', // 审批结果是否通知发起人 + noticeStarter: '0', // 审批结果是否通知发起人 }) const decisionItemList = ref([]) // 可选决策项 const noticeStarterList = ref([]) // 可选决策项 @@ -112,7 +112,7 @@ - + diff --git a/src/plugins/preload.ts b/src/plugins/preload.ts index 1baf447..a8cf308 100644 --- a/src/plugins/preload.ts +++ b/src/plugins/preload.ts @@ -52,8 +52,17 @@ return '直接主管' } else if (nodeConfig.settype == 6) { - // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管` - return `第${nodeConfig.directorLevel}层级主管` + let approvalStr = '' + if (nodeConfig.examineMode == 1) { + approvalStr = '（依次审批）' + } + else if (nodeConfig.examineMode == 2) { + approvalStr = '（会签）' + } + else if (nodeConfig.examineMode == 3) { + approvalStr = '（或签）' + } + return `第${nodeConfig.directorLevel}层级主管${approvalStr}` } else if (nodeConfig.settype == 7) { // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管` diff --git a/src/router/modules/laboratory.ts b/src/router/modules/laboratory.ts index 1252370..e56acc8 100644 --- a/src/router/modules/laboratory.ts +++ b/src/router/modules/laboratory.ts @@ -164,41 +164,41 @@ }, ], }, - { - path: '/labStatement', - component: Layout, - redirect: '/labStatement/list', - name: 'LabStatement', - meta: { - title: '报表管理', - icon: 'ep:key', - auth: '/lab/statement', - }, - children: [ - { - path: 'list', - name: 'LabStatementList', - component: () => import('@/views/laboratory/statement/environment/list.vue'), - meta: { - title: '环境记录单', - auth: '/lab/statement/environmentList', - icon: 'ep:key', - }, - }, - { - path: '/labStatement/:type/:id?', - name: 'LabStatementDetail', - component: () => import('@/views/laboratory/statement/environment/detail.vue'), - meta: { - title: '环境记录单', - icon: 'ep:key', - sidebar: false, - breadcrumb: true, - activeMenu: '/labStatement/list', - }, - }, - ], - }, + // { + // path: '/labStatement', + // component: Layout, + // redirect: '/labStatement/list', + // name: 'LabStatement', + // meta: { + // title: '报表管理', + // icon: 'ep:key', + // auth: '/lab/statement', + // }, + // children: [ + // { + // path: 'list', + // name: 'LabStatementList', + // component: () => import('@/views/laboratory/statement/environment/list.vue'), + // meta: { + // title: '环境记录单', + // auth: '/lab/statement/environmentList', + // icon: 'ep:key', + // }, + // }, + // { + // path: '/labStatement/:type/:id?', + // name: 'LabStatementDetail', + // component: () => import('@/views/laboratory/statement/environment/detail.vue'), + // meta: { + // title: '环境记录单', + // icon: 'ep:key', + // sidebar: false, + // breadcrumb: true, + // activeMenu: '/labStatement/list', + // }, + // }, + // ], + // }, // 系统管理 { path: '/labSystem', diff --git a/src/views/system/process/addProcess.vue b/src/views/system/process/addProcess.vue index ad5d290..159b7f3 100644 --- a/src/views/system/process/addProcess.vue +++ b/src/views/system/process/addProcess.vue @@ -19,7 +19,7 @@ formID: '', // formID desc: '', // 流程描述 decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝 - noticeStarter: '', // 审批结果是否通知发起人 + noticeStarter: '0', // 审批结果是否通知发起人 }) const decisionItemList = ref([]) // 可选决策项 const noticeStarterList = ref([]) // 可选决策项 @@ -161,7 +161,7 @@ - + diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue index 1165f46..71dfc20 100644 --- a/src/views/system/process/detailProcess.vue +++ b/src/views/system/process/detailProcess.vue @@ -21,7 +21,7 @@ formID: '', // formID desc: '', // 流程描述 decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝 - noticeStarter: '', // 审批结果是否通知发起人 + noticeStarter: '0', // 审批结果是否通知发起人 }) const decisionItemList = ref([]) // 可选决策项 const noticeStarterList = ref([]) // 可选决策项 @@ -112,7 +112,7 @@ - + diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue index 4ef4764..52cf23a 100644 --- a/src/views/system/process/editProcess.vue +++ b/src/views/system/process/editProcess.vue @@ -21,7 +21,7 @@ formID: '', // formID desc: '', // 流程描述 decisionItem: '', // 可选决策项 1同意驳回拒绝2同意驳回3同意拒绝 - noticeStarter: '', // 审批结果是否通知发起人 + noticeStarter: '0', // 审批结果是否通知发起人 }) const rules = reactive({ name: [ @@ -181,7 +181,7 @@ - +