+
+
+ {{ nodeConfig.nodeName }}
+
+ {{ nodeConfig.type === 1 ? '' : '' }}
+
- {{ nodeConfig.nodeName }}
-
-
-
-
-
- 请选择{{ placeholderList[nodeConfig.type] }}
-
- {{ setApproverStr(nodeConfig) }}
+ {{ nodeConfig.nodeName }}
+
+
+
+
+
+ 请选择{{ defaultText }}
+ {{ showText }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <
+
+
+
+ {{ item.nodeName }}
+ 优先级{{ item.priorityLevel }}
+
+
+
+ >
+
+
+ {{ $func.conditionStr(nodeConfig, index) }}
+
+
+
+
+
+
-
-
- 请选择{{ placeholderList[nodeConfig.type] }}
-
- {{ setApproverStr(nodeConfig) }}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- <
-
-
- {{ item.nodeName }}
- 优先级{{ item.priorityLevel }}
-
-
-
- >
-
-
- {{ conditionStr(item, index) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ approverConfig.nodeName }}
-
-
-
-
-
-
-
-
-
-
- {{ item.label }}
- ({{ item.mark }})
-
-
-
-
-
-
- 连续多级部门主管(按照组织架构，发起人向上的各级主管依次审批)
-
-
-
- 直到发起人向上的
-
-
-
-
-
-
- 直到
-
-
-
-
-
-
-
-
-
- 部门主管
-
-
- 审批角色
-
-
- 指定用户
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 连续多级部门主管
-
-
- 抄送角色
-
-
- 指定用户
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 按组织架构，发起人向上的各级主管依次抄送
-
-
-
- 直到发起人向上的
-
-
-
-
-
-
- 直到
-
-
-
-
-
-
-
-
-
-
-
-
- 其他情况
-
-
-
-
-
-
-
-
- 当
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 添加条件
-
-
-
-
-
-
-
-
-
-
-
-
- 添加条件组
-
-
-
-
-
+
-
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
new file mode 100644
index 0000000..e4f2c55
--- /dev/null
+++ b/src/components/workFlow/selectBox.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
new file mode 100644
index 0000000..21c2de5
--- /dev/null
+++ b/src/components/workFlow/selectResult.vue
@@ -0,0 +1,94 @@
+
+
+
+
+
+ 已选（{{ total }}）
+ 清空
+
+
+
+
+ -
+
+ {{ item.roleName }}
+ 
+
+
+
+ -
+
+ {{ item.departmentName }}
+
+
+
+
+ -
+
+ {{ item.employeeName }}
+
+
+
+
+
+
+
+
diff --git a/src/components/workFlow/workFlow.vue b/src/components/workFlow/workFlow.vue
deleted file mode 100644
index 439b560..0000000
--- a/src/components/workFlow/workFlow.vue
+++ /dev/null
@@ -1,764 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/css/override-element-ui.css b/src/css/override-element-ui.css
index d772692..4a931e9 100644
--- a/src/css/override-element-ui.css
+++ b/src/css/override-element-ui.css
@@ -47,6 +47,7 @@
.demo-drawer__footer {
padding: 10px 30px !important;
border-top: 1px solid #f2f2f2 !important;
+ margin-top: 32px;
}
.demo-drawer__footer .el-button {
diff --git a/src/css/workflow.css b/src/css/workflow.css
index 26ba1e6..43a0bf8 100644
--- a/src/css/workflow.css
+++ b/src/css/workflow.css
@@ -1099,7 +1099,9 @@
.zoom {
display: flex;
- position: fixed;
+
+ /* position: fixed; */
+ position: relative;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
diff --git a/src/plugins/api.js b/src/plugins/api.js
index b3b9e24..f736077 100644
--- a/src/plugins/api.js
+++ b/src/plugins/api.js
@@ -1,9 +1,3 @@
-/*
- * @Date: 2022-08-25 14:06:59
- * @LastEditors: StavinLi 495727881@qq.com
- * @LastEditTime: 2022-09-21 14:36:58
- * @FilePath: /Workflow-Vue3/src/plugins/api.js
- */
import http from '@/plugins/axios'
const baseUrl = import.meta.env.BASE_URL
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index b0281d9..fc008ff 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -37,6 +37,7 @@
document.cookie = `${name[i]}=''; path=/; expires=${myDate.toGMTString()}`
}
},
+ // 讲负责人的姓名挑出来做成字符串
arrToStr(arr) {
if (arr) {
return arr.map((item) => { return item.name }).toString()
@@ -58,53 +59,79 @@
})
arr.splice(includesIndex, 1)
},
+ // 设置审批节点的文字
setApproverStr(nodeConfig) {
- if (nodeConfig.settype == 1) {
- if (nodeConfig.nodeUserList.length == 1) {
- return nodeConfig.nodeUserList[0].name
+ console.log(nodeConfig)
+ let tempValue = '会签'
+ let strPeople = ' '
+ if (nodeConfig.selectCustomApprovalType === 'huoqian') {
+ tempValue = '或签'
+ }
+ if (nodeConfig.selectCustomApprovalMethod === 'normal') {
+ if (nodeConfig.nodeUserList.length === 1) {
+ strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
}
else if (nodeConfig.nodeUserList.length > 1) {
- if (nodeConfig.examineMode == 1) {
- return this.arrToStr(nodeConfig.nodeUserList)
- }
- else if (nodeConfig.examineMode == 2) {
- return `${nodeConfig.nodeUserList.length}人会签`
- }
+ strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
}
+ return strPeople
}
- else if (nodeConfig.settype == 2) {
- const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
- if (nodeConfig.examineMode == 1) {
- return level
+ else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
+ let strPeople = ' '
+ if (nodeConfig.nodeUserList.length === 1) {
+ strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
}
- else if (nodeConfig.examineMode == 2) {
- return `${level}会签`
+ else if (nodeConfig.nodeUserList.length > 1) {
+ strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
}
+ return strPeople
}
- else if (nodeConfig.settype == 4) {
- if (nodeConfig.selectRange == 1) {
- return '发起人自选'
- }
- else {
- if (nodeConfig.nodeUserList.length > 0) {
- if (nodeConfig.selectRange == 2) {
- return '发起人自选'
- }
- else {
- return `发起人从${nodeConfig.nodeUserList[0].name}中自选`
- }
- }
- else {
- return ''
- }
- }
- }
- else if (nodeConfig.settype == 5) {
- return '发起人自己'
- }
- else if (nodeConfig.settype == 7) {
- return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
- }
+ // if (nodeConfig.settype == 1) {
+ // if (nodeConfig.nodeUserList.length == 1) {
+ // return nodeConfig.nodeUserList[0].name
+ // }
+ // else if (nodeConfig.nodeUserList.length > 1) {
+ // if (nodeConfig.examineMode == 1) {
+ // return this.arrToStr(nodeConfig.nodeUserList)
+ // }
+ // else if (nodeConfig.examineMode == 2) {
+ // return `${nodeConfig.nodeUserList.length}人会签`
+ // }
+ // }
+ // }
+ // 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 == 4) {
+ // if (nodeConfig.selectRange == 1) {
+ // return '发起人自选'
+ // }
+ // else {
+ // if (nodeConfig.nodeUserList.length > 0) {
+ // if (nodeConfig.selectRange == 2) {
+ // return '发起人自选'
+ // }
+ // else {
+ // return `发起人从${nodeConfig.nodeUserList[0].name}中自选`
+ // }
+ // }
+ // else {
+ // return ''
+ // }
+ // }
+ // }
+ // else if (nodeConfig.settype == 5) {
+ // return '发起人自己'
+ // }
+ // else if (nodeConfig.settype == 7) {
+ // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
+ // }
},
dealStr(str, obj) {
const arr = []
@@ -152,7 +179,9 @@
}
},
copyerStr(nodeConfig) {
+ console.log(nodeConfig.nodeUserList)
if (nodeConfig.nodeUserList.length != 0) {
+ console.log('copyerStr')
return this.arrToStr(nodeConfig.nodeUserList)
}
else {
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 956b386..ba7d7a0 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -3,12 +3,12 @@
'workFlow',
{
state: () => ({
- tableId: '',
+ tableId: '', // 审批id
isTried: false,
promoterDrawer: false,
flowPermission1: {},
- approverDrawer: false,
- approverConfig1: {},
+ approverDrawer: false, // 审批抽屉显示隐藏
+ approverConfig1: {}, // 审批设置
copyerDrawer: false,
copyerConfig1: {},
conditionDrawer: false,
@@ -29,9 +29,11 @@
setFlowPermission(payload: object) {
this.flowPermission1 = payload
},
+ // 审批抽屉显隐
setApprover(payload: boolean) {
this.approverDrawer = payload
},
+ // 审批设置
setApproverConfig(payload: object) {
this.approverConfig1 = payload
},
diff --git a/public/conditions.json b/public/conditions.json
new file mode 100644
index 0000000..82eb19d
--- /dev/null
+++ b/public/conditions.json
@@ -0,0 +1,30 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": [
+ {
+ "columnId": "1090",
+ "showType": "1",
+ "showName": "预计采购总费用",
+ "columnName": "planProcurementTotalMoney",
+ "columnType": "Double",
+ "fixedDownBoxValue": ""
+ },
+ {
+ "columnId": "1092",
+ "showType": "3",
+ "showName": "采购类型",
+ "columnName": "procurementType",
+ "columnType": "String",
+ "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+ },
+ {
+ "columnId": "1093",
+ "showType": "1",
+ "showName": "园区面积",
+ "columnName": "parkArea",
+ "columnType": "Double",
+ "fixedDownBoxValue": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git "a/public/conditions\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/conditions\345\255\227\346\256\265\346\263\250\351\207\212.js"
new file mode 100644
index 0000000..58920ac
--- /dev/null
+++ "b/public/conditions\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -0,0 +1,34 @@
+export default {
+ "code": "200",
+ "msg": "操作成功",
+ "data": [
+ {
+ //条件id columnId == 0 为发起人
+ "columnId": "1090",
+ //columnType == "String" && showType == "3"为多选 columnType == "Double"为区间
+ "showType": "1",
+ "showName": "预计采购总费用",
+ //columnName 条件自定义字段
+ "columnName": "planProcurementTotalMoney",
+ "columnType": "Double",
+ //fixedDownBoxValue 匹配 columnType == "String" && showType == "3"时子选项内容
+ "fixedDownBoxValue": ""
+ },
+ {
+ "columnId": "1092",
+ "showType": "3",
+ "showName": "采购类型",
+ "columnName": "procurementType",
+ "columnType": "String",
+ "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+ },
+ {
+ "columnId": "1093",
+ "showType": "1",
+ "showName": "园区面积",
+ "columnName": "parkArea",
+ "columnType": "Double",
+ "fixedDownBoxValue": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git a/public/data.json b/public/data.json
index bbe88b1..632c75c 100644
--- a/public/data.json
+++ b/public/data.json
@@ -136,4 +136,4 @@
"conditionNodes": []
}
}
-}
\ No newline at end of file
+}
diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index bb7afeb..c182ad6 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -58,7 +58,7 @@
"conditionNodes": [{ //条件节点
"nodeName": "条件1",
"type": 3,
- "priorityLevel": 1,
+ "priorityLevel": 1,
"settype": 1,
"selectMode": 0,
"selectRange": 0,
@@ -134,4 +134,4 @@
"conditionNodes": []
}
}
-}
\ No newline at end of file
+}
diff --git a/public/departments.json b/public/departments.json
new file mode 100644
index 0000000..dfd7789
--- /dev/null
+++ b/public/departments.json
@@ -0,0 +1,26 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "childDepartments": [{
+ "departmentKey": "RLXZB_V2",
+ "departmentName": "人力行政部",
+ "id": "150",
+ "parentId": "0",
+ "departmentNames": "人力行政部"
+ }, {
+ "departmentKey": "ZNBN",
+ "departmentName": "法务部",
+ "id": "324",
+ "parentId": "0",
+ "departmentNames": "法务部"
+ }],
+ "employees": [{
+ "id": "53128111",
+ "employeeName": "雅楠",
+ "isLeave": "0",
+ "open": "false"
+ }],
+ "titleDepartments": []
+ }
+}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
new file mode 100644
index 0000000..dfd7789
--- /dev/null
+++ b/public/departments0.json
@@ -0,0 +1,26 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "childDepartments": [{
+ "departmentKey": "RLXZB_V2",
+ "departmentName": "人力行政部",
+ "id": "150",
+ "parentId": "0",
+ "departmentNames": "人力行政部"
+ }, {
+ "departmentKey": "ZNBN",
+ "departmentName": "法务部",
+ "id": "324",
+ "parentId": "0",
+ "departmentNames": "法务部"
+ }],
+ "employees": [{
+ "id": "53128111",
+ "employeeName": "雅楠",
+ "isLeave": "0",
+ "open": "false"
+ }],
+ "titleDepartments": []
+ }
+}
\ No newline at end of file
diff --git a/public/departments150.json b/public/departments150.json
new file mode 100644
index 0000000..aa6cc37
--- /dev/null
+++ b/public/departments150.json
@@ -0,0 +1,26 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "childDepartments": [],
+ "employees": [{
+ "id": "53128112",
+ "employeeName": "测试1",
+ "isLeave": "0",
+ "open": "false"
+ },{
+ "id": "53128113",
+ "employeeName": "测试2",
+ "isLeave": "0",
+ "open": "false"
+ }],
+ "titleDepartments": [{
+ "departmentId": "150",
+ "departmentKey": "RLXZB_V2",
+ "departmentName": "人力行政部",
+ "departmentNames": "人力行政部",
+ "id": "150",
+ "parentId": "0"
+ }]
+ }
+}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
new file mode 100644
index 0000000..34b8cc2
--- /dev/null
+++ b/public/departments324.json
@@ -0,0 +1,21 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "childDepartments": [],
+ "employees": [{
+ "id": "53128133",
+ "employeeName": "测试3",
+ "isLeave": "0",
+ "open": "false"
+ }],
+ "titleDepartments": [{
+ "departmentId": "324",
+ "departmentKey": "ZNBN",
+ "departmentName": "法务部",
+ "departmentNames": "法务部",
+ "id": "324",
+ "parentId": "0"
+ }]
+ }
+}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
new file mode 100644
index 0000000..227a989
--- /dev/null
+++ b/public/employees.json
@@ -0,0 +1,42 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "navigatepageNums": ["1"],
+ "startRow": "1",
+ "hasNextPage": "false",
+ "prePage": "0",
+ "nextPage": "0",
+ "endRow": "3",
+ "pageSize": "30",
+ "list": [{
+ "departmentName": "招商事业部",
+ "employeeName": "111111",
+ "employeeDepartmentId": "121",
+ "id": "5312",
+ "departmentNames": "招商事业部"
+ }, {
+ "departmentName": "111",
+ "employeeName": "东亚-测试",
+ "employeeDepartmentId": "139",
+ "id": "2515638",
+ "departmentNames": "111"
+ }, {
+ "departmentName": "招商事业部",
+ "employeeName": "1111",
+ "employeeDepartmentId": "121",
+ "id": "2515746",
+ "departmentNames": "招商事业部"
+ }],
+ "pageNum": "1",
+ "navigatePages": "8",
+ "navigateFirstPage": "1",
+ "total": "3",
+ "pages": "1",
+ "size": "3",
+ "isLastPage": "true",
+ "hasPreviousPage": "false",
+ "navigateLastPage": "1",
+ "isFirstPage": "true"
+ }
+}
\ No newline at end of file
diff --git a/public/public/conditions.json b/public/public/conditions.json
new file mode 100644
index 0000000..82eb19d
--- /dev/null
+++ b/public/public/conditions.json
@@ -0,0 +1,30 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": [
+ {
+ "columnId": "1090",
+ "showType": "1",
+ "showName": "预计采购总费用",
+ "columnName": "planProcurementTotalMoney",
+ "columnType": "Double",
+ "fixedDownBoxValue": ""
+ },
+ {
+ "columnId": "1092",
+ "showType": "3",
+ "showName": "采购类型",
+ "columnName": "procurementType",
+ "columnType": "String",
+ "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+ },
+ {
+ "columnId": "1093",
+ "showType": "1",
+ "showName": "园区面积",
+ "columnName": "parkArea",
+ "columnType": "Double",
+ "fixedDownBoxValue": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git "a/public/public/conditions\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/public/conditions\345\255\227\346\256\265\346\263\250\351\207\212.js"
new file mode 100644
index 0000000..58920ac
--- /dev/null
+++ "b/public/public/conditions\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -0,0 +1,34 @@
+export default {
+ "code": "200",
+ "msg": "操作成功",
+ "data": [
+ {
+ //条件id columnId == 0 为发起人
+ "columnId": "1090",
+ //columnType == "String" && showType == "3"为多选 columnType == "Double"为区间
+ "showType": "1",
+ "showName": "预计采购总费用",
+ //columnName 条件自定义字段
+ "columnName": "planProcurementTotalMoney",
+ "columnType": "Double",
+ //fixedDownBoxValue 匹配 columnType == "String" && showType == "3"时子选项内容
+ "fixedDownBoxValue": ""
+ },
+ {
+ "columnId": "1092",
+ "showType": "3",
+ "showName": "采购类型",
+ "columnName": "procurementType",
+ "columnType": "String",
+ "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+ },
+ {
+ "columnId": "1093",
+ "showType": "1",
+ "showName": "园区面积",
+ "columnName": "parkArea",
+ "columnType": "Double",
+ "fixedDownBoxValue": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git a/public/public/data.json b/public/public/data.json
new file mode 100644
index 0000000..bbe88b1
--- /dev/null
+++ b/public/public/data.json
@@ -0,0 +1,139 @@
+{
+ "code": "200",
+ "msg": "success",
+ "data": {
+ "tableId": 1,
+ "workFlowDef": {
+ "name": "合同审批"
+ },
+ "directorMaxLevel": 4,
+ "flowPermission": [],
+ "nodeConfig": {
+ "nodeName": "发起人",
+ "type": 0,
+ "priorityLevel": "",
+ "settype": "",
+ "selectMode": "",
+ "selectRange": "",
+ "directorLevel": "",
+ "examineMode": "",
+ "noHanderAction": "",
+ "examineEndDirectorLevel": "",
+ "ccSelfSelectFlag": "",
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": {
+ "nodeName": "审核人",
+ "error": false,
+ "type": 1,
+ "settype": 2,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": {
+ "nodeName": "路由",
+ "type": 4,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": {
+ "nodeName": "抄送人",
+ "type": 2,
+ "ccSelfSelectFlag": 1,
+ "childNode": null,
+ "nodeUserList": [],
+ "error": false
+ },
+ "conditionNodes": [{
+ "nodeName": "条件1",
+ "type": 3,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [{
+ "columnId": 0,
+ "type": 1,
+ "conditionEn": "",
+ "conditionCn": "",
+ "optType": "",
+ "zdy1": "",
+ "zdy2": "",
+ "opt1": "",
+ "opt2": "",
+ "columnDbname": "",
+ "columnType": "",
+ "showType": "",
+ "showName": "",
+ "fixedDownBoxValue": ""
+ }],
+ "nodeUserList": [{
+ "targetId": 85,
+ "type": 1,
+ "name": "天旭"
+ }],
+ "childNode": {
+ "nodeName": "审核人",
+ "type": 1,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [{
+ "targetId": 2515744,
+ "type": 1,
+ "name": "哈哈哈哈"
+ }],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ },
+ "conditionNodes": [],
+ "error": false
+ }, {
+ "nodeName": "条件2",
+ "type": 3,
+ "priorityLevel": 2,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ }]
+ },
+ "nodeUserList": []
+ },
+ "conditionNodes": []
+ }
+ }
+}
\ No newline at end of file
diff --git "a/public/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
new file mode 100644
index 0000000..bb7afeb
--- /dev/null
+++ "b/public/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -0,0 +1,137 @@
+export default {
+ "code": "200",
+ "msg": "success",
+ "data": {
+ "tableId": 1,//审批id
+ "workFlowDef": {
+ "name": "合同审批",//审批名称
+ },
+ "directorMaxLevel": 4,//审批主管最大层级
+ "flowPermission": [],//发起人
+ "nodeConfig": {
+ "nodeName": "发起人",//节点名称
+ "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
+ "priorityLevel": "",// 条件优先级
+ "settype": "",// 审批人设置 1指定成员 2主管 4发起人自选 5发起人自己 7连续多级主管
+ "selectMode": "", //审批人数 1选一个人 2选多个人
+ "selectRange": "", //选择范围 1.全公司 2指定成员 2指定角色
+ "directorLevel": "", //审批终点 最高层主管数
+ "examineMode": "", //多人审批时采用的审批方式 1依次审批 2会签
+ "noHanderAction": "",//审批人为空时 1自动审批通过/不允许发起 2转交给审核管理员
+ "examineEndDirectorLevel": "", //审批终点 第n层主管
+ "ccSelfSelectFlag": "", //允许发起人自选抄送人
+ "conditionList": [], //当审批单同时满足以下条件时进入此流程
+ "nodeUserList": [], //操作人
+ "childNode": {
+ "nodeName": "审核人",
+ "error": false, //当前审批是否通过校验
+ "type": 1,
+ "settype": 2,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": {
+ "nodeName": "路由",
+ "type": 4,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": {
+ "nodeName": "抄送人",
+ "type": 2,
+ "ccSelfSelectFlag": 1,
+ "childNode": null,
+ "nodeUserList": [],
+ "error": false
+ },
+ "conditionNodes": [{ //条件节点
+ "nodeName": "条件1",
+ "type": 3,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [{ //当前条件
+ "columnId": 0, //发起人
+ "type": 1, //1 发起人 2其他
+ "optType": "", //["", "<", ">", "≤", "=", "≥"][optType]
+ "zdy1": "",//左侧自定义内容
+ "zdy2": "",//右侧自定义内容
+ "opt1": "",//左侧符号 < ≤
+ "opt2": "",//右侧符号 < ≤
+ "columnDbname": "",//条件字段名称
+ "columnType": "",//条件字段类型
+ "showType": "",//3多选 其他
+ "showName": "",//展示名
+ "fixedDownBoxValue": ""//多选数组
+ }],
+ "nodeUserList": [{
+ "targetId": 85,
+ "type": 1,
+ "name": "天旭"
+ }],
+ "childNode": {
+ "nodeName": "审核人",
+ "type": 1,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [{
+ "targetId": 2515744,
+ "type": 1,
+ "name": "哈哈哈哈"
+ }],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ },
+ "conditionNodes": [],
+ "error": false
+ }, {
+ "nodeName": "条件2",
+ "type": 3,
+ "priorityLevel": 2,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ }]
+ },
+ "nodeUserList": []
+ },
+ "conditionNodes": []
+ }
+ }
+}
\ No newline at end of file
diff --git a/public/public/departments.json b/public/public/departments.json
new file mode 100644
index 0000000..dfd7789
--- /dev/null
+++ b/public/public/departments.json
@@ -0,0 +1,26 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "childDepartments": [{
+ "departmentKey": "RLXZB_V2",
+ "departmentName": "人力行政部",
+ "id": "150",
+ "parentId": "0",
+ "departmentNames": "人力行政部"
+ }, {
+ "departmentKey": "ZNBN",
+ "departmentName": "法务部",
+ "id": "324",
+ "parentId": "0",
+ "departmentNames": "法务部"
+ }],
+ "employees": [{
+ "id": "53128111",
+ "employeeName": "雅楠",
+ "isLeave": "0",
+ "open": "false"
+ }],
+ "titleDepartments": []
+ }
+}
\ No newline at end of file
diff --git a/public/public/departments0.json b/public/public/departments0.json
new file mode 100644
index 0000000..dfd7789
--- /dev/null
+++ b/public/public/departments0.json
@@ -0,0 +1,26 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "childDepartments": [{
+ "departmentKey": "RLXZB_V2",
+ "departmentName": "人力行政部",
+ "id": "150",
+ "parentId": "0",
+ "departmentNames": "人力行政部"
+ }, {
+ "departmentKey": "ZNBN",
+ "departmentName": "法务部",
+ "id": "324",
+ "parentId": "0",
+ "departmentNames": "法务部"
+ }],
+ "employees": [{
+ "id": "53128111",
+ "employeeName": "雅楠",
+ "isLeave": "0",
+ "open": "false"
+ }],
+ "titleDepartments": []
+ }
+}
\ No newline at end of file
diff --git a/public/public/departments150.json b/public/public/departments150.json
new file mode 100644
index 0000000..aa6cc37
--- /dev/null
+++ b/public/public/departments150.json
@@ -0,0 +1,26 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "childDepartments": [],
+ "employees": [{
+ "id": "53128112",
+ "employeeName": "测试1",
+ "isLeave": "0",
+ "open": "false"
+ },{
+ "id": "53128113",
+ "employeeName": "测试2",
+ "isLeave": "0",
+ "open": "false"
+ }],
+ "titleDepartments": [{
+ "departmentId": "150",
+ "departmentKey": "RLXZB_V2",
+ "departmentName": "人力行政部",
+ "departmentNames": "人力行政部",
+ "id": "150",
+ "parentId": "0"
+ }]
+ }
+}
\ No newline at end of file
diff --git a/public/public/departments324.json b/public/public/departments324.json
new file mode 100644
index 0000000..34b8cc2
--- /dev/null
+++ b/public/public/departments324.json
@@ -0,0 +1,21 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "childDepartments": [],
+ "employees": [{
+ "id": "53128133",
+ "employeeName": "测试3",
+ "isLeave": "0",
+ "open": "false"
+ }],
+ "titleDepartments": [{
+ "departmentId": "324",
+ "departmentKey": "ZNBN",
+ "departmentName": "法务部",
+ "departmentNames": "法务部",
+ "id": "324",
+ "parentId": "0"
+ }]
+ }
+}
\ No newline at end of file
diff --git a/public/public/employees.json b/public/public/employees.json
new file mode 100644
index 0000000..227a989
--- /dev/null
+++ b/public/public/employees.json
@@ -0,0 +1,42 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "navigatepageNums": ["1"],
+ "startRow": "1",
+ "hasNextPage": "false",
+ "prePage": "0",
+ "nextPage": "0",
+ "endRow": "3",
+ "pageSize": "30",
+ "list": [{
+ "departmentName": "招商事业部",
+ "employeeName": "111111",
+ "employeeDepartmentId": "121",
+ "id": "5312",
+ "departmentNames": "招商事业部"
+ }, {
+ "departmentName": "111",
+ "employeeName": "东亚-测试",
+ "employeeDepartmentId": "139",
+ "id": "2515638",
+ "departmentNames": "111"
+ }, {
+ "departmentName": "招商事业部",
+ "employeeName": "1111",
+ "employeeDepartmentId": "121",
+ "id": "2515746",
+ "departmentNames": "招商事业部"
+ }],
+ "pageNum": "1",
+ "navigatePages": "8",
+ "navigateFirstPage": "1",
+ "total": "3",
+ "pages": "1",
+ "size": "3",
+ "isLastPage": "true",
+ "hasPreviousPage": "false",
+ "navigateLastPage": "1",
+ "isFirstPage": "true"
+ }
+}
\ No newline at end of file
diff --git a/public/public/favicon.ico b/public/public/favicon.ico
new file mode 100644
index 0000000..df36fcf
--- /dev/null
+++ b/public/public/favicon.ico
Binary files differ
diff --git a/public/public/roles.json b/public/public/roles.json
new file mode 100644
index 0000000..a13bdc7
--- /dev/null
+++ b/public/public/roles.json
@@ -0,0 +1,80 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "navigatepageNums": [],
+ "startRow": "1",
+ "hasNextPage": "false",
+ "prePage": "0",
+ "nextPage": "0",
+ "endRow": "8",
+ "pageSize": "0",
+ "list": [{
+ "code": "SHGLY",
+ "roleId": "1",
+ "scope": "1",
+ "roleName": "审核管理员",
+ "description": "初始化内置审批角色",
+ "status": "1"
+ }, {
+ "code": "",
+ "roleId": "2",
+ "scope": "1",
+ "roleName": "招商事业部",
+ "description": "",
+ "status": "1"
+ }, {
+ "code": "",
+ "roleId": "3",
+ "scope": "1",
+ "roleName": "互联网部门",
+ "description": "",
+ "status": "1"
+ }, {
+ "code": "",
+ "roleId": "4",
+ "scope": "1",
+ "roleName": "销售部",
+ "description": "",
+ "status": "1"
+ }, {
+ "code": "",
+ "roleId": "5",
+ "scope": "1",
+ "roleName": "战区一",
+ "description": "",
+ "status": "1"
+ }, {
+ "code": "",
+ "roleId": "6",
+ "scope": "1",
+ "roleName": "战区二",
+ "description": "",
+ "status": "1"
+ }, {
+ "code": "",
+ "roleId": "7",
+ "scope": "1",
+ "roleName": "JAVA开发",
+ "description": "",
+ "status": "1"
+ }, {
+ "code": "",
+ "roleId": "8",
+ "scope": "1",
+ "roleName": "测试审批角色",
+ "description": "",
+ "status": "1"
+ }],
+ "pageNum": "1",
+ "navigatePages": "8",
+ "navigateFirstPage": "0",
+ "total": "8",
+ "pages": "0",
+ "size": "8",
+ "isLastPage": "true",
+ "hasPreviousPage": "false",
+ "navigateLastPage": "0",
+ "isFirstPage": "true"
+ }
+}
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index f96b6fe..da724a9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,7 +7,7 @@
declare module '@vue/runtime-core' {
export interface GlobalComponents {
- AddNode: typeof import('./components/addNode.vue')['default']
+ AddNode: typeof import('./components/workFlow/addNode.vue')['default']
AppContainer: typeof import('./components/AppContainer/index.vue')['default']
ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
Auth: typeof import('./components/Auth/index.vue')['default']
@@ -26,7 +26,7 @@
ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
- NodeWrap: typeof import('./components/nodeWrap.vue')['default']
+ NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
NormalTable: typeof import('./components/NormalTable/index.vue')['default']
PageHeader: typeof import('./components/PageHeader/index.vue')['default']
PageMain: typeof import('./components/PageMain/index.vue')['default']
@@ -38,8 +38,10 @@
SearchArea: typeof import('./components/SearchArea/index.vue')['default']
SearchBar: typeof import('./components/SearchBar/index.vue')['default']
SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
- SelectBox: typeof import('./components/selectBox.vue')['default']
- SelectResult: typeof import('./components/selectResult.vue')['default']
+ SelectBox: typeof import('./components/workFlow/selectBox.vue')['default']
+ SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
+ SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
+ SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
SelectTree: typeof import('./components/SelectTree/index.vue')['default']
SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..4f97c80 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -1,10 +1,16 @@
-
-
-
-
-
-
-
-
diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
new file mode 100644
index 0000000..c27f353
--- /dev/null
+++ b/src/components/dialog/dialog.ts
@@ -0,0 +1,15 @@
+// 角色信息
+export interface IroleInfo {
+ id: string
+ name: string // 角色名
+ tips: string // 别名
+ dataScopeType: string // 数据权限类型
+ dataScopeTypeName?: string // 数据权限类型名称
+ pid: string // 父角色
+ deptId: string // 组织机构
+ num: number // 排序
+ version: string // 保留字段
+ children?: []
+ type?: number
+ targetId?: string
+}
diff --git a/src/components/dialog/employeesDialog.vue b/src/components/dialog/employeesDialog.vue
index 61ac040..a52b2ae 100644
--- a/src/components/dialog/employeesDialog.vue
+++ b/src/components/dialog/employeesDialog.vue
@@ -1,8 +1,8 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ {{ scope.row.statusName }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
new file mode 100644
index 0000000..d76462c
--- /dev/null
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+
+
+ 确 定
+
+
+
+
+
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6b2694d..38281d2 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,9 +1,13 @@
-
+
-
+
+
+
+
+ 负责人
+
+
+
+ 指定成员
+
+
+ 指定角色
+
+
+
+
+ {{ item.name }}
-
diff --git a/src/components/selectBox.vue b/src/components/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/selectResult.vue b/src/components/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
-
-
- 已选（{{ total }}）
- 清空
-
-
-
-
- -
-
- {{ item.roleName }}
-
-
-
-
- -
-
- {{ item.departmentName }}
-
-
-
-
- -
-
- {{ item.employeeName }}
-
-
-
-
-
-
-
-
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 2c0ea84..71f6df6 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,197 +1,167 @@
-
-
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index a5b1ff7..2674b98 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,456 +1,150 @@
-
-
-
-
-
-
+
+
+ {{ nodeConfig.nodeName }}
+
+ {{ nodeConfig.type === 1 ? '' : '' }}
+
- {{ nodeConfig.nodeName }}
-
-
-
-
-
- 请选择{{ placeholderList[nodeConfig.type] }}
-
- {{ setApproverStr(nodeConfig) }}
+ {{ nodeConfig.nodeName }}
+
+
+
+
+
+ 请选择{{ defaultText }}
+ {{ showText }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <
+
+
+
+ {{ item.nodeName }}
+ 优先级{{ item.priorityLevel }}
+
+
+
+ >
+
+
+ {{ $func.conditionStr(nodeConfig, index) }}
+
+
+
+
+
+
-
-
- 请选择{{ placeholderList[nodeConfig.type] }}
-
- {{ setApproverStr(nodeConfig) }}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- <
-
-
- {{ item.nodeName }}
- 优先级{{ item.priorityLevel }}
-
-
-
- >
-
-
- {{ conditionStr(item, index) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ approverConfig.nodeName }}
-
-
-
-
-
-
-
-
-
-
- {{ item.label }}
- ({{ item.mark }})
-
-
-
-
-
-
- 连续多级部门主管(按照组织架构，发起人向上的各级主管依次审批)
-
-
-
- 直到发起人向上的
-
-
-
-
-
-
- 直到
-
-
-
-
-
-
-
-
-
- 部门主管
-
-
- 审批角色
-
-
- 指定用户
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 连续多级部门主管
-
-
- 抄送角色
-
-
- 指定用户
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 按组织架构，发起人向上的各级主管依次抄送
-
-
-
- 直到发起人向上的
-
-
-
-
-
-
- 直到
-
-
-
-
-
-
-
-
-
-
-
-
- 其他情况
-
-
-
-
-
-
-
-
- 当
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 添加条件
-
-
-
-
-
-
-
-
-
-
-
-
- 添加条件组
-
-
-
-
-
+
-
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
new file mode 100644
index 0000000..e4f2c55
--- /dev/null
+++ b/src/components/workFlow/selectBox.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
new file mode 100644
index 0000000..21c2de5
--- /dev/null
+++ b/src/components/workFlow/selectResult.vue
@@ -0,0 +1,94 @@
+
+
+
+
+
+ 已选（{{ total }}）
+ 清空
+
+
+
+
+ -
+
+ {{ item.roleName }}
+
+
+
+
+ -
+
+ {{ item.departmentName }}
+
+
+
+
+ -
+
+ {{ item.employeeName }}
+
+
+
+
+
+
+
+
diff --git a/src/components/workFlow/workFlow.vue b/src/components/workFlow/workFlow.vue
deleted file mode 100644
index 439b560..0000000
--- a/src/components/workFlow/workFlow.vue
+++ /dev/null
@@ -1,764 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/css/override-element-ui.css b/src/css/override-element-ui.css
index d772692..4a931e9 100644
--- a/src/css/override-element-ui.css
+++ b/src/css/override-element-ui.css
@@ -47,6 +47,7 @@
.demo-drawer__footer {
padding: 10px 30px !important;
border-top: 1px solid #f2f2f2 !important;
+ margin-top: 32px;
}
.demo-drawer__footer .el-button {
diff --git a/src/css/workflow.css b/src/css/workflow.css
index 26ba1e6..43a0bf8 100644
--- a/src/css/workflow.css
+++ b/src/css/workflow.css
@@ -1099,7 +1099,9 @@
.zoom {
display: flex;
- position: fixed;
+
+ /* position: fixed; */
+ position: relative;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
diff --git a/src/plugins/api.js b/src/plugins/api.js
index b3b9e24..f736077 100644
--- a/src/plugins/api.js
+++ b/src/plugins/api.js
@@ -1,9 +1,3 @@
-/*
- * @Date: 2022-08-25 14:06:59
- * @LastEditors: StavinLi 495727881@qq.com
- * @LastEditTime: 2022-09-21 14:36:58
- * @FilePath: /Workflow-Vue3/src/plugins/api.js
- */
import http from '@/plugins/axios'
const baseUrl = import.meta.env.BASE_URL
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index b0281d9..fc008ff 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -37,6 +37,7 @@
document.cookie = `${name[i]}=''; path=/; expires=${myDate.toGMTString()}`
}
},
+ // 讲负责人的姓名挑出来做成字符串
arrToStr(arr) {
if (arr) {
return arr.map((item) => { return item.name }).toString()
@@ -58,53 +59,79 @@
})
arr.splice(includesIndex, 1)
},
+ // 设置审批节点的文字
setApproverStr(nodeConfig) {
- if (nodeConfig.settype == 1) {
- if (nodeConfig.nodeUserList.length == 1) {
- return nodeConfig.nodeUserList[0].name
+ console.log(nodeConfig)
+ let tempValue = '会签'
+ let strPeople = ' '
+ if (nodeConfig.selectCustomApprovalType === 'huoqian') {
+ tempValue = '或签'
+ }
+ if (nodeConfig.selectCustomApprovalMethod === 'normal') {
+ if (nodeConfig.nodeUserList.length === 1) {
+ strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
}
else if (nodeConfig.nodeUserList.length > 1) {
- if (nodeConfig.examineMode == 1) {
- return this.arrToStr(nodeConfig.nodeUserList)
- }
- else if (nodeConfig.examineMode == 2) {
- return `${nodeConfig.nodeUserList.length}人会签`
- }
+ strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
}
+ return strPeople
}
- else if (nodeConfig.settype == 2) {
- const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
- if (nodeConfig.examineMode == 1) {
- return level
+ else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
+ let strPeople = ' '
+ if (nodeConfig.nodeUserList.length === 1) {
+ strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
}
- else if (nodeConfig.examineMode == 2) {
- return `${level}会签`
+ else if (nodeConfig.nodeUserList.length > 1) {
+ strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
}
+ return strPeople
}
- else if (nodeConfig.settype == 4) {
- if (nodeConfig.selectRange == 1) {
- return '发起人自选'
- }
- else {
- if (nodeConfig.nodeUserList.length > 0) {
- if (nodeConfig.selectRange == 2) {
- return '发起人自选'
- }
- else {
- return `发起人从${nodeConfig.nodeUserList[0].name}中自选`
- }
- }
- else {
- return ''
- }
- }
- }
- else if (nodeConfig.settype == 5) {
- return '发起人自己'
- }
- else if (nodeConfig.settype == 7) {
- return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
- }
+ // if (nodeConfig.settype == 1) {
+ // if (nodeConfig.nodeUserList.length == 1) {
+ // return nodeConfig.nodeUserList[0].name
+ // }
+ // else if (nodeConfig.nodeUserList.length > 1) {
+ // if (nodeConfig.examineMode == 1) {
+ // return this.arrToStr(nodeConfig.nodeUserList)
+ // }
+ // else if (nodeConfig.examineMode == 2) {
+ // return `${nodeConfig.nodeUserList.length}人会签`
+ // }
+ // }
+ // }
+ // 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 == 4) {
+ // if (nodeConfig.selectRange == 1) {
+ // return '发起人自选'
+ // }
+ // else {
+ // if (nodeConfig.nodeUserList.length > 0) {
+ // if (nodeConfig.selectRange == 2) {
+ // return '发起人自选'
+ // }
+ // else {
+ // return `发起人从${nodeConfig.nodeUserList[0].name}中自选`
+ // }
+ // }
+ // else {
+ // return ''
+ // }
+ // }
+ // }
+ // else if (nodeConfig.settype == 5) {
+ // return '发起人自己'
+ // }
+ // else if (nodeConfig.settype == 7) {
+ // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
+ // }
},
dealStr(str, obj) {
const arr = []
@@ -152,7 +179,9 @@
}
},
copyerStr(nodeConfig) {
+ console.log(nodeConfig.nodeUserList)
if (nodeConfig.nodeUserList.length != 0) {
+ console.log('copyerStr')
return this.arrToStr(nodeConfig.nodeUserList)
}
else {
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 956b386..ba7d7a0 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -3,12 +3,12 @@
'workFlow',
{
state: () => ({
- tableId: '',
+ tableId: '', // 审批id
isTried: false,
promoterDrawer: false,
flowPermission1: {},
- approverDrawer: false,
- approverConfig1: {},
+ approverDrawer: false, // 审批抽屉显示隐藏
+ approverConfig1: {}, // 审批设置
copyerDrawer: false,
copyerConfig1: {},
conditionDrawer: false,
@@ -29,9 +29,11 @@
setFlowPermission(payload: object) {
this.flowPermission1 = payload
},
+ // 审批抽屉显隐
setApprover(payload: boolean) {
this.approverDrawer = payload
},
+ // 审批设置
setApproverConfig(payload: object) {
this.approverConfig1 = payload
},
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 534d796..5cd7866 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -133,11 +133,11 @@
-
+
diff --git a/public/conditions.json b/public/conditions.json
new file mode 100644
index 0000000..82eb19d
--- /dev/null
+++ b/public/conditions.json
@@ -0,0 +1,30 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": [
+ {
+ "columnId": "1090",
+ "showType": "1",
+ "showName": "预计采购总费用",
+ "columnName": "planProcurementTotalMoney",
+ "columnType": "Double",
+ "fixedDownBoxValue": ""
+ },
+ {
+ "columnId": "1092",
+ "showType": "3",
+ "showName": "采购类型",
+ "columnName": "procurementType",
+ "columnType": "String",
+ "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+ },
+ {
+ "columnId": "1093",
+ "showType": "1",
+ "showName": "园区面积",
+ "columnName": "parkArea",
+ "columnType": "Double",
+ "fixedDownBoxValue": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git "a/public/conditions\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/conditions\345\255\227\346\256\265\346\263\250\351\207\212.js"
new file mode 100644
index 0000000..58920ac
--- /dev/null
+++ "b/public/conditions\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -0,0 +1,34 @@
+export default {
+ "code": "200",
+ "msg": "操作成功",
+ "data": [
+ {
+ //条件id columnId == 0 为发起人
+ "columnId": "1090",
+ //columnType == "String" && showType == "3"为多选 columnType == "Double"为区间
+ "showType": "1",
+ "showName": "预计采购总费用",
+ //columnName 条件自定义字段
+ "columnName": "planProcurementTotalMoney",
+ "columnType": "Double",
+ //fixedDownBoxValue 匹配 columnType == "String" && showType == "3"时子选项内容
+ "fixedDownBoxValue": ""
+ },
+ {
+ "columnId": "1092",
+ "showType": "3",
+ "showName": "采购类型",
+ "columnName": "procurementType",
+ "columnType": "String",
+ "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+ },
+ {
+ "columnId": "1093",
+ "showType": "1",
+ "showName": "园区面积",
+ "columnName": "parkArea",
+ "columnType": "Double",
+ "fixedDownBoxValue": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git a/public/data.json b/public/data.json
index bbe88b1..632c75c 100644
--- a/public/data.json
+++ b/public/data.json
@@ -136,4 +136,4 @@
"conditionNodes": []
}
}
-}
\ No newline at end of file
+}
diff --git "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
index bb7afeb..c182ad6 100644
--- "a/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
+++ "b/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -58,7 +58,7 @@
"conditionNodes": [{ //条件节点
"nodeName": "条件1",
"type": 3,
- "priorityLevel": 1,
+ "priorityLevel": 1,
"settype": 1,
"selectMode": 0,
"selectRange": 0,
@@ -134,4 +134,4 @@
"conditionNodes": []
}
}
-}
\ No newline at end of file
+}
diff --git a/public/departments.json b/public/departments.json
new file mode 100644
index 0000000..dfd7789
--- /dev/null
+++ b/public/departments.json
@@ -0,0 +1,26 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "childDepartments": [{
+ "departmentKey": "RLXZB_V2",
+ "departmentName": "人力行政部",
+ "id": "150",
+ "parentId": "0",
+ "departmentNames": "人力行政部"
+ }, {
+ "departmentKey": "ZNBN",
+ "departmentName": "法务部",
+ "id": "324",
+ "parentId": "0",
+ "departmentNames": "法务部"
+ }],
+ "employees": [{
+ "id": "53128111",
+ "employeeName": "雅楠",
+ "isLeave": "0",
+ "open": "false"
+ }],
+ "titleDepartments": []
+ }
+}
\ No newline at end of file
diff --git a/public/departments0.json b/public/departments0.json
new file mode 100644
index 0000000..dfd7789
--- /dev/null
+++ b/public/departments0.json
@@ -0,0 +1,26 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "childDepartments": [{
+ "departmentKey": "RLXZB_V2",
+ "departmentName": "人力行政部",
+ "id": "150",
+ "parentId": "0",
+ "departmentNames": "人力行政部"
+ }, {
+ "departmentKey": "ZNBN",
+ "departmentName": "法务部",
+ "id": "324",
+ "parentId": "0",
+ "departmentNames": "法务部"
+ }],
+ "employees": [{
+ "id": "53128111",
+ "employeeName": "雅楠",
+ "isLeave": "0",
+ "open": "false"
+ }],
+ "titleDepartments": []
+ }
+}
\ No newline at end of file
diff --git a/public/departments150.json b/public/departments150.json
new file mode 100644
index 0000000..aa6cc37
--- /dev/null
+++ b/public/departments150.json
@@ -0,0 +1,26 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "childDepartments": [],
+ "employees": [{
+ "id": "53128112",
+ "employeeName": "测试1",
+ "isLeave": "0",
+ "open": "false"
+ },{
+ "id": "53128113",
+ "employeeName": "测试2",
+ "isLeave": "0",
+ "open": "false"
+ }],
+ "titleDepartments": [{
+ "departmentId": "150",
+ "departmentKey": "RLXZB_V2",
+ "departmentName": "人力行政部",
+ "departmentNames": "人力行政部",
+ "id": "150",
+ "parentId": "0"
+ }]
+ }
+}
\ No newline at end of file
diff --git a/public/departments324.json b/public/departments324.json
new file mode 100644
index 0000000..34b8cc2
--- /dev/null
+++ b/public/departments324.json
@@ -0,0 +1,21 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "childDepartments": [],
+ "employees": [{
+ "id": "53128133",
+ "employeeName": "测试3",
+ "isLeave": "0",
+ "open": "false"
+ }],
+ "titleDepartments": [{
+ "departmentId": "324",
+ "departmentKey": "ZNBN",
+ "departmentName": "法务部",
+ "departmentNames": "法务部",
+ "id": "324",
+ "parentId": "0"
+ }]
+ }
+}
\ No newline at end of file
diff --git a/public/employees.json b/public/employees.json
new file mode 100644
index 0000000..227a989
--- /dev/null
+++ b/public/employees.json
@@ -0,0 +1,42 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "navigatepageNums": ["1"],
+ "startRow": "1",
+ "hasNextPage": "false",
+ "prePage": "0",
+ "nextPage": "0",
+ "endRow": "3",
+ "pageSize": "30",
+ "list": [{
+ "departmentName": "招商事业部",
+ "employeeName": "111111",
+ "employeeDepartmentId": "121",
+ "id": "5312",
+ "departmentNames": "招商事业部"
+ }, {
+ "departmentName": "111",
+ "employeeName": "东亚-测试",
+ "employeeDepartmentId": "139",
+ "id": "2515638",
+ "departmentNames": "111"
+ }, {
+ "departmentName": "招商事业部",
+ "employeeName": "1111",
+ "employeeDepartmentId": "121",
+ "id": "2515746",
+ "departmentNames": "招商事业部"
+ }],
+ "pageNum": "1",
+ "navigatePages": "8",
+ "navigateFirstPage": "1",
+ "total": "3",
+ "pages": "1",
+ "size": "3",
+ "isLastPage": "true",
+ "hasPreviousPage": "false",
+ "navigateLastPage": "1",
+ "isFirstPage": "true"
+ }
+}
\ No newline at end of file
diff --git a/public/public/conditions.json b/public/public/conditions.json
new file mode 100644
index 0000000..82eb19d
--- /dev/null
+++ b/public/public/conditions.json
@@ -0,0 +1,30 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": [
+ {
+ "columnId": "1090",
+ "showType": "1",
+ "showName": "预计采购总费用",
+ "columnName": "planProcurementTotalMoney",
+ "columnType": "Double",
+ "fixedDownBoxValue": ""
+ },
+ {
+ "columnId": "1092",
+ "showType": "3",
+ "showName": "采购类型",
+ "columnName": "procurementType",
+ "columnType": "String",
+ "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+ },
+ {
+ "columnId": "1093",
+ "showType": "1",
+ "showName": "园区面积",
+ "columnName": "parkArea",
+ "columnType": "Double",
+ "fixedDownBoxValue": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git "a/public/public/conditions\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/public/conditions\345\255\227\346\256\265\346\263\250\351\207\212.js"
new file mode 100644
index 0000000..58920ac
--- /dev/null
+++ "b/public/public/conditions\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -0,0 +1,34 @@
+export default {
+ "code": "200",
+ "msg": "操作成功",
+ "data": [
+ {
+ //条件id columnId == 0 为发起人
+ "columnId": "1090",
+ //columnType == "String" && showType == "3"为多选 columnType == "Double"为区间
+ "showType": "1",
+ "showName": "预计采购总费用",
+ //columnName 条件自定义字段
+ "columnName": "planProcurementTotalMoney",
+ "columnType": "Double",
+ //fixedDownBoxValue 匹配 columnType == "String" && showType == "3"时子选项内容
+ "fixedDownBoxValue": ""
+ },
+ {
+ "columnId": "1092",
+ "showType": "3",
+ "showName": "采购类型",
+ "columnName": "procurementType",
+ "columnType": "String",
+ "fixedDownBoxValue": "{\"1\":{\"key\":\"1\",\"value\":\"新开园区集中采购\",\"column\":\"\",\"type\":\"1\"}}"
+ },
+ {
+ "columnId": "1093",
+ "showType": "1",
+ "showName": "园区面积",
+ "columnName": "parkArea",
+ "columnType": "Double",
+ "fixedDownBoxValue": ""
+ }
+ ]
+}
\ No newline at end of file
diff --git a/public/public/data.json b/public/public/data.json
new file mode 100644
index 0000000..bbe88b1
--- /dev/null
+++ b/public/public/data.json
@@ -0,0 +1,139 @@
+{
+ "code": "200",
+ "msg": "success",
+ "data": {
+ "tableId": 1,
+ "workFlowDef": {
+ "name": "合同审批"
+ },
+ "directorMaxLevel": 4,
+ "flowPermission": [],
+ "nodeConfig": {
+ "nodeName": "发起人",
+ "type": 0,
+ "priorityLevel": "",
+ "settype": "",
+ "selectMode": "",
+ "selectRange": "",
+ "directorLevel": "",
+ "examineMode": "",
+ "noHanderAction": "",
+ "examineEndDirectorLevel": "",
+ "ccSelfSelectFlag": "",
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": {
+ "nodeName": "审核人",
+ "error": false,
+ "type": 1,
+ "settype": 2,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": {
+ "nodeName": "路由",
+ "type": 4,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": {
+ "nodeName": "抄送人",
+ "type": 2,
+ "ccSelfSelectFlag": 1,
+ "childNode": null,
+ "nodeUserList": [],
+ "error": false
+ },
+ "conditionNodes": [{
+ "nodeName": "条件1",
+ "type": 3,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [{
+ "columnId": 0,
+ "type": 1,
+ "conditionEn": "",
+ "conditionCn": "",
+ "optType": "",
+ "zdy1": "",
+ "zdy2": "",
+ "opt1": "",
+ "opt2": "",
+ "columnDbname": "",
+ "columnType": "",
+ "showType": "",
+ "showName": "",
+ "fixedDownBoxValue": ""
+ }],
+ "nodeUserList": [{
+ "targetId": 85,
+ "type": 1,
+ "name": "天旭"
+ }],
+ "childNode": {
+ "nodeName": "审核人",
+ "type": 1,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [{
+ "targetId": 2515744,
+ "type": 1,
+ "name": "哈哈哈哈"
+ }],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ },
+ "conditionNodes": [],
+ "error": false
+ }, {
+ "nodeName": "条件2",
+ "type": 3,
+ "priorityLevel": 2,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ }]
+ },
+ "nodeUserList": []
+ },
+ "conditionNodes": []
+ }
+ }
+}
\ No newline at end of file
diff --git "a/public/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js" "b/public/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
new file mode 100644
index 0000000..bb7afeb
--- /dev/null
+++ "b/public/public/data\345\255\227\346\256\265\346\263\250\351\207\212.js"
@@ -0,0 +1,137 @@
+export default {
+ "code": "200",
+ "msg": "success",
+ "data": {
+ "tableId": 1,//审批id
+ "workFlowDef": {
+ "name": "合同审批",//审批名称
+ },
+ "directorMaxLevel": 4,//审批主管最大层级
+ "flowPermission": [],//发起人
+ "nodeConfig": {
+ "nodeName": "发起人",//节点名称
+ "type": 0,// 0 发起人 1审批 2抄送 3条件 4路由
+ "priorityLevel": "",// 条件优先级
+ "settype": "",// 审批人设置 1指定成员 2主管 4发起人自选 5发起人自己 7连续多级主管
+ "selectMode": "", //审批人数 1选一个人 2选多个人
+ "selectRange": "", //选择范围 1.全公司 2指定成员 2指定角色
+ "directorLevel": "", //审批终点 最高层主管数
+ "examineMode": "", //多人审批时采用的审批方式 1依次审批 2会签
+ "noHanderAction": "",//审批人为空时 1自动审批通过/不允许发起 2转交给审核管理员
+ "examineEndDirectorLevel": "", //审批终点 第n层主管
+ "ccSelfSelectFlag": "", //允许发起人自选抄送人
+ "conditionList": [], //当审批单同时满足以下条件时进入此流程
+ "nodeUserList": [], //操作人
+ "childNode": {
+ "nodeName": "审核人",
+ "error": false, //当前审批是否通过校验
+ "type": 1,
+ "settype": 2,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": {
+ "nodeName": "路由",
+ "type": 4,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": {
+ "nodeName": "抄送人",
+ "type": 2,
+ "ccSelfSelectFlag": 1,
+ "childNode": null,
+ "nodeUserList": [],
+ "error": false
+ },
+ "conditionNodes": [{ //条件节点
+ "nodeName": "条件1",
+ "type": 3,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [{ //当前条件
+ "columnId": 0, //发起人
+ "type": 1, //1 发起人 2其他
+ "optType": "", //["", "<", ">", "≤", "=", "≥"][optType]
+ "zdy1": "",//左侧自定义内容
+ "zdy2": "",//右侧自定义内容
+ "opt1": "",//左侧符号 < ≤
+ "opt2": "",//右侧符号 < ≤
+ "columnDbname": "",//条件字段名称
+ "columnType": "",//条件字段类型
+ "showType": "",//3多选 其他
+ "showName": "",//展示名
+ "fixedDownBoxValue": ""//多选数组
+ }],
+ "nodeUserList": [{
+ "targetId": 85,
+ "type": 1,
+ "name": "天旭"
+ }],
+ "childNode": {
+ "nodeName": "审核人",
+ "type": 1,
+ "priorityLevel": 1,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [{
+ "targetId": 2515744,
+ "type": 1,
+ "name": "哈哈哈哈"
+ }],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ },
+ "conditionNodes": [],
+ "error": false
+ }, {
+ "nodeName": "条件2",
+ "type": 3,
+ "priorityLevel": 2,
+ "settype": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": 1,
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 1,
+ "ccSelfSelectFlag": 1,
+ "conditionList": [],
+ "nodeUserList": [],
+ "childNode": null,
+ "conditionNodes": [],
+ "error": false
+ }]
+ },
+ "nodeUserList": []
+ },
+ "conditionNodes": []
+ }
+ }
+}
\ No newline at end of file
diff --git a/public/public/departments.json b/public/public/departments.json
new file mode 100644
index 0000000..dfd7789
--- /dev/null
+++ b/public/public/departments.json
@@ -0,0 +1,26 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "childDepartments": [{
+ "departmentKey": "RLXZB_V2",
+ "departmentName": "人力行政部",
+ "id": "150",
+ "parentId": "0",
+ "departmentNames": "人力行政部"
+ }, {
+ "departmentKey": "ZNBN",
+ "departmentName": "法务部",
+ "id": "324",
+ "parentId": "0",
+ "departmentNames": "法务部"
+ }],
+ "employees": [{
+ "id": "53128111",
+ "employeeName": "雅楠",
+ "isLeave": "0",
+ "open": "false"
+ }],
+ "titleDepartments": []
+ }
+}
\ No newline at end of file
diff --git a/public/public/departments0.json b/public/public/departments0.json
new file mode 100644
index 0000000..dfd7789
--- /dev/null
+++ b/public/public/departments0.json
@@ -0,0 +1,26 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "childDepartments": [{
+ "departmentKey": "RLXZB_V2",
+ "departmentName": "人力行政部",
+ "id": "150",
+ "parentId": "0",
+ "departmentNames": "人力行政部"
+ }, {
+ "departmentKey": "ZNBN",
+ "departmentName": "法务部",
+ "id": "324",
+ "parentId": "0",
+ "departmentNames": "法务部"
+ }],
+ "employees": [{
+ "id": "53128111",
+ "employeeName": "雅楠",
+ "isLeave": "0",
+ "open": "false"
+ }],
+ "titleDepartments": []
+ }
+}
\ No newline at end of file
diff --git a/public/public/departments150.json b/public/public/departments150.json
new file mode 100644
index 0000000..aa6cc37
--- /dev/null
+++ b/public/public/departments150.json
@@ -0,0 +1,26 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "childDepartments": [],
+ "employees": [{
+ "id": "53128112",
+ "employeeName": "测试1",
+ "isLeave": "0",
+ "open": "false"
+ },{
+ "id": "53128113",
+ "employeeName": "测试2",
+ "isLeave": "0",
+ "open": "false"
+ }],
+ "titleDepartments": [{
+ "departmentId": "150",
+ "departmentKey": "RLXZB_V2",
+ "departmentName": "人力行政部",
+ "departmentNames": "人力行政部",
+ "id": "150",
+ "parentId": "0"
+ }]
+ }
+}
\ No newline at end of file
diff --git a/public/public/departments324.json b/public/public/departments324.json
new file mode 100644
index 0000000..34b8cc2
--- /dev/null
+++ b/public/public/departments324.json
@@ -0,0 +1,21 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "childDepartments": [],
+ "employees": [{
+ "id": "53128133",
+ "employeeName": "测试3",
+ "isLeave": "0",
+ "open": "false"
+ }],
+ "titleDepartments": [{
+ "departmentId": "324",
+ "departmentKey": "ZNBN",
+ "departmentName": "法务部",
+ "departmentNames": "法务部",
+ "id": "324",
+ "parentId": "0"
+ }]
+ }
+}
\ No newline at end of file
diff --git a/public/public/employees.json b/public/public/employees.json
new file mode 100644
index 0000000..227a989
--- /dev/null
+++ b/public/public/employees.json
@@ -0,0 +1,42 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "navigatepageNums": ["1"],
+ "startRow": "1",
+ "hasNextPage": "false",
+ "prePage": "0",
+ "nextPage": "0",
+ "endRow": "3",
+ "pageSize": "30",
+ "list": [{
+ "departmentName": "招商事业部",
+ "employeeName": "111111",
+ "employeeDepartmentId": "121",
+ "id": "5312",
+ "departmentNames": "招商事业部"
+ }, {
+ "departmentName": "111",
+ "employeeName": "东亚-测试",
+ "employeeDepartmentId": "139",
+ "id": "2515638",
+ "departmentNames": "111"
+ }, {
+ "departmentName": "招商事业部",
+ "employeeName": "1111",
+ "employeeDepartmentId": "121",
+ "id": "2515746",
+ "departmentNames": "招商事业部"
+ }],
+ "pageNum": "1",
+ "navigatePages": "8",
+ "navigateFirstPage": "1",
+ "total": "3",
+ "pages": "1",
+ "size": "3",
+ "isLastPage": "true",
+ "hasPreviousPage": "false",
+ "navigateLastPage": "1",
+ "isFirstPage": "true"
+ }
+}
\ No newline at end of file
diff --git a/public/public/favicon.ico b/public/public/favicon.ico
new file mode 100644
index 0000000..df36fcf
--- /dev/null
+++ b/public/public/favicon.ico
Binary files differ
diff --git a/public/public/roles.json b/public/public/roles.json
new file mode 100644
index 0000000..a13bdc7
--- /dev/null
+++ b/public/public/roles.json
@@ -0,0 +1,80 @@
+{
+ "code": "200",
+ "msg": "操作成功",
+ "data": {
+ "navigatepageNums": [],
+ "startRow": "1",
+ "hasNextPage": "false",
+ "prePage": "0",
+ "nextPage": "0",
+ "endRow": "8",
+ "pageSize": "0",
+ "list": [{
+ "code": "SHGLY",
+ "roleId": "1",
+ "scope": "1",
+ "roleName": "审核管理员",
+ "description": "初始化内置审批角色",
+ "status": "1"
+ }, {
+ "code": "",
+ "roleId": "2",
+ "scope": "1",
+ "roleName": "招商事业部",
+ "description": "",
+ "status": "1"
+ }, {
+ "code": "",
+ "roleId": "3",
+ "scope": "1",
+ "roleName": "互联网部门",
+ "description": "",
+ "status": "1"
+ }, {
+ "code": "",
+ "roleId": "4",
+ "scope": "1",
+ "roleName": "销售部",
+ "description": "",
+ "status": "1"
+ }, {
+ "code": "",
+ "roleId": "5",
+ "scope": "1",
+ "roleName": "战区一",
+ "description": "",
+ "status": "1"
+ }, {
+ "code": "",
+ "roleId": "6",
+ "scope": "1",
+ "roleName": "战区二",
+ "description": "",
+ "status": "1"
+ }, {
+ "code": "",
+ "roleId": "7",
+ "scope": "1",
+ "roleName": "JAVA开发",
+ "description": "",
+ "status": "1"
+ }, {
+ "code": "",
+ "roleId": "8",
+ "scope": "1",
+ "roleName": "测试审批角色",
+ "description": "",
+ "status": "1"
+ }],
+ "pageNum": "1",
+ "navigatePages": "8",
+ "navigateFirstPage": "0",
+ "total": "8",
+ "pages": "0",
+ "size": "8",
+ "isLastPage": "true",
+ "hasPreviousPage": "false",
+ "navigateLastPage": "0",
+ "isFirstPage": "true"
+ }
+}
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index f96b6fe..da724a9 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -7,7 +7,7 @@
declare module '@vue/runtime-core' {
export interface GlobalComponents {
- AddNode: typeof import('./components/addNode.vue')['default']
+ AddNode: typeof import('./components/workFlow/addNode.vue')['default']
AppContainer: typeof import('./components/AppContainer/index.vue')['default']
ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
Auth: typeof import('./components/Auth/index.vue')['default']
@@ -26,7 +26,7 @@
ImagePreview: typeof import('./components/ImagePreview/index.vue')['default']
ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default']
ImageUpload: typeof import('./components/ImageUpload/index.vue')['default']
- NodeWrap: typeof import('./components/nodeWrap.vue')['default']
+ NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default']
NormalTable: typeof import('./components/NormalTable/index.vue')['default']
PageHeader: typeof import('./components/PageHeader/index.vue')['default']
PageMain: typeof import('./components/PageMain/index.vue')['default']
@@ -38,8 +38,10 @@
SearchArea: typeof import('./components/SearchArea/index.vue')['default']
SearchBar: typeof import('./components/SearchBar/index.vue')['default']
SearchItem: typeof import('./components/SearchArea/SearchItem.vue')['default']
- SelectBox: typeof import('./components/selectBox.vue')['default']
- SelectResult: typeof import('./components/selectResult.vue')['default']
+ SelectBox: typeof import('./components/workFlow/selectBox.vue')['default']
+ SelectEmployeesDialog: typeof import('./components/dialog/selectEmployeesDialog.vue')['default']
+ SelectResult: typeof import('./components/workFlow/selectResult.vue')['default']
+ SelectRoleDialog: typeof import('./components/dialog/selectRoleDialog.vue')['default']
SelectTree: typeof import('./components/SelectTree/index.vue')['default']
SvgIcon: typeof import('./components/SvgIcon/index.vue')['default']
SystemInfo: typeof import('./components/SystemInfo/index.vue')['default']
diff --git a/src/components/NormalTable/index.vue b/src/components/NormalTable/index.vue
index a751eca..4f97c80 100644
--- a/src/components/NormalTable/index.vue
+++ b/src/components/NormalTable/index.vue
@@ -1,10 +1,16 @@
-
-
-
-
-
-
-
-
diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
new file mode 100644
index 0000000..c27f353
--- /dev/null
+++ b/src/components/dialog/dialog.ts
@@ -0,0 +1,15 @@
+// 角色信息
+export interface IroleInfo {
+ id: string
+ name: string // 角色名
+ tips: string // 别名
+ dataScopeType: string // 数据权限类型
+ dataScopeTypeName?: string // 数据权限类型名称
+ pid: string // 父角色
+ deptId: string // 组织机构
+ num: number // 排序
+ version: string // 保留字段
+ children?: []
+ type?: number
+ targetId?: string
+}
diff --git a/src/components/dialog/employeesDialog.vue b/src/components/dialog/employeesDialog.vue
index 61ac040..a52b2ae 100644
--- a/src/components/dialog/employeesDialog.vue
+++ b/src/components/dialog/employeesDialog.vue
@@ -1,8 +1,8 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+
+
+
+
+
+
+
+ {{ scope.row.statusName }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/dialog/selectRoleDialog.vue b/src/components/dialog/selectRoleDialog.vue
new file mode 100644
index 0000000..d76462c
--- /dev/null
+++ b/src/components/dialog/selectRoleDialog.vue
@@ -0,0 +1,145 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取 消
+
+
+ 确 定
+
+
+
+
+
+
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index 6b2694d..38281d2 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -1,9 +1,13 @@
-
+
-
+
+
+
+
+ 负责人
+
+
+
+ 指定成员
+
+
+ 指定角色
+
+
+
+
+ {{ item.name }}
-
diff --git a/src/components/selectBox.vue b/src/components/selectBox.vue
deleted file mode 100644
index e4f2c55..0000000
--- a/src/components/selectBox.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/components/selectResult.vue b/src/components/selectResult.vue
deleted file mode 100644
index 21c2de5..0000000
--- a/src/components/selectResult.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-
-
-
-
-
- 已选（{{ total }}）
- 清空
-
-
-
-
- -
-
- {{ item.roleName }}
-
-
-
-
- -
-
- {{ item.departmentName }}
-
-
-
-
- -
-
- {{ item.employeeName }}
-
-
-
-
-
-
-
-
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 2c0ea84..71f6df6 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -1,197 +1,167 @@
-
-
diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue
index a5b1ff7..2674b98 100644
--- a/src/components/workFlow/nodeWrap.vue
+++ b/src/components/workFlow/nodeWrap.vue
@@ -1,456 +1,150 @@
-
-
-
-
-
-
+
+
+ {{ nodeConfig.nodeName }}
+
+ {{ nodeConfig.type === 1 ? '' : '' }}
+
- {{ nodeConfig.nodeName }}
-
-
-
-
-
- 请选择{{ placeholderList[nodeConfig.type] }}
-
- {{ setApproverStr(nodeConfig) }}
+ {{ nodeConfig.nodeName }}
+
+
+
+
+
+ 请选择{{ defaultText }}
+ {{ showText }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <
+
+
+
+ {{ item.nodeName }}
+ 优先级{{ item.priorityLevel }}
+
+
+
+ >
+
+
+ {{ $func.conditionStr(nodeConfig, index) }}
+
+
+
+
+
+
-
-
- 请选择{{ placeholderList[nodeConfig.type] }}
-
- {{ setApproverStr(nodeConfig) }}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
- <
-
-
- {{ item.nodeName }}
- 优先级{{ item.priorityLevel }}
-
-
-
- >
-
-
- {{ conditionStr(item, index) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ approverConfig.nodeName }}
-
-
-
-
-
-
-
-
-
-
- {{ item.label }}
- ({{ item.mark }})
-
-
-
-
-
-
- 连续多级部门主管(按照组织架构，发起人向上的各级主管依次审批)
-
-
-
- 直到发起人向上的
-
-
-
-
-
-
- 直到
-
-
-
-
-
-
-
-
-
- 部门主管
-
-
- 审批角色
-
-
- 指定用户
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 连续多级部门主管
-
-
- 抄送角色
-
-
- 指定用户
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 按组织架构，发起人向上的各级主管依次抄送
-
-
-
- 直到发起人向上的
-
-
-
-
-
-
- 直到
-
-
-
-
-
-
-
-
-
-
-
-
- 其他情况
-
-
-
-
-
-
-
-
- 当
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 添加条件
-
-
-
-
-
-
-
-
-
-
-
-
- 添加条件组
-
-
-
-
-
+
-
diff --git a/src/components/workFlow/selectBox.vue b/src/components/workFlow/selectBox.vue
new file mode 100644
index 0000000..e4f2c55
--- /dev/null
+++ b/src/components/workFlow/selectBox.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
diff --git a/src/components/workFlow/selectResult.vue b/src/components/workFlow/selectResult.vue
new file mode 100644
index 0000000..21c2de5
--- /dev/null
+++ b/src/components/workFlow/selectResult.vue
@@ -0,0 +1,94 @@
+
+
+
+
+
+ 已选（{{ total }}）
+ 清空
+
+
+
+
+ -
+
+ {{ item.roleName }}
+
+
+
+
+ -
+
+ {{ item.departmentName }}
+
+
+
+
+ -
+
+ {{ item.employeeName }}
+
+
+
+
+
+
+
+
diff --git a/src/components/workFlow/workFlow.vue b/src/components/workFlow/workFlow.vue
deleted file mode 100644
index 439b560..0000000
--- a/src/components/workFlow/workFlow.vue
+++ /dev/null
@@ -1,764 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/css/override-element-ui.css b/src/css/override-element-ui.css
index d772692..4a931e9 100644
--- a/src/css/override-element-ui.css
+++ b/src/css/override-element-ui.css
@@ -47,6 +47,7 @@
.demo-drawer__footer {
padding: 10px 30px !important;
border-top: 1px solid #f2f2f2 !important;
+ margin-top: 32px;
}
.demo-drawer__footer .el-button {
diff --git a/src/css/workflow.css b/src/css/workflow.css
index 26ba1e6..43a0bf8 100644
--- a/src/css/workflow.css
+++ b/src/css/workflow.css
@@ -1099,7 +1099,9 @@
.zoom {
display: flex;
- position: fixed;
+
+ /* position: fixed; */
+ position: relative;
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
diff --git a/src/plugins/api.js b/src/plugins/api.js
index b3b9e24..f736077 100644
--- a/src/plugins/api.js
+++ b/src/plugins/api.js
@@ -1,9 +1,3 @@
-/*
- * @Date: 2022-08-25 14:06:59
- * @LastEditors: StavinLi 495727881@qq.com
- * @LastEditTime: 2022-09-21 14:36:58
- * @FilePath: /Workflow-Vue3/src/plugins/api.js
- */
import http from '@/plugins/axios'
const baseUrl = import.meta.env.BASE_URL
diff --git a/src/plugins/preload.js b/src/plugins/preload.js
index b0281d9..fc008ff 100644
--- a/src/plugins/preload.js
+++ b/src/plugins/preload.js
@@ -37,6 +37,7 @@
document.cookie = `${name[i]}=''; path=/; expires=${myDate.toGMTString()}`
}
},
+ // 讲负责人的姓名挑出来做成字符串
arrToStr(arr) {
if (arr) {
return arr.map((item) => { return item.name }).toString()
@@ -58,53 +59,79 @@
})
arr.splice(includesIndex, 1)
},
+ // 设置审批节点的文字
setApproverStr(nodeConfig) {
- if (nodeConfig.settype == 1) {
- if (nodeConfig.nodeUserList.length == 1) {
- return nodeConfig.nodeUserList[0].name
+ console.log(nodeConfig)
+ let tempValue = '会签'
+ let strPeople = ' '
+ if (nodeConfig.selectCustomApprovalType === 'huoqian') {
+ tempValue = '或签'
+ }
+ if (nodeConfig.selectCustomApprovalMethod === 'normal') {
+ if (nodeConfig.nodeUserList.length === 1) {
+ strPeople = `由${nodeConfig.nodeUserList[0].name}人负责`
}
else if (nodeConfig.nodeUserList.length > 1) {
- if (nodeConfig.examineMode == 1) {
- return this.arrToStr(nodeConfig.nodeUserList)
- }
- else if (nodeConfig.examineMode == 2) {
- return `${nodeConfig.nodeUserList.length}人会签`
- }
+ strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（${tempValue}）`
}
+ return strPeople
}
- else if (nodeConfig.settype == 2) {
- const level = nodeConfig.directorLevel == 1 ? '直接主管' : `第${nodeConfig.directorLevel}级主管`
- if (nodeConfig.examineMode == 1) {
- return level
+ else if (nodeConfig.selectCustomApprovalMethod === 'stepBYstep') {
+ let strPeople = ' '
+ if (nodeConfig.nodeUserList.length === 1) {
+ strPeople = `由${nodeConfig.nodeUserList[0].name}人负责(逐级审批)`
}
- else if (nodeConfig.examineMode == 2) {
- return `${level}会签`
+ else if (nodeConfig.nodeUserList.length > 1) {
+ strPeople = `由${this.arrToStr(nodeConfig.nodeUserList)}人负责（逐级审批-${tempValue}）`
}
+ return strPeople
}
- else if (nodeConfig.settype == 4) {
- if (nodeConfig.selectRange == 1) {
- return '发起人自选'
- }
- else {
- if (nodeConfig.nodeUserList.length > 0) {
- if (nodeConfig.selectRange == 2) {
- return '发起人自选'
- }
- else {
- return `发起人从${nodeConfig.nodeUserList[0].name}中自选`
- }
- }
- else {
- return ''
- }
- }
- }
- else if (nodeConfig.settype == 5) {
- return '发起人自己'
- }
- else if (nodeConfig.settype == 7) {
- return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
- }
+ // if (nodeConfig.settype == 1) {
+ // if (nodeConfig.nodeUserList.length == 1) {
+ // return nodeConfig.nodeUserList[0].name
+ // }
+ // else if (nodeConfig.nodeUserList.length > 1) {
+ // if (nodeConfig.examineMode == 1) {
+ // return this.arrToStr(nodeConfig.nodeUserList)
+ // }
+ // else if (nodeConfig.examineMode == 2) {
+ // return `${nodeConfig.nodeUserList.length}人会签`
+ // }
+ // }
+ // }
+ // 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 == 4) {
+ // if (nodeConfig.selectRange == 1) {
+ // return '发起人自选'
+ // }
+ // else {
+ // if (nodeConfig.nodeUserList.length > 0) {
+ // if (nodeConfig.selectRange == 2) {
+ // return '发起人自选'
+ // }
+ // else {
+ // return `发起人从${nodeConfig.nodeUserList[0].name}中自选`
+ // }
+ // }
+ // else {
+ // return ''
+ // }
+ // }
+ // }
+ // else if (nodeConfig.settype == 5) {
+ // return '发起人自己'
+ // }
+ // else if (nodeConfig.settype == 7) {
+ // return `从直接主管到通讯录中级别最高的第${nodeConfig.examineEndDirectorLevel}个层级主管`
+ // }
},
dealStr(str, obj) {
const arr = []
@@ -152,7 +179,9 @@
}
},
copyerStr(nodeConfig) {
+ console.log(nodeConfig.nodeUserList)
if (nodeConfig.nodeUserList.length != 0) {
+ console.log('copyerStr')
return this.arrToStr(nodeConfig.nodeUserList)
}
else {
diff --git a/src/store/modules/workFlow.ts b/src/store/modules/workFlow.ts
index 956b386..ba7d7a0 100644
--- a/src/store/modules/workFlow.ts
+++ b/src/store/modules/workFlow.ts
@@ -3,12 +3,12 @@
'workFlow',
{
state: () => ({
- tableId: '',
+ tableId: '', // 审批id
isTried: false,
promoterDrawer: false,
flowPermission1: {},
- approverDrawer: false,
- approverConfig1: {},
+ approverDrawer: false, // 审批抽屉显示隐藏
+ approverConfig1: {}, // 审批设置
copyerDrawer: false,
copyerConfig1: {},
conditionDrawer: false,
@@ -29,9 +29,11 @@
setFlowPermission(payload: object) {
this.flowPermission1 = payload
},
+ // 审批抽屉显隐
setApprover(payload: boolean) {
this.approverDrawer = payload
},
+ // 审批设置
setApproverConfig(payload: object) {
this.approverConfig1 = payload
},
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 534d796..5cd7866 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -133,11 +133,11 @@
-
+
diff --git a/src/views/system/process/process.vue b/src/views/system/process/process.vue
index f248fe7..040ad8f 100644
--- a/src/views/system/process/process.vue
+++ b/src/views/system/process/process.vue
@@ -192,33 +192,35 @@
-
-
-
-
-
- 编辑
-
-
- 详情
-
-
- 废止
-
-
- 删除
-
-
-
-
-
+
+
+
+
+
+
+ 编辑
+
+
+ 详情
+
+
+ 废止
+
+
+ 删除
+
+
+
+
+
+
@@ -232,6 +234,17 @@
+
+
+ 
+ 
+