diff --git a/departments150.json b/departments150.json
new file mode 100644
index 0000000..aa6cc37
--- /dev/null
+++ b/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/departments150.json b/departments150.json
new file mode 100644
index 0000000..aa6cc37
--- /dev/null
+++ b/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/departments150.json b/public/departments150.json
deleted file mode 100644
index aa6cc37..0000000
--- a/public/departments150.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "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/departments150.json b/departments150.json
new file mode 100644
index 0000000..aa6cc37
--- /dev/null
+++ b/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/departments150.json b/public/departments150.json
deleted file mode 100644
index aa6cc37..0000000
--- a/public/departments150.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "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/myData.json b/public/myData.json
new file mode 100644
index 0000000..c594e52
--- /dev/null
+++ b/public/myData.json
@@ -0,0 +1,64 @@
+export default {
+ "_value": {
+ "formId": "555", //表单id
+ "formName": "555", //表单名称
+ "formDesc": "555", //表单描述
+ "formContent": "555", //表单内容
+ "tableId": 1,
+ "workFlowDef": {
+ "flowKey": "", //流程定义key，更新流程定义使用（更新必传）
+ "directorId": "1", //传入用户id，代表流程负责人
+ "name": "1228测试"
+ },
+ "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": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": "3",
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": {
+ "nodeName": "审核人",
+ "error": false,
+ "type": 1,
+ "settype": 5,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": "",
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": null,
+ "nodeUserList": []
+ },
+ "nodeUserList": [
+ {
+ "type": 1,
+ "targetId": "1",
+ "name": "雅楠"
+ },
+ {
+ "type": 1,
+ "targetId": "2",
+ "nam
+}
diff --git a/departments150.json b/departments150.json
new file mode 100644
index 0000000..aa6cc37
--- /dev/null
+++ b/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/departments150.json b/public/departments150.json
deleted file mode 100644
index aa6cc37..0000000
--- a/public/departments150.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "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/myData.json b/public/myData.json
new file mode 100644
index 0000000..c594e52
--- /dev/null
+++ b/public/myData.json
@@ -0,0 +1,64 @@
+export default {
+ "_value": {
+ "formId": "555", //表单id
+ "formName": "555", //表单名称
+ "formDesc": "555", //表单描述
+ "formContent": "555", //表单内容
+ "tableId": 1,
+ "workFlowDef": {
+ "flowKey": "", //流程定义key，更新流程定义使用（更新必传）
+ "directorId": "1", //传入用户id，代表流程负责人
+ "name": "1228测试"
+ },
+ "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": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": "3",
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": {
+ "nodeName": "审核人",
+ "error": false,
+ "type": 1,
+ "settype": 5,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": "",
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": null,
+ "nodeUserList": []
+ },
+ "nodeUserList": [
+ {
+ "type": 1,
+ "targetId": "1",
+ "name": "雅楠"
+ },
+ {
+ "type": 1,
+ "targetId": "2",
+ "nam
+}
diff --git a/src/api/system/process.ts b/src/api/system/process.ts
index b768187..2ad4b03 100644
--- a/src/api/system/process.ts
+++ b/src/api/system/process.ts
@@ -44,7 +44,7 @@
// 加载流程定义
export function unloadProcess(params: Object) {
const param = {
- jsonObject: params,
+ _value: params,
}
return request({
url: `${prefix}/jsonToBpmn`,
@@ -52,3 +52,15 @@
data: param,
})
}
+
+// 流程定义编辑
+export function efitProcess(params: Object) {
+ const param = {
+ _value: params,
+ }
+ return request({
+ url: `${prefix}/update`,
+ method: 'post',
+ data: param,
+ })
+}
diff --git a/departments150.json b/departments150.json
new file mode 100644
index 0000000..aa6cc37
--- /dev/null
+++ b/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/departments150.json b/public/departments150.json
deleted file mode 100644
index aa6cc37..0000000
--- a/public/departments150.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "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/myData.json b/public/myData.json
new file mode 100644
index 0000000..c594e52
--- /dev/null
+++ b/public/myData.json
@@ -0,0 +1,64 @@
+export default {
+ "_value": {
+ "formId": "555", //表单id
+ "formName": "555", //表单名称
+ "formDesc": "555", //表单描述
+ "formContent": "555", //表单内容
+ "tableId": 1,
+ "workFlowDef": {
+ "flowKey": "", //流程定义key，更新流程定义使用（更新必传）
+ "directorId": "1", //传入用户id，代表流程负责人
+ "name": "1228测试"
+ },
+ "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": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": "3",
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": {
+ "nodeName": "审核人",
+ "error": false,
+ "type": 1,
+ "settype": 5,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": "",
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": null,
+ "nodeUserList": []
+ },
+ "nodeUserList": [
+ {
+ "type": 1,
+ "targetId": "1",
+ "name": "雅楠"
+ },
+ {
+ "type": 1,
+ "targetId": "2",
+ "nam
+}
diff --git a/src/api/system/process.ts b/src/api/system/process.ts
index b768187..2ad4b03 100644
--- a/src/api/system/process.ts
+++ b/src/api/system/process.ts
@@ -44,7 +44,7 @@
// 加载流程定义
export function unloadProcess(params: Object) {
const param = {
- jsonObject: params,
+ _value: params,
}
return request({
url: `${prefix}/jsonToBpmn`,
@@ -52,3 +52,15 @@
data: param,
})
}
+
+// 流程定义编辑
+export function efitProcess(params: Object) {
+ const param = {
+ _value: params,
+ }
+ return request({
+ url: `${prefix}/update`,
+ method: 'post',
+ data: param,
+ })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index a996819..280906e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -10,6 +10,7 @@
AddNode: typeof import('./components/workFlow/addNode.vue')['default']
AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
AppContainer: typeof import('./components/AppContainer/index.vue')['default']
+ ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
Auth: typeof import('./components/Auth/index.vue')['default']
AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/departments150.json b/departments150.json
new file mode 100644
index 0000000..aa6cc37
--- /dev/null
+++ b/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/departments150.json b/public/departments150.json
deleted file mode 100644
index aa6cc37..0000000
--- a/public/departments150.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "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/myData.json b/public/myData.json
new file mode 100644
index 0000000..c594e52
--- /dev/null
+++ b/public/myData.json
@@ -0,0 +1,64 @@
+export default {
+ "_value": {
+ "formId": "555", //表单id
+ "formName": "555", //表单名称
+ "formDesc": "555", //表单描述
+ "formContent": "555", //表单内容
+ "tableId": 1,
+ "workFlowDef": {
+ "flowKey": "", //流程定义key，更新流程定义使用（更新必传）
+ "directorId": "1", //传入用户id，代表流程负责人
+ "name": "1228测试"
+ },
+ "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": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": "3",
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": {
+ "nodeName": "审核人",
+ "error": false,
+ "type": 1,
+ "settype": 5,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": "",
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": null,
+ "nodeUserList": []
+ },
+ "nodeUserList": [
+ {
+ "type": 1,
+ "targetId": "1",
+ "name": "雅楠"
+ },
+ {
+ "type": 1,
+ "targetId": "2",
+ "nam
+}
diff --git a/src/api/system/process.ts b/src/api/system/process.ts
index b768187..2ad4b03 100644
--- a/src/api/system/process.ts
+++ b/src/api/system/process.ts
@@ -44,7 +44,7 @@
// 加载流程定义
export function unloadProcess(params: Object) {
const param = {
- jsonObject: params,
+ _value: params,
}
return request({
url: `${prefix}/jsonToBpmn`,
@@ -52,3 +52,15 @@
data: param,
})
}
+
+// 流程定义编辑
+export function efitProcess(params: Object) {
+ const param = {
+ _value: params,
+ }
+ return request({
+ url: `${prefix}/update`,
+ method: 'post',
+ data: param,
+ })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index a996819..280906e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -10,6 +10,7 @@
AddNode: typeof import('./components/workFlow/addNode.vue')['default']
AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
AppContainer: typeof import('./components/AppContainer/index.vue')['default']
+ ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
Auth: typeof import('./components/Auth/index.vue')['default']
AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b198bc8..f9273ee 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -70,7 +70,7 @@
}
const changeType = (val) => {
approverConfig.value.nodeUserList = []
- approverConfig.value.examineMode = 1
+ // approverConfig.value.examineMode = 1
approverConfig.value.noHanderAction = 2
if (val === 2) {
approverConfig.value.directorLevel = 1
@@ -126,7 +126,7 @@
})
return
}
- else if (!approverConfig.value.selectCustomApprovalType) {
+ else if (!approverConfig.value.examineMode) {
ElMessage({
message: '请选择审批类型',
type: 'warning',
@@ -298,11 +298,11 @@
负责人
-
-
+
+
指定成员
-
+
指定角色
@@ -326,10 +326,10 @@
清除
-
+
选择成员
-
+
选择角色
@@ -351,13 +351,21 @@
审批类型
-
+
+
+
+ 会签
+
+
+ 或签
+
diff --git a/departments150.json b/departments150.json
new file mode 100644
index 0000000..aa6cc37
--- /dev/null
+++ b/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/departments150.json b/public/departments150.json
deleted file mode 100644
index aa6cc37..0000000
--- a/public/departments150.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "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/myData.json b/public/myData.json
new file mode 100644
index 0000000..c594e52
--- /dev/null
+++ b/public/myData.json
@@ -0,0 +1,64 @@
+export default {
+ "_value": {
+ "formId": "555", //表单id
+ "formName": "555", //表单名称
+ "formDesc": "555", //表单描述
+ "formContent": "555", //表单内容
+ "tableId": 1,
+ "workFlowDef": {
+ "flowKey": "", //流程定义key，更新流程定义使用（更新必传）
+ "directorId": "1", //传入用户id，代表流程负责人
+ "name": "1228测试"
+ },
+ "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": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": "3",
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": {
+ "nodeName": "审核人",
+ "error": false,
+ "type": 1,
+ "settype": 5,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": "",
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": null,
+ "nodeUserList": []
+ },
+ "nodeUserList": [
+ {
+ "type": 1,
+ "targetId": "1",
+ "name": "雅楠"
+ },
+ {
+ "type": 1,
+ "targetId": "2",
+ "nam
+}
diff --git a/src/api/system/process.ts b/src/api/system/process.ts
index b768187..2ad4b03 100644
--- a/src/api/system/process.ts
+++ b/src/api/system/process.ts
@@ -44,7 +44,7 @@
// 加载流程定义
export function unloadProcess(params: Object) {
const param = {
- jsonObject: params,
+ _value: params,
}
return request({
url: `${prefix}/jsonToBpmn`,
@@ -52,3 +52,15 @@
data: param,
})
}
+
+// 流程定义编辑
+export function efitProcess(params: Object) {
+ const param = {
+ _value: params,
+ }
+ return request({
+ url: `${prefix}/update`,
+ method: 'post',
+ data: param,
+ })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index a996819..280906e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -10,6 +10,7 @@
AddNode: typeof import('./components/workFlow/addNode.vue')['default']
AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
AppContainer: typeof import('./components/AppContainer/index.vue')['default']
+ ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
Auth: typeof import('./components/Auth/index.vue')['default']
AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b198bc8..f9273ee 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -70,7 +70,7 @@
}
const changeType = (val) => {
approverConfig.value.nodeUserList = []
- approverConfig.value.examineMode = 1
+ // approverConfig.value.examineMode = 1
approverConfig.value.noHanderAction = 2
if (val === 2) {
approverConfig.value.directorLevel = 1
@@ -126,7 +126,7 @@
})
return
}
- else if (!approverConfig.value.selectCustomApprovalType) {
+ else if (!approverConfig.value.examineMode) {
ElMessage({
message: '请选择审批类型',
type: 'warning',
@@ -298,11 +298,11 @@
负责人
-
-
+
+
指定成员
-
+
指定角色
@@ -326,10 +326,10 @@
清除
-
+
选择成员
-
+
选择角色
@@ -351,13 +351,21 @@
审批类型
-
+
+
+
+ 会签
+
+
+ 或签
+
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 71f6df6..2bc0ed6 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -13,6 +13,7 @@
if (type != 4) {
let data
if (type == 1) {
+ console.log('props.childNodeP', props.childNodeP, JSON.stringify(props.childNodeP) === '{}')
data = {
nodeName: '审核人',
error: true,
@@ -24,7 +25,7 @@
examineMode: 1,
noHanderAction: 1,
examineEndDirectorLevel: 0,
- childNode: props.childNodeP,
+ childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
nodeUserList: [],
}
}
diff --git a/departments150.json b/departments150.json
new file mode 100644
index 0000000..aa6cc37
--- /dev/null
+++ b/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/departments150.json b/public/departments150.json
deleted file mode 100644
index aa6cc37..0000000
--- a/public/departments150.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "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/myData.json b/public/myData.json
new file mode 100644
index 0000000..c594e52
--- /dev/null
+++ b/public/myData.json
@@ -0,0 +1,64 @@
+export default {
+ "_value": {
+ "formId": "555", //表单id
+ "formName": "555", //表单名称
+ "formDesc": "555", //表单描述
+ "formContent": "555", //表单内容
+ "tableId": 1,
+ "workFlowDef": {
+ "flowKey": "", //流程定义key，更新流程定义使用（更新必传）
+ "directorId": "1", //传入用户id，代表流程负责人
+ "name": "1228测试"
+ },
+ "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": 1,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": "3",
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": {
+ "nodeName": "审核人",
+ "error": false,
+ "type": 1,
+ "settype": 5,
+ "selectMode": 0,
+ "selectRange": 0,
+ "directorLevel": 1,
+ "examineMode": "",
+ "noHanderAction": 2,
+ "examineEndDirectorLevel": 0,
+ "childNode": null,
+ "nodeUserList": []
+ },
+ "nodeUserList": [
+ {
+ "type": 1,
+ "targetId": "1",
+ "name": "雅楠"
+ },
+ {
+ "type": 1,
+ "targetId": "2",
+ "nam
+}
diff --git a/src/api/system/process.ts b/src/api/system/process.ts
index b768187..2ad4b03 100644
--- a/src/api/system/process.ts
+++ b/src/api/system/process.ts
@@ -44,7 +44,7 @@
// 加载流程定义
export function unloadProcess(params: Object) {
const param = {
- jsonObject: params,
+ _value: params,
}
return request({
url: `${prefix}/jsonToBpmn`,
@@ -52,3 +52,15 @@
data: param,
})
}
+
+// 流程定义编辑
+export function efitProcess(params: Object) {
+ const param = {
+ _value: params,
+ }
+ return request({
+ url: `${prefix}/update`,
+ method: 'post',
+ data: param,
+ })
+}
diff --git a/src/components.d.ts b/src/components.d.ts
index a996819..280906e 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -10,6 +10,7 @@
AddNode: typeof import('./components/workFlow/addNode.vue')['default']
AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default']
AppContainer: typeof import('./components/AppContainer/index.vue')['default']
+ ApprovalDialog: typeof import('./components/Approval/ApprovalDialog.vue')['default']
ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default']
Auth: typeof import('./components/Auth/index.vue')['default']
AuthAll: typeof import('./components/AuthAll/index.vue')['default']
diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue
index b198bc8..f9273ee 100644
--- a/src/components/drawer/approverDrawer.vue
+++ b/src/components/drawer/approverDrawer.vue
@@ -70,7 +70,7 @@
}
const changeType = (val) => {
approverConfig.value.nodeUserList = []
- approverConfig.value.examineMode = 1
+ // approverConfig.value.examineMode = 1
approverConfig.value.noHanderAction = 2
if (val === 2) {
approverConfig.value.directorLevel = 1
@@ -126,7 +126,7 @@
})
return
}
- else if (!approverConfig.value.selectCustomApprovalType) {
+ else if (!approverConfig.value.examineMode) {
ElMessage({
message: '请选择审批类型',
type: 'warning',
@@ -298,11 +298,11 @@
负责人
-
-
+
+
指定成员
-
+
指定角色
@@ -326,10 +326,10 @@
清除
-
+
选择成员
-
+
选择角色
@@ -351,13 +351,21 @@
审批类型
-
+
+
+
+ 会签
+
+
+ 或签
+
diff --git a/src/components/workFlow/addNode.vue b/src/components/workFlow/addNode.vue
index 71f6df6..2bc0ed6 100644
--- a/src/components/workFlow/addNode.vue
+++ b/src/components/workFlow/addNode.vue
@@ -13,6 +13,7 @@
if (type != 4) {
let data
if (type == 1) {
+ console.log('props.childNodeP', props.childNodeP, JSON.stringify(props.childNodeP) === '{}')
data = {
nodeName: '审核人',
error: true,
@@ -24,7 +25,7 @@
examineMode: 1,
noHanderAction: 1,
examineEndDirectorLevel: 0,
- childNode: props.childNodeP,
+ childNode: JSON.stringify(props.childNodeP) === '{}' || props.childNodeP === null ? null : props.childNodeP,
nodeUserList: [],
}
}
diff --git a/src/views/setting.vue b/src/views/setting.vue
index 3fa6db9..8dec235 100644
--- a/src/views/setting.vue
+++ b/src/views/setting.vue
@@ -9,7 +9,7 @@
import copyerDrawer from '@/components/drawer/copyerDrawer.vue'
import conditionDrawer from '@/components/drawer/conditionDrawer.vue'
import { getWorkFlowData, setWorkFlowData } from '@/plugins/api.js'
-import { unloadProcess } from '@/api/system/process'
+import { efitProcess, unloadProcess } from '@/api/system/process'
const props = defineProps({
allowEditNode: {
@@ -52,7 +52,9 @@
// window.location.href = ""
}
const reErr = ({ childNode }) => {
- if (childNode) {
+ console.log('999999999999999', childNode)
+ if (JSON.stringify(childNode) === '{}') {
+ console.log('1111')
const { type, error, nodeName, conditionNodes } = childNode
if (type == 1 || type == 2) {
if (error) {
@@ -77,6 +79,7 @@
}
}
else {
+ console.log('childNode = null')
childNode = null
}
}
@@ -86,22 +89,21 @@
processConfig.value.formId = props.getRowData.formId
processConfig.value.formName = props.getRowData.formName
processConfig.value.formDesc = props.getRowData.formDesc
- processConfig.value.workFlowDef.id = props.getRowData.id
+ processConfig.value.formContent = props.getRowData.formDesc
+ processConfig.value.workFlowDef.flowKey = props.getRowData.flowKey
processConfig.value.workFlowDef.directorId = props.getRowData.directorId
+ processConfig.value.workFlowDef.name = props.getRowData.name
workFlowStore.setIsTried(true)
tipList.value = []
- reErr(nodeConfig)
+ reErr(nodeConfig.value)
+ reErr(processConfig.value)
if (tipList.value.length != 0) {
tipVisible.value = true
return
}
processConfig.value.flowPermission = flowPermission.value
- console.log(JSON.stringify(processConfig))
- const param = {
- _value: processConfig.value,
- }
- const res = await unloadProcess(param)
+ const res = await efitProcess(processConfig.value)
// if (res.code == 200) {
// ElMessage.success('设置成功')
// setTimeout(() => {