diff --git a/ruoyi-ui/src/api/demo/demo.js b/ruoyi-ui/src/api/demo/demo.js
deleted file mode 100644
index 04d40256..00000000
--- a/ruoyi-ui/src/api/demo/demo.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import request from '@/utils/request'
-
-// 查询测试单表列表
-export function listDemo(query) {
-  return request({
-    url: '/demo/demo/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 自定义分页接口
-export function pageDemo(query) {
-  return request({
-    url: '/demo/demo/page',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询测试单表详细
-export function getDemo(id) {
-  return request({
-    url: '/demo/demo/' + id,
-    method: 'get'
-  })
-}
-
-// 新增测试单表
-export function addDemo(data) {
-  return request({
-    url: '/demo/demo',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改测试单表
-export function updateDemo(data) {
-  return request({
-    url: '/demo/demo',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除测试单表
-export function delDemo(id) {
-  return request({
-    url: '/demo/demo/' + id,
-    method: 'delete'
-  })
-}
-
diff --git a/ruoyi-ui/src/api/demo/leave.js b/ruoyi-ui/src/api/demo/leave.js
deleted file mode 100644
index aba149c3..00000000
--- a/ruoyi-ui/src/api/demo/leave.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询请假业务列表
-export function listLeave(query) {
-  return request({
-    url: '/demo/leave/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询请假业务详细
-export function getLeave(id) {
-  return request({
-    url: '/demo/leave/' + id,
-    method: 'get'
-  })
-}
-
-// 新增请假业务
-export function addLeave(data) {
-  return request({
-    url: '/demo/leave',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改请假业务
-export function updateLeave(data) {
-  return request({
-    url: '/demo/leave',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除请假业务
-export function delLeave(id) {
-  return request({
-    url: '/demo/leave/' + id,
-    method: 'delete'
-  })
-}
diff --git a/ruoyi-ui/src/api/demo/tree.js b/ruoyi-ui/src/api/demo/tree.js
deleted file mode 100644
index 4c7ebc07..00000000
--- a/ruoyi-ui/src/api/demo/tree.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询测试树表列表
-export function listTree(query) {
-  return request({
-    url: '/demo/tree/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询测试树表详细
-export function getTree(id) {
-  return request({
-    url: '/demo/tree/' + id,
-    method: 'get'
-  })
-}
-
-// 新增测试树表
-export function addTree(data) {
-  return request({
-    url: '/demo/tree',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改测试树表
-export function updateTree(data) {
-  return request({
-    url: '/demo/tree',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除测试树表
-export function delTree(id) {
-  return request({
-    url: '/demo/tree/' + id,
-    method: 'delete'
-  })
-}
diff --git a/ruoyi-ui/src/api/system/dept.js b/ruoyi-ui/src/api/system/dept.js
deleted file mode 100644
index 9ca69663..00000000
--- a/ruoyi-ui/src/api/system/dept.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import request from '@/utils/request'
-
-// 查询部门列表
-export function listDept(query) {
-  return request({
-    url: '/system/dept/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询部门列表（排除节点）
-export function listDeptExcludeChild(deptId) {
-  return request({
-    url: '/system/dept/list/exclude/' + deptId,
-    method: 'get'
-  })
-}
-
-// 查询部门详细
-export function getDept(deptId) {
-  return request({
-    url: '/system/dept/' + deptId,
-    method: 'get'
-  })
-}
-
-// 新增部门
-export function addDept(data) {
-  return request({
-    url: '/system/dept',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改部门
-export function updateDept(data) {
-  return request({
-    url: '/system/dept',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除部门
-export function delDept(deptId) {
-  return request({
-    url: '/system/dept/' + deptId,
-    method: 'delete'
-  })
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/api/system/org.js b/ruoyi-ui/src/api/system/org.js
new file mode 100644
index 00000000..5d46f57b
--- /dev/null
+++ b/ruoyi-ui/src/api/system/org.js
@@ -0,0 +1,52 @@
+import request from '@/utils/request'
+
+// 查询机构列表
+export function listSysOrg(query) {
+  return request({
+    url: '/system/org/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询机构列表（排除节点）
+export function listSysOrgExcludeChild(orgId) {
+  return request({
+    url: '/system/org/list/exclude/' + orgId,
+    method: 'get'
+  })
+}
+
+// 查询机构详细
+export function getSysOrg(orgId) {
+  return request({
+    url: '/system/org/' + orgId,
+    method: 'get'
+  })
+}
+
+// 新增机构
+export function addSysOrg(data) {
+  return request({
+    url: '/system/org',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改机构
+export function updateSysOrg(data) {
+  return request({
+    url: '/system/org',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除机构
+export function delSysOrg(orgId) {
+  return request({
+    url: '/system/org/' + orgId,
+    method: 'delete'
+  })
+}
diff --git a/ruoyi-ui/src/api/system/role.js b/ruoyi-ui/src/api/system/role.js
index 528cd186..44bb5bd3 100644
--- a/ruoyi-ui/src/api/system/role.js
+++ b/ruoyi-ui/src/api/system/role.js
@@ -1,119 +1,119 @@
-import request from '@/utils/request'
-
-// 查询角色列表
-export function listRole(query) {
-  return request({
-    url: '/system/role/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询角色详细
-export function getRole(roleId) {
-  return request({
-    url: '/system/role/' + roleId,
-    method: 'get'
-  })
-}
-
-// 新增角色
-export function addRole(data) {
-  return request({
-    url: '/system/role',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改角色
-export function updateRole(data) {
-  return request({
-    url: '/system/role',
-    method: 'put',
-    data: data
-  })
-}
-
-// 角色数据权限
-export function dataScope(data) {
-  return request({
-    url: '/system/role/dataScope',
-    method: 'put',
-    data: data
-  })
-}
-
-// 角色状态修改
-export function changeRoleStatus(roleId, status) {
-  const data = {
-    roleId,
-    status
-  }
-  return request({
-    url: '/system/role/changeStatus',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除角色
-export function delRole(roleId) {
-  return request({
-    url: '/system/role/' + roleId,
-    method: 'delete'
-  })
-}
-
-// 查询角色已授权用户列表
-export function allocatedUserList(query) {
-  return request({
-    url: '/system/role/authUser/allocatedList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询角色未授权用户列表
-export function unallocatedUserList(query) {
-  return request({
-    url: '/system/role/authUser/unallocatedList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 取消用户授权角色
-export function authUserCancel(data) {
-  return request({
-    url: '/system/role/authUser/cancel',
-    method: 'put',
-    data: data
-  })
-}
-
-// 批量取消用户授权角色
-export function authUserCancelAll(data) {
-  return request({
-    url: '/system/role/authUser/cancelAll',
-    method: 'put',
-    params: data
-  })
-}
-
-// 授权用户选择
-export function authUserSelectAll(data) {
-  return request({
-    url: '/system/role/authUser/selectAll',
-    method: 'put',
-    params: data
-  })
-}
-
-// 根据角色ID查询部门树结构
-export function deptTreeSelect(roleId) {
-  return request({
-    url: '/system/role/deptTree/' + roleId,
-    method: 'get'
-  })
-}
+import request from '@/utils/request'
+
+// 查询角色列表
+export function listRole(query) {
+  return request({
+    url: '/system/role/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询角色详细
+export function getRole(roleId) {
+  return request({
+    url: '/system/role/' + roleId,
+    method: 'get'
+  })
+}
+
+// 新增角色
+export function addRole(data) {
+  return request({
+    url: '/system/role',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改角色
+export function updateRole(data) {
+  return request({
+    url: '/system/role',
+    method: 'put',
+    data: data
+  })
+}
+
+// 角色数据权限
+export function dataScope(data) {
+  return request({
+    url: '/system/role/dataScope',
+    method: 'put',
+    data: data
+  })
+}
+
+// 角色状态修改
+export function changeRoleStatus(roleId, status) {
+  const data = {
+    roleId,
+    status
+  }
+  return request({
+    url: '/system/role/changeStatus',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除角色
+export function delRole(roleId) {
+  return request({
+    url: '/system/role/' + roleId,
+    method: 'delete'
+  })
+}
+
+// 查询角色已授权用户列表
+export function allocatedUserList(query) {
+  return request({
+    url: '/system/role/authUser/allocatedList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询角色未授权用户列表
+export function unallocatedUserList(query) {
+  return request({
+    url: '/system/role/authUser/unallocatedList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 取消用户授权角色
+export function authUserCancel(data) {
+  return request({
+    url: '/system/role/authUser/cancel',
+    method: 'put',
+    data: data
+  })
+}
+
+// 批量取消用户授权角色
+export function authUserCancelAll(data) {
+  return request({
+    url: '/system/role/authUser/cancelAll',
+    method: 'put',
+    params: data
+  })
+}
+
+// 授权用户选择
+export function authUserSelectAll(data) {
+  return request({
+    url: '/system/role/authUser/selectAll',
+    method: 'put',
+    params: data
+  })
+}
+
+// 根据角色ID查询机构树结构
+export function sysOrgTreeSelect(roleId) {
+  return request({
+    url: '/system/role/orgTree/' + roleId,
+    method: 'get'
+  })
+}
diff --git a/ruoyi-ui/src/api/system/user.js b/ruoyi-ui/src/api/system/user.js
index f2f76ef9..e6495c4e 100644
--- a/ruoyi-ui/src/api/system/user.js
+++ b/ruoyi-ui/src/api/system/user.js
@@ -126,10 +126,10 @@ export function updateAuthRole(data) {
   })
 }
 
-// 查询部门下拉树结构
-export function deptTreeSelect() {
+// 查询机构下拉树结构
+export function sysOrgTreeSelect() {
   return request({
-    url: '/system/user/deptTree',
+    url: '/system/user/orgTree',
     method: 'get'
   })
 }
diff --git a/ruoyi-ui/src/api/workflow/actNodeAssginee.js b/ruoyi-ui/src/api/workflow/actNodeAssginee.js
deleted file mode 100644
index 304bdec2..00000000
--- a/ruoyi-ui/src/api/workflow/actNodeAssginee.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import request from "@/utils/request";
-
-export function add(data) {
-  return request({
-    url: '/workflow/actNodeAssignee',
-    method: 'post',
-    data: data
-  })
-}
-
-export function del(id) {
-  return request({
-    url: '/workflow/actNodeAssignee/'+id,
-    method: 'delete'
-  })
-}
-
-export function getInfoSetting(processDefinitionId,nodeId) {
-  return request({
-    url: `/workflow/actNodeAssignee/${processDefinitionId}/${nodeId}`,
-    method: 'get'
-  })
-}
-
-export function copy(processDefinitionId,key) {
-  return request({
-    url: `/workflow/actNodeAssignee/copy/${processDefinitionId}/${key}`,
-    method: 'post'
-  })
-}
-
diff --git a/ruoyi-ui/src/api/workflow/businessForm.js b/ruoyi-ui/src/api/workflow/businessForm.js
deleted file mode 100644
index 071b0b5b..00000000
--- a/ruoyi-ui/src/api/workflow/businessForm.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询业务表单列表
-export function listBusinessForm(query) {
-  return request({
-    url: '/workflow/businessForm/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询业务表单详细
-export function getBusinessForm(id) {
-  return request({
-    url: '/workflow/businessForm/' + id,
-    method: 'get'
-  })
-}
-
-// 新增业务表单
-export function addBusinessForm(data) {
-  return request({
-    url: '/workflow/businessForm',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改业务表单
-export function updateBusinessForm(data) {
-  return request({
-    url: '/workflow/businessForm',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除业务表单
-export function delBusinessForm(id) {
-  return request({
-    url: '/workflow/businessForm/' + id,
-    method: 'delete'
-  })
-}
diff --git a/ruoyi-ui/src/api/workflow/businessRule.js b/ruoyi-ui/src/api/workflow/businessRule.js
deleted file mode 100644
index 4a6a8974..00000000
--- a/ruoyi-ui/src/api/workflow/businessRule.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import request from '@/utils/request'
-
-// 查询业务规则列表
-export function listBusinessRule(query) {
-  return request({
-    url: '/workflow/businessRule/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询业务规则详细
-export function getBusinessRule(id) {
-  return request({
-    url: '/workflow/businessRule/' + id,
-    method: 'get'
-  })
-}
-
-// 新增业务规则
-export function addbusinessRule(data) {
-  return request({
-    url: '/workflow/businessRule',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改业务规则
-export function updateBusinessRule(data) {
-  return request({
-    url: '/workflow/businessRule',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除业务规则
-export function delBusinessRule(id) {
-  return request({
-    url: '/workflow/businessRule/' + id,
-    method: 'delete'
-  })
-}
diff --git a/ruoyi-ui/src/api/workflow/definition.js b/ruoyi-ui/src/api/workflow/definition.js
deleted file mode 100644
index 8f404a77..00000000
--- a/ruoyi-ui/src/api/workflow/definition.js
+++ /dev/null
@@ -1,90 +0,0 @@
-import request from "@/utils/request";
-/**
- * 分页查询
- * @param {条件} query
- * @returns
- */
-export function list(query) {
-  return request({
-    url: '/workflow/definition/list',
-    method: 'get',
-    params: query
-  })
-}
-
-/**
- * 分页查询
- * @param {条件} query
- * @returns
- */
- export function hisList(query) {
-    return request({
-      url: '/workflow/definition/hisList',
-      method: 'get',
-      params: query
-    })
-}
-
-/**
- *
- * @param {参数} data
- * @returns
- */
-export function updateProcDefState(data) {
-  return request({
-    url: '/workflow/definition/updateProcDefState',
-    method: 'put',
-    data: data
-  })
-}
-
-/**
- * 按流程部署id删除
- * @param {流程部署id} deploymentId
- * @returns
- */
- export function del(deploymentId,definitionId) {
-  return request({
-    url: `/workflow/definition/${deploymentId}/${definitionId}`,
-    method: 'delete'
-  })
-}
-
-/**
- * 通过zip或xml部署流程定义
- * @returns
- */
-export function deployProcessFile(data) {
-  return request({
-    url: '/workflow/definition/deployByFile',
-    method: 'post',
-    data: data
-  })
-}
-
-/**
- *
- * @param {流程定义设置} definitionId
- * @returns
- */
-export function setting(definitionId) {
-  return request({
-    url: '/workflow/definition/setting/'+definitionId,
-    method: 'get'
-  })
-}
-
-/**
- *
- * @param {查看xml} definitionId
- * @returns
- */
-export function getXml(definitionId) {
-  return request({
-    url: '/workflow/definition/getXml/'+definitionId,
-    method: 'get'
-  })
-}
-
-
-
diff --git a/ruoyi-ui/src/api/workflow/dynamicForm.js b/ruoyi-ui/src/api/workflow/dynamicForm.js
deleted file mode 100644
index c95bff15..00000000
--- a/ruoyi-ui/src/api/workflow/dynamicForm.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import request from '@/utils/request'
-
-// 查询流程单列表
-export function listDynamicForm(query) {
-  return request({
-    url: '/workflow/dynamicForm/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询启用流程单列表
-export function listDynamicFormEnable(query) {
-  return request({
-    url: '/workflow/dynamicForm/enableList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询流程单详细
-export function getDynamicForm(id) {
-  return request({
-    url: '/workflow/dynamicForm/' + id,
-    method: 'get'
-  })
-}
-
-// 新增流程单
-export function addDynamicForm(data) {
-  return request({
-    url: '/workflow/dynamicForm',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改流程单
-export function updateDynamicForm(data) {
-  return request({
-    url: '/workflow/dynamicForm',
-    method: 'put',
-    data: data
-  })
-}
-
-// 修改流程单
-export function editForm(data) {
-  return request({
-    url: '/workflow/dynamicForm/editForm',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除流程单
-export function delDynamicForm(id) {
-  return request({
-    url: '/workflow/dynamicForm/' + id,
-    method: 'delete'
-  })
-}
diff --git a/ruoyi-ui/src/api/workflow/message.js b/ruoyi-ui/src/api/workflow/message.js
deleted file mode 100644
index 167d1a1d..00000000
--- a/ruoyi-ui/src/api/workflow/message.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import request from '@/utils/request'
-
-// 查询消息通知列表
-export function listMessage(query) {
-  return request({
-    url: '/workflow/message/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 获取个人站内信
-export function listWaitingMessage() {
-  return request({
-    url: '/workflow/message/waitingMessage',
-    method: 'get'
-  })
-}
-
-// 查询消息通知详细
-export function getMessage(id) {
-  return request({
-    url: '/workflow/message/' + id,
-    method: 'get'
-  })
-}
-
-// 新增消息通知
-export function addMessage(data) {
-  return request({
-    url: '/workflow/message',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改消息通知
-export function updateMessage(data) {
-  return request({
-    url: '/workflow/message',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除消息通知
-export function delMessage(id) {
-  return request({
-    url: '/workflow/message/' + id,
-    method: 'delete'
-  })
-}
-
-// 阅读消息
-export function readMessage(id) {
-  return request({
-    url: '/workflow/message/readMessage/' + id,
-    method: 'get'
-  })
-}
-
-// 批量阅读消息
-export function batchReadMessage(id) {
-  return request({
-    url: '/workflow/message/batchReadMessage',
-    method: 'get'
-  })
-}
diff --git a/ruoyi-ui/src/api/workflow/model.js b/ruoyi-ui/src/api/workflow/model.js
deleted file mode 100644
index ea605f1e..00000000
--- a/ruoyi-ui/src/api/workflow/model.js
+++ /dev/null
@@ -1,110 +0,0 @@
-import request from "@/utils/request";
-/**
- * 分页查询
- * @param {条件} query
- * @returns
- */
-export function list(query) {
-  return request({
-    url: '/workflow/model/list',
-    method: 'get',
-    params: query
-  })
-}
-
-/**
- * 新增模型定义
- * @param {传输的数据}} data
- * @returns
- */
-export function add(data) {
-  return request({
-    url: '/workflow/model',
-    method: 'post',
-    data: data
-  })
-}
-
-/**
- * 按id删除模型
- * @param {模型id} id
- * @returns
- */
-export function del(id) {
-  return request({
-    url: '/workflow/model/' + id,
-    method: 'delete'
-  })
-}
-
-/**
- * 流程部署
- * @param {模型id} id
- * @returns
- */
-export function deploy(id) {
-  return request({
-    url: '/workflow/model/deploy/' + id,
-    method: 'post'
-  })
-}
-/**
- * 将流程定义转换为模型
- * @param {流程定义id} processDefinitionId
- * @returns
- */
- export function convertToModel(processDefinitionId) {
-  return request({
-    url: '/workflow/model/convertToModel/' + processDefinitionId,
-    method: 'put'
-  })
-}
-
-/**
- * 查询模型xml
- * @param {模型id} modelId
- * @returns
- */
-export function getEditorXml(modelId) {
-  return request({
-    url: `workflow/model/getInfo/${modelId}/xml`,
-    method: 'get'
-  })
-}
-
-/**
- * 保存模型
- * @param {参数} data
- * @returns
- */
-export function saveModelXml(data) {
-  return request({
-    url: `workflow/model`,
-    method: 'put',
-    data: data
-  })
-}
-
-
-export function getModelInfo(modelId) {
-  return request({
-    url: `model/${modelId}/json`,
-    method: 'get'
-  })
-}
-
-export function newModel(data) {
-    return request({
-      url: `model/newModel`,
-      method: 'post',
-      data: data
-    })
-}
-
-export function editModelInfo(modelId,data) {
-    return request({
-      url: `/model/${modelId}/save`,
-      method: 'put',
-      data: data
-    })
-}
diff --git a/ruoyi-ui/src/api/workflow/processDefSetting.js b/ruoyi-ui/src/api/workflow/processDefSetting.js
deleted file mode 100644
index d1fb241b..00000000
--- a/ruoyi-ui/src/api/workflow/processDefSetting.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import request from '@/utils/request'
-
-// 查询流程定义与单配置列表
-export function listProcessDefSetting(query) {
-  return request({
-    url: '/workflow/processDefSetting/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询流程定义与单配置详细
-export function getProcessDefSetting(id) {
-  return request({
-    url: '/workflow/processDefSetting/' + id,
-    method: 'get'
-  })
-}
-
-// 按流程定义id查询流程定义与单配置详细
-export function getProcessDefSettingByDefId(id) {
-  return request({
-    url: '/workflow/processDefSetting/getProcessDefSettingByDefId/' + id,
-    method: 'get'
-  })
-}
-
-// 校验表单是否关联
-export function checkProcessDefSetting(defId,param,businessType) {
-  return request({
-    url: `/workflow/processDefSetting/checkProcessDefSetting/${defId}/${param}/${businessType}` ,
-    method: 'get'
-  })
-}
-
-// 新增流程定义与单配置
-export function addProcessDefSetting(data) {
-  return request({
-    url: '/workflow/processDefSetting',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改流程定义与单配置
-export function updateProcessDefSetting(data) {
-  return request({
-    url: '/workflow/processDefSetting',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除流程定义与单配置
-export function delProcessDefSetting(id) {
-  return request({
-    url: '/workflow/processDefSetting/' + id,
-    method: 'delete'
-  })
-}
diff --git a/ruoyi-ui/src/api/workflow/processInst.js b/ruoyi-ui/src/api/workflow/processInst.js
deleted file mode 100644
index bd733b6c..00000000
--- a/ruoyi-ui/src/api/workflow/processInst.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import request from '@/utils/request'
-
-export default {
-  // 提交申请 ，启动流程申请
-  startProcessApply(data) {
-    return request({
-      url: '/workflow/processInstance/startWorkFlow',
-      method: 'post',
-      data: data
-    })
-  },
-
-  // 通过流程实例id查询流程审批记录
-  getHistoryInfoList(processInstId) {
-    return request({
-      url: '/workflow/processInstance/getHistoryInfoList/'+processInstId,
-      method: 'get'
-    })
-  },
-
-  // 通过流程实例id获取历史流程图
-  getHistoryProcessImage(processInstId) {
-    return process.env.VUE_APP_BASE_API+`/workflow/processInstance/getHistoryProcessImage?processInstId=${processInstId}&t=` + Math.random()
-  },
-
-  // 通过业务id查询流程实例
-  getInfoByBusinessKey(businessKey) {
-    return request({
-      url: '/workflow/actBusiness/getInfoByBusinessKey/'+businessKey,
-      method: 'get'
-    })
-  },
-
-  // 查询正在运行的流程实例
-  getProcessInstRunningByPage(query) {
-    return request({
-      url: '/workflow/processInstance/getProcessInstRunningByPage',
-      method: 'get',
-      params: query
-    })
-  },
-
-  // 挂起或激活流程实例
-  state(data) {
-    return request({
-      url: '/workflow/processInstance/state',
-      method: 'put',
-      data: data
-    })
-  },
-
-  // 作废流程实例，不会删除历史记录
-  deleteRuntimeProcessInst(processInstId) {
-    return request({
-      url: '/workflow/processInstance/deleteRuntimeProcessInst/'+processInstId,
-      method: 'delete'
-    })
-  },
-
-  // 删除运行中的实例，删除历史记录,删除业务与流程关联信息
-  deleteRuntimeProcessAndHisInst(processInstId) {
-    return request({
-      url: '/workflow/processInstance/deleteRuntimeProcessAndHisInst/'+processInstId,
-      method: 'delete'
-    })
-  },
-
-  // 删除已完成的实例，删除历史记录,删除业务与流程关联信息
-  deleteFinishProcessAndHisInst(processInstId) {
-    return request({
-      url: '/workflow/processInstance/deleteFinishProcessAndHisInst/'+processInstId,
-      method: 'delete'
-    })
-  },
-
-  // 撤销申请
-  cancelProcessApply(processInstanceId) {
-    return request({
-      url: '/workflow/processInstance/cancelProcessApply/'+processInstanceId,
-      method: 'get'
-    })
-  },
-
-  // 查询已完成的流程实例
-  getProcessInstFinishByPage(query) {
-    return request({
-      url: '/workflow/processInstance/getProcessInstFinishByPage',
-      method: 'get',
-      params: query
-    })
-  }
-}
diff --git a/ruoyi-ui/src/api/workflow/task.js b/ruoyi-ui/src/api/workflow/task.js
deleted file mode 100644
index 68e522bb..00000000
--- a/ruoyi-ui/src/api/workflow/task.js
+++ /dev/null
@@ -1,151 +0,0 @@
-import request from '@/utils/request'
-
-export default {
-
-  // 查询当前用户的待办任务
-  getTaskWaitByPage(query) {
-    return request({
-      url: '/workflow/task/getTaskWaitByPage',
-      method: 'get',
-      params: query
-    })
-  },
-
-  // 查询当前用户的已办任务
-  getTaskFinishByPage(query) {
-    return request({
-      url: '/workflow/task/getTaskFinishByPage',
-      method: 'get',
-      params: query
-    })
-  },
-
-    // 查询所有用户的待办任务
-    getAllTaskWaitByPage(query) {
-      return request({
-        url: '/workflow/task/getAllTaskWaitByPage',
-        method: 'get',
-        params: query
-      })
-    },
-
-    // 查询所有用户的已办任务
-    getAllTaskFinishByPage(query) {
-      return request({
-        url: '/workflow/task/getAllTaskFinishByPage',
-        method: 'get',
-        params: query
-      })
-    },
-
-  // 完成任务
-  completeTask(data) {
-    return request({
-      url: '/workflow/task/completeTask',
-      method: 'post',
-      data: data
-    })
-  },
-
-  // 获取目标节点（下一个节点）
-  getNextNodeInfo(data) {
-    return request({
-      url: '/workflow/task/getNextNodeInfo',
-      method: 'post',
-      data: data
-    })
-  },
-
-  // 获取历史任务节点，用于驳回功能
-  getBackNodes(processInstId) {
-    return request({
-      url: '/workflow/task/getBackNodes/'+processInstId,
-      method: 'get'
-    })
-  },
-
-  // 驳回审批
-  backProcess(data) {
-    return request({
-      url: '/workflow/task/backProcess',
-      method: 'post',
-      data: data
-    })
-  },
-  // 删除执行后的节点
-  deleteByNodeIds(data) {
-    return request({
-      url: '/workflow/task/deleteByNodeIds',
-      method: 'post',
-      data: data
-    })
-  },
-  // 签收任务
-  claim(taskId) {
-    return request({
-      url: '/workflow/task/claim/'+taskId,
-      method: 'post'
-    })
-  },
-  // 归还任务
-  returnTask(taskId) {
-    return request({
-      url: '/workflow/task/returnTask/'+taskId,
-      method: 'post'
-    })
-  },
-  // 委托任务
-  delegateTask(data) {
-    return request({
-      url: '/workflow/task/delegateTask',
-      method: 'post',
-      data: data
-    })
-  },
-  // 转办任务
-  transmitTask(data) {
-    return request({
-      url: '/workflow/task/transmitTask',
-      method: 'post',
-      data: data
-    })
-  },
-  // 会签任务加签
-  addMultiInstanceExecution(data) {
-    return request({
-      url: '/workflow/task/addMultiInstanceExecution',
-      method: 'post',
-      data: data
-    })
-  },
-  // 会签任务减签
-  deleteMultiInstanceExecution(data) {
-    return request({
-      url: '/workflow/task/deleteMultiInstanceExecution',
-      method: 'post',
-      data: data
-    })
-  },
-  // 会签任务减签
-  updateAssignee(data) {
-    return request({
-      url: '/workflow/task/updateAssignee',
-      method: 'post',
-      data: data
-    })
-  },
-  //查询流程变量
-  getProcessInstVariable(taskId) {
-    return request({
-      url: '/workflow/task/getProcessInstVariable/'+taskId,
-      method: 'get'
-    })
-  },
-  //修改审批意见
-  editComment(commentId,comment) {
-    return request({
-      url: `/workflow/task/editComment/${commentId}/${comment}`,
-      method: 'put'
-    })
-  }
-}
diff --git a/ruoyi-ui/src/api/workflow/workflowUser.js b/ruoyi-ui/src/api/workflow/workflowUser.js
deleted file mode 100644
index 3131802c..00000000
--- a/ruoyi-ui/src/api/workflow/workflowUser.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import request from '@/utils/request'
-
-// 查询工作流接口用户
-export function getWorkflowUserListByPage(data) {
-    return request({
-      url: '/workflow/user/getWorkflowUserListByPage',
-      method: 'post',
-      data: data
-    })
-}
-// 分页查询工作流选择加签人员
-export function getWorkflowAddMultiListByPage(data) {
-  return request({
-    url: '/workflow/user/getWorkflowAddMultiListByPage',
-    method: 'post',
-    data: data
-  })
-}
diff --git a/ruoyi-ui/src/assets/img/home/home_bg.png b/ruoyi-ui/src/assets/img/home/home_bg.png
deleted file mode 100644
index d0edd455..00000000
Binary files a/ruoyi-ui/src/assets/img/home/home_bg.png and /dev/null differ
diff --git a/ruoyi-ui/src/assets/img/work/custInfo/module_header_left.png b/ruoyi-ui/src/assets/img/work/custInfo/module_header_left.png
deleted file mode 100644
index 20054cef..00000000
Binary files a/ruoyi-ui/src/assets/img/work/custInfo/module_header_left.png and /dev/null differ
diff --git a/ruoyi-ui/src/assets/img/work/custInfo/module_header_share.png b/ruoyi-ui/src/assets/img/work/custInfo/module_header_share.png
deleted file mode 100644
index 4d0c2017..00000000
Binary files a/ruoyi-ui/src/assets/img/work/custInfo/module_header_share.png and /dev/null differ
diff --git a/ruoyi-ui/src/assets/img/work/custInfo/riskOverviewBground.png b/ruoyi-ui/src/assets/img/work/custInfo/riskOverviewBground.png
deleted file mode 100644
index 59b31c07..00000000
Binary files a/ruoyi-ui/src/assets/img/work/custInfo/riskOverviewBground.png and /dev/null differ
diff --git a/ruoyi-ui/src/assets/img/work/custInfo/riskOverviewBgroundSigle.png b/ruoyi-ui/src/assets/img/work/custInfo/riskOverviewBgroundSigle.png
deleted file mode 100644
index 8ff31dde..00000000
Binary files a/ruoyi-ui/src/assets/img/work/custInfo/riskOverviewBgroundSigle.png and /dev/null differ
diff --git a/ruoyi-ui/src/assets/img/work/custInfo/riskOverview_iconRisk1.png b/ruoyi-ui/src/assets/img/work/custInfo/riskOverview_iconRisk1.png
deleted file mode 100644
index e7b52009..00000000
Binary files a/ruoyi-ui/src/assets/img/work/custInfo/riskOverview_iconRisk1.png and /dev/null differ
diff --git a/ruoyi-ui/src/assets/img/work/custInfo/riskOverview_iconRisk2.png b/ruoyi-ui/src/assets/img/work/custInfo/riskOverview_iconRisk2.png
deleted file mode 100644
index a5264b16..00000000
Binary files a/ruoyi-ui/src/assets/img/work/custInfo/riskOverview_iconRisk2.png and /dev/null differ
diff --git a/ruoyi-ui/src/assets/img/work/custInfo/riskOverview_iconRisk3.png b/ruoyi-ui/src/assets/img/work/custInfo/riskOverview_iconRisk3.png
deleted file mode 100644
index a4fc9532..00000000
Binary files a/ruoyi-ui/src/assets/img/work/custInfo/riskOverview_iconRisk3.png and /dev/null differ
diff --git a/ruoyi-ui/src/assets/img/work/custInfo/riskOverview_iconRisk4.png b/ruoyi-ui/src/assets/img/work/custInfo/riskOverview_iconRisk4.png
deleted file mode 100644
index 726f1a84..00000000
Binary files a/ruoyi-ui/src/assets/img/work/custInfo/riskOverview_iconRisk4.png and /dev/null differ
diff --git a/ruoyi-ui/src/assets/img/work/custInfo/riskOverview_sigh.png b/ruoyi-ui/src/assets/img/work/custInfo/riskOverview_sigh.png
deleted file mode 100644
index 10c6cff3..00000000
Binary files a/ruoyi-ui/src/assets/img/work/custInfo/riskOverview_sigh.png and /dev/null differ
diff --git a/ruoyi-ui/src/assets/img/work/custInfo/warning.png b/ruoyi-ui/src/assets/img/work/custInfo/warning.png
deleted file mode 100644
index 1afe0773..00000000
Binary files a/ruoyi-ui/src/assets/img/work/custInfo/warning.png and /dev/null differ
diff --git a/ruoyi-ui/src/assets/img/work/duty/warning.png b/ruoyi-ui/src/assets/img/work/duty/warning.png
deleted file mode 100644
index 1afe0773..00000000
Binary files a/ruoyi-ui/src/assets/img/work/duty/warning.png and /dev/null differ
diff --git a/ruoyi-ui/src/assets/img/work/loan/warning.png b/ruoyi-ui/src/assets/img/work/loan/warning.png
deleted file mode 100644
index 1afe0773..00000000
Binary files a/ruoyi-ui/src/assets/img/work/loan/warning.png and /dev/null differ
diff --git a/ruoyi-ui/src/assets/img/work/process/warning.png b/ruoyi-ui/src/assets/img/work/process/warning.png
deleted file mode 100644
index 1afe0773..00000000
Binary files a/ruoyi-ui/src/assets/img/work/process/warning.png and /dev/null differ
diff --git a/ruoyi-ui/src/assets/img/work/product/warning.png b/ruoyi-ui/src/assets/img/work/product/warning.png
deleted file mode 100644
index 1afe0773..00000000
Binary files a/ruoyi-ui/src/assets/img/work/product/warning.png and /dev/null differ
diff --git a/ruoyi-ui/src/assets/img/work/risk/warning.png b/ruoyi-ui/src/assets/img/work/risk/warning.png
deleted file mode 100644
index 1afe0773..00000000
Binary files a/ruoyi-ui/src/assets/img/work/risk/warning.png and /dev/null differ
diff --git a/ruoyi-ui/src/assets/img/work/touch/warning.png b/ruoyi-ui/src/assets/img/work/touch/warning.png
deleted file mode 100644
index 1afe0773..00000000
Binary files a/ruoyi-ui/src/assets/img/work/touch/warning.png and /dev/null differ
diff --git a/ruoyi-ui/src/components/Bpmn/package/BpmData.js b/ruoyi-ui/src/components/Bpmn/package/BpmData.js
deleted file mode 100644
index 672ca449..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/BpmData.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * 存储流程设计相关参数
- */
-export default class BpmData {
-  constructor() {
-    this.controls = [] // 设计器控件
-    this.init()
-  }
-
-  init() {
-    this.controls = [
-      {
-        action: 'create.start-event',
-        title: '开始'
-      },
-      {
-        action: 'create.intermediate-event',
-        title: '中间'
-      },
-      {
-        action: 'create.end-event',
-        title: '结束'
-      },
-      {
-        action: 'create.exclusive-gateway',
-        title: '网关'
-      },
-      {
-        action: 'create.task',
-        title: '任务'
-      },
-      {
-        action: 'create.user-task',
-        title: '用户任务'
-      },
-      {
-        action: 'create.user-sign-task',
-        title: '会签任务'
-      },
-      {
-        action: 'create.subprocess-expanded',
-        title: '子流程'
-      },
-      {
-        action: 'create.data-object',
-        title: '数据对象'
-      },
-      {
-        action: 'create.data-store',
-        title: '数据存储'
-      },
-      {
-        action: 'create.participant-expanded',
-        title: '扩展流程'
-      },
-      {
-        action: 'create.group',
-        title: '分组'
-      }
-    ]
-  }
-
-  //  获取控件配置信息
-  getControl(action) {
-    const result = this.controls.filter(item => item.action === action)
-    return result[0] || {}
-  }
-}
diff --git a/ruoyi-ui/src/components/Bpmn/package/PropertyPanel.vue b/ruoyi-ui/src/components/Bpmn/package/PropertyPanel.vue
deleted file mode 100644
index 3ca31a53..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/PropertyPanel.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <div ref="propertyPanel" class="property-panel">
-    <div v-if="nodeName" class="node-name">{{ nodeName }}</div>
-    <component
-      :is="getComponent"
-      v-if="element"
-      :element="element"
-      :modeler="modeler"
-      :users="users"
-      :groups="groups"
-      :categorys="categorys"
-    />
-  </div>
-</template>
-
-<script>
-import taskPanel from './components/nodePanel/task.vue'
-import startEndPanel from './components/nodePanel/startEnd.vue'
-import processPanel from './components/nodePanel/process.vue'
-import sequenceFlowPanel from './components/nodePanel/sequenceFlow.vue'
-import gatewayPanel from './components/nodePanel/gateway.vue'
-import { NodeName } from './lang/zh'
-
-export default {
-  name: 'PropertyPanel',
-  components: { processPanel, taskPanel, startEndPanel, sequenceFlowPanel, gatewayPanel },
-  props: {
-    users: {
-      type: Array,
-      required: true
-    },
-    groups: {
-      type: Array,
-      required: true
-    },
-    categorys: {
-      type: Array,
-      required: true
-    },
-    modeler: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-      element: null,
-      form: {
-        id: '',
-        name: '',
-        color: null
-      },
-      roles: [
-        { value: 'manager', label: '经理' },
-        { value: 'personnel', label: '人事' },
-        { value: 'charge', label: '主管' }
-      ]
-    }
-  },
-  computed: {
-    getComponent() {
-      const type = this.element?.type
-      if (['bpmn:IntermediateThrowEvent', 'bpmn:StartEvent', 'bpmn:EndEvent'].includes(type)) {
-        return 'startEndPanel'
-      }
-      if ([
-        'bpmn:UserTask',
-        'bpmn:Task',
-        'bpmn:SendTask',
-        'bpmn:ReceiveTask',
-        'bpmn:ManualTask',
-        'bpmn:BusinessRuleTask',
-        'bpmn:ServiceTask',
-        'bpmn:ScriptTask'
-        // 'bpmn:CallActivity',
-        // 'bpmn:SubProcess'
-      ].includes(type)) {
-        return 'taskPanel'
-      }
-      if (type === 'bpmn:SequenceFlow') {
-        return 'sequenceFlowPanel'
-      }
-      if ([
-        'bpmn:InclusiveGateway',
-        'bpmn:ExclusiveGateway',
-        'bpmn:ParallelGateway',
-        'bpmn:EventBasedGateway'
-      ].includes(type)) {
-        return 'gatewayPanel'
-      }
-      if (type === 'bpmn:Process') {
-        return 'processPanel'
-      }
-      return null
-    },
-    nodeName() {
-      if (this.element) {
-        const bizObj = this.element.businessObject
-        const type = bizObj?.eventDefinitions
-          ? bizObj.eventDefinitions[0].$type
-          : bizObj.$type
-        return NodeName[type] || type
-      }
-      return ''
-    }
-  },
-  mounted() {
-    this.handleModeler()
-  },
-  methods: {
-    handleModeler() {
-      this.modeler.on('root.added', e => {
-        if (e.element.type === 'bpmn:Process') {
-          this.element = null
-          this.$nextTick().then(() => {
-            this.element = e.element
-          })
-        }
-      })
-      this.modeler.on('element.click', e => {
-        const { element } = e
-        console.log(element)
-        if (element.type === 'bpmn:Process') {
-          this.element = element
-        }
-      })
-      this.modeler.on('selection.changed', e => {
-        // hack 同类型面板不刷新
-        this.element = null
-        const element = e.newSelection[0]
-        if (element) {
-          this.$nextTick().then(() => {
-            this.element = element
-          })
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-.property-panel {
-  padding: 20px 20px;
-  // reset element css
-  .el-form--label-top .el-form-item__label {
-    padding: 0;
-  }
-  .el-form-item {
-    margin-bottom: 6px;
-  }
-  .tab-table .el-form-item {
-    margin-bottom: 16px;
-  }
-  .node-name{
-    border-bottom: 1px solid #ccc;
-    padding: 0 0 10px 20px;
-    margin-bottom: 10px;
-    font-size: 16px;
-    font-weight: bold;
-    color: #444;
-  }
-}
-</style>
diff --git a/ruoyi-ui/src/components/Bpmn/package/common/customTranslate.js b/ruoyi-ui/src/components/Bpmn/package/common/customTranslate.js
deleted file mode 100644
index fa05f9d6..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/common/customTranslate.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import translations from '../lang/zh'
-
-export default function customTranslate(template, replacements) {
-  replacements = replacements || {}
-
-  // Translate
-  template = translations[template] || template
-
-  // Replace
-  return template.replace(/{([^}]+)}/g, function(_, key) {
-    var str = replacements[key]
-    if (
-      translations[replacements[key]] !== null &&
-      translations[replacements[key]] !== 'undefined'
-    ) {
-      str = translations[replacements[key]]
-    }
-    return str || '{' + key + '}'
-  })
-}
diff --git a/ruoyi-ui/src/components/Bpmn/package/common/mixinExecutionListener.js b/ruoyi-ui/src/components/Bpmn/package/common/mixinExecutionListener.js
deleted file mode 100644
index 23295b00..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/common/mixinExecutionListener.js
+++ /dev/null
@@ -1,24 +0,0 @@
-
-import executionListenerDialog from '../components/nodePanel/property/executionListener'
-export default {
-  components: {
-    executionListenerDialog
-  },
-  data() {
-    return {
-      executionListenerLength: 0,
-      dialogName: null
-    }
-  },
-  methods: {
-    computedExecutionListenerLength() {
-      this.executionListenerLength = this.element.businessObject.extensionElements?.values?.length ?? 0
-    },
-    finishExecutionListener() {
-      if (this.dialogName === 'executionListenerDialog') {
-        this.computedExecutionListenerLength()
-      }
-      this.dialogName = ''
-    }
-  }
-}
diff --git a/ruoyi-ui/src/components/Bpmn/package/common/mixinPanel.js b/ruoyi-ui/src/components/Bpmn/package/common/mixinPanel.js
deleted file mode 100644
index 8686b983..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/common/mixinPanel.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import xcrud from 'xcrud'
-import golbalConfig from 'xcrud/package/common/config'
-import showConfig from '../flowable/showConfig'
-golbalConfig.set({
-  input: {
-    // size: 'mini'
-  },
-  select: {
-    // size: 'mini'
-  },
-  colorPicker: {
-    showAlpha: true
-  },
-  xform: {
-    form: {
-      labelWidth: 'auto'
-      // size: 'mini'
-    }
-  }
-})
-export default {
-  components: { xForm: xcrud.xForm },
-  props: {
-    modeler: {
-      type: Object,
-      required: true
-    },
-    element: {
-      type: Object,
-      required: true
-    },
-    categorys: {
-      type: Array,
-      default: () => []
-    }
-  },
-  watch: {
-    'formData.id': function(val) {
-      this.updateProperties({ id: val })
-    },
-    'formData.name': function(val) {
-      this.updateProperties({ name: val })
-    },
-    'formData.documentation': function(val) {
-      if (!val) {
-        this.updateProperties({ documentation: [] })
-        return
-      }
-      const documentationElement = this.modeler.get('moddle').create('bpmn:Documentation', { text: val })
-      this.updateProperties({ documentation: [documentationElement] })
-    }
-  },
-  methods: {
-    updateProperties(properties) {
-      const modeling = this.modeler.get('modeling')
-      modeling.updateProperties(this.element, properties)
-    }
-  },
-  computed: {
-    elementType() {
-      const bizObj = this.element.businessObject
-      return bizObj.eventDefinitions
-        ? bizObj.eventDefinitions[0].$type
-        : bizObj.$type
-    },
-    showConfig() {
-      return showConfig[this.elementType] || {}
-    }
-  }
-}
diff --git a/ruoyi-ui/src/components/Bpmn/package/common/mixinXcrud.js b/ruoyi-ui/src/components/Bpmn/package/common/mixinXcrud.js
deleted file mode 100644
index 1f7ee5b5..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/common/mixinXcrud.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import xcrud from 'xcrud'
-import golbalConfig from 'xcrud/package/common/config'
-golbalConfig.set({
-  input: {
-    // size: 'mini'
-  },
-  select: {
-    // size: 'mini'
-  },
-  colorPicker: {
-    showAlpha: true
-  },
-  xform: {
-    form: {
-      labelWidth: 'auto'
-      // size: 'mini'
-    }
-  }
-})
-export default {
-  components: { xForm: xcrud.xForm }
-}
diff --git a/ruoyi-ui/src/components/Bpmn/package/common/parseElement.js b/ruoyi-ui/src/components/Bpmn/package/common/parseElement.js
deleted file mode 100644
index 63cf336e..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/common/parseElement.js
+++ /dev/null
@@ -1,53 +0,0 @@
-export function commonParse(element) {
-  const result = {
-    ...element.businessObject,
-    ...element.businessObject.$attrs
-  }
-  return formatJsonKeyValue(result)
-}
-
-export function formatJsonKeyValue(result) {
-  // 移除flowable前缀，格式化数组
-  for (const key in result) {
-    if (key.indexOf('flowable:') === 0) {
-      const newKey = key.replace('flowable:', '')
-      result[newKey] = result[key]
-      delete result[key]
-    }
-  }
-  result = documentationParse(result)
-  return result
-}
-
-export function documentationParse(obj) {
-  if ('documentation' in obj) {
-    let str = ''
-    obj.documentation.forEach(item => {
-      str += item.text
-    })
-    obj.documentation = str
-  }
-  return obj
-}
-
-export function conditionExpressionParse(obj) {
-  if ('conditionExpression' in obj) {
-    obj.conditionExpression = obj.conditionExpression.body
-  }
-  return obj
-}
-
-export function userTaskParse(obj) {
-  for (const key in obj) {
-    if (key === 'candidateUsers') {
-      obj.userType = 'candidateUsers'
-      obj[key] = obj[key]?.split(',') || []
-    } else if (key === 'candidateGroups') {
-      obj.userType = 'candidateGroups'
-      obj[key] = obj[key]?.split(',') || []
-    } else if (key === 'assignee') {
-      obj.userType = 'assignee'
-    }
-  }
-  return obj
-}
diff --git a/ruoyi-ui/src/components/Bpmn/package/components/custom/customContextPad.vue b/ruoyi-ui/src/components/Bpmn/package/components/custom/customContextPad.vue
deleted file mode 100644
index 89c2f684..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/components/custom/customContextPad.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-export default class CustomContextPad {
-    constructor(config, contextPad, create, elementFactory, injector, translate) {
-        this.create = create;
-        this.elementFactory = elementFactory;
-        this.translate = translate;
-
-        if (config.autoPlace !== false) {
-            this.autoPlace = injector.get('autoPlace', false);
-        }
-
-        contextPad.registerProvider(this); // 定义这是一个contextPad
-    }
-
-    getContextPadEntries(element) {}
-}
-
-CustomContextPad.$inject = [
-    'config',
-    'contextPad',
-    'create',
-    'elementFactory',
-    'injector',
-    'translate'
-];
diff --git a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/gateway.vue b/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/gateway.vue
deleted file mode 100644
index db181531..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/gateway.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-  <div>
-    <x-form ref="xForm" v-model="formData" :config="formConfig">
-      <template #executionListener>
-        <el-badge :value="executionListenerLength">
-          <el-button size="small" @click="dialogName = 'executionListenerDialog'">编辑</el-button>
-        </el-badge>
-      </template>
-    </x-form>
-    <executionListenerDialog
-      v-if="dialogName === 'executionListenerDialog'"
-      :element="element"
-      :modeler="modeler"
-      @close="finishExecutionListener"
-    />
-  </div>
-</template>
-
-<script>
-import mixinPanel from '../../common/mixinPanel'
-import mixinExecutionListener from '../../common/mixinExecutionListener'
-import { commonParse } from '../../common/parseElement'
-export default {
-  mixins: [mixinPanel, mixinExecutionListener],
-  data() {
-    return {
-      formData: {}
-    }
-  },
-  computed: {
-    formConfig() {
-      return {
-        inline: false,
-        item: [
-          {
-            xType: 'input',
-            name: 'id',
-            label: '节点 id',
-            rules: [{ required: true, message: 'Id 不能为空' }]
-          },
-          {
-            xType: 'input',
-            name: 'name',
-            label: '节点名称'
-          },
-          {
-            xType: 'input',
-            name: 'documentation',
-            label: '节点描述'
-          },
-          {
-            xType: 'slot',
-            name: 'executionListener',
-            label: '执行监听器'
-          },
-          {
-            xType: 'switch',
-            name: 'async',
-            label: '异步',
-            activeText: '是',
-            inactiveText: '否'
-          }
-        ]
-      }
-    }
-  },
-  watch: {
-    'formData.async': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:async': val })
-    }
-  },
-  created() {
-    this.formData = commonParse(this.element)
-  }
-}
-</script>
-
-<style>
-
-</style>
diff --git a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/process.vue b/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/process.vue
deleted file mode 100644
index 6498d481..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/process.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<template>
-  <div>
-    <x-form ref="xForm" v-model="formData" :config="formConfig">
-      <template #executionListener>
-        <el-badge :value="executionListenerLength">
-          <el-button size="small" @click="dialogName = 'executionListenerDialog'">编辑</el-button>
-        </el-badge>
-      </template>
-      <template #signal>
-        <el-badge :value="signalLength">
-          <el-button size="small" @click="dialogName = 'signalDialog'">编辑</el-button>
-        </el-badge>
-      </template>
-    </x-form>
-    <executionListenerDialog
-      v-if="dialogName === 'executionListenerDialog'"
-      :element="element"
-      :modeler="modeler"
-      @close="finishExecutionListener"
-    />
-    <signalDialog
-      v-if="dialogName === 'signalDialog'"
-      :element="element"
-      :modeler="modeler"
-      @close="finishExecutionListener"
-    />
-  </div>
-</template>
-
-<script>
-import mixinPanel from '../../common/mixinPanel'
-import mixinExecutionListener from '../../common/mixinExecutionListener'
-import signalDialog from './property/signal'
-import { commonParse } from '../../common/parseElement'
-export default {
-  components: {
-    signalDialog
-  },
-  mixins: [mixinPanel, mixinExecutionListener],
-  data() {
-    return {
-      signalLength: 0,
-      formData: {}
-    }
-  },
-  computed: {
-    formConfig() {
-      const _this = this
-      return {
-        inline: false,
-        item: [
-          {
-            xType: 'select',
-            name: 'processCategory',
-            label: '流程分类',
-            dic: { data: _this.categorys, label: 'name', value: 'id' }
-          },
-          {
-            xType: 'input',
-            name: 'id',
-            label: '流程标识key',
-            rules: [{ required: true, message: 'Id 不能为空' }]
-          },
-          {
-            xType: 'input',
-            name: 'name',
-            label: '流程名称'
-          },
-          {
-            xType: 'input',
-            name: 'documentation',
-            label: '节点描述'
-          },
-          {
-            xType: 'slot',
-            name: 'executionListener',
-            label: '执行监听器'
-          },
-          {
-            xType: 'slot',
-            name: 'signal',
-            label: '信号定义'
-          }
-        ]
-      }
-    }
-  },
-  watch: {
-    'formData.processCategory': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:processCategory': val })
-    }
-  },
-  created() {
-    this.formData = commonParse(this.element)
-  },
-  methods: {
-    computedSignalLength() {
-      this.signalLength = this.element.businessObject.extensionElements?.values?.length ?? 0
-    },
-    finishSignal() {
-      if (this.dialogName === 'signalDialog') {
-        this.computedSignalLength()
-      }
-      this.dialogName = ''
-    }
-  }
-}
-</script>
-
-<style>
-
-</style>
diff --git a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/property/executionListener.vue b/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/property/executionListener.vue
deleted file mode 100644
index df105f93..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/property/executionListener.vue
+++ /dev/null
@@ -1,195 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      title="执行监听器"
-      :visible.sync="dialogVisible"
-      width="900px"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :show-close="false"
-      @closed="$emit('close')"
-      append-to-body
-    >
-      <x-form ref="xForm" v-model="formData" :config="formConfig">
-        <template #params="scope">
-          <el-badge :value="scope.row.params ? scope.row.params.length : 0" type="primary">
-            <el-button size="small" @click="configParam(scope.$index)">配置</el-button>
-          </el-badge>
-        </template>
-      </x-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" size="medium" @click="closeDialog">确 定</el-button>
-      </span>
-    </el-dialog>
-    <listenerParam v-if="showParamDialog" :value="formData.executionListener[nowIndex].params" @close="finishConfigParam" />
-  </div>
-</template>
-
-<script>
-import mixinPanel from '../../../common/mixinPanel'
-import listenerParam from './listenerParam'
-export default {
-  components: { listenerParam },
-  mixins: [mixinPanel],
-  data() {
-    return {
-      dialogVisible: true,
-      showParamDialog: false,
-      nowIndex: null,
-      formData: {
-        executionListener: []
-      }
-    }
-  },
-  computed: {
-    formConfig() {
-    //   const _this = this
-      return {
-        inline: false,
-        item: [
-          {
-            xType: 'tabs',
-            tabs: [
-              {
-                label: '执行监听器',
-                name: 'executionListener',
-                column: [
-                  {
-                    label: '事件',
-                    name: 'event',
-                    width: 180,
-                    rules: [{ required: true, message: '请选择', trigger: ['blur', 'change'] }],
-                    xType: 'select',
-                    dic: [
-                      { label: 'start', value: 'start' },
-                      { label: 'end', value: 'end' },
-                      { label: 'take', value: 'take' }
-                    ]
-                  },
-                  {
-                    label: '类型',
-                    name: 'type',
-                    width: 180,
-                    rules: [{ required: true, message: '请选择', trigger: ['blur', 'change'] }],
-                    xType: 'select',
-                    dic: [
-                      { label: '类', value: 'class' },
-                      { label: '表达式', value: 'expression' },
-                      { label: '委托表达式', value: 'delegateExpression' }
-                    ],
-                    tooltip: `类：示例 com.company.MyCustomListener，自定义类必须实现 org.flowable.engine.delegate.TaskListener 接口 <br />
-                              表达式：示例 \${myObject.callMethod(task, task.eventName)} <br />
-                              委托表达式：示例 \${myListenerSpringBean} ，该 springBean 需要实现 org.flowable.engine.delegate.TaskListener 接口
-                    `
-                  },
-                  {
-                    label: 'java 类名',
-                    name: 'className',
-                    xType: 'input',
-                    rules: [{ required: true, message: '请输入', trigger: ['blur', 'change'] }]
-                  },
-                  {
-                    xType: 'slot',
-                    label: '参数',
-                    width: 120,
-                    slot: true,
-                    name: 'params'
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  mounted() {
-    this.formData.executionListener = this.element.businessObject.extensionElements?.values
-      .filter(item => item.$type === 'flowable:ExecutionListener')
-      .map(item => {
-        let type
-        if ('class' in item) type = 'class'
-        if ('expression' in item) type = 'expression'
-        if ('delegateExpression' in item) type = 'delegateExpression'
-        return {
-          event: item.event,
-          type: type,
-          className: item[type],
-          params: item.fields?.map(field => {
-            let fieldType
-            if ('stringValue' in field) fieldType = 'stringValue'
-            if ('expression' in field) fieldType = 'expression'
-            return {
-              name: field.name,
-              type: fieldType,
-              value: field[fieldType]
-            }
-          }) ?? []
-        }
-      }) ?? []
-  },
-  methods: {
-    configParam(index) {
-      this.nowIndex = index
-      const nowObj = this.formData.executionListener[index]
-      if (!nowObj.params) {
-        nowObj.params = []
-      }
-      this.showParamDialog = true
-    },
-    finishConfigParam(param) {
-      this.showParamDialog = false
-      // hack 数量不更新问题
-      const cache = this.formData.executionListener[this.nowIndex]
-      cache.params = param
-      this.$set(this.formData.executionListener[this.nowIndex], this.nowIndex, cache)
-      this.nowIndex = null
-    },
-    updateElement() {
-      if (this.formData.executionListener?.length) {
-        let extensionElements = this.element.businessObject.get('extensionElements')
-        if (!extensionElements) {
-          extensionElements = this.modeler.get('moddle').create('bpmn:ExtensionElements')
-        }
-        // 清除旧值
-        extensionElements.values = extensionElements.values?.filter(item => item.$type !== 'flowable:ExecutionListener') ?? []
-        this.formData.executionListener.forEach(item => {
-          const executionListener = this.modeler.get('moddle').create('flowable:ExecutionListener')
-          executionListener['event'] = item.event
-          executionListener[item.type] = item.className
-          if (item.params && item.params.length) {
-            item.params.forEach(field => {
-              const fieldElement = this.modeler.get('moddle').create('flowable:Field')
-              fieldElement['name'] = field.name
-              fieldElement[field.type] = field.value
-              // 注意：flowable.json 中定义的string和expression类为小写，不然会和原生的String类冲突，此处为hack
-              // const valueElement = this.modeler.get('moddle').create(`flowable:${field.type}`, { body: field.value })
-              // fieldElement[field.type] = valueElement
-              executionListener.get('fields').push(fieldElement)
-            })
-          }
-          extensionElements.get('values').push(executionListener)
-        })
-        this.updateProperties({ extensionElements: extensionElements })
-      } else {
-        const extensionElements = this.element.businessObject[`extensionElements`]
-        if (extensionElements) {
-          extensionElements.values = extensionElements.values?.filter(item => item.$type !== 'flowable:ExecutionListener') ?? []
-        }
-      }
-    },
-    closeDialog() {
-      this.$refs.xForm.validate().then(() => {
-        this.updateElement()
-        this.dialogVisible = false
-      }).catch(e => console.error(e))
-    }
-  }
-}
-</script>
-
-<style>
-.flow-containers  .el-badge__content.is-fixed {
-    top: 18px;
-}
-</style>
diff --git a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/property/listenerParam.vue b/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/property/listenerParam.vue
deleted file mode 100644
index 2e0f8b10..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/property/listenerParam.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      title="监听器参数"
-      :visible.sync="dialogVisible"
-      width="700px"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :show-close="false"
-      @closed="$emit('close', formData.paramList)"
-      append-to-body
-    >
-      <x-form ref="xForm" v-model="formData" :config="formConfig" />
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" size="medium" @click="closeDialog">确 定</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import mixinXcrud from '../../../common/mixinXcrud'
-export default {
-  mixins: [mixinXcrud],
-  props: {
-    value: {
-      type: Array,
-      default: () => []
-    }
-  },
-  data() {
-    return {
-      dialogVisible: true,
-      formData: {
-        paramList: this.value
-      }
-    }
-  },
-  computed: {
-    formConfig() {
-      return {
-        inline: false,
-        item: [
-          {
-            xType: 'tabs',
-            tabs: [
-              {
-                label: '监听器参数',
-                name: 'paramList',
-                column: [
-                  {
-                    label: '类型',
-                    name: 'type',
-                    width: 180,
-                    rules: [{ required: true, message: '请选择', trigger: ['blur', 'change'] }],
-                    xType: 'select',
-                    dic: [
-                      { label: '字符串', value: 'stringValue' },
-                      { label: '表达式', value: 'expression' }
-                    ]
-                  },
-                  {
-                    label: '名称',
-                    name: 'name',
-                    width: 180,
-                    rules: [{ required: true, message: '请选择', trigger: ['blur', 'change'] }],
-                    xType: 'input'
-                  },
-                  {
-                    label: '值',
-                    name: 'value',
-                    xType: 'input',
-                    rules: [{ required: true, message: '请输入', trigger: ['blur', 'change'] }]
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  methods: {
-    closeDialog() {
-      this.$refs.xForm.validate().then(() => {
-        this.dialogVisible = false
-      }).catch(e => console.error(e))
-    }
-  }
-}
-</script>
-
-<style>
-.flow-containers  .el-badge__content.is-fixed {
-    top: 18px;
-}
-</style>
diff --git a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/property/multiInstance.vue b/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/property/multiInstance.vue
deleted file mode 100644
index 49eb06c3..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/property/multiInstance.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      title="多实例配置"
-      :visible.sync="dialogVisible"
-      width="500px"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :show-close="false"
-      class="muti-instance"
-      @closed="$emit('close')"
-      append-to-body
-    >
-      <el-alert
-        type="info"
-        :closable="false"
-        show-icon
-        style="margin-bottom: 20px"
-      >
-        <template #title>
-          按照BPMN2.0规范的要求，用于为每个实例创建执行的父执行，会提供下列变量:<br>
-          nrOfInstances：实例总数。<br>
-          nrOfActiveInstances：当前活动的（即未完成的），实例数量。对于顺序多实例，这个值总为1。<br>
-          nrOfCompletedInstances：已完成的实例数量。<br>
-          loopCounter：给定实例在for-each循环中的index。<br>
-        </template>
-      </el-alert>
-      <x-form ref="xForm" v-model="formData" :config="formConfig" />
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import mixinPanel from '../../../common/mixinPanel'
-import { formatJsonKeyValue } from '../../../common/parseElement'
-export default {
-  mixins: [mixinPanel],
-  data() {
-    return {
-      dialogVisible: true,
-      formData: {}
-    }
-  },
-  computed: {
-    formConfig() {
-      const _this = this
-      return {
-        inline: false,
-        item: [
-          {
-            xType: 'input',
-            name: 'collection',
-            label: '集合',
-            tooltip: '属性会作为表达式进行解析。如果表达式解析为字符串而不是一个集合，<br />不论是因为本身配置的就是静态字符串值，还是表达式计算结果为字符串，<br />这个字符串都会被当做变量名，并从流程变量中用于获取实际的集合。'
-          },
-          {
-            xType: 'input',
-            name: 'elementVariable',
-            label: '元素变量',
-            tooltip: '每创建一个用户任务前，先以该元素变量为label，集合中的一项为value，<br />创建（局部）流程变量，该局部流程变量被用于指派用户任务。<br />一般来说，该字符串应与指定人员变量相同。'
-          },
-          {
-            xType: 'radio',
-            name: 'isSequential',
-            label: '执行方式',
-            dic: [{ label: '串行', value: true }, { label: '并行', value: false }]
-          },
-          {
-            xType: 'input',
-            name: 'completionCondition',
-            label: '完成条件',
-            tooltip: '多实例活动在所有实例都完成时结束，然而也可以指定一个表达式，在每个实例<br />结束时进行计算。当表达式计算为true时，将销毁所有剩余的实例，并结束多实例<br />活动，继续执行流程。例如 ${nrOfCompletedInstances/nrOfInstances >= 0.6 }，<br />表示当任务完成60%时，该节点就算完成'
-          }
-        ],
-        operate: [
-          { text: '确定', show: true, click: _this.save },
-          { text: '清空', show: true, click: () => { _this.formData = {} } }
-        ]
-      }
-    }
-  },
-  mounted() {
-    const cache = JSON.parse(JSON.stringify(this.element.businessObject.loopCharacteristics ?? {}))
-    cache.completionCondition = cache.completionCondition?.body
-    this.formData = formatJsonKeyValue(cache)
-  },
-  methods: {
-    updateElement() {
-      if (this.formData.isSequential !== null && this.formData.isSequential !== undefined) {
-        let loopCharacteristics = this.element.businessObject.get('loopCharacteristics')
-        if (!loopCharacteristics) {
-          loopCharacteristics = this.modeler.get('moddle').create('bpmn:MultiInstanceLoopCharacteristics')
-        }
-        loopCharacteristics['isSequential'] = this.formData.isSequential
-        loopCharacteristics['collection'] = this.formData.collection
-        loopCharacteristics['elementVariable'] = this.formData.elementVariable
-        if (this.formData.completionCondition) {
-          const completionCondition = this.modeler.get('moddle').create('bpmn:Expression', { body: this.formData.completionCondition })
-          loopCharacteristics['completionCondition'] = completionCondition
-        }
-        this.updateProperties({ loopCharacteristics: loopCharacteristics })
-      } else {
-        delete this.element.businessObject.loopCharacteristics
-      }
-    },
-    save() {
-      this.updateElement()
-      this.dialogVisible = false
-    }
-  }
-}
-</script>
-
-<style>
-.muti-instance .el-form-item {
-  margin-bottom: 22px;
-}
-</style>
diff --git a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/property/signal.vue b/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/property/signal.vue
deleted file mode 100644
index 781c24d2..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/property/signal.vue
+++ /dev/null
@@ -1,125 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      title="信号定义"
-      :visible.sync="dialogVisible"
-      width="700px"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :show-close="false"
-      @closed="$emit('close')"
-      append-to-body
-    >
-      <x-form ref="xForm" v-model="formData" :config="formConfig" />
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" size="medium" @click="closeDialog">确 定</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import mixinPanel from '../../../common/mixinPanel'
-export default {
-  mixins: [mixinPanel],
-  data() {
-    return {
-      dialogVisible: true,
-      formData: {
-        signal: []
-      }
-    }
-  },
-  computed: {
-    formConfig() {
-    //   const _this = this
-      return {
-        inline: false,
-        item: [
-          {
-            xType: 'tabs',
-            tabs: [
-              {
-                label: '信号定义',
-                name: 'signal',
-                column: [
-                  {
-                    label: 'scope',
-                    name: 'scope',
-                    width: 180,
-                    rules: [{ required: true, message: '请选择', trigger: ['blur', 'change'] }],
-                    xType: 'select',
-                    dic: [
-                      { label: '全局', value: 'start' },
-                      { label: '流程实例', value: 'end' }
-                    ]
-                  },
-                  {
-                    label: 'id',
-                    name: 'id',
-                    width: 200,
-                    rules: [{ required: true, message: '请输入', trigger: ['blur', 'change'] }],
-                    xType: 'input'
-                  },
-                  {
-                    label: '名称',
-                    name: 'name',
-                    xType: 'input',
-                    rules: [{ required: true, message: '请输入', trigger: ['blur', 'change'] }]
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  mounted() {
-    // this.formData.signal = this.element.businessObject.extensionElements?.values.map(item => {
-    //   let type
-    //   if ('class' in item.$attrs) type = 'class'
-    //   if ('expression' in item.$attrs) type = 'expression'
-    //   if ('delegateExpression' in item.$attrs) type = 'delegateExpression'
-    //   return {
-    //     event: item.$attrs.event,
-    //     type: type,
-    //     className: item.$attrs[type]
-    //   }
-    // }) ?? []
-  },
-  methods: {
-    updateElement() {
-      if (this.formData.signal?.length) {
-        let extensionElements = this.element.businessObject.get('extensionElements')
-        if (!extensionElements) {
-          extensionElements = this.modeler.get('moddle').create('bpmn:signal')
-        }
-        const length = extensionElements.get('values').length
-        for (let i = 0; i < length; i++) {
-          // 清除旧值
-          extensionElements.get('values').pop()
-        }
-        this.updateProperties({ extensionElements: extensionElements })
-      } else {
-        const extensionElements = this.element.businessObject[`extensionElements`]
-        if (extensionElements) {
-          extensionElements.values = extensionElements.values?.filter(item => item.$type !== 'flowable:ExecutionListener')
-        }
-      }
-    },
-    closeDialog() {
-      this.$refs.xForm.validate().then(() => {
-        this.updateElement()
-        this.dialogVisible = false
-      }).catch(e => console.error(e))
-    }
-  }
-}
-</script>
-
-<style>
-.flow-containers  .el-badge__content.is-fixed {
-    top: 18px;
-}
-</style>
diff --git a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/property/taskListener.vue b/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/property/taskListener.vue
deleted file mode 100644
index 7f1b56e7..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/property/taskListener.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-      title="任务监听器"
-      :visible.sync="dialogVisible"
-      width="900px"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :show-close="false"
-      @closed="$emit('close')"
-      append-to-body
-    >
-      <x-form ref="xForm" v-model="formData" :config="formConfig">
-        <template #params="scope">
-          <el-badge :value="scope.row.params ? scope.row.params.length : 0" type="primary">
-            <el-button size="small" @click="configParam(scope.$index)">配置</el-button>
-          </el-badge>
-        </template>
-      </x-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" size="medium" @click="closeDialog">确 定</el-button>
-      </span>
-    </el-dialog>
-    <listenerParam v-if="showParamDialog" :value="formData.taskListener[nowIndex].params" @close="finishConfigParam" />
-  </div>
-</template>
-
-<script>
-import mixinPanel from '../../../common/mixinPanel'
-import listenerParam from './listenerParam'
-export default {
-  components: { listenerParam },
-  mixins: [mixinPanel],
-  data() {
-    return {
-      dialogVisible: true,
-      showParamDialog: false,
-      nowIndex: null,
-      formData: {
-        taskListener: []
-      }
-    }
-  },
-  computed: {
-    formConfig() {
-    //   const _this = this
-      return {
-        inline: false,
-        item: [
-          {
-            xType: 'tabs',
-            tabs: [
-              {
-                label: '任务监听器',
-                name: 'taskListener',
-                column: [
-                  {
-                    label: '事件',
-                    name: 'event',
-                    width: 180,
-                    rules: [{ required: true, message: '请选择', trigger: ['blur', 'change'] }],
-                    xType: 'select',
-                    dic: [
-                      { label: 'create', value: 'create' },
-                      { label: 'assignment', value: 'assignment' },
-                      { label: 'complete', value: 'complete' },
-                      { label: 'delete', value: 'delete' }
-                    ],
-                    tooltip: `create（创建）：当任务已经创建，并且所有任务参数都已经设置时触发。<br />
-                              assignment（指派）：当任务已经指派给某人时触发。请注意：当流程执行到达用户任务时，在触发create事件之前，会首先触发assignment事件。<br />
-                              complete（完成）：当任务已经完成，从运行时数据中删除前触发。<br />
-                              delete（删除）：在任务即将被删除前触发。请注意任务由completeTask正常完成时也会触发。
-                    `
-                  },
-                  {
-                    label: '类型',
-                    name: 'type',
-                    width: 180,
-                    rules: [{ required: true, message: '请选择', trigger: ['blur', 'change'] }],
-                    xType: 'select',
-                    dic: [
-                      { label: '类', value: 'class' },
-                      { label: '表达式', value: 'expression' },
-                      { label: '委托表达式', value: 'delegateExpression' }
-                    ]
-                  },
-                  {
-                    label: 'java 类名',
-                    name: 'className',
-                    xType: 'input',
-                    rules: [{ required: true, message: '请输入', trigger: ['blur', 'change'] }]
-                  },
-                  {
-                    xType: 'slot',
-                    label: '参数',
-                    width: 120,
-                    slot: true,
-                    name: 'params'
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  mounted() {
-    this.formData.taskListener = this.element.businessObject.extensionElements?.values
-      .filter(item => item.$type === 'flowable:TaskListener')
-      .map(item => {
-        let type
-        if ('class' in item) type = 'class'
-        if ('expression' in item) type = 'expression'
-        if ('delegateExpression' in item) type = 'delegateExpression'
-        return {
-          event: item.event,
-          type: type,
-          className: item[type],
-          params: item.fields?.map(field => {
-            let fieldType
-            if ('stringValue' in field) fieldType = 'stringValue'
-            if ('expression' in field) fieldType = 'expression'
-            return {
-              name: field.name,
-              type: fieldType,
-              value: field[fieldType]
-            }
-          }) ?? []
-        }
-      }) ?? []
-  },
-  methods: {
-    configParam(index) {
-      this.nowIndex = index
-      const nowObj = this.formData.taskListener[index]
-      if (!nowObj.params) {
-        nowObj.params = []
-      }
-      this.showParamDialog = true
-    },
-    finishConfigParam(param) {
-      this.showParamDialog = false
-      // hack 数量不更新问题
-      const cache = this.formData.taskListener[this.nowIndex]
-      cache.params = param
-      this.$set(this.formData.taskListener[this.nowIndex], this.nowIndex, cache)
-      this.nowIndex = null
-    },
-    updateElement() {
-      if (this.formData.taskListener?.length) {
-        let extensionElements = this.element.businessObject.get('extensionElements')
-        if (!extensionElements) {
-          extensionElements = this.modeler.get('moddle').create('bpmn:ExtensionElements')
-        }
-        // 清除旧值
-        extensionElements.values = extensionElements.values?.filter(item => item.$type !== 'flowable:TaskListener') ?? []
-        this.formData.taskListener.forEach(item => {
-          const taskListener = this.modeler.get('moddle').create('flowable:TaskListener')
-          taskListener['event'] = item.event
-          taskListener[item.type] = item.className
-          if (item.params && item.params.length) {
-            item.params.forEach(field => {
-              const fieldElement = this.modeler.get('moddle').create('flowable:Field')
-              fieldElement['name'] = field.name
-              fieldElement[field.type] = field.value
-              // 注意：flowable.json 中定义的string和expression类为小写，不然会和原生的String类冲突，此处为hack
-              // const valueElement = this.modeler.get('moddle').create(`flowable:${field.type}`, { body: field.value })
-              // fieldElement[field.type] = valueElement
-              taskListener.get('fields').push(fieldElement)
-            })
-          }
-          extensionElements.get('values').push(taskListener)
-        })
-        this.updateProperties({ extensionElements: extensionElements })
-      } else {
-        const extensionElements = this.element.businessObject[`extensionElements`]
-        if (extensionElements) {
-          extensionElements.values = extensionElements.values?.filter(item => item.$type !== 'flowable:TaskListener') ?? []
-        }
-      }
-    },
-    closeDialog() {
-      this.$refs.xForm.validate().then(() => {
-        this.updateElement()
-        this.dialogVisible = false
-      }).catch(e => console.error(e))
-    }
-  }
-}
-</script>
-
-<style>
-.flow-containers  .el-badge__content.is-fixed {
-    top: 18px;
-}
-</style>
diff --git a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/sequenceFlow.vue b/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/sequenceFlow.vue
deleted file mode 100644
index 178cd7d4..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/sequenceFlow.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-  <div>
-    <x-form ref="xForm" v-model="formData" :config="formConfig">
-      <template #executionListener>
-        <el-badge :value="executionListenerLength">
-          <el-button size="small" @click="dialogName = 'executionListenerDialog'">编辑</el-button>
-        </el-badge>
-      </template>
-    </x-form>
-    <executionListenerDialog
-      v-if="dialogName === 'executionListenerDialog'"
-      :element="element"
-      :modeler="modeler"
-      @close="finishExecutionListener"
-    />
-  </div>
-</template>
-
-<script>
-import mixinPanel from '../../common/mixinPanel'
-import mixinExecutionListener from '../../common/mixinExecutionListener'
-import { commonParse, conditionExpressionParse } from '../../common/parseElement'
-export default {
-  mixins: [mixinPanel, mixinExecutionListener],
-  data() {
-    return {
-      formData: {}
-    }
-  },
-  computed: {
-    formConfig() {
-      return {
-        inline: false,
-        item: [
-          {
-            xType: 'input',
-            name: 'id',
-            label: '节点 id',
-            rules: [{ required: true, message: 'Id 不能为空' }]
-          },
-          {
-            xType: 'input',
-            name: 'name',
-            label: '节点名称'
-          },
-          {
-            xType: 'input',
-            name: 'documentation',
-            label: '节点描述'
-          },
-          {
-            xType: 'slot',
-            name: 'executionListener',
-            label: '执行监听器'
-          },
-          {
-            xType: 'input',
-            name: 'conditionExpression',
-            label: '跳转条件'
-          },
-          {
-            xType: 'input',
-            name: 'skipExpression',
-            label: '跳过表达式'
-          }
-        ]
-      }
-    }
-  },
-  watch: {
-    'formData.conditionExpression': function(val) {
-      if (val) {
-        const newCondition = this.modeler.get('moddle').create('bpmn:FormalExpression', { body: val })
-        this.updateProperties({ conditionExpression: newCondition })
-      } else {
-        this.updateProperties({ conditionExpression: null })
-      }
-    },
-    'formData.skipExpression': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:skipExpression': val })
-    }
-  },
-  created() {
-    let cache = commonParse(this.element)
-    cache = conditionExpressionParse(cache)
-    this.formData = cache
-  }
-}
-</script>
-
-<style></style>
diff --git a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/startEnd.vue b/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/startEnd.vue
deleted file mode 100644
index f16fe226..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/startEnd.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-  <div>
-    <x-form ref="xForm" v-model="formData" :config="formConfig">
-      <template #executionListener>
-        <el-badge :value="executionListenerLength">
-          <el-button size="small" @click="dialogName = 'executionListenerDialog'">编辑</el-button>
-        </el-badge>
-      </template>
-    </x-form>
-    <executionListenerDialog
-      v-if="dialogName === 'executionListenerDialog'"
-      :element="element"
-      :modeler="modeler"
-      @close="finishExecutionListener"
-    />
-  </div>
-</template>
-
-<script>
-import mixinPanel from '../../common/mixinPanel'
-import mixinExecutionListener from '../../common/mixinExecutionListener'
-import { commonParse } from '../../common/parseElement'
-export default {
-  mixins: [mixinPanel, mixinExecutionListener],
-  data() {
-    return {
-      formData: {}
-    }
-  },
-  computed: {
-    formConfig() {
-      const _this = this
-      return {
-        inline: false,
-        item: [
-          {
-            xType: 'input',
-            name: 'id',
-            label: '节点 id',
-            rules: [{ required: true, message: 'Id 不能为空' }]
-          },
-          {
-            xType: 'input',
-            name: 'name',
-            label: '节点名称'
-          },
-          {
-            xType: 'input',
-            name: 'documentation',
-            label: '节点描述'
-          },
-          {
-            xType: 'slot',
-            name: 'executionListener',
-            label: '执行监听器'
-          },
-          {
-            xType: 'input',
-            name: 'initiator',
-            label: '发起人',
-            show: !!_this.showConfig.initiator
-          },
-          {
-            xType: 'input',
-            name: 'formKey',
-            label: '表单标识key',
-            show: !!_this.showConfig.formKey
-          }
-        ]
-      }
-    }
-  },
-  watch: {
-    'formData.initiator': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:initiator': val })
-    },
-    'formData.formKey': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:formKey': val })
-    }
-  },
-  created() {
-    this.formData = commonParse(this.element)
-  }
-}
-</script>
-
-<style>
-
-</style>
diff --git a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/task.vue b/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/task.vue
deleted file mode 100644
index 053fe673..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/components/nodePanel/task.vue
+++ /dev/null
@@ -1,376 +0,0 @@
-<template>
-  <div>
-    <x-form ref="xForm" v-model="formData" :config="formConfig">
-      <template #executionListener>
-        <el-badge :value="executionListenerLength">
-          <el-button size="small" @click="dialogName = 'executionListenerDialog'">编辑</el-button>
-        </el-badge>
-      </template>
-      <template #taskListener>
-        <el-badge :value="taskListenerLength">
-          <el-button size="small" @click="dialogName = 'taskListenerDialog'">编辑</el-button>
-        </el-badge>
-      </template>
-      <template #multiInstance>
-        <el-badge :is-dot="hasMultiInstance">
-          <el-button size="small" @click="dialogName = 'multiInstanceDialog'">编辑</el-button>
-        </el-badge>
-      </template>
-    </x-form>
-    <executionListenerDialog
-      v-if="dialogName === 'executionListenerDialog'"
-      :element="element"
-      :modeler="modeler"
-      @close="finishExecutionListener"
-    />
-    <taskListenerDialog
-      v-if="dialogName === 'taskListenerDialog'"
-      :element="element"
-      :modeler="modeler"
-      @close="finishTaskListener"
-    />
-    <multiInstanceDialog
-      v-if="dialogName === 'multiInstanceDialog'"
-      :element="element"
-      :modeler="modeler"
-      @close="finishMultiInstance"
-    />
-  </div>
-</template>
-
-<script>
-import mixinPanel from '../../common/mixinPanel'
-import executionListenerDialog from './property/executionListener'
-import taskListenerDialog from './property/taskListener'
-import multiInstanceDialog from './property/multiInstance'
-import { commonParse, userTaskParse } from '../../common/parseElement'
-export default {
-  components: {
-    executionListenerDialog,
-    taskListenerDialog,
-    multiInstanceDialog
-  },
-  mixins: [mixinPanel],
-  props: {
-    users: {
-      type: Array,
-      required: true
-    },
-    groups: {
-      type: Array,
-      required: true
-    }
-  },
-  data() {
-    return {
-      userTypeOption: [
-        { label: '指定人员', value: 'assignee' }//,
-        // { label: '候选人员', value: 'candidateUsers' },
-        // { label: '候选组', value: 'candidateGroups' }
-      ],
-      dialogName: '',
-      executionListenerLength: 0,
-      taskListenerLength: 0,
-      hasMultiInstance: false,
-      formData: {}
-    }
-  },
-  computed: {
-    formConfig() {
-      const _this = this
-      return {
-        inline: false,
-        item: [
-          {
-            xType: 'input',
-            name: 'id',
-            label: '节点 id',
-            rules: [{ required: true, message: 'Id 不能为空' }]
-          },
-          {
-            xType: 'input',
-            name: 'name',
-            label: '节点名称'
-          },
-          {
-            xType: 'input',
-            name: 'documentation',
-            label: '节点描述'
-          },
-          {
-            xType: 'slot',
-            name: 'executionListener',
-            label: '执行监听器'
-          },
-          {
-            xType: 'slot',
-            name: 'taskListener',
-            label: '任务监听器',
-            show: !!_this.showConfig.taskListener
-          },
-          {
-            xType: 'select',
-            name: 'userType',
-            label: '人员类型',
-            dic: _this.userTypeOption,
-            show: !!_this.showConfig.userType
-          },
-          {
-            xType: 'select',
-            name: 'assignee',
-            label: '指定人员',
-            allowCreate: true,
-            filterable: true,
-            clearable: true,
-            dic: { data: _this.users, label: 'name', value: 'id' },
-            show: !!_this.showConfig.assignee && _this.formData.userType === 'assignee'
-          },
-          {
-            xType: 'select',
-            name: 'candidateUsers',
-            label: '候选人员',
-            multiple: true,
-            allowCreate: true,
-            filterable: true,
-            dic: { data: _this.users, label: 'name', value: 'id' },
-            show: !!_this.showConfig.candidateUsers && _this.formData.userType === 'candidateUsers'
-          },
-          {
-            xType: 'select',
-            name: 'candidateGroups',
-            label: '候选组',
-            multiple: true,
-            allowCreate: true,
-            filterable: true,
-            dic: { data: _this.groups, label: 'name', value: 'id' },
-            show: !!_this.showConfig.candidateGroups && _this.formData.userType === 'candidateGroups'
-          },
-          {
-            xType: 'slot',
-            name: 'multiInstance',
-            label: '多实例'
-          },
-          {
-            xType: 'switch',
-            name: 'async',
-            label: '异步',
-            activeText: '是',
-            inactiveText: '否',
-            show: !!_this.showConfig.async
-          },
-          {
-            xType: 'input',
-            name: 'priority',
-            label: '优先级',
-            show: !!_this.showConfig.priority
-          },
-          {
-            xType: 'input',
-            name: 'formKey',
-            label: '表单标识key',
-            show: !!_this.showConfig.formKey
-          },
-          {
-            xType: 'input',
-            name: 'skipExpression',
-            label: '跳过表达式',
-            show: !!_this.showConfig.skipExpression
-          },
-          {
-            xType: 'switch',
-            name: 'isForCompensation',
-            label: '是否为补偿',
-            activeText: '是',
-            inactiveText: '否',
-            show: !!_this.showConfig.isForCompensation
-          },
-          {
-            xType: 'switch',
-            name: 'triggerable',
-            label: '服务任务可触发',
-            activeText: '是',
-            inactiveText: '否',
-            show: !!_this.showConfig.triggerable
-          },
-          {
-            xType: 'switch',
-            name: 'autoStoreVariables',
-            label: '自动存储变量',
-            activeText: '是',
-            inactiveText: '否',
-            show: !!_this.showConfig.autoStoreVariables
-          },
-          {
-            xType: 'input',
-            name: 'ruleVariablesInput',
-            label: '输入变量',
-            show: !!_this.showConfig.ruleVariablesInput
-          },
-          {
-            xType: 'input',
-            name: 'rules',
-            label: '规则',
-            show: !!_this.showConfig.rules
-          },
-          {
-            xType: 'input',
-            name: 'resultVariable',
-            label: '结果变量',
-            show: !!_this.showConfig.resultVariable
-          },
-          {
-            xType: 'switch',
-            name: 'exclude',
-            label: '排除',
-            activeText: '是',
-            inactiveText: '否',
-            show: !!_this.showConfig.exclude
-          },
-          {
-            xType: 'input',
-            name: 'class',
-            label: '类',
-            show: !!_this.showConfig.class
-          },
-          {
-            xType: 'datePicker',
-            type: 'datetime',
-            name: 'dueDate',
-            label: '到期时间',
-            show: !!_this.showConfig.dueDate
-          }
-        ]
-      }
-    }
-  },
-  watch: {
-    'formData.userType': function(val, oldVal) {
-      if (oldVal) {
-        const types = ['assignee', 'candidateUsers', 'candidateGroups']
-        types.forEach(type => {
-          delete this.element.businessObject.$attrs[`flowable:${type}`]
-          delete this.formData[type]
-        })
-      }
-    },
-    'formData.assignee': function(val) {
-      if (this.formData.userType !== 'assignee') {
-        delete this.element.businessObject.$attrs[`flowable:assignee`]
-        return
-      }
-      this.updateProperties({ 'flowable:assignee': val })
-    },
-    'formData.candidateUsers': function(val) {
-      if (this.formData.userType !== 'candidateUsers') {
-        delete this.element.businessObject.$attrs[`flowable:candidateUsers`]
-        return
-      }
-      this.updateProperties({ 'flowable:candidateUsers': val?.join(',') })
-    },
-    'formData.candidateGroups': function(val) {
-      if (this.formData.userType !== 'candidateGroups') {
-        delete this.element.businessObject.$attrs[`flowable:candidateGroups`]
-        return
-      }
-      this.updateProperties({ 'flowable:candidateGroups': val?.join(',') })
-    },
-    'formData.async': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:async': true })
-    },
-    'formData.dueDate': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:dueDate': val })
-    },
-    'formData.formKey': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:formKey': val })
-    },
-    'formData.priority': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:priority': val })
-    },
-    'formData.skipExpression': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:skipExpression': val })
-    },
-    'formData.isForCompensation': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'isForCompensation': val })
-    },
-    'formData.triggerable': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:triggerable': val })
-    },
-    'formData.class': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:class': val })
-    },
-    'formData.autoStoreVariables': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:autoStoreVariables': val })
-    },
-    'formData.exclude': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:exclude': val })
-    },
-    'formData.ruleVariablesInput': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:ruleVariablesInput': val })
-    },
-    'formData.rules': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:rules': val })
-    },
-    'formData.resultVariable': function(val) {
-      if (val === '') val = null
-      this.updateProperties({ 'flowable:resultVariable': val })
-    }
-  },
-  created() {
-    let cache = commonParse(this.element)
-    cache = userTaskParse(cache)
-    this.formData = cache
-    this.computedExecutionListenerLength()
-    this.computedTaskListenerLength()
-    this.computedHasMultiInstance()
-  },
-  methods: {
-    computedExecutionListenerLength() {
-      this.executionListenerLength = this.element.businessObject.extensionElements?.values
-        ?.filter(item => item.$type === 'flowable:ExecutionListener').length ?? 0
-    },
-    computedTaskListenerLength() {
-      this.taskListenerLength = this.element.businessObject.extensionElements?.values
-        ?.filter(item => item.$type === 'flowable:TaskListener').length ?? 0
-    },
-    computedHasMultiInstance() {
-      if (this.element.businessObject.loopCharacteristics) {
-        this.hasMultiInstance = true
-      } else {
-        this.hasMultiInstance = false
-      }
-    },
-    finishExecutionListener() {
-      if (this.dialogName === 'executionListenerDialog') {
-        this.computedExecutionListenerLength()
-      }
-      this.dialogName = ''
-    },
-    finishTaskListener() {
-      if (this.dialogName === 'taskListenerDialog') {
-        this.computedTaskListenerLength()
-      }
-      this.dialogName = ''
-    },
-    finishMultiInstance() {
-      if (this.dialogName === 'multiInstanceDialog') {
-        this.computedHasMultiInstance()
-      }
-      this.dialogName = ''
-    }
-  }
-}
-</script>
-
-<style></style>
diff --git a/ruoyi-ui/src/components/Bpmn/package/flowable/flowable.json b/ruoyi-ui/src/components/Bpmn/package/flowable/flowable.json
deleted file mode 100644
index bffad659..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/flowable/flowable.json
+++ /dev/null
@@ -1,1194 +0,0 @@
-{
-    "name": "Flowable",
-    "uri": "http://flowable.org/bpmn",
-    "prefix": "flowable",
-    "xml": {
-      "tagAlias": "lowerCase"
-    },
-    "associations": [],
-    "types": [
-      {
-        "name": "InOutBinding",
-        "superClass": ["Element"],
-        "isAbstract": true,
-        "properties": [
-          {
-            "name": "source",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "sourceExpression",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "target",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "businessKey",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "local",
-            "isAttr": true,
-            "type": "Boolean",
-            "default": false
-          },
-          {
-            "name": "variables",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "In",
-        "superClass": ["InOutBinding"],
-        "meta": {
-          "allowedIn": ["bpmn:CallActivity"]
-        }
-      },
-      {
-        "name": "Out",
-        "superClass": ["InOutBinding"],
-        "meta": {
-          "allowedIn": ["bpmn:CallActivity"]
-        }
-      },
-      {
-        "name": "AsyncCapable",
-        "isAbstract": true,
-        "extends": ["bpmn:Activity", "bpmn:Gateway", "bpmn:Event"],
-        "properties": [
-          {
-            "name": "async",
-            "isAttr": true,
-            "type": "Boolean",
-            "default": false
-          },
-          {
-            "name": "asyncBefore",
-            "isAttr": true,
-            "type": "Boolean",
-            "default": false
-          },
-          {
-            "name": "asyncAfter",
-            "isAttr": true,
-            "type": "Boolean",
-            "default": false
-          },
-          {
-            "name": "exclusive",
-            "isAttr": true,
-            "type": "Boolean",
-            "default": true
-          }
-        ]
-      },
-      {
-        "name": "flowable:in",
-        "superClass": ["Element"],
-        "properties": [
-          {
-            "name": "source",
-            "type": "string",
-            "isAttr": true
-          },
-          {
-            "name": "target",
-            "type": "string",
-            "isAttr": true
-          }
-        ]
-      },
-      {
-        "name": "flowable:out",
-        "superClass": ["Element"],
-        "properties": [
-          {
-            "name": "source",
-            "type": "string",
-            "isAttr": true
-          },
-          {
-            "name": "target",
-            "type": "string",
-            "isAttr": true
-          }
-        ]
-      },
-      {
-        "name": "BoundaryEvent",
-        "superClass": ["CatchEvent"],
-        "properties": [
-          {
-            "name": "cancelActivity",
-            "default": true,
-            "isAttr": true,
-            "type": "Boolean"
-          },
-          {
-            "name": "attachedToRef",
-            "type": "Activity",
-            "isAttr": true,
-            "isReference": true
-          }
-        ]
-      },
-      {
-        "name": "JobPriorized",
-        "isAbstract": true,
-        "extends": ["bpmn:Process", "flowable:AsyncCapable"],
-        "properties": [
-          {
-            "name": "jobPriority",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "SignalEventDefinition",
-        "isAbstract": true,
-        "extends": ["bpmn:SignalEventDefinition"],
-        "properties": [
-          {
-            "name": "async",
-            "isAttr": true,
-            "type": "Boolean",
-            "default": false
-          }
-        ]
-      },
-      {
-        "name": "ErrorEventDefinition",
-        "isAbstract": true,
-        "extends": ["bpmn:ErrorEventDefinition"],
-        "properties": [
-          {
-            "name": "errorCodeVariable",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "errorMessageVariable",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "Error",
-        "isAbstract": true,
-        "extends": ["bpmn:Error"],
-        "properties": [
-          {
-            "name": "flowable:errorMessage",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "PotentialStarter",
-        "superClass": ["Element"],
-        "properties": [
-          {
-            "name": "resourceAssignmentExpression",
-            "type": "bpmn:ResourceAssignmentExpression"
-          }
-        ]
-      },
-      {
-        "name": "UserTask",
-        "isAbstract": true,
-        "extends": ["bpmn:UserTask"],
-        "properties": [
-          {
-            "name": "timerEventDefinition",
-            "type": "Expression"
-          },
-          {
-            "name": "multiInstanceLoopCharacteristics",
-            "type": "MultiInstanceLoopCharacteristics"
-          }
-        ]
-      },
-      {
-        "name": "StartEvent",
-        "isAbstract": true,
-        "extends": ["bpmn:StartEvent"],
-        "properties": [
-          {
-            "name": "timerEventDefinition",
-            "type": "Expression"
-          }
-        ]
-      },
-      {
-        "name": "FormSupported",
-        "isAbstract": true,
-        "extends": ["bpmn:StartEvent", "bpmn:UserTask"],
-        "properties": [
-          {
-            "name": "formHandlerClass",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "formKey",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "TemplateSupported",
-        "isAbstract": true,
-        "extends": ["bpmn:Process", "bpmn:FlowElement"],
-        "properties": [
-          {
-            "name": "modelerTemplate",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "Initiator",
-        "isAbstract": true,
-        "extends": ["bpmn:StartEvent"],
-        "properties": [
-          {
-            "name": "initiator",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "ScriptTask",
-        "isAbstract": true,
-        "extends": ["bpmn:ScriptTask"],
-        "properties": [
-          {
-            "name": "resultVariable",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "resource",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "Process",
-        "isAbstract": true,
-        "extends": ["bpmn:Process"],
-        "properties": [
-          {
-            "name": "candidateStarterGroups",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "candidateStarterUsers",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "versionTag",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "historyTimeToLive",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "isStartableInTasklist",
-            "isAttr": true,
-            "type": "Boolean",
-            "default": true
-          }
-        ]
-      },
-      {
-        "name": "EscalationEventDefinition",
-        "isAbstract": true,
-        "extends": ["bpmn:EscalationEventDefinition"],
-        "properties": [
-          {
-            "name": "escalationCodeVariable",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "FormalExpression",
-        "isAbstract": true,
-        "extends": ["bpmn:FormalExpression"],
-        "properties": [
-          {
-            "name": "resource",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "Assignable",
-        "extends": ["bpmn:UserTask"],
-        "properties": [
-          {
-            "name": "candidateGroups",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "dueDate",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "followUpDate",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "priority",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "CallActivity",
-        "extends": ["bpmn:CallActivity"],
-        "properties": [
-          {
-            "name": "calledElementBinding",
-            "isAttr": true,
-            "type": "String",
-            "default": "latest"
-          },
-          {
-            "name": "calledElementVersion",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "calledElementVersionTag",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "calledElementTenantId",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "caseRef",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "caseBinding",
-            "isAttr": true,
-            "type": "String",
-            "default": "latest"
-          },
-          {
-            "name": "caseVersion",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "caseTenantId",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "variableMappingClass",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "variableMappingDelegateExpression",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "ServiceTaskLike",
-        "extends": [
-          "bpmn:ServiceTask",
-          "bpmn:BusinessRuleTask",
-          "bpmn:SendTask",
-          "bpmn:MessageEventDefinition"
-        ],
-        "properties": [
-          {
-            "name": "expression",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "class",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "delegateExpression",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "resultVariable",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "ExclusiveGateway",
-        "isAbstract": true,
-        "extends": ["bpmn:ExclusiveGateway"],
-        "properties": [
-          {
-            "name": "serviceClass",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "DmnCapable",
-        "extends": ["bpmn:BusinessRuleTask"],
-        "properties": [
-          {
-            "name": "decisionRef",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "decisionRefBinding",
-            "isAttr": true,
-            "type": "String",
-            "default": "latest"
-          },
-          {
-            "name": "decisionRefVersion",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "mapDecisionResult",
-            "isAttr": true,
-            "type": "String",
-            "default": "resultList"
-          },
-          {
-            "name": "decisionRefTenantId",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "ExternalCapable",
-        "extends": ["flowable:ServiceTaskLike"],
-        "properties": [
-          {
-            "name": "type",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "topic",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "TaskPriorized",
-        "extends": ["bpmn:Process", "flowable:ExternalCapable"],
-        "properties": [
-          {
-            "name": "taskPriority",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "Properties",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": ["*"]
-        },
-        "properties": [
-          {
-            "name": "values",
-            "type": "Property",
-            "isMany": true
-          }
-        ]
-      },
-      {
-        "name": "Property",
-        "superClass": ["Element"],
-        "properties": [
-          {
-            "name": "id",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "name",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "value",
-            "type": "String",
-            "isAttr": true
-          }
-        ]
-      },
-      {
-        "name": "Connector",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": ["flowable:ServiceTaskLike"]
-        },
-        "properties": [
-          {
-            "name": "inputOutput",
-            "type": "InputOutput"
-          },
-          {
-            "name": "connectorId",
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "InputOutput",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": ["bpmn:FlowNode", "flowable:Connector"]
-        },
-        "properties": [
-          {
-            "name": "inputOutput",
-            "type": "InputOutput"
-          },
-          {
-            "name": "connectorId",
-            "type": "String"
-          },
-          {
-            "name": "inputParameters",
-            "isMany": true,
-            "type": "InputParameter"
-          },
-          {
-            "name": "outputParameters",
-            "isMany": true,
-            "type": "OutputParameter"
-          }
-        ]
-      },
-      {
-        "name": "InputOutputParameter",
-        "properties": [
-          {
-            "name": "name",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "value",
-            "isBody": true,
-            "type": "String"
-          },
-          {
-            "name": "definition",
-            "type": "InputOutputParameterDefinition"
-          }
-        ]
-      },
-      {
-        "name": "InputOutputParameterDefinition",
-        "isAbstract": true
-      },
-      {
-        "name": "List",
-        "superClass": ["InputOutputParameterDefinition"],
-        "properties": [
-          {
-            "name": "items",
-            "isMany": true,
-            "type": "InputOutputParameterDefinition"
-          }
-        ]
-      },
-      {
-        "name": "Map",
-        "superClass": ["InputOutputParameterDefinition"],
-        "properties": [
-          {
-            "name": "entries",
-            "isMany": true,
-            "type": "Entry"
-          }
-        ]
-      },
-      {
-        "name": "Entry",
-        "properties": [
-          {
-            "name": "key",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "value",
-            "isBody": true,
-            "type": "String"
-          },
-          {
-            "name": "definition",
-            "type": "InputOutputParameterDefinition"
-          }
-        ]
-      },
-      {
-        "name": "Value",
-        "superClass": ["InputOutputParameterDefinition"],
-        "properties": [
-          {
-            "name": "id",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "name",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "value",
-            "isBody": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "Script",
-        "superClass": ["InputOutputParameterDefinition"],
-        "properties": [
-          {
-            "name": "scriptFormat",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "resource",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "value",
-            "isBody": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "Field",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": [
-            "flowable:ServiceTaskLike",
-            "flowable:ExecutionListener",
-            "flowable:TaskListener"
-          ]
-        },
-        "properties": [
-          {
-            "name": "name",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "expression",
-            "isAttr": true,
-            "type": "expression"
-          },
-          {
-            "name": "string",
-            "type": "string"
-          },
-          {
-            "name": "stringValue",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "string",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": [
-            "flowable:Field"
-          ]
-        },
-        "properties": [
-          {
-            "name": "body",
-            "isBody": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "expression",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": [
-            "flowable:Field"
-          ]
-        },
-        "properties": [
-          {
-            "name": "body",
-            "isBody": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "InputParameter",
-        "superClass": ["InputOutputParameter"]
-      },
-      {
-        "name": "OutputParameter",
-        "superClass": ["InputOutputParameter"]
-      },
-      {
-        "name": "Collectable",
-        "isAbstract": true,
-        "extends": ["bpmn:MultiInstanceLoopCharacteristics"],
-        "superClass": ["flowable:AsyncCapable"],
-        "properties": [
-          {
-            "name": "collection",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "elementVariable",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "SequenceFlow",
-        "superClass": ["FlowElement"],
-        "properties": [
-          {
-            "name": "isImmediate",
-            "isAttr": true,
-            "type": "Boolean"
-          },
-          {
-            "name": "conditionExpression",
-            "type": "Expression"
-          },
-          {
-            "name": "sourceRef",
-            "type": "FlowNode",
-            "isAttr": true,
-            "isReference": true
-          },
-          {
-            "name": "targetRef",
-            "type": "FlowNode",
-            "isAttr": true,
-            "isReference": true
-          }
-        ]
-      },
-      {
-        "name": "MultiInstanceLoopCharacteristics",
-        "superClass": ["LoopCharacteristics"],
-        "properties": [
-          {
-            "name": "isSequential",
-            "default": false,
-            "isAttr": true,
-            "type": "Boolean"
-          },
-          {
-            "name": "behavior",
-            "type": "MultiInstanceBehavior",
-            "default": "All",
-            "isAttr": true
-          },
-          {
-            "name": "loopCardinality",
-            "type": "Expression",
-            "xml": {
-              "serialize": "xsi:type"
-            }
-          },
-          {
-            "name": "loopDataInputRef",
-            "type": "ItemAwareElement",
-            "isReference": true
-          },
-          {
-            "name": "loopDataOutputRef",
-            "type": "ItemAwareElement",
-            "isReference": true
-          },
-          {
-            "name": "inputDataItem",
-            "type": "DataInput",
-            "xml": {
-              "serialize": "property"
-            }
-          },
-          {
-            "name": "outputDataItem",
-            "type": "DataOutput",
-            "xml": {
-              "serialize": "property"
-            }
-          },
-          {
-            "name": "complexBehaviorDefinition",
-            "type": "ComplexBehaviorDefinition",
-            "isMany": true
-          },
-          {
-            "name": "completionCondition",
-            "type": "Expression",
-            "xml": {
-              "serialize": "xsi:type"
-            }
-          },
-          {
-            "name": "oneBehaviorEventRef",
-            "type": "EventDefinition",
-            "isAttr": true,
-            "isReference": true
-          },
-          {
-            "name": "noneBehaviorEventRef",
-            "type": "EventDefinition",
-            "isAttr": true,
-            "isReference": true
-          }
-        ]
-      },
-      {
-        "name": "FailedJobRetryTimeCycle",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": ["flowable:AsyncCapable", "bpmn:MultiInstanceLoopCharacteristics"]
-        },
-        "properties": [
-          {
-            "name": "body",
-            "isBody": true,
-            "type": "String"
-          }
-        ]
-      },
-      {
-        "name": "ExecutionListener",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": [
-            "bpmn:Task",
-            "bpmn:ServiceTask",
-            "bpmn:UserTask",
-            "bpmn:BusinessRuleTask",
-            "bpmn:ScriptTask",
-            "bpmn:ReceiveTask",
-            "bpmn:ManualTask",
-            "bpmn:ExclusiveGateway",
-            "bpmn:SequenceFlow",
-            "bpmn:ParallelGateway",
-            "bpmn:InclusiveGateway",
-            "bpmn:EventBasedGateway",
-            "bpmn:StartEvent",
-            "bpmn:IntermediateCatchEvent",
-            "bpmn:IntermediateThrowEvent",
-            "bpmn:EndEvent",
-            "bpmn:BoundaryEvent",
-            "bpmn:CallActivity",
-            "bpmn:SubProcess",
-            "bpmn:Process"
-          ]
-        },
-        "properties": [
-          {
-            "name": "expression",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "class",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "delegateExpression",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "event",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "script",
-            "type": "Script"
-          },
-          {
-            "name": "fields",
-            "type": "Field",
-            "isMany": true
-          }
-        ]
-      },
-      {
-        "name": "TaskListener",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": ["bpmn:UserTask"]
-        },
-        "properties": [
-          {
-            "name": "expression",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "class",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "delegateExpression",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "event",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "script",
-            "type": "Script"
-          },
-          {
-            "name": "fields",
-            "type": "Field",
-            "isMany": true
-          }
-        ]
-      },
-      {
-        "name": "FormProperty",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": ["bpmn:StartEvent", "bpmn:UserTask"]
-        },
-        "properties": [
-          {
-            "name": "id",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "name",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "type",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "required",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "readable",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "writable",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "variable",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "expression",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "datePattern",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "default",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "values",
-            "type": "Value",
-            "isMany": true
-          }
-        ]
-      },
-      {
-        "name": "FormData",
-        "superClass": ["Element"],
-        "meta": {
-          "allowedIn": ["bpmn:StartEvent", "bpmn:UserTask"]
-        },
-        "properties": [
-          {
-            "name": "fields",
-            "type": "FormField",
-            "isMany": true
-          },
-          {
-            "name": "businessKey",
-            "type": "String",
-            "isAttr": true
-          }
-        ]
-      },
-      {
-        "name": "FormField",
-        "superClass": ["Element"],
-        "properties": [
-          {
-            "name": "id",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "label",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "type",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "datePattern",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "defaultValue",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "properties",
-            "type": "Properties"
-          },
-          {
-            "name": "validation",
-            "type": "Validation"
-          },
-          {
-            "name": "values",
-            "type": "Value",
-            "isMany": true
-          }
-        ]
-      },
-      {
-        "name": "Validation",
-        "superClass": ["Element"],
-        "properties": [
-          {
-            "name": "constraints",
-            "type": "Constraint",
-            "isMany": true
-          }
-        ]
-      },
-      {
-        "name": "Constraint",
-        "superClass": ["Element"],
-        "properties": [
-          {
-            "name": "name",
-            "type": "String",
-            "isAttr": true
-          },
-          {
-            "name": "config",
-            "type": "String",
-            "isAttr": true
-          }
-        ]
-      },
-      {
-        "name": "ConditionalEventDefinition",
-        "isAbstract": true,
-        "extends": ["bpmn:ConditionalEventDefinition"],
-        "properties": [
-          {
-            "name": "variableName",
-            "isAttr": true,
-            "type": "String"
-          },
-          {
-            "name": "variableEvent",
-            "isAttr": true,
-            "type": "String"
-          }
-        ]
-      }
-    ],
-    "emumerations": []
-  }
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/Bpmn/package/flowable/init.js b/ruoyi-ui/src/components/Bpmn/package/flowable/init.js
deleted file mode 100644
index ec9e282d..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/flowable/init.js
+++ /dev/null
@@ -1,24 +0,0 @@
-
-function randomStr() {
-  return Math.random().toString(36).slice(-8)
-}
-
-export default function() {
-  return `<?xml version="1.0" encoding="UTF-8"?>
-    <definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:bioc="http://bpmn.io/schema/bpmn/biocolor/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:flowable="http://flowable.org/bpmn" targetNamespace="http://www.flowable.org/processdef">
-      <process id="process_${randomStr()}" name="name_${randomStr()}">
-        <startEvent id="startNode1" name="开始" />
-      </process>
-      <bpmndi:BPMNDiagram id="BPMNDiagram_flow">
-        <bpmndi:BPMNPlane id="BPMNPlane_flow" bpmnElement="T-2d89e7a3-ba79-4abd-9f64-ea59621c258c">
-          <bpmndi:BPMNShape id="BPMNShape_startNode1" bpmnElement="startNode1" bioc:stroke="">
-            <omgdc:Bounds x="240" y="200" width="30" height="30" />
-            <bpmndi:BPMNLabel>
-              <omgdc:Bounds x="242" y="237" width="23" height="14" />
-            </bpmndi:BPMNLabel>
-          </bpmndi:BPMNShape>
-        </bpmndi:BPMNPlane>
-      </bpmndi:BPMNDiagram>
-    </definitions>
-    `
-}
diff --git a/ruoyi-ui/src/components/Bpmn/package/flowable/showConfig.js b/ruoyi-ui/src/components/Bpmn/package/flowable/showConfig.js
deleted file mode 100644
index 45a752b7..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/flowable/showConfig.js
+++ /dev/null
@@ -1,51 +0,0 @@
-export default {
-  'bpmn:EndEvent': {},
-  'bpmn:StartEvent': {
-    initiator: true,
-    formKey: true
-  },
-  'bpmn:UserTask': {
-    userType: true,
-    assignee: true,
-    candidateUsers: true,
-    candidateGroups: true,
-    async: true,
-    priority: true,
-    formKey: true,
-    skipExpression: true,
-    dueDate: true,
-    taskListener: true
-  },
-  'bpmn:ServiceTask': {
-    async: true,
-    skipExpression: true,
-    isForCompensation: true,
-    triggerable: true,
-    class: true
-  },
-  'bpmn:ScriptTask': {
-    async: true,
-    isForCompensation: true,
-    autoStoreVariables: true
-  },
-  'bpmn:ManualTask': {
-    async: true,
-    isForCompensation: true
-  },
-  'bpmn:ReceiveTask': {
-    async: true,
-    isForCompensation: true
-  },
-  'bpmn:SendTask': {
-    async: true,
-    isForCompensation: true
-  },
-  'bpmn:BusinessRuleTask': {
-    async: true,
-    isForCompensation: true,
-    ruleVariablesInput: true,
-    rules: true,
-    resultVariable: true,
-    exclude: true
-  }
-}
diff --git a/ruoyi-ui/src/components/Bpmn/package/index.js b/ruoyi-ui/src/components/Bpmn/package/index.js
deleted file mode 100644
index f78489d2..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import workflowBpmnModeler from './index.vue'
-
-workflowBpmnModeler.install = Vue => Vue.component(workflowBpmnModeler.name, workflowBpmnModeler) // 给组件配置install方法
-
-export default workflowBpmnModeler
diff --git a/ruoyi-ui/src/components/Bpmn/package/index.vue b/ruoyi-ui/src/components/Bpmn/package/index.vue
deleted file mode 100644
index 13e8f916..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/index.vue
+++ /dev/null
@@ -1,422 +0,0 @@
-<template>
-  <div v-loading="isView" class="flow-containers" :class="{ 'view-mode': isView }">
-    <el-container style="height: 100%">
-      <el-header style="border-bottom: 1px solid rgb(218 218 218);height: auto;">
-        <div style="display: flex; padding: 10px 0px; justify-content: space-between;">
-          <div>
-            <el-upload action="" :before-upload="openBpmn" style="margin-right: 10px; display:inline-block;">
-              <el-tooltip effect="dark" content="加载xml" placement="bottom">
-                <el-button size="mini" icon="el-icon-folder-opened" />
-              </el-tooltip>
-            </el-upload>
-            <el-tooltip effect="dark" content="新建" placement="bottom">
-              <el-button size="mini" icon="el-icon-circle-plus" @click="newDiagram" />
-            </el-tooltip>
-            <el-tooltip effect="dark" content="自适应屏幕" placement="bottom">
-              <el-button size="mini" icon="el-icon-rank" @click="fitViewport" />
-            </el-tooltip>
-            <el-tooltip effect="dark" content="放大" placement="bottom">
-              <el-button size="mini" icon="el-icon-zoom-in" @click="zoomViewport(true)" />
-            </el-tooltip>
-            <el-tooltip effect="dark" content="缩小" placement="bottom">
-              <el-button size="mini" icon="el-icon-zoom-out" @click="zoomViewport(false)" />
-            </el-tooltip>
-            <el-tooltip effect="dark" content="后退" placement="bottom">
-              <el-button size="mini" icon="el-icon-back" @click="modeler.get('commandStack').undo()" />
-            </el-tooltip>
-            <el-tooltip effect="dark" content="前进" placement="bottom">
-              <el-button size="mini" icon="el-icon-right" @click="modeler.get('commandStack').redo()" />
-            </el-tooltip>
-          </div>
-          <div>
-            <el-button size="mini" icon="el-icon-download" @click="saveXML(true)">下载xml</el-button>
-            <el-button size="mini" icon="el-icon-picture" @click="saveImg('svg', true)">下载svg</el-button>
-            <el-button size="mini" type="primary" @click="save">保存模型</el-button>
-          </div>
-        </div>
-      </el-header>
-      <el-container style="align-items: stretch">
-        <el-main style="padding: 0;">
-          <div ref="canvas" class="canvas" />
-        </el-main>
-        <el-aside style="width: 400px; min-height: 650px; background-color: #f0f2f5">
-          <panel v-if="modeler" :modeler="modeler" :users="users" :groups="groups" :categorys="categorys" />
-        </el-aside>
-      </el-container>
-    </el-container>
-
-  </div>
-</template>
-
-<script>
-// 汉化
-import customTranslate from './common/customTranslate'
-import Modeler from 'bpmn-js/lib/Modeler'
-import panel from './PropertyPanel'
-import BpmData from './BpmData'
-import getInitStr from './flowable/init'
-// 引入flowable的节点文件
-import flowableModdle from './flowable/flowable.json'
-export default {
-  name: 'WorkflowBpmnModeler',
-  components: {
-    panel
-  },
-  props: {
-    xml: {
-      type: String,
-      default: ''
-    },
-    users: {
-      type: Array,
-      default: () => []
-    },
-    groups: {
-      type: Array,
-      default: () => []
-    },
-    categorys: {
-      type: Array,
-      default: () => []
-    },
-    isView: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      modeler: null,
-      taskList: [],
-      zoom: 1
-    }
-  },
-  watch: {
-    xml: function(val) {
-      if (val) {
-        this.createNewDiagram(val)
-      }
-    }
-  },
-  mounted() {
-    // 生成实例
-    this.modeler = new Modeler({
-      container: this.$refs.canvas,
-      additionalModules: [
-        {
-          translate: ['value', customTranslate]
-        }
-      ],
-      moddleExtensions: {
-        flowable: flowableModdle
-      }
-    })
-    // 新增流程定义
-    if (!this.xml) {
-      this.newDiagram()
-    } else {
-      this.createNewDiagram(this.xml)
-    }
-  },
-  methods: {
-    newDiagram() {
-      this.createNewDiagram(getInitStr())
-    },
-    // 让图能自适应屏幕
-    fitViewport() {
-      this.zoom = this.modeler.get('canvas').zoom('fit-viewport')
-      const bbox = document.querySelector('.flow-containers .viewport').getBBox()
-      const currentViewbox = this.modeler.get('canvas').viewbox()
-      const elementMid = {
-        x: bbox.x + bbox.width / 2 - 65,
-        y: bbox.y + bbox.height / 2
-      }
-      this.modeler.get('canvas').viewbox({
-        x: elementMid.x - currentViewbox.width / 2,
-        y: elementMid.y - currentViewbox.height / 2,
-        width: currentViewbox.width,
-        height: currentViewbox.height
-      })
-      this.zoom = bbox.width / currentViewbox.width * 1.8
-    },
-    // 放大缩小
-    zoomViewport(zoomIn = true) {
-      this.zoom = this.modeler.get('canvas').zoom()
-      this.zoom += (zoomIn ? 0.1 : -0.1)
-      this.modeler.get('canvas').zoom(this.zoom)
-    },
-    async createNewDiagram(data) {
-      // 将字符串转换成图显示出来
-      // data = data.replace(/<!\[CDATA\[(.+?)]]>/g, '&lt;![CDATA[$1]]&gt;')
-      data = data.replace(/<!\[CDATA\[(.+?)]]>/g, function(match, str) {
-        return str.replace(/</g, '&lt;')
-      })
-      try {
-        await this.modeler.importXML(data)
-        this.adjustPalette()
-        this.fitViewport()
-        // this.fillColor()
-      } catch (err) {
-        console.error(err.message, err.warnings)
-      }
-    },
-    // 调整左侧工具栏排版
-    adjustPalette() {
-      try {
-        // 获取 bpmn 设计器实例
-        const canvas = this.$refs.canvas
-        const djsPalette = canvas.children[0].children[1].children[4]
-        const djsPalStyle = {
-          width: '130px',
-          padding: '5px',
-          background: 'white',
-          left: '20px',
-          borderRadius: 0
-        }
-        for (var key in djsPalStyle) {
-          djsPalette.style[key] = djsPalStyle[key]
-        }
-        const palette = djsPalette.children[0]
-        const allGroups = palette.children
-        allGroups[0].style['display'] = 'none'
-        // 修改控件样式
-        for (var gKey in allGroups) {
-          const group = allGroups[gKey]
-          for (var cKey in group.children) {
-            const control = group.children[cKey]
-            const controlStyle = {
-              display: 'flex',
-              justifyContent: 'flex-start',
-              alignItems: 'center',
-              width: '100%',
-              padding: '5px'
-            }
-            if (
-              control.className &&
-              control.dataset &&
-              control.className.indexOf('entry') !== -1
-            ) {
-              const controlProps = new BpmData().getControl(
-                control.dataset.action
-              )
-              control.innerHTML = `<div style='font-size: 14px;font-weight:500;margin-left:15px;'>${
-                controlProps['title']
-              }</div>`
-              for (var csKey in controlStyle) {
-                control.style[csKey] = controlStyle[csKey]
-              }
-            }
-          }
-        }
-      } catch (e) {
-        console.log(e)
-      }
-    },
-    fillColor() {
-      const canvas = this.modeler.get('canvas')
-      this.modeler._definitions.rootElements[0].flowElements.forEach(n => {
-        if (n.$type === 'bpmn:UserTask') {
-          const completeTask = this.taskList.find(m => m.key === n.id) || { completed: true }
-          const todoTask = this.taskList.find(m => !m.completed)
-          const endTask = this.taskList[this.taskList.length - 1]
-          if (completeTask) {
-            canvas.addMarker(n.id, completeTask.completed ? 'highlight' : 'highlight-todo')
-            n.outgoing?.forEach(nn => {
-              const targetTask = this.taskList.find(m => m.key === nn.targetRef.id)
-              if (targetTask) {
-                canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
-              } else if (nn.targetRef.$type === 'bpmn:ExclusiveGateway') {
-                // canvas.addMarker(nn.id, 'highlight');
-                canvas.addMarker(nn.id, completeTask.completed ? 'highlight' : 'highlight-todo')
-                canvas.addMarker(nn.targetRef.id, completeTask.completed ? 'highlight' : 'highlight-todo')
-              } else if (nn.targetRef.$type === 'bpmn:EndEvent') {
-                if (!todoTask && endTask.key === n.id) {
-                  canvas.addMarker(nn.id, 'highlight')
-                  canvas.addMarker(nn.targetRef.id, 'highlight')
-                }
-                if (!completeTask.completed) {
-                  canvas.addMarker(nn.id, 'highlight-todo')
-                  canvas.addMarker(nn.targetRef.id, 'highlight-todo')
-                }
-              }
-            })
-          }
-        } else if (n.$type === 'bpmn:ExclusiveGateway') {
-          n.outgoing.forEach(nn => {
-            const targetTask = this.taskList.find(m => m.key === nn.targetRef.id)
-            if (targetTask) {
-              canvas.addMarker(nn.id, targetTask.completed ? 'highlight' : 'highlight-todo')
-            }
-          })
-        }
-        if (n.$type === 'bpmn:StartEvent') {
-          n.outgoing.forEach(nn => {
-            const completeTask = this.taskList.find(m => m.key === nn.targetRef.id)
-            if (completeTask) {
-              canvas.addMarker(nn.id, 'highlight')
-              canvas.addMarker(n.id, 'highlight')
-              return
-            }
-          })
-        }
-      })
-    },
-    // 对外 api
-    getProcess() {
-      const element = this.getProcessElement()
-      return {
-        id: element.id,
-        name: element.name,
-        category: element.$attrs['flowable:processCategory']
-      }
-    },
-    getProcessElement() {
-      const rootElements = this.modeler.getDefinitions().rootElements
-      for (let i = 0; i < rootElements.length; i++) {
-        if (rootElements[i].$type === 'bpmn:Process') return rootElements[i]
-      }
-    },
-    async saveXML(download = false) {
-      try {
-        const { xml } = await this.modeler.saveXML({ format: true })
-        if (download) {
-          this.downloadFile(`${this.getProcessElement().name}.bpmn20.xml`, xml, 'application/xml')
-        }
-        return xml
-      } catch (err) {
-        console.log(err)
-      }
-    },
-    async saveImg(type = 'svg', download = false) {
-      try {
-        const { svg } = await this.modeler.saveSVG({ format: true })
-        if (download) {
-          this.downloadFile(this.getProcessElement().name, svg, 'image/svg+xml')
-        }
-        return svg
-      } catch (err) {
-        console.log(err)
-      }
-    },
-    async save() {
-      const process = this.getProcess()
-      const xml = await this.saveXML()
-      const svg = await this.saveImg()
-      const result = { process, xml, svg }
-      this.$emit('save', result)
-      window.parent.postMessage(result, '*')
-    },
-    openBpmn(file) {
-      const reader = new FileReader()
-      reader.readAsText(file, 'utf-8')
-      reader.onload = () => {
-        this.createNewDiagram(reader.result)
-      }
-      return false
-    },
-    downloadFile(filename, data, type) {
-      var a = document.createElement('a')
-      var url = window.URL.createObjectURL(new Blob([data], { type: type }))
-      a.href = url
-      a.download = filename
-      a.click()
-      window.URL.revokeObjectURL(url)
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-/*左边工具栏以及编辑节点的样式*/
-@import "~bpmn-js/dist/assets/diagram-js.css";
-@import "~bpmn-js/dist/assets/bpmn-font/css/bpmn.css";
-@import "~bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css";
-@import "~bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css";
-.view-mode {
-  .el-header, .el-aside, .djs-palette, .bjs-powered-by {
-    display: none;
-  }
-  .el-loading-mask {
-    background-color: initial;
-  }
-  .el-loading-spinner {
-    display: none;
-  }
-}
-.flow-containers {
-  // background-color: #ffffff;
-  width: 100%;
-  height: 100%;
-  .canvas {
-    width: 100%;
-    height: 100%;
-  }
-  .panel {
-    position: absolute;
-    right: 0;
-    top: 50px;
-    width: 300px;
-  }
-  .load {
-    margin-right: 10px;
-  }
-  .el-form-item__label{
-    font-size: 13px;
-  }
-
-  .djs-palette{
-    left: 0px!important;
-    top: 0px;
-    border-top: none;
-  }
-
-  .djs-container svg {
-    min-height: 650px;
-  }
-
-  // .highlight.djs-shape .djs-visual > :nth-child(1) {
-  //   fill: green !important;
-  //   stroke: green !important;
-  //   fill-opacity: 0.2 !important;
-  // }
-  // .highlight.djs-shape .djs-visual > :nth-child(2) {
-  //   fill: green !important;
-  // }
-  // .highlight.djs-shape .djs-visual > path {
-  //   fill: green !important;
-  //   fill-opacity: 0.2 !important;
-  //   stroke: green !important;
-  // }
-  // .highlight.djs-connection > .djs-visual > path {
-  //   stroke: green !important;
-  // }
-  // // .djs-connection > .djs-visual > path {
-  // //   stroke: orange !important;
-  // //   stroke-dasharray: 4px !important;
-  // //   fill-opacity: 0.2 !important;
-  // // }
-  // // .djs-shape .djs-visual > :nth-child(1) {
-  // //   fill: orange !important;
-  // //   stroke: orange !important;
-  // //   stroke-dasharray: 4px !important;
-  // //   fill-opacity: 0.2 !important;
-  // // }
-  // .highlight-todo.djs-connection > .djs-visual > path {
-  //   stroke: orange !important;
-  //   stroke-dasharray: 4px !important;
-  //   fill-opacity: 0.2 !important;
-  // }
-  // .highlight-todo.djs-shape .djs-visual > :nth-child(1) {
-  //   fill: orange !important;
-  //   stroke: orange !important;
-  //   stroke-dasharray: 4px !important;
-  //   fill-opacity: 0.2 !important;
-  // }
-  // .overlays-div {
-  //   font-size: 10px;
-  //   color: red;
-  //   width: 100px;
-  //   top: -20px !important;
-  // }
-}
-</style>
diff --git a/ruoyi-ui/src/components/Bpmn/package/lang/zh.js b/ruoyi-ui/src/components/Bpmn/package/lang/zh.js
deleted file mode 100644
index 003c0cc5..00000000
--- a/ruoyi-ui/src/components/Bpmn/package/lang/zh.js
+++ /dev/null
@@ -1,227 +0,0 @@
-export default {
-  // Labels
-  'Activate the global connect tool': '激活全局连接工具',
-  'Append {type}': '添加 {type}',
-  'Add Lane above': '在上面添加道',
-  'Divide into two Lanes': '分割成两个道',
-  'Divide into three Lanes': '分割成三个道',
-  'Add Lane below': '在下面添加道',
-  'Append compensation activity': '追加补偿活动',
-  'Change type': '修改类型',
-  'Connect using Association': '使用关联连接',
-  'Connect using Sequence/MessageFlow or Association': '使用顺序/消息流或者关联连接',
-  'Connect using DataInputAssociation': '使用数据输入关联连接',
-  'Remove': '移除',
-  'Activate the hand tool': '激活抓手工具',
-  'Activate the lasso tool': '激活套索工具',
-  'Activate the create/remove space tool': '激活创建/删除空间工具',
-  'Create expanded SubProcess': '创建扩展子过程',
-  'Create IntermediateThrowEvent/BoundaryEvent': '创建中间抛出事件/边界事件',
-  'Create Pool/Participant': '创建池/参与者',
-  'Parallel Multi Instance': '并行多重事件',
-  'Sequential Multi Instance': '时序多重事件',
-  'DataObjectReference': '数据对象参考',
-  'DataStoreReference': '数据存储参考',
-  'Loop': '循环',
-  'Ad-hoc': '即席',
-  'Create {type}': '创建 {type}',
-  'Task': '任务',
-  'Send Task': '发送任务',
-  'Receive Task': '接收任务',
-  'User Task': '用户任务',
-  'Manual Task': '手工任务',
-  'Business Rule Task': '业务规则任务',
-  'Service Task': '服务任务',
-  'Script Task': '脚本任务',
-  'Call Activity': '调用活动',
-  'Sub Process (collapsed)': '子流程（折叠的）',
-  'Sub Process (expanded)': '子流程（展开的）',
-  'Start Event': '开始事件',
-  'StartEvent': '开始事件',
-  'Intermediate Throw Event': '中间事件',
-  'End Event': '结束事件',
-  'EndEvent': '结束事件',
-  'Create Gateway': '创建网关',
-  'Create Intermediate/Boundary Event': '创建中间/边界事件',
-  'Message Start Event': '消息开始事件',
-  'Timer Start Event': '定时开始事件',
-  'Conditional Start Event': '条件开始事件',
-  'Signal Start Event': '信号开始事件',
-  'Error Start Event': '错误开始事件',
-  'Escalation Start Event': '升级开始事件',
-  'Compensation Start Event': '补偿开始事件',
-  'Message Start Event (non-interrupting)': '消息开始事件（非中断）',
-  'Timer Start Event (non-interrupting)': '定时开始事件（非中断）',
-  'Conditional Start Event (non-interrupting)': '条件开始事件（非中断）',
-  'Signal Start Event (non-interrupting)': '信号开始事件（非中断）',
-  'Escalation Start Event (non-interrupting)': '升级开始事件（非中断）',
-  'Message Intermediate Catch Event': '消息中间捕获事件',
-  'Message Intermediate Throw Event': '消息中间抛出事件',
-  'Timer Intermediate Catch Event': '定时中间捕获事件',
-  'Escalation Intermediate Throw Event': '升级中间抛出事件',
-  'Conditional Intermediate Catch Event': '条件中间捕获事件',
-  'Link Intermediate Catch Event': '链接中间捕获事件',
-  'Link Intermediate Throw Event': '链接中间抛出事件',
-  'Compensation Intermediate Throw Event': '补偿中间抛出事件',
-  'Signal Intermediate Catch Event': '信号中间捕获事件',
-  'Signal Intermediate Throw Event': '信号中间抛出事件',
-  'Message End Event': '消息结束事件',
-  'Escalation End Event': '定时结束事件',
-  'Error End Event': '错误结束事件',
-  'Cancel End Event': '取消结束事件',
-  'Compensation End Event': '补偿结束事件',
-  'Signal End Event': '信号结束事件',
-  'Terminate End Event': '终止结束事件',
-  'Message Boundary Event': '消息边界事件',
-  'Message Boundary Event (non-interrupting)': '消息边界事件（非中断）',
-  'Timer Boundary Event': '定时边界事件',
-  'Timer Boundary Event (non-interrupting)': '定时边界事件（非中断）',
-  'Escalation Boundary Event': '升级边界事件',
-  'Escalation Boundary Event (non-interrupting)': '升级边界事件（非中断）',
-  'Conditional Boundary Event': '条件边界事件',
-  'Conditional Boundary Event (non-interrupting)': '条件边界事件（非中断）',
-  'Error Boundary Event': '错误边界事件',
-  'Cancel Boundary Event': '取消边界事件',
-  'Signal Boundary Event': '信号边界事件',
-  'Signal Boundary Event (non-interrupting)': '信号边界事件（非中断）',
-  'Compensation Boundary Event': '补偿边界事件',
-  'Exclusive Gateway': '互斥网关',
-  'Parallel Gateway': '并行网关',
-  'Inclusive Gateway': '相容网关',
-  'Complex Gateway': '复杂网关',
-  'Event based Gateway': '事件网关',
-  'Transaction': '转运',
-  'Sub Process': '子流程',
-  'Event Sub Process': '事件子流程',
-  'Collapsed Pool': '折叠池',
-  'Expanded Pool': '展开池',
-  // Errors
-  'no parent for {element} in {parent}': '在{parent}里，{element}没有父类',
-  'no shape type specified': '没有指定的形状类型',
-  'flow elements must be children of pools/participants': '流元素必须是池/参与者的子类',
-  'out of bounds release': 'out of bounds release',
-  'more than {count} child lanes': '子道大于{count} ',
-  'element required': '元素不能为空',
-  'diagram not part of bpmn:Definitions': '流程图不符合bpmn规范',
-  'no diagram to display': '没有可展示的流程图',
-  'no process or collaboration to display': '没有可展示的流程/协作',
-  'element {element} referenced by {referenced}#{property} not yet drawn': '由{referenced}#{property}引用的{element}元素仍未绘制',
-  'already rendered {element}': '{element} 已被渲染',
-  'failed to import {element}': '导入{element}失败',
-  // 属性面板的参数
-  'Id': '标识',
-  'Name': '名称',
-  'General': '常规',
-  'Details': '详情',
-  'Message Name': '消息名称',
-  'Message': '消息',
-  'Initiator': '创建者',
-  'Asynchronous Continuations': '持续异步',
-  'Asynchronous Before': '异步前',
-  'Asynchronous After': '异步后',
-  'Job Configuration': '工作配置',
-  'Exclusive': '排除',
-  'Job Priority': '工作优先级',
-  'Retry Time Cycle': '重试时间周期',
-  'Documentation': '文档',
-  'Element Documentation': '元素文档',
-  'History Configuration': '历史配置',
-  'History Time To Live': '历史的生存时间',
-  'Forms': '表单',
-  'Form Key': '表单key',
-  'Form Fields': '表单字段',
-  'Business Key': '业务key',
-  'Form Field': '表单字段',
-  'ID': '编号',
-  'Type': '类型',
-  'Label': '名称',
-  'Default Value': '默认值',
-  'Validation': '校验',
-  'Add Constraint': '添加约束',
-  'Config': '配置',
-  'Properties': '属性',
-  'Add Property': '添加属性',
-  'Value': '值',
-  'Listeners': '监听器',
-  'Execution Listener': '执行监听',
-  'Event Type': '事件类型',
-  'Listener Type': '监听器类型',
-  'Java Class': 'Java类',
-  'Expression': '表达式',
-  'Must provide a value': '必须提供一个值',
-  'Delegate Expression': '代理表达式',
-  'Script': '脚本',
-  'Script Format': '脚本格式',
-  'Script Type': '脚本类型',
-  'Inline Script': '内联脚本',
-  'External Script': '外部脚本',
-  'Resource': '资源',
-  'Field Injection': '字段注入',
-  'Extensions': '扩展',
-  'Input/Output': '输入/输出',
-  'Input Parameters': '输入参数',
-  'Output Parameters': '输出参数',
-  'Parameters': '参数',
-  'Output Parameter': '输出参数',
-  'Timer Definition Type': '定时器定义类型',
-  'Timer Definition': '定时器定义',
-  'Date': '日期',
-  'Duration': '持续',
-  'Cycle': '循环',
-  'Signal': '信号',
-  'Signal Name': '信号名称',
-  'Escalation': '升级',
-  'Error': '错误',
-  'Link Name': '链接名称',
-  'Condition': '条件名称',
-  'Variable Name': '变量名称',
-  'Variable Event': '变量事件',
-  'Specify more than one variable change event as a comma separated list.': '多个变量事件以逗号隔开',
-  'Wait for Completion': '等待完成',
-  'Activity Ref': '活动参考',
-  'Version Tag': '版本标签',
-  'Executable': '可执行文件',
-  'External Task Configuration': '扩展任务配置',
-  'Task Priority': '任务优先级',
-  'External': '外部',
-  'Connector': '连接器',
-  'Must configure Connector': '必须配置连接器',
-  'Connector Id': '连接器编号',
-  'Implementation': '实现方式',
-  'Field Injections': '字段注入',
-  'Fields': '字段',
-  'Result Variable': '结果变量',
-  'Topic': '主题',
-  'Configure Connector': '配置连接器',
-  'Input Parameter': '输入参数',
-  'Assignee': '代理人',
-  'Candidate Users': '候选用户',
-  'Candidate Groups': '候选组',
-  'Due Date': '到期时间',
-  'Follow Up Date': '跟踪日期',
-  'Priority': '优先级',
-  'The follow up date as an EL expression (e.g. ${someDate} or an ISO date (e.g. 2015-06-26T09:54:00)': '跟踪日期必须符合EL表达式，如： ${someDate} ,或者一个ISO标准日期，如：2015-06-26T09:54:00',
-  'The due date as an EL expression (e.g. ${someDate} or an ISO date (e.g. 2015-06-26T09:54:00)': '跟踪日期必须符合EL表达式，如： ${someDate} ,或者一个ISO标准日期，如：2015-06-26T09:54:00',
-  'Variables': '变量'
-}
-
-export const NodeName = {
-  'bpmn:Process': '流程',
-  'bpmn:StartEvent': '开始事件',
-  'bpmn:IntermediateThrowEvent': '中间事件',
-  'bpmn:Task': '任务',
-  'bpmn:SendTask': '发送任务',
-  'bpmn:ReceiveTask': '接收任务',
-  'bpmn:UserTask': '用户任务',
-  'bpmn:ManualTask': '手工任务',
-  'bpmn:BusinessRuleTask': '业务规则任务',
-  'bpmn:ServiceTask': '服务任务',
-  'bpmn:ScriptTask': '脚本任务',
-  'bpmn:EndEvent': '结束事件',
-  'bpmn:SequenceFlow': '流程线',
-  'bpmn:ExclusiveGateway': '互斥网关',
-  'bpmn:ParallelGateway': '并行网关',
-  'bpmn:InclusiveGateway': '相容网关',
-  'bpmn:ComplexGateway': '复杂网关',
-  'bpmn:EventBasedGateway': '事件网关'
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/configPanel.vue b/ruoyi-ui/src/components/FormDesigner/configPanel.vue
deleted file mode 100644
index fd659efe..00000000
--- a/ruoyi-ui/src/components/FormDesigner/configPanel.vue
+++ /dev/null
@@ -1,76 +0,0 @@
-<template>
-  <div class="right-board">
-    <el-tabs v-model="currentTab" class="center-tabs">
-      <el-tab-pane label="属性配置" name="field" />
-    </el-tabs>
-    <div class="field-box">
-      <el-scrollbar class="right-scrollbar">
-        <el-form size="small" label-width="100px" >
-          <div v-for="(item,index) in cmps" :key="index">
-            <component v-if="item.name === activeItem.compType" :getFormId="getFormId" :props="activeItem" :is="item.content"></component>
-          </div>
-        </el-form>
-      </el-scrollbar>
-    </div>
-  </div>
-</template>
-
-<script>
-import reg from "./custom/register";
-
-export default {
-  name:'configPanel',
-  data() {
-    return {
-      currentTab: 'field',
-      cmps:reg,
-      formIdArray:[]
-    }
-  },
-  props:{
-    activeItem: { 
-      type: Object,
-      default:function(){
-        return {}
-      }
-    },
-    itemList: { 
-      type: Array,
-      default:function(){
-        return []
-      }
-    }
-  },
-  created() {
-    this.cmps.forEach(c => {
-      c.content = require(`./custom/configs/${c.name}`).default;
-    });
-  },
-  methods:{
-    getFormId(itemId){
-      this.formIdArray = [];
-      Array.from(this.itemList,(item)=>{
-        if(item.compType === 'row'){
-          Array.from(item.columns,(column)=>{
-            Array.from(column.list,(col)=>{
-              if(col._id !== itemId){
-                this.formIdArray.push(col.id);
-              }
-            })
-          })
-        }else{
-          if(item._id !== itemId){
-            this.formIdArray.push(item.id);
-          }
-        }
-      })
-      return this.formIdArray;
-    }
-  }
-}
-</script>
-<style scoped>
-.field-box >>> .el-scrollbar__wrap{
-  overflow-x: hidden;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/Switch.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/Switch.vue
deleted file mode 100644
index 0b4b74c3..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/Switch.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
-  <div v-show="props.compType === 'Switch'">
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId"></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="标题">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <!-- <el-form-item label="表单栅格">
-      <el-slider class="input" v-model="props.span" :max="24" :min="1" :marks="{12:''}"></el-slider>
-    </el-form-item> -->
-    <el-form-item label="栅格间隔">
-      <el-input-number v-model="props.gutter"  :min="0"></el-input-number>
-    </el-form-item>
-    <el-form-item label="标签宽度">
-      <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel" @change="handlerChangeLabel"></el-switch>
-    </el-form-item>
-    <el-form-item label="必填">
-      <el-switch v-model="props.required"></el-switch>
-    </el-form-item>
-    <el-form-item label="开启时颜色">
-      <el-color-picker v-model="props['active-color']"></el-color-picker>
-    </el-form-item>
-    <el-form-item label="关闭时颜色">
-      <el-color-picker v-model="props['inactive-color']"></el-color-picker>
-    </el-form-item>
-    <el-form-item label="开启时值">
-      <el-input class="input" v-model="props['active-value']"></el-input>
-    </el-form-item>
-    <el-form-item label="关闭时值">
-      <el-input class="input" v-model="props['inactive-value']"></el-input>
-    </el-form-item>
-    <el-form-item label="默认值">
-      <el-switch v-model="props.value"></el-switch>
-    </el-form-item>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-
-export default {
-  name:"inputConfig",
-  props:['props','getFormId'],
-  components: {
-  },
-  mixins:[changeId],
-  data(){
-    return {}
-  },
-  methods:{
-    handlerChangeLabel(val){
-      this.props.labelWidth = val?'80':'1';
-    },
-    handlerChangeDisStatus(val){
-      this.props.readOnly = !val;
-    },
-    handlerChangeReadStatus(val){
-      this.props.disabled = !val;
-    }
-  },
-  mounted(){
-  }
-}
-</script>
-<style scoped>
-.input{
-  width:75%
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/alert.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/alert.vue
deleted file mode 100644
index c193d7fd..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/alert.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<template>
-  <div v-show="props.compType === 'alert'">
-    <!-- <el-form-item label="字段名">
-      <el-input class="input" v-model="props"></el-input>
-    </el-form-item> -->
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" ></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="标题">
-      <el-input class="input" v-model="props.title"></el-input>
-    </el-form-item>
-    <el-form-item label="类型" >
-      <el-select v-model="props.type" placeholder="请选择">
-        <el-option label="success" value="success"/>
-        <el-option label="warning" value="warning"/>
-        <el-option label="error" value="error"/>
-        <el-option label="info" value="info"/>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="辅助文字">
-      <el-input class="input" v-model="props.description"></el-input>
-    </el-form-item>
-    <el-form-item label="关闭">
-      <el-switch v-model="props.closable"></el-switch>
-    </el-form-item>
-    <el-form-item label="居中">
-      <el-switch v-model="props.center"></el-switch>
-    </el-form-item>
-    <el-form-item label="关闭按钮自定义文本">
-      <el-input class="input" v-model="props['close-text']"/>
-    </el-form-item>
-    <el-form-item label="显示图标">
-      <el-switch v-model="props['show-icon']"></el-switch>
-    </el-form-item>
-    <el-form-item label="主题">
-      <el-radio-group v-model="props.effect">
-        <el-radio-button label="light">light</el-radio-button>
-        <el-radio-button label="dark">dark</el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-  </div>
-</template>
-<script>
-/**
- * input的配置项
- */
-export default {
-  name:"buttonConfig",
-  props:{
-    props:{}
-  },
-  components:{
-  },
-  data(){
-    return {
-    }
-  },
-  methods:{
-    handlerShowLabel(val){
-      if(val){
-        this.props.labelWidth = 80;
-      }else{
-        this.props.labelWidth = 0;
-      }
-    }
-  },
-  mounted(){
-  }
-}
-</script>
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/barCode.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/barCode.vue
deleted file mode 100644
index d03b3e06..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/barCode.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-  <div v-show="props.compType === 'barCode'">
-    <!-- <el-form-item label="字段名">
-      <el-input class="input" v-model="props"></el-input>
-    </el-form-item> -->
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" ></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel" @change="handlerShowLabel"></el-switch>
-    </el-form-item>
-    <el-form-item label="标签文字" v-show="props.showLabel">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <el-form-item label="标签长度" v-show="props.showLabel">
-      <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="占用列数" v-show="props.span">
-      <el-input-number v-model="props.span"  :min="1" :max="24"></el-input-number>
-    </el-form-item>
-    <el-form-item label="条码值">
-      <el-input v-model="props.value"></el-input>
-    </el-form-item>
-    <el-form-item label="条码颜色" v-show="props.lineColor">
-      <el-color-picker v-model="props.lineColor" @change="handlerChangeBarCode"/>
-    </el-form-item>
-    <el-form-item label="背景颜色" v-show="props.background">
-      <el-color-picker v-model="props.background" @change="handlerChangeBackground"/>
-    </el-form-item>
-    <!--暂不启用-->
-    <!-- <el-form-item label="条码宽度">
-      <el-input-number v-model="props.width"  :min="1" :max="10" :step="1"></el-input-number>
-    </el-form-item> -->
-    <el-form-item label="条码高度">
-      <el-input-number v-model="props.height"  :min="10" :max="100" :step="1"></el-input-number>
-    </el-form-item>
-    <el-form-item label="显示值">
-      <el-switch v-model="props.displayValue"></el-switch>
-    </el-form-item>
-  </div>
-</template>
-<script>
-/**
- * input的配置项
- */
-export default {
-  name:"buttonConfig",
-  props:{
-    props:{}
-  },
-  components:{
-  },
-  data(){
-    return {
-    }
-  },
-  methods:{
-    handlerShowLabel(val){
-      if(val){
-        this.props.labelWidth = 80;
-      }else{
-        this.props.labelWidth = 0;
-      }
-    },
-    handlerChangeBarCode(val){
-      if(val == null){
-        this.props.lineColor = '#000';
-      }
-    },
-    handlerChangeBackground(val){
-      if(val == null){
-        this.props.background = '#fff';
-      }
-    }
-  },
-  mounted(){
-  }
-}
-</script>
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/button.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/button.vue
deleted file mode 100644
index 1118db11..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/button.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
-  <div v-show="props.compType === 'button'">
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" ></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="按钮文字">
-      <el-input class="input" v-model="props.text"></el-input>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel" @change="handlerShowLabel"></el-switch>
-    </el-form-item>
-    <el-form-item label="标签文字" v-show="props.showLabel">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <el-form-item label="标签长度" v-show="props.showLabel">
-      <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="占用列数" v-show="props.span">
-      <el-input-number v-model="props.span"  :min="1" :max="24"></el-input-number>
-    </el-form-item>
-    
-    <el-form-item label="按钮类型" >
-      <el-select v-model="props.type" placeholder="请选择">
-        <el-option label="primary" value="primary"/>
-        <el-option label="success" value="success"/>
-        <el-option label="warning" value="warning"/>
-        <el-option label="danger" value="danger"/>
-        <el-option label="info" value="info"/>
-        <el-option label="text" value="text"/>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="按钮大小">
-      <el-radio-group v-model="props.size">
-        <el-radio-button label="medium">大</el-radio-button>
-        <el-radio-button label="small">中</el-radio-button>
-        <el-radio-button label="mini">小</el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-    <el-form-item label="禁用">
-      <el-switch v-model="props.disabled"></el-switch>
-    </el-form-item>
-    <el-form-item label="简单样式">
-      <el-switch v-model="props.plain"></el-switch>
-    </el-form-item>
-    <el-form-item label="圆角">
-      <el-switch v-model="props.round"></el-switch>
-    </el-form-item>
-    <el-form-item label="圆形">
-      <el-switch v-model="props.circle"></el-switch>
-    </el-form-item>
-    <el-form-item label="图标">
-      <el-input placeholder="请选择图标" readonly  v-model="props.icon">
-        <template slot="append" >
-          <i class="el-icon-picture" style="cursor: pointer;" @click="handlerSelectIcon"/>
-        </template>
-      </el-input>
-    </el-form-item>
-    <icon-dialog v-model="props.icon" :visible.sync="iconDialogVisible"/>
-  </div>
-</template>
-<script>
-
-/**
- * input的配置项
- */
-export default {
-  name:"buttonConfig",
-  props:{
-    props:{}
-  },
-  data(){
-    return {
-      iconDialogVisible:false
-    }
-  },
-  methods:{
-    handlerShowLabel(val){
-      if(val){
-        this.props.labelWidth = 80;
-      }else{
-        this.props.labelWidth = 0;
-      }
-    },
-    handlerSelectIcon(){
-      this.iconDialogVisible = true;
-    }
-  },
-  mounted(){
-  }
-}
-</script>
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/cascader.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/cascader.vue
deleted file mode 100644
index 1cc5a1d9..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/cascader.vue
+++ /dev/null
@@ -1,192 +0,0 @@
-<template>
-  <div v-show="props.compType === 'cascader'">
-    <!-- <el-form-item label="字段名">
-      <el-input class="input" v-model="props"></el-input>
-    </el-form-item> -->
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId" ></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="标题">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <el-form-item label="栅格">
-      <el-input-number v-model="props.span"  :min="1" :max="24"/>
-    </el-form-item>
-    <el-form-item label="宽度">
-      <el-input-number v-model="props.width"  :min="0" :max="100"/>%
-    </el-form-item>
-    <el-form-item label="提示符">
-      <el-input class="input" v-model="props.placeholder" placeholder="请输入提示符"/>
-    </el-form-item>
-    <!-- <el-form-item label="表单栅格">
-      <el-slider class="input" v-model="props.span" :max="24" :min="1" :marks="{12:''}"></el-slider>
-    </el-form-item> -->
-    <el-form-item label="栅格间隔">
-      <el-input-number v-model="props.gutter"  :min="0"></el-input-number>
-    </el-form-item>
-    <el-form-item label="标签宽度">
-      <el-input-number v-model="props.labelWidth"  :min="0" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel"  @change="handlerChangeLabel"></el-switch>
-    </el-form-item>
-    <el-form-item label="大小">
-      <el-radio-group v-model="props.size">
-        <el-radio-button label="medium">正常</el-radio-button>
-        <el-radio-button label="small">略小</el-radio-button>
-        <el-radio-button label="mini">迷你</el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-    <el-form-item label="清除">
-      <el-switch v-model="props.clearable"></el-switch>
-    </el-form-item>
-    <el-form-item label="禁用">
-      <el-switch v-model="props.disabled" ></el-switch>
-    </el-form-item>
-    <el-form-item label="完整路径">
-      <el-switch v-model="props.props['show-all-levels']" ></el-switch>
-    </el-form-item>
-    <el-form-item label="分隔符">
-      <el-input v-model="props.props.separator" ></el-input>
-    </el-form-item>
-    <el-form-item label="搜索">
-      <el-switch v-model="props.props.filterable" ></el-switch>
-    </el-form-item>
-    <el-form-item label="展开方式">
-      <el-radio-group v-model="props.props.props.expandTrigger">
-      <el-radio-button label="click">点击</el-radio-button>
-      <el-radio-button label="hover">悬停</el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-    <el-form-item label="多选">
-      <el-switch v-model="props.props.props.multiple"></el-switch>
-    </el-form-item>
-    <el-form-item label="任一级可选">
-      <el-switch v-model="props.props.props.checkStrictly"></el-switch>
-    </el-form-item>
-    <el-form-item label="数据类型">
-      <el-radio-group v-model="props.dataType" @change="handlerChangeDataType">
-        <el-radio-button label="static">静态数据</el-radio-button>
-        <el-radio-button label="dynamic">动态数据</el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-    <div v-show="props.dataType ==='dynamic'">
-      <el-form-item label="地址">
-        <el-input v-model="props.action"></el-input>
-      </el-form-item>
-      <el-form-item label="显示标识">
-        <el-input v-model="props.props.props.label"></el-input>
-      </el-form-item>
-      <el-form-item label="值标识">
-        <el-input v-model="props.props.props.value"></el-input>
-      </el-form-item>
-      <el-form-item label="下级标识">
-        <el-input v-model="props.props.props.children"></el-input>
-      </el-form-item>
-    </div>
-    <div v-show="props.dataType ==='static'">
-        <el-form-item label="静态数据">
-          <el-button icon="el-icon-edit-outline" circle @click="handlerStaticData"></el-button>
-        </el-form-item>
-        <el-form-item label="省市区">
-          <el-checkbox v-model="props['china-area-data']" @change="handlerSetAreaData"/>
-        </el-form-item>
-    </div>
-    <!-- <el-form-item label="URL">
-      <el-input v-model="props.action"></el-input>
-    </el-form-item> -->
-    
-    <el-dialog  :visible.sync="staticDataVisible" width="70%"
-                :close-on-press-escape="false"
-                :close-on-click-modal="false"
-                :show-close="false"
-                :center="true"
-                top="20px"
-    >
-      <codemirror v-model="staticOptions" :options="codeMirror"/>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handlerSave">确 定</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-//引入 省市区 数据
-import {areaData} from '../../utils/chinaAreaData';
-import {codemirror} from 'vue-codemirror';
-// 核心样式
-import 'codemirror/lib/codemirror.css';
-// 引入主题后还需要在 options 中指定主题才会生效
-import 'codemirror/theme/dracula.css';
-import 'codemirror/mode/javascript/javascript'
-const options = {
-    tabSize: 2, // 缩进格式
-    theme: 'dracula', // 主题，对应主题库 JS 需要提前引入
-    lineNumbers: true, // 显示行号
-    line: true,
-    styleActiveLine: true, // 高亮选中行
-    hintOptions: {
-      completeSingle: true // 当匹配只有一项的时候是否自动补全
-    }
-  }
-/**
- * input的配置项
- */
-export default {
-  name:"cascaderConfig",
-  props:['props'],
-  components:{
-    codemirror
-  },
-  mixins:[changeId],
-  data(){
-    return {
-      staticDataVisible:false,
-      codeMirror:options,
-      staticOptions:'',
-      tempOptions:[]
-    }
-  },
-  methods:{
-    handlerChangeLabel(val){
-      this.props.labelWidth = val?'80':'1'
-    },
-    handlerStaticData(){
-      this.staticOptions = JSON.stringify(this.props.options,null,4);
-      this.staticDataVisible = true;
-      
-    },
-    handlerSave(){
-      this.props.options = JSON.parse(this.staticOptions);
-      this.staticDataVisible = false;
-    },
-    handlerChangeDataType(value){
-      if(value === 'static'){
-        this.props.options = [];
-        this.props.options = this.tempOptions;
-      }else{
-        this.tempOptions = this.props.options;
-        this.props.options = [];
-      }
-    },
-    handlerSetAreaData(val){
-      if(val){
-        const areaoptions = areaData();
-        this.tempOptions = this.props.options;
-        this.props.options = areaoptions;
-      }else{
-        this.props.options = this.tempOptions;
-      }
-    }
-  },
-  mounted(){
-  },
-  watch:{
-  }
-}
-</script>
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/checkbox.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/checkbox.vue
deleted file mode 100644
index 44adc348..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/checkbox.vue
+++ /dev/null
@@ -1,203 +0,0 @@
-<template>
-  <div v-show="props.compType === 'checkbox'">
-    <!-- <el-form-item label="字段名">
-      <el-input class="input" v-model="props"></el-input>
-    </el-form-item> -->
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId"></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="标题">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <el-form-item label="提示符">
-      <el-input class="input" v-model="props.placeholder" placeholder="请输入提示符"/>
-    </el-form-item>
-    <!-- <el-form-item label="表单栅格">
-      <el-slider class="input" v-model="props.span" :max="24" :min="1" :marks="{12:''}"></el-slider>
-    </el-form-item> -->
-    <el-form-item label="栅格间隔">
-      <el-input-number v-model="props.gutter"  :min="0"></el-input-number>
-    </el-form-item>
-    <el-form-item label="标签宽度">
-      <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel" @change="handlerChangeLabel"></el-switch>
-    </el-form-item>
-    <el-form-item label="必填">
-      <el-switch v-model="props.required"></el-switch>
-    </el-form-item>
-    <el-form-item label="垂直">
-      <el-switch v-model="props.vertical"></el-switch>
-    </el-form-item>
-    <el-form-item label="最小数量">
-      <el-input-number v-model="props.min"  :min="1" ></el-input-number>
-    </el-form-item>
-    <el-form-item label="最大数量">
-      <el-input-number v-model="props.max"  :min="1" ></el-input-number>
-    </el-form-item>
-    <el-form-item label="选项样式">
-      <el-radio-group v-model="props.optionType">
-        <el-radio-button label="default">默认</el-radio-button>
-        <el-radio-button label="button">按钮</el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-    <el-form-item label="显示边框">
-      <el-switch v-model="props.border"></el-switch>
-    </el-form-item>
-    <el-form-item label="选项尺寸" v-show="props.border||props.optionType ==='button'">
-      <el-radio-group v-model="props.size">
-        <el-radio-button label="medium">正常</el-radio-button>
-        <el-radio-button label="small">略小</el-radio-button>
-        <el-radio-button label="mini">迷你</el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-    <el-form-item label="禁用">
-      <el-switch v-model="props.disabled" @change="handlerChangeDisStatus('disabled')"></el-switch>
-    </el-form-item>
-    <el-form-item label="默认值">
-      <el-input class="input"
-        :value="setDefaultValue(props.value)"
-        placeholder="请输入默认值"
-        @input="onDefaultValueInput"
-      />
-    </el-form-item>
-    <el-form-item label="数据类型">
-      <el-radio-group v-model="props.dataType" @change="handlerChangeDataType">
-        <el-radio-button label="static">静态数据</el-radio-button>
-        <el-radio-button label="dynamic">动态数据</el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-    <div v-show='props.dataType ==="static"'>
-    <el-divider>选项</el-divider>
-      <draggable :list="props.options" handle=".option-drag">
-        <div v-for="(item, index) in props.options" :key="index" class="select-item">
-          <div class="select-line-icon option-drag">
-            <i class="el-icon-s-operation" />
-          </div>
-          <el-input v-model="item.label" placeholder="选项名" size="small" />
-          <el-input
-            placeholder="选项值"
-            size="small"
-            :value="item.value"
-            @input="setOptionValue(item, $event)"
-          />
-          <div class="close-btn select-line-icon" @click="props.options.splice(index, 1)">
-            <i class="el-icon-remove-outline" />
-          </div>
-        </div>
-      </draggable>
-    <div style="margin-left: 20px;">
-      <el-button
-        style="padding-bottom: 0"
-        icon="el-icon-circle-plus-outline"
-        type="text"
-        @click="addSelectItem"
-      >
-        添加选项
-      </el-button>
-    </div>
-    </div>
-    <div v-show='props.dataType ==="dynamic"'>
-      <el-form-item label="地址">
-        <el-input v-model="props.action"></el-input>
-      </el-form-item>
-    </div>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-import draggable from "vuedraggable";
-import { isNumberStr } from '../../utils/index'
-/**
- * input的配置项
- */
-let vm = {
-  name:"checkboxConfig",
-  props:['props','getFormId'],
-  components:{
-    draggable
-  },
-  mixins:[changeId],
-  data(){
-    return {
-    }
-  },
-  methods:{
-    handlerChangeLabel(val){
-      this.props.labelWidth = val?'80':'1'
-    },
-    handlerChangeDisStatus(val){
-      this.props.readOnly = !val
-    },
-    handlerChangeReadStatus(val){
-      this.props.disabled = !val
-    },
-    setDefaultValue(val) {
-      if (Array.isArray(val)) {
-        return val.join(',')
-      }
-      if (['string', 'number'].indexOf(val) > -1) {
-        return val
-      }
-      if (typeof val === 'boolean') {
-        return `${val}`
-      }
-      return val
-    },
-    onDefaultValueInput(str) {
-      if (Array.isArray(this.props.value)) {
-        // 数组
-        this.$set(
-          this.props,
-          'value',
-          str.split(',').map(val => (isNumberStr(val) ? +val : val))
-        )
-      } else if (['true', 'false'].indexOf(str) > -1) {
-        // 布尔
-        this.$set(this.props, 'value', JSON.parse(str))
-      } else {
-        // 字符串和数字
-        this.$set(
-          this.props,
-          'value',
-          isNumberStr(str) ? +str : str
-        )
-      }
-    },
-    setOptionValue(item,val){
-      item.value = isNumberStr(val) ? +val : val
-    },
-    addSelectItem(){
-      this.props.options.push({
-        label: '',
-        value: ''
-      })
-    },
-    multipleChange(val){
-    //   this.$set(this.props, 'value', val ? [] : '')
-    },
-    handlerChangeDataType(value){
-      if(value === 'static'){
-        this.props.options = [];
-        this.props.options = this.tempOptions;
-      }else{
-        this.tempOptions = this.props.options;
-        this.props.options = [];
-      }
-    }
-  },
-  mounted(){
-  },
-  watch: {
-  }
-}
-export default vm;
-</script>
-<style lang="scss" scoped>
-.input{
-  width:75%
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/colorPicker.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/colorPicker.vue
deleted file mode 100644
index 3ef564df..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/colorPicker.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-  <div v-show="props.compType === 'colorPicker'">
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId" ></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel" @change="handlerShowLabel"></el-switch>
-    </el-form-item>
-    <el-form-item label="标签文字" v-show="props.showLabel">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <el-form-item label="标签长度" v-show="props.showLabel">
-      <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="透明">
-        <el-switch v-model="props['show-alpha']"></el-switch>
-    </el-form-item>
-    <el-form-item label="默认颜色">
-        <el-color-picker v-model="props.value" />
-    </el-form-item>
-    <el-form-item label="大小">
-      <el-radio-group v-model="props.size">
-        <el-radio-button label="medium">常规</el-radio-button>
-        <el-radio-button label="small">略小</el-radio-button>
-        <el-radio-button label="mini">迷你</el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-    <el-form-item label="预定义颜色">
-        <div class="select-item" v-for="(item,index) in props.predefine" :key="item">
-            <span class="el-color-picker__color"><!--style="background-color: rgb(64, 158, 255);"-->
-                <span class="el-color-picker__color-inner" :style="{'background-color':item}">
-                </span>
-            </span>
-            <div class="close-btn select-line-icon">
-                <i class="el-icon-remove-outline" @click="handlerRemoveColor(index)"/>
-            </div>
-        </div>
-        <br/>
-        <el-color-picker v-model="color" @change="handlerAddPreColor"></el-color-picker>
-    </el-form-item>
-</div>
-</template>
-<script>
-import {changeId} from '../mixin'
-export default {
-  name:"buttonConfig",
-  props:{
-    props:{}
-  },
-  mixins:[changeId],
-  data(){
-    return {
-      color:'#409EFF',
-    }
-  },
-  methods:{
-    handlerShowLabel(val){
-      if(val){
-        this.props.labelWidth = 80;
-      }else{
-        this.props.labelWidth = 0;
-      }
-    },
-    handlerAddPreColor(val){
-        console.log(val);
-        this.props.predefine.push(val);
-        console.log(this.props.predefine);
-    },
-    handlerRemoveColor(index){
-        this.props.predefine.splice(index,1);
-    }
-  },
-  mounted(){
-  }
-}
-</script>
-<style scoped>
-.el-color-picker__color{
-    position: relative;
-    display: block;
-    box-sizing: border-box;
-    border: 1px solid #999;
-    border-radius: 2px;
-    width:100px;
-    height:30px;
-    float:left;
-    margin-right:2px;
-}
-</style>
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/date.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/date.vue
deleted file mode 100644
index 82dd498c..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/date.vue
+++ /dev/null
@@ -1,127 +0,0 @@
-<template>
-  <div v-show="props.compType === 'date'">
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId"></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="标题">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <el-form-item label="栅格间隔">
-      <el-input-number v-model="props.gutter"  :min="0"></el-input-number>
-    </el-form-item>
-    <el-form-item label="标签宽度">
-      <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel"></el-switch>
-    </el-form-item>
-    <el-form-item  label="提示符">
-      <el-input class="input" v-model="props.placeholder"></el-input>
-    </el-form-item>
-    <el-form-item label="必填">
-      <el-switch v-model="props.required"></el-switch>
-    </el-form-item>
-    <el-form-item label="时间类型">
-      <el-select class="input" v-model="props.type" @change="handlerFormatChange">
-        <el-option v-for="item in dateTypeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="时间格式">
-      <el-input class="input" :value="props.format" @change="handlerChangeValueFormat"/>
-    </el-form-item>
-    <el-form-item label="清空">
-      <el-switch v-model="props.clearable"></el-switch>
-    </el-form-item>
-    <el-form-item label="只读">
-      <el-switch v-model="props.readonly"></el-switch>
-    </el-form-item>
-    <el-form-item label="禁用">
-      <el-switch v-model="props.disabled"></el-switch>
-    </el-form-item>
-    <el-form-item label="分隔符" v-show="props.type === 'monthrange'||props.type === 'daterange'||props.type === 'datetimerange'">
-      <el-input v-model="props['range-separator']"></el-input>
-    </el-form-item>
-    <el-form-item label="默认值">
-      <el-date-picker class="input" v-model="props.value" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"/>
-    </el-form-item>
-    
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-const dateType =[
-    {
-      label: '日(date)',
-      value: 'date'
-    },
-    {
-      label: '周(week)',
-      value: 'week'
-    },
-    {
-      label: '月(month)',
-      value: 'month'
-    },
-    {
-      label: '年(year)',
-      value: 'year'
-    },
-    {
-      label: '日期时间(datetime)',
-      value: 'datetime'
-    },
-    {
-      label: '月份范围',
-      value: 'monthrange'
-    },
-    {
-      label: '日期范围',
-      value: 'daterange'
-    },
-    {
-      label: '日期时间范围',
-      value: 'datetimerange'
-    }
-  ];
-const dateTimeFormat = {
-  date: 'yyyy-MM-dd',
-  week: 'yyyy 第 WW 周',
-  month: 'yyyy-MM',
-  year: 'yyyy',
-  datetime: 'yyyy-MM-dd HH:mm:ss',
-  daterange: 'yyyy-MM-dd',
-  monthrange: 'yyyy-MM',
-  datetimerange: 'yyyy-MM-dd HH:mm:ss'
-}
-
-export default {
-  name:"inputConfig",
-  props:['props','getFormId'],
-  components: {
-  },
-  mixins:[changeId],
-  data(){
-    return {
-      dateTypeOptions:dateType
-    }
-  },
-  methods:{
-    handlerFormatChange(val){
-      this.props.format = dateTimeFormat[val];
-      this.props['value-format'] = dateTimeFormat[val];
-    },
-    handlerChangeValueFormat(val){
-      this.props['value-format'] = val;
-    }
-  },
-  mounted(){
-  }
-}
-</script>
-<style scoped>
-.input{
-  width:75%
-}
-</style>
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/dialogList.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/dialogList.vue
deleted file mode 100644
index 46021052..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/dialogList.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-  <div v-show="props.compType === 'dialogList'" class="dialogList">
-    <el-collapse v-model="activePanel" accordion>
-      <el-collapse-item title="基础设置" name="1">
-        <el-form-item label="ID" >
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" ></el-input>
-      </el-tooltip>
-      </el-form-item>
-      <el-form-item label="标题" >
-        <el-input class="input" v-model="props.label"></el-input>
-      </el-form-item>
-      <el-form-item label="栅格" >
-        <el-input-number v-model="props.span"  :min="1" :max="24"/>
-      </el-form-item>
-      <el-form-item label="标签宽度">
-        <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-      </el-form-item>
-      <el-form-item label="显示标签">
-        <el-switch v-model="props.showLabel"></el-switch>
-      </el-form-item>
-      <el-form-item label="必填">
-        <el-switch v-model="props.required"></el-switch>
-      </el-form-item>
-      <el-form-item label="禁用" >
-        <el-switch v-model="props.disabled"></el-switch>
-      </el-form-item>
-      <el-form-item label="默认值" >
-        <el-input class="input" v-model="props.value"></el-input>
-      </el-form-item>
-      <el-form-item label="请求地址">
-          <el-input v-model="props.action"></el-input>
-      </el-form-item>
-      <el-form-item label="标题">
-          <el-input v-model="props.title"></el-input>
-      </el-form-item>
-      <el-form-item label="多选">
-          <el-switch v-model="props.multi"></el-switch>
-      </el-form-item>
-      <el-form-item label="显示序号">
-          <el-switch v-model="props.showIndex"></el-switch>
-      </el-form-item>
-      <el-form-item label="表格高度">
-          <el-input-number v-model="props.height" :step="10" :max="1500" :min="100"></el-input-number>
-      </el-form-item>
-      <el-form-item label="字段值">
-          <el-input v-model="props.dval"></el-input>
-      </el-form-item>
-      <el-form-item label="字段名称">
-          <el-input v-model="props.dlabel"></el-input>
-      </el-form-item>
-      </el-collapse-item>
-      <el-collapse-item title="字段配置" name="2">
-            <el-table
-            :data="colOptions"
-            @row-dblclick="handlerDeleteRow"
-          >
-            <el-table-column property="label"  label="字段" align="center" />
-            <el-table-column property="property"  label="属性"  align="center" />
-            <el-table-column property="width"  label="宽度"  align="center" width="70" />
-            <el-table-column label="显示">
-              
-            </el-table-column>
-          </el-table>
-        <br/>
-        <el-alert title="字段和属性不能为空,请检查" v-show="alertShow" type="error" :closable="false"/>
-        <el-alert title="属性已存在请检查" v-show="propertyExistShow" type="error" :closable="false"/>
-        <br>
-        <el-form-item label="字段" label-width="60px">
-            <el-input v-model="dLabel" />
-        </el-form-item>
-        <el-form-item label="属性" label-width="60px">
-            <el-input v-model="dProperty"/>
-        </el-form-item>
-        <el-form-item label="宽度" label-width="60px">
-            <el-input-number v-model="dWidth" />
-        </el-form-item>
-        <el-form-item label="显示" label-width="60px">
-            <el-switch v-model="dShow" />
-        </el-form-item>
-        <div style="margin-left: 20px;">
-          <el-button
-            style="padding-bottom: 0"
-            icon="el-icon-circle-plus-outline"
-            type="text"
-            @click="addColItem"
-          >
-            添加选项
-          </el-button>
-        </div>
-      </el-collapse-item>
-      <el-collapse-item title="数值联动" name="3">
-        
-      </el-collapse-item>
-    </el-collapse>
-  </div>
-</template>
-<script>
-/**
- * text的配置项
- */
-export default {
-  name:"textConfig",
-  props:{
-    props:{}
-  },
-  data(){
-    return {
-      activePanel:'1',
-      colOptions:[],
-      dLabel:'',
-      dProperty:'',
-      dWidth:150,
-      dShow:true,
-      alertShow:false,
-      propertyExistShow:false,
-    }
-  },
-  methods:{
-    addColItem(){
-      if(this.dLabel!==''&&this.dProperty!==''){
-        const existOptions = this.colOptions.find(item=>item.property === this.dProperty);
-        if( typeof existOptions === 'undefined'){
-          this.alertShow = false;
-          this.propertyExistShow = false;
-          const obj = {};
-          obj.index = this.colOptions.length;
-          obj.show = this.dShow;
-          obj.label = this.dLabel;
-          obj.property = this.dProperty;
-          obj.width = this.dWidth;
-          this.colOptions.push(obj);
-          this.resetFields();
-        }else{
-          this.propertyExistShow = true;
-        }
-      }else{
-        this.alertShow = true;
-      }
-    },
-    resetFields(){
-      this.dLabel = '';
-      this.dProperty = '';
-      this.dWidth = 150;
-      this.dShow = true;
-    },
-    handlerDeleteRow(row){
-      let index = this.colOptions.findIndex(item=>item.property==row.property);
-      this.colOptions.splice(index,1);
-    }
-  },
-  mounted() {
-    this.$nextTick(()=> {
-      this.colOptions = this.colOptions.concat(JSON.parse(this.props.colConf));
-    })
-  },
-  watch:{
-    'colOptions'(newVal){
-      this.props.colConf = JSON.stringify(newVal);
-    }
-  }
-}
-</script>
-<style scoped>
-.dialogList >>> .el-collapse-item__header{
-  background-color: #f4f6fc;
-  padding-left:10px;
-}
-.dialogList >>> .el-collapse-item__header{
-  height:35px;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/divider.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/divider.vue
deleted file mode 100644
index df2dd4b6..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/divider.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-<template>
-  <div v-show="props.compType === 'divider'">
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" ></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="文字">
-      <el-input class="input" v-model="props.text"></el-input>
-    </el-form-item>
-    <el-form-item label="文字大小">
-      <el-radio-group v-model="props['content-position']">
-        <el-radio-button label="left">左</el-radio-button>
-        <el-radio-button label="center">中</el-radio-button>
-        <el-radio-button label="right">右</el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-  </div>
-</template>
-<script>
-/**
- * input的配置项
- */
-export default {
-  name:"dividerConfig",
-  props:{
-    props:{}
-  },
-  data(){
-    return {
-    }
-  },
-  methods:{
-    
-  },
-  mounted(){
-  }
-}
-</script>
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/dynamicTable.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/dynamicTable.vue
deleted file mode 100644
index 10ce5369..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/dynamicTable.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div v-show="props.compType === 'dynamicTable'">
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId"></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="显示新增按钮" label-width="120px">
-      <el-switch v-model="props.buttonAdd"></el-switch>
-    </el-form-item>
-    <el-form-item label="显示删除按钮" label-width="120px">
-      <el-switch v-model="props.buttonDel"></el-switch>
-    </el-form-item>
-    <el-form-item label="显示行号" label-width="120px">
-      <el-switch v-model="props.showIndex"></el-switch>
-    </el-form-item>
-    <el-form-item label="多选" label-width="120px">
-      <el-switch v-model="props.multiCheck"></el-switch>
-    </el-form-item>
-    <el-form-item label="合计行" label-width="120px">
-      <el-switch v-model="props['show-summary']"></el-switch>
-    </el-form-item>
-    <el-form-item label="合计文本" label-width="120px">
-      <el-input v-model="props['sum-text']"></el-input>
-    </el-form-item>
-    <el-form-item label="单位文本" label-width="120px">
-      <el-input v-model="props['summary-text']"></el-input>
-    </el-form-item>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-export default {
-  name:"dynamicTableConfig",
-  props:['props','getFormId'],
-  mixins:[changeId],
-  data(){
-    return {
-    }
-  },
-  methods:{
-  }
-}
-</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/editor.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/editor.vue
deleted file mode 100644
index 8c1acfbe..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/editor.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-  <div v-show="props.compType === 'editor'">
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId" ></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel" @change="handlerShowLabel"></el-switch>
-    </el-form-item>
-    <el-form-item label="标签文字" v-show="props.showLabel">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <el-form-item label="标签长度" v-show="props.showLabel">
-      <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="必填">
-      <el-switch v-model="props.required"></el-switch>
-    </el-form-item>
-    <el-form-item label="验证最大字数">
-      <el-switch v-model="props.validateMaxText"></el-switch>
-    </el-form-item>
-    <el-form-item label="最大字数">
-      <el-input-number v-model="props.max"  :min="100" ></el-input-number>
-    </el-form-item>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-export default {
-  name:"editorConfig",
-  props:{
-    props:{}
-  },
-  mixins:[changeId],
-  methods:{
-    handlerShowLabel(val){
-      if(val){
-        this.props.labelWidth = 80;
-      }else{
-        this.props.labelWidth = 0;
-      }
-    }
-  }
-
-}
-</script>
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/html.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/html.vue
deleted file mode 100644
index 42e97726..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/html.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<!--废弃-->
-<template>
-  <div v-show="props.compType === 'html'">
-    <!-- <el-form-item label="字段名">
-      <el-input class="input" v-model="props"></el-input>
-    </el-form-item> -->
-    <el-form-item label="ID" labelWidth="40px">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" ></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="文本" labelWidth="40px">
-      <!-- <el-input type="textarea" class="input" v-model="props.text" rows="12"></el-input> -->
-      <el-button icon="el-icon-edit-outline" circle @click="handlerEditMore"></el-button>
-    </el-form-item>
-    <el-dialog  :visible.sync="editTextVisible" width="70%"
-                :close-on-press-escape="false"
-                :close-on-click-modal="false"
-                :show-close="false"
-                :center="true"
-                top="20px"
-    >
-    <fancy-editor v-model="props.text"/>
-    <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handlerSave">确 定</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-<script>
-
-/**
- * text的配置项
- */
-export default{
-  name:"htmlConfig",
-  props:{
-    props:{}
-  },
-  data(){
-    return {
-      editTextVisible:false
-    }
-  },
-  methods:{
-    handlerEditMore(){
-      this.editTextVisible = true;
-    },
-    handlerSave(){
-      this.editTextVisible = false;
-    }
-  }
-}
-</script>
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/input.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/input.vue
deleted file mode 100644
index b3217cd8..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/input.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<template>
-  <div v-show="props.compType === 'input'">
-    <!-- <el-form-item label="字段名">
-      <el-input class="input" v-model="props"></el-input>
-    </el-form-item> -->
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId" ></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="标题">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <el-form-item label="栅格">
-      <el-input-number v-model="props.span"  :min="1" :max="24"/>
-    </el-form-item>
-<!--    <el-form-item label="宽度">-->
-<!--      <el-input-number v-model="props.width"  :min="1" :max="100"/>%-->
-<!--    </el-form-item>-->
-    <el-form-item label="提示符">
-      <el-input class="input" v-model="props.placeholder" placeholder="请输入提示符"/>
-    </el-form-item>
-    <el-form-item label="栅格间隔">
-      <el-input-number v-model="props.gutter"  :min="0"></el-input-number>
-    </el-form-item>
-    <el-form-item label="标签宽度">
-      <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel" @change="handlerChangeLabel"></el-switch>
-    </el-form-item>
-    <el-form-item label="必填">
-      <el-switch v-model="props.required"></el-switch>
-    </el-form-item>
-    <el-form-item label="清除">
-      <el-switch v-model="props.clearable"></el-switch>
-    </el-form-item>
-    <el-form-item label="禁用">
-      <el-switch v-model="props.disabled"></el-switch>
-    </el-form-item>
-    <el-form-item label="只读">
-      <el-switch v-model="props.readonly"></el-switch>
-    </el-form-item>
-    <el-form-item label="前置图标">
-      <el-input placeholder="请选择图标" readonly  v-model="props['prefix-icon']">
-        <template slot="append" >
-          <i class="el-icon-picture" style="cursor: pointer;" @click="handlerPrefixSelectIcon"/>
-        </template>
-      </el-input>
-    </el-form-item>
-    <el-form-item label="后置图标">
-      <el-input placeholder="请选择图标" readonly  v-model="props['suffix-icon']">
-        <template slot="append" >
-          <i class="el-icon-picture" style="cursor: pointer;" @click="handlerSuffixSelectIcon"/>
-        </template>
-      </el-input>
-    </el-form-item>
-    <el-form-item label="前缀">
-      <el-input  v-model="props.prepend">
-      </el-input>
-    </el-form-item>
-    <el-form-item label="后缀">
-      <el-input  v-model="props.append">
-      </el-input>
-    </el-form-item>
-    <el-form-item label="默认值">
-      <el-input class="input" v-model="props.value"></el-input>
-    </el-form-item>
-    <el-divider>校验</el-divider>
-    <el-form-item label="验证类型">
-      <el-select v-model="props.rulesType" @change="handlerChangeRulesType">
-        <el-option label="无" value="default"/>
-        <el-option label="电话" value="phone"/>
-        <el-option label="邮箱" value="email"/>
-        <el-option label="纯数字" value="number"/>
-        <el-option label="身份证" value="idcard"/>
-      </el-select>
-    </el-form-item>
-    <div v-for="(item, index) in props.rules" :key="index" class="rule-item">
-        <el-input v-model="item.rule" placeholder="正则" size="small" />
-        <p/>
-        <el-input v-model="item.msg" placeholder="自定义提示" size="small" />
-        <div class="close-btn select-line-icon" @click="props.rules.splice(index, 1)">
-          <i class="el-icon-remove-outline close-icon" />
-        </div>
-      </div>
-    <div style="margin-left: 20px;">
-      <el-button
-        style="padding-bottom: 0"
-        icon="el-icon-circle-plus-outline"
-        type="text"
-        @click="addRuleItem"
-      >
-        添加选项
-      </el-button>
-    </div>
-    <icon-dialog v-model="props['suffix-icon']" :visible.sync="iconDialogVisible_suffix"/>
-    <icon-dialog v-model="props['prefix-icon']" :visible.sync="iconDialogVisible_prefix"/>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-import iconDialog from '../../iconDialog';
-const defaultRules={
-  'phone':{'rule':'0?(13|14|15|17|18|19)[0-9]{9}','msg':'您输入的电话号码不符合规则'},
-  'email':{'rule':'\\w[-\\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\\.)+[A-Za-z]{2,14}','msg':'您输入的邮件地址不符合规则'},
-  'number':{'rule':'^[0-9]*$','msg':'您输入的内容不符合纯数字规则'},
-  'idcard':{'rule':'\\d{17}[\\d|x]|\\d{15}','msg':'您输入的身份证号码不符合规则'}
-}
-/**
- * input的配置项
- */
-export default {
-  name:"inputConfig",
-  props:['props','getFormId'],
-  components:{
-    iconDialog
-  },
-  mixins:[changeId],
-  data(){
-    return {
-      val:'',
-      iconDialogVisible_suffix:false,
-      iconDialogVisible_prefix:false
-    }
-  },
-  methods:{
-    handlerChangeLabel(val){
-      this.props.labelWidth = val?'80':'1'
-    },
-    handlerSuffixSelectIcon(){
-      this.iconDialogVisible_suffix = true;
-    },
-    handlerPrefixSelectIcon(){
-      this.iconDialogVisible_prefix = true;
-    },
-    addRuleItem(){
-      this.props.rules.push({
-        rule: '',
-        msg: ''
-      })
-    },
-    handlerChangeRulesType(val){
-      const obj = defaultRules[val];
-      this.props.rules.push({
-        rule: obj.rule,
-        msg: obj.msg
-      })
-    }
-  },
-  mounted(){
-  },
-  watch:{
-  }
-}
-</script>
-<style scoped>
-.input{
-  width:75%
-}
-.rule-item{
- padding-top: 5px;
- padding-bottom: 5px;
-}
-.close-btn{
-  text-align: center;
-}
-.close-icon:hover{
-  cursor: pointer;
-}
-.close-btn >>> .el-icon-remove-outline{
-  color:"red"
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/inputNumber.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/inputNumber.vue
deleted file mode 100644
index 3dc357f2..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/inputNumber.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<template>
-  <div v-show="props.compType === 'inputNumber'">
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId"></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="标题">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <!-- <el-form-item label="表单栅格">
-      <el-slider class="input" v-model="props.span" :max="24" :min="1" :marks="{12:''}"></el-slider>
-    </el-form-item> -->
-    <el-form-item label="栅格间隔">
-      <el-input-number v-model="props.gutter"  :min="0"></el-input-number>
-    </el-form-item>
-    <el-form-item label="标签宽度">
-      <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel" @change="handlerChangeLabel"></el-switch>
-    </el-form-item>
-    <el-form-item label="必填">
-      <el-switch v-model="props.required"></el-switch>
-    </el-form-item>
-    <el-form-item label="最小值">
-      <el-input-number v-model="props.min"></el-input-number>
-    </el-form-item>
-    <el-form-item label="最大值">
-      <el-input-number v-model="props.max"></el-input-number>
-    </el-form-item>
-    <el-form-item label="步长">
-      <el-input-number v-model="props.step"></el-input-number>
-    </el-form-item>
-    <el-form-item label="精度">
-      <el-input-number v-model="props.precision" :min="0" :max="10"></el-input-number>
-    </el-form-item>
-    <el-form-item label="按钮位置">
-      <el-radio-group v-model="props['controls-position']">
-        <el-radio-button label="default">默认</el-radio-button>
-        <el-radio-button label="right">右侧</el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-    <el-form-item label="禁用">
-      <el-switch v-model="props.disabled" @change="handlerChangeDisStatus('disabled')"></el-switch>
-    </el-form-item>
-    <el-form-item label="默认值">
-      <el-input class="input" v-model="props.value"></el-input>
-    </el-form-item>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-export default {
-  name:"inputConfig",
-  props:['props','getFormId'],
-  components: {
-  },
-  mixins:[changeId],
-  data(){
-    return {
-    }
-  },
-  methods:{
-    handlerChangeLabel(val){
-      this.props.labelWidth = val?'80':'1'
-    },
-    handlerChangeDisStatus(val){
-      this.props.readOnly = val?false:true
-    },
-    handlerChangeReadStatus(val){
-      this.props.disabled = val?false:true
-    },
-  },
-  mounted(){
-  }
-}
-</script>
-<style scoped>
-.input{
-  width:75%
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/link.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/link.vue
deleted file mode 100644
index 65135315..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/link.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-  <div v-show="props.compType === 'link'">
-    <!-- <el-form-item label="字段名">
-      <el-input class="input" v-model="props"></el-input>
-    </el-form-item> -->
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id"  @change="handlerChangeId" ></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="链接文字">
-      <el-input class="input" v-model="props.text"></el-input>
-    </el-form-item>
-    <el-form-item label="类型" >
-      <el-select v-model="props.type" placeholder="请选择">
-        <el-option label="primary" value="primary"/>
-        <el-option label="success" value="success"/>
-        <el-option label="warning" value="warning"/>
-        <el-option label="danger" value="danger"/>
-        <el-option label="info" value="info"/>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="url">
-      <el-input class="input" v-model="props.href"></el-input>
-    </el-form-item>
-    <el-form-item label="禁用">
-      <el-switch v-model="props.disabled"></el-switch>
-    </el-form-item>
-    <el-form-item label="新窗口">
-      <el-switch v-model="isNewWindow" @change="handlerChangeTargetValue"></el-switch>
-    </el-form-item>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-export default {
-  name:"buttonConfig",
-  props:{
-    props:{}
-  },
-  components:{
-  },
-  mixins:[changeId],
-  data(){
-    return {
-      isNewWindow:true  
-    }
-  },
-  methods:{
-    handlerShowLabel(val){
-      if(val){
-        this.props.labelWidth = 80;
-      }else{
-        this.props.labelWidth = 0;
-      }
-    },
-    handlerChangeTargetValue(val){
-      if(val){
-        this.props.target = '_blank';
-      }else{
-        this.props.target = '_self';
-      }
-    }
-  },
-  mounted(){
-  }
-}
-</script>
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/radio.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/radio.vue
deleted file mode 100644
index 38fd474f..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/radio.vue
+++ /dev/null
@@ -1,198 +0,0 @@
-<template>
-  <div v-show="props.compType === 'radio'">
-    <!-- <el-form-item label="字段名">
-      <el-input class="input" v-model="props"></el-input>
-    </el-form-item> -->
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId"></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="标题">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <el-form-item label="提示符">
-      <el-input class="input" v-model="props.placeholder" placeholder="请输入提示符"/>
-    </el-form-item>
-    <!-- <el-form-item label="表单栅格">
-      <el-slider class="input" v-model="props.span" :max="24" :min="1" :marks="{12:''}"></el-slider>
-    </el-form-item> -->
-    <el-form-item label="栅格间隔">
-      <el-input-number v-model="props.gutter"  :min="0"></el-input-number>
-    </el-form-item>
-    <el-form-item label="标签宽度">
-      <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel" @change="handlerChangeLabel"></el-switch>
-    </el-form-item>
-    <el-form-item label="必填">
-      <el-switch v-model="props.required"></el-switch>
-    </el-form-item>
-    <el-form-item label="垂直">
-      <el-switch v-model="props.vertical"></el-switch>
-    </el-form-item>
-    <el-form-item label="选项样式">
-      <el-radio-group v-model="props.optionType">
-        <el-radio-button label="default">默认</el-radio-button>
-        <el-radio-button label="button">按钮</el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-    <el-form-item label="显示边框">
-      <el-switch v-model="props.border"></el-switch>
-    </el-form-item>
-    <el-form-item label="大小" v-show="props.border||props.optionType ==='button'">
-      <el-radio-group v-model="props.size">
-        <el-radio-button label="medium">正常</el-radio-button>
-        <el-radio-button label="small">略小</el-radio-button>
-        <el-radio-button label="mini">迷你</el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-    <el-form-item label="禁用">
-      <el-switch v-model="props.disabled" @change="handlerChangeDisStatus('disabled')"></el-switch>
-    </el-form-item>
-    <el-form-item label="默认值">
-      <el-input class="input"
-        :value="setDefaultValue(props.value)"
-        placeholder="请输入默认值"
-        @input="onDefaultValueInput"
-      />
-    </el-form-item>
-    <el-form-item label="数据类型">
-      <el-radio-group v-model="props.dataType" @change="handlerChangeDataType">
-        <el-radio-button label="static">静态数据</el-radio-button>
-        <el-radio-button label="dynamic">动态数据</el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-    <div v-show='props.dataType ==="static"'>
-    <el-divider>选项</el-divider>
-      <draggable :list="props.options" handle=".option-drag">
-      <div v-for="(item, index) in props.options" :key="index" class="select-item">
-        <div class="select-line-icon option-drag">
-          <i class="el-icon-s-operation" />
-        </div>
-        <el-input v-model="item.label" placeholder="选项名" size="small" />
-        <el-input
-          placeholder="选项值"
-          size="small"
-          :value="item.value"
-          @input="setOptionValue(item, $event)"
-        />
-        <div class="close-btn select-line-icon" @click="props.options.splice(index, 1)">
-          <i class="el-icon-remove-outline" />
-        </div>
-      </div>
-      </draggable>
-    <div style="margin-left: 20px;">
-      <el-button
-        style="padding-bottom: 0"
-        icon="el-icon-circle-plus-outline"
-        type="text"
-        @click="addSelectItem"
-      >
-        添加选项
-      </el-button>
-    </div>
-    </div>
-    <div v-show='props.dataType ==="dynamic"'>
-      <el-form-item label="地址">
-        <el-input v-model="props.action"></el-input>
-      </el-form-item>
-    </div>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-import draggable from "vuedraggable";
-import { isNumberStr } from '../../utils/index'
-/**
- * input的配置项
- */
-let vm = {
-  name:"inputConfig",
-  props:['props','getFormId'],
-  components:{
-    draggable
-  },
-  mixins:[changeId],
-  data(){
-    return {
-      val:123
-    }
-  },
-  methods:{
-    handlerChangeLabel(val){
-      this.props.labelWidth = val?'80':'1'
-    },
-    handlerChangeDisStatus(val){
-      this.props.readOnly = !val
-    },
-    handlerChangeReadStatus(val){
-      this.props.disabled = !val
-    },
-    setDefaultValue(val) {
-      if (Array.isArray(val)) {
-        return val.join(',')
-      }
-      if (['string', 'number'].indexOf(val) > -1) {
-        return val
-      }
-      if (typeof val === 'boolean') {
-        return `${val}`
-      }
-      return val
-    },
-    onDefaultValueInput(str) {
-      if (Array.isArray(this.props.value)) {
-        // 数组
-        this.$set(
-          this.props,
-          'value',
-          str.split(',').map(val => (isNumberStr(val) ? +val : val))
-        )
-      } else if (['true', 'false'].indexOf(str) > -1) {
-        // 布尔
-        this.$set(this.props, 'value', JSON.parse(str))
-      } else {
-        // 字符串和数字
-        this.$set(
-          this.props,
-          'value',
-          isNumberStr(str) ? +str : str
-        )
-      }
-    },
-    setOptionValue(item,val){
-      item.value = isNumberStr(val) ? +val : val
-    },
-    addSelectItem(){
-      this.props.options.push({
-        label: '',
-        value: ''
-      })
-    },
-    multipleChange(val){
-    //   this.$set(this.props, 'value', val ? [] : '')
-    },
-    handlerChangeDataType(value){
-      if(value === 'static'){
-        this.props.options = [];
-        this.props.options = this.tempOptions;
-      }else{
-        this.tempOptions = this.props.options;
-        this.props.options = [];
-      }
-    }
-  },
-  mounted(){
-  },
-  watch: {
-  }
-}
-export default vm;
-</script>
-<style lang="scss" scoped>
-.input{
-  width:75%
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/rate.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/rate.vue
deleted file mode 100644
index fae0cbd4..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/rate.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
-  <div v-show="props.compType === 'rate'">
-    <!-- <el-form-item label="字段名">
-      <el-input class="input" v-model="props"></el-input>
-    </el-form-item> -->
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId"></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="标题">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <!-- <el-form-item label="表单栅格">
-      <el-slider class="input" v-model="props.span" :max="24" :min="1" :marks="{12:''}"></el-slider>
-    </el-form-item> -->
-    <el-form-item label="栅格间隔">
-      <el-input-number v-model="props.gutter"  :min="0"></el-input-number>
-    </el-form-item>
-    <el-form-item label="标签宽度">
-      <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel"></el-switch>
-    </el-form-item>
-    <el-form-item label="必填">
-      <el-switch v-model="props.required"></el-switch>
-    </el-form-item>
-    <el-form-item label="允许半选">
-      <el-switch v-model="props['allow-half']"></el-switch>
-    </el-form-item>
-    <el-form-item label="显示分数">
-      <el-switch v-model="props['show-score']"></el-switch>
-    </el-form-item>
-    <el-form-item label="最大值">
-      <el-input-number v-model="props.max"></el-input-number>
-    </el-form-item>
-    <el-form-item label="禁用">
-      <el-switch v-model="props.disabled"></el-switch>
-    </el-form-item>
-    <el-form-item label="默认值">
-      <el-input class="input" v-model="props.value"></el-input>
-    </el-form-item>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-export default {
-  name:"rate",
-  props:['props','getFormId'],
-  components: {
-  },
-  mixins:[changeId],
-  data(){
-    return {
-    }
-  },
-  methods:{
-  },
-  mounted(){
-  }
-}
-</script>
-<style scoped>
-.input{
-  width:75%
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/row.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/row.vue
deleted file mode 100644
index 8bbb5f02..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/row.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--后期支持flex布局-->
-<template>
-  <div v-show="props.compType === 'row'">
-    <el-form-item label="栅格间隔">
-      <el-input-number size="small" v-model="props.gutter" :min="0" :max="100"/>
-    </el-form-item>
-    <el-divider>列配置项</el-divider>
-      <div v-for="(item, index) in props.columns" :key="index" class="select-item">
-        <div class="select-line-icon">
-          <i class="el-icon-s-operation" />
-        </div>
-        <el-input-number
-          size="normal"
-          v-model="item.span"
-          :min="1" :max="24"
-        />
-        <div class="close-btn select-line-icon" @click="props.columns.splice(index,1)">
-          <i class="el-icon-remove-outline" />
-        </div>
-      </div>
-    <div style="margin-left: 30px;">
-      <el-button
-        style="padding-bottom: 0"
-        icon="el-icon-circle-plus-outline"
-        type="text"
-        @click="handlerAddCol"
-      >
-        添加选项
-      </el-button>
-    </div>
-  </div>
-</template>
-<script>
-
-export default {
-  name:"rowConfig",
-  props:['props','getFormId'],
-  data(){
-    return {
-    }
-  },
-  methods:{
-    handlerAddCol(){
-      const colIndex = this.props.columns+1;
-      this.props.columns.push({
-        index:colIndex,
-        span:12,
-        list:[]
-      })
-    },
-  },
-  mounted(){
-  }
-}
-</script>
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/select.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/select.vue
deleted file mode 100644
index 365532d9..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/select.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<template>
-  <div v-show="props.compType === 'select'">
-    <!-- <el-form-item label="字段名">
-      <el-input class="input" v-model="props"></el-input>
-    </el-form-item> -->
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId"></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="标题">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <el-form-item label="提示符">
-      <el-input class="input" v-model="props.placeholder" placeholder="请输入提示符"/>
-    </el-form-item>
-    <!-- <el-form-item label="表单栅格">
-      <el-slider class="input" v-model="props.span" :max="24" :min="1" :marks="{12:''}"></el-slider>
-    </el-form-item> -->
-    <el-form-item label="栅格间隔">
-      <el-input-number v-model="props.gutter"  :min="0"></el-input-number>
-    </el-form-item>
-    <el-form-item label="标签宽度">
-      <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel" @change="handlerChangeLabel"></el-switch>
-    </el-form-item>
-    <el-form-item label="必填">
-      <el-switch v-model="props.required"></el-switch>
-    </el-form-item>
-    <el-form-item label="清除">
-      <el-switch v-model="props.clearable"></el-switch>
-    </el-form-item>
-    <el-form-item label="禁用">
-      <el-switch v-model="props.disabled"></el-switch>
-    </el-form-item>
-    <el-form-item label="多选">
-      <el-switch v-model="props.multiple" @change="multipleChange"></el-switch>
-    </el-form-item>
-    <el-form-item label="折叠" v-show="props.multiple">
-      <el-switch v-model="props['collapse-tags']" ></el-switch>
-    </el-form-item>
-    <el-form-item label="搜索">
-      <el-switch v-model="props.filterable"></el-switch>
-    </el-form-item>
-    <el-form-item label="默认值">
-      <el-input class="input"
-        :value="setValue(props.value)"
-        placeholder="请输入默认值"
-        @input="onValueInput"
-      />
-    </el-form-item>
-    <el-form-item label="数据类型">
-      <el-radio-group v-model="props.dataType" @change="handlerChangeDataType">
-        <el-radio-button label="static">静态数据</el-radio-button>
-        <el-radio-button label="dynamic">动态数据</el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-    <div v-show='props.dataType ==="static"'>
-    <el-divider>选项</el-divider>
-      <draggable :list="props.options" handle=".option-drag">
-      <div v-for="(item, index) in props.options" :key="index" class="select-item">
-        <div class="select-line-icon option-drag">
-          <i class="el-icon-s-operation" />
-        </div>
-        <el-input v-model="item.label" placeholder="选项名" size="small" />
-        <el-input
-          placeholder="选项值"
-          size="small"
-          :value="item.value"
-          @input="setOptionValue(item, $event)"
-        />
-        <div class="close-btn select-line-icon" @click="props.options.splice(index, 1)">
-          <i class="el-icon-remove-outline" />
-        </div>
-      </div>
-      </draggable>
-    <div style="margin-left: 20px;">
-      <el-button
-        style="padding-bottom: 0"
-        icon="el-icon-circle-plus-outline"
-        type="text"
-        @click="addSelectItem"
-      >
-        添加选项
-      </el-button>
-    </div>
-    </div>
-    <div v-show='props.dataType ==="dynamic"'>
-      <el-form-item label="地址">
-        <el-input v-model="props.action"></el-input>
-      </el-form-item>
-    </div>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-import draggable from "vuedraggable";
-import { isNumberStr } from '../../utils/index'
-export default {
-  name:"inputConfig",
-  props:['props','getFormId'],
-  components:{
-    draggable
-  },
-  mixins:[changeId],
-  data(){
-    return {
-      tempOptions:[]
-    }
-  },
-  methods:{
-    handlerChangeLabel(val){
-      this.props.labelWidth = val?'80':'1'
-    },
-    setValue(val) {
-      if (Array.isArray(val)) {
-        return val.join(',')
-      }
-      if (['string', 'number'].indexOf(val) > -1) {
-        return val
-      }
-      if (typeof val === 'boolean') {
-        return `${val}`
-      }
-      return val
-    },
-    onValueInput(str) {
-      if (Array.isArray(this.props.value)) {
-        // 数组
-        this.$set(
-          this.props,
-          'value',
-          str.split(',').map(val => (isNumberStr(val) ? +val : val))
-        )
-      } else if (['true', 'false'].indexOf(str) > -1) {
-        // 布尔
-        this.$set(this.props, 'value', JSON.parse(str))
-      } else {
-        // 字符串和数字
-        this.$set(
-          this.props,
-          'value',
-          isNumberStr(str) ? +str : str
-        )
-      }
-    },
-    setOptionValue(item,val){
-      item.value = isNumberStr(val) ? +val : val
-    },
-    addSelectItem(){
-      this.props.options.push({
-        label: '',
-        value: ''
-      })
-    },
-    multipleChange(val){
-      this.$set(this.props, 'value', val ? [] : '')
-    },
-    handlerChangeDataType(value){
-      if(value === 'static'){
-        this.props.options = [];
-        this.props.options = this.tempOptions;
-      }else{
-        this.tempOptions = this.props.options;
-        this.props.options = [];
-      }
-    }
-  },
-  mounted(){
-  }
-}
-</script>
-<style lang="scss" scoped>
-.input{
-  width:75%
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/slider.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/slider.vue
deleted file mode 100644
index da501e25..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/slider.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div v-show="props.compType === 'slider'">
-    <!-- <el-form-item label="字段名">
-      <el-input class="input" v-model="props"></el-input>
-    </el-form-item> -->
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId"></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="标题">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <!-- <el-form-item label="表单栅格">
-      <el-slider class="input" v-model="props.span" :max="24" :min="1" :marks="{12:''}"></el-slider>
-    </el-form-item> -->
-    <el-form-item label="栅格间隔">
-      <el-input-number v-model="props.gutter"  :min="0"></el-input-number>
-    </el-form-item>
-    <el-form-item label="标签宽度">
-      <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel"></el-switch>
-    </el-form-item>
-    <el-form-item label="必填">
-      <el-switch v-model="props.required"></el-switch>
-    </el-form-item>
-
-    <el-form-item label="最小值">
-      <el-input-number v-model="props.min"  :min="0"></el-input-number>
-    </el-form-item>
-    <el-form-item label="最大值">
-      <el-input-number v-model="props.max" placeholder="字符长度"/>
-    </el-form-item>
-    <el-form-item label="步长">
-      <el-input-number v-model="props.step"></el-input-number>
-    </el-form-item>
-    <el-form-item label="范围选择">
-      <el-switch v-model="props.range"></el-switch>
-    </el-form-item>
-    <el-form-item label="显示断点">
-      <el-switch v-model="props['show-stops']"></el-switch>
-    </el-form-item>
-    <el-form-item label="显示提示消息">
-      <el-switch v-model="props['show-tooltip']"></el-switch>
-    </el-form-item>
-    <el-form-item label="禁用">
-      <el-switch v-model="props.disabled"></el-switch>
-    </el-form-item>
-    <el-form-item label="默认值">
-      <el-input class="input" v-model="props.value"></el-input>
-    </el-form-item>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-export default {
-  name:"inputConfig",
-  props:['props','getFormId'],
-  components: {
-  },
-  mixins:[changeId],
-  data(){
-    return {
-    }
-  },
-  methods:{
-  },
-  mounted(){
-  }
-}
-</script>
-<style scoped>
-.input{
-  width:75%
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/table.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/table.vue
deleted file mode 100644
index 1041fcb2..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/table.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<template>
-  <div v-show="props.compType === 'table'">
-      <el-form-item label="ID" >
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId" ></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="单元格样式">
-      <el-input  class="input" v-model="props.tdStyle"></el-input>
-    </el-form-item>
-    <el-form-item label="表格宽度">
-      <el-inputNumber  class="input" :min="0" :max="500" v-model="props.width"></el-inputNumber>
-    </el-form-item>
-    <el-form-item label="行高">
-      <el-inputNumber  class="input" :min="0" :max="1500" :step="5" v-model="props.height"></el-inputNumber>
-    </el-form-item>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-/**
- * input的配置项
- */
-export default {
-  name:"inputConfig",
-  props:['props','getFormId'],
-  components:{
-  },
-  mixins:[changeId],
-  data(){
-    return {
-
-    }
-  },
-  methods:{
-  }
-}
-</script>
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/tdItem.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/tdItem.vue
deleted file mode 100644
index ef098849..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/tdItem.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
-  <div v-show="props.compType === 'tdItem'">
-    <el-form-item label="单元格背景">
-      <el-color-picker v-model="props.style.background" :predefine="predefineColors"/>
-    </el-form-item>
-    <el-form-item label="表格宽度(%)">
-      <el-inputNumber  class="input" :min="0" :max="100" v-model="props.style.width"/>
-    </el-form-item>
-  </div>
-</template>
-<script>
-/**
- * input的配置项
- */
-export default {
-  name:"tdItemConfig",
-  props:['props'],
-  data(){
-    return {
-        predefineColors: [
-          '#F6F6F6'
-        ]
-    }
-  },
-  methods:{
-  }
-}
-</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/text.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/text.vue
deleted file mode 100644
index 7b4b48dd..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/text.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-  <div v-show="props.compType === 'text'">
-    <!-- <el-form-item label="字段名">
-      <el-input class="input" v-model="props"></el-input>
-    </el-form-item> -->
-    <el-form-item label="ID" labelWidth="40px">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId" ></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="文本" labelWidth="40px">
-      <el-input type="textarea" class="input" v-model="props.text" rows="12" ></el-input>
-    </el-form-item>
-    <el-form-item label="颜色" labelWidth="40px">
-      <el-color-picker v-model="props.color" />
-    </el-form-item>
-    <el-form-item label="布局" labelWidth="40px">
-        <el-radio-group v-model="props.align">
-          <el-radio-button label="left">左</el-radio-button>
-          <el-radio-button label="center">中</el-radio-button>
-          <el-radio-button label="right">右</el-radio-button>
-        </el-radio-group>
-    </el-form-item>
-    <el-form-item label="大小" labelWidth="40px">
-        <el-input-number v-model="props.size" :min="10" :max="50" @change="handlerChangeSize"></el-input-number>
-    </el-form-item>
-    <el-form-item label="加粗" labelWidth="40px">
-        <el-input-number v-model="props.bold" :min="100" :max="800" :step="100" @change="handlerChangeBold"></el-input-number>
-    </el-form-item>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-export default {
-  name:"textConfig",
-  props:['props'],
-  data(){
-    return{
-    }
-  },
-  mixins:[changeId],
-  methods:{
-    handlerChangeSize(val){
-      this.props.size = val+'';
-    },
-    handlerChangeBold(val){
-      this.props.bold = val+'';
-    }
-  }
-}
-</script>
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/textarea.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/textarea.vue
deleted file mode 100644
index 277316ab..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/textarea.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-<template>
-  <div v-show="props.compType === 'textarea'">
-    <!-- <el-form-item label="字段名">
-      <el-input class="input" v-model="props"></el-input>
-    </el-form-item> -->
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId"></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="标题">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <el-form-item label="提示符">
-      <el-input class="input" v-model="props.placeholder" placeholder="请输入提示符"/>
-    </el-form-item>
-    <!-- <el-form-item label="表单栅格">
-      <el-slider class="input" v-model="props.span" :max="24" :min="1" :marks="{12:''}"></el-slider>
-    </el-form-item> -->
-    <el-form-item label="栅格间隔">
-      <el-input-number v-model="props.gutter"  :min="0"></el-input-number>
-    </el-form-item>
-    <el-form-item label="标签宽度">
-      <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel" @change="handlerChangeLabel"></el-switch>
-    </el-form-item>
-    <el-form-item label="必填">
-      <el-switch v-model="props.required"></el-switch>
-    </el-form-item>
-    <el-form-item label="输入框行数">
-      <el-input-number v-model="props.rows"  :min="0"></el-input-number>
-    </el-form-item>
-    <el-form-item label="长度限制">
-      <el-input-number v-model="props.maxlength" placeholder="字符长度"/>
-    </el-form-item>
-    <el-form-item label="输入统计">
-      <el-switch v-model="props['show-word-limit']"></el-switch>
-    </el-form-item>
-    <el-form-item label="禁用">
-      <el-switch v-model="props.disabled" @change="handlerChangeDisStatus"></el-switch>
-    </el-form-item>
-    <el-form-item label="只读">
-      <el-switch v-model="props.readonly" @change="handlerChangeReadStatus"></el-switch>
-    </el-form-item>
-    <el-form-item label="默认值">
-      <el-input class="input" v-model="props.value"></el-input>
-    </el-form-item>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-export default {
-  name:"inputConfig",
-  props:['props','getFormId'],
-  components: {
-  },
-  mixins:[changeId],
-  data(){
-    return {
-    }
-  },
-  methods:{
-    handlerChangeLabel(val){
-      this.props.labelWidth = val?'80':'1'
-    },
-    handlerChangeDisStatus(val){
-      this.props.readOnly = !val
-    },
-    handlerChangeReadStatus(val){
-      this.props.disabled = !val
-    }
-  },
-  mounted(){
-  }
-}
-</script>
-<style scoped>
-.input{
-  width:75%
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/time.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/time.vue
deleted file mode 100644
index a0ef6893..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/time.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<template>
-  <div v-show="props.compType === 'time'">
-    <!-- <el-form-item label="字段名">
-      <el-input class="input" v-model="props"></el-input>
-    </el-form-item> -->
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId"></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="标题">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <!-- <el-form-item label="表单栅格">
-      <el-slider class="input" v-model="props.span" :max="24" :min="1" :marks="{12:''}"></el-slider>
-    </el-form-item> -->
-    <el-form-item label="栅格间隔">
-      <el-input-number v-model="props.gutter"  :min="0"></el-input-number>
-    </el-form-item>
-    <el-form-item label="标签宽度">
-      <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel"></el-switch>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-input class="input" v-model="props.placeholder"></el-input>
-    </el-form-item>
-    <el-form-item label="必填">
-      <el-switch v-model="props.required"></el-switch>
-    </el-form-item>
-    <el-form-item label="清空">
-      <el-switch v-model="props.clearable"></el-switch>
-    </el-form-item>
-    <el-form-item label="只读">
-      <el-switch v-model="props.readonly"></el-switch>
-    </el-form-item>
-    <el-form-item label="禁用">
-      <el-switch v-model="props.disabled"></el-switch>
-    </el-form-item>
-    <el-form-item label="范围选择">
-      <el-switch v-model="props['is-range']"></el-switch>
-    </el-form-item>
-    <el-form-item label="分隔符"  v-show="props['is-range']">
-      <el-input v-model="props['range-separator']"></el-input>
-    </el-form-item>
-    <el-form-item label="默认值">
-      <el-time-picker class="input" v-model="props.value" placeholder="选择默认时间"/>
-    </el-form-item>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-export default {
-  name:"timeConfig",
-  components: {
-  },
-  mixins:[changeId],
-  props:['props','getFormId'],
-  data(){
-    return {
-    }
-  },
-  methods:{
-  },
-  mounted(){
-  }
-}
-</script>
-<style scoped>
-.input{
-  width:75%
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/configs/upload.vue b/ruoyi-ui/src/components/FormDesigner/custom/configs/upload.vue
deleted file mode 100644
index 9223a282..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/configs/upload.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-<template>
-  <div v-show="props.compType === 'upload'">
-    <el-form-item label="ID">
-      <el-tooltip class="item" effect="dark" content="请注意,ID的修改可能会导致该组件相关事件失效！" placement="left">
-        <el-input class="input" v-model="props.id" @change="handlerChangeId" ></el-input>
-      </el-tooltip>
-    </el-form-item>
-    <el-form-item label="标题">
-      <el-input class="input" v-model="props.label"></el-input>
-    </el-form-item>
-    <el-form-item label="栅格">
-      <el-input-number v-model="props.span"  :min="1" :max="24"/>
-    </el-form-item>
-    <el-form-item label="宽度%">
-      <el-input-number v-model="props.width"  :min="1" :max="100"/>
-    </el-form-item>
-    <el-form-item label="提示符">
-      <el-input class="input" v-model="props.placeholder" placeholder="请输入提示符"/>
-    </el-form-item>
-    <!-- <el-form-item label="表单栅格">
-      <el-slider class="input" v-model="props.span" :max="24" :min="1" :marks="{12:''}"></el-slider>
-    </el-form-item> -->
-    <el-form-item label="栅格间隔">
-      <el-input-number v-model="props.gutter"  :min="0"></el-input-number>
-    </el-form-item>
-    <el-form-item label="标签宽度">
-      <el-input-number v-model="props.labelWidth"  :min="1" :max="200"></el-input-number>
-    </el-form-item>
-    <el-form-item label="显示标签">
-      <el-switch v-model="props.showLabel" @change="handlerChangeLabel"></el-switch>
-    </el-form-item>
-    <el-form-item label="请求地址">
-      <el-input v-model="props.action"></el-input>
-    </el-form-item>
-    <el-form-item label="大小(MB)">
-      <el-input-number v-model="props.fileSize"  :min="1" :max="10000" :step="10"/>
-    </el-form-item>
-    <el-form-item label="允许文件类型">
-      <el-input v-model="props.accept"></el-input>
-    </el-form-item>
-    <el-form-item label="必填">
-      <el-switch v-model="props.required"></el-switch>
-    </el-form-item>
-    <el-form-item label="多文件上传">
-      <el-switch v-model="props.multiple"></el-switch>
-    </el-form-item>
-    <el-form-item label="显示文件列表">
-      <el-switch v-model="props['show-file-list']"></el-switch>
-    </el-form-item>
-    <el-form-item label="显示类型">
-      <el-radio-group v-model="props['list-type']" >
-        <el-radio-button label="text">普通</el-radio-button>
-        <!-- <el-radio-button label="picture">照片</el-radio-button> -->
-        <el-radio-button label="picture-card">照片</el-radio-button>
-      </el-radio-group>
-    </el-form-item>
-    <el-form-item label="按钮文字">
-      <el-input v-model="props.buttonText"></el-input>
-    </el-form-item>
-    <el-form-item label="显示提示">
-      <el-switch v-model="props.showTip"></el-switch>
-    </el-form-item>
-    <el-form-item label="提示内容" v-show="props.showTip">
-      <el-input v-model="props.tips" ></el-input>
-    </el-form-item>
-  </div>
-</template>
-<script>
-import {changeId} from '../mixin'
-export default {
-  name:"uploadConfig",
-  props:['props'],
-  components:{
-  },
-  mixins:[changeId],
-  data(){
-    return {
-    }
-  },
-  methods:{
-    handlerChangeLabel(val){
-      this.props.labelWidth = val?'80':'1'
-    }
-  },
-  mounted(){
-  },
-  watch:{
-  }
-}
-</script>
-<style scoped>
-.input{
-  width:75%
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/formConf.js b/ruoyi-ui/src/components/FormDesigner/custom/formConf.js
deleted file mode 100644
index 9c56adbf..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/formConf.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * 表单配置
- */
-const formConf = {
-  version:'1.10',
-  formRef: 'elForm',
-  formModel: 'form',
-  rules: 'rules',
-  size: 'medium',
-  labelPosition: 'right',
-  labelWidth: 80,
-  formRules: 'rules',
-  gutter: 15,
-  disabled: false,
-  dynamicTableAllowed:true
-};
-export default formConf;
-
-//动态表单允许放入的组件
-export const dynamicTableAllowedItems = [
-  'input',
-  'select',
-  'radio',
-  'checkbox',
-  'Switch',
-  'inputNumber',
-  'textarea',
-  'slider',
-  'rate',
-  'date',
-  'time'
-];
-
-//row允许放入的items
-export const rowAllowedItems = [
-  'input',
-  'input',
-  'select',
-  'radio',
-  'checkbox',
-  'Switch',
-  'inputNumber',
-  'textarea',
-  'slider',
-  'rate',
-  'date',
-  'time'
-]
-//table允许放入的items
-export const tableAllowedItems = [
-  'row','dynamicTable'
-]
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/formDraw.js b/ruoyi-ui/src/components/FormDesigner/custom/formDraw.js
deleted file mode 100644
index 972cd7cd..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/formDraw.js
+++ /dev/null
@@ -1,106 +0,0 @@
-//初始化data里面的数据（1、默认为空，2、之前存在的数据。。）
-let itemDatas = {}
-export function datas(){
-    itemDatas = {};
-    let self = this;
-    this.itemList.forEach(val => {
-        if(val.layout === 'rowItem'){ //row布局
-            dataResolveRowItem(val);  //解析row布局
-        }else if(val.layout === 'dynamicItem'){ //动态表单布局
-            let obj =dataResolveDynamicItem(val);
-            let array = [];
-            array.push(obj);
-            itemDatas[val.id] = array;
-        }else if(val.layout === 'tableItem'){ //表格布局
-            dataResolveTableItem(val);
-        }else{    //表单
-            dataResolveColItem(val);
-        }
-    })
-    Object.keys(itemDatas).forEach(key =>{
-        this.$set(this.form, key, itemDatas[key]);
-    })
-}
-
-function dataResolveRowItem(val){
-    const columns = val.columns;
-    columns.forEach(v =>{
-        v.list.forEach(item =>{
-            if(item.layout==='dynamicItem'){
-                let obj =dataResolveDynamicItem(item);
-                let array = [];
-                array.push(obj);
-                itemDatas[item.id] = array;
-            }else{
-                dataResolveColItem(item);
-            }
-        })
-    })
-}
-function dataResolveDynamicItem(val){
-    const columns = val.columns;
-
-    let obj ={};
-    columns.forEach(v =>{
-        const key = v.id;
-        obj[key] = v.value;
-    })
-    return obj;
-}
-
-/*
-遍历表格实现组件渲染
-*/
-function dataResolveTableItem(val){
-    val.layoutArray.map((tr)=>{
-        tr.map((td)=>{
-            td.columns.map(item=>dataResolveColItem(item));
-        })
-    })
-}
-
-function dataResolveColItem(val){
-    itemDatas[val.id] = val.value;
-}
-
-export function fillDatas(jsonValue){
-    const self = this;
-    Object.keys(jsonValue).forEach(key =>{
-       
-       if(typeof(self.form[key]) === 'string'||typeof(self.form[key]) === 'number'){
-         self.$set(self.form, key,jsonValue[key]);
-       }else if(self.form[key] instanceof Array){//有可能是多选或者是明细表
-         //判断是否数组中为对象
-         if(jsonValue[key].length>0){
-             const firsValue = jsonValue[key][0];//获取第一个对象判断是什么类型
-             if(typeof(firsValue) === 'string'||typeof(firsValue) === 'number'){
-               self.$set(self.form, key,jsonValue[key]);
-             }else{ //明细表数组
-               const arrayData = jsonValue[key];
-               //self.form[key] = [];
-               arrayData.forEach((v,index)=>{
-                 const newV = JSON.parse(JSON.stringify(v));
-                 self.$set(self.form[key],index,newV);
-               })
-             }
-         }
-       }
-     })
-     //console.log(this.form);
-   }
-
-export function addRow(element){
-    let obj =dataResolveDynamicItem(element);
-    this.form[element.id].push(obj);
-}
-
-export function deleteRow(scope,element){
-    this.form[element.id].splice(scope.$index,1);
-}
-
-export function batchDeleteRow(indexs,element){
-    for(let i =0;i<indexs.length;i++){
-        const index = indexs[i];
-        this.form[element.id].splice(index,1);
-    }
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/itemList.js b/ruoyi-ui/src/components/FormDesigner/custom/itemList.js
deleted file mode 100644
index c7b53755..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/itemList.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import {input} from "./items/input";
-import {select} from "./items/select";
-import {radio} from "./items/radio";
-import {checkbox} from "./items/checkbox";
-import {Switch} from "./items/Switch";
-import {inputNumber} from "./items/inputNumber";
-import {textarea} from "./items/textarea";
-import {slider} from "./items/slider";
-import {rate} from "./items/rate";
-import {date} from "./items/date";
-import {time} from "./items/time";
-import {editor} from "./items/editor";
-import {colorPicker} from "./items/colorPicker";
-import {cascader} from "./items/cascader";
-import {upload} from "./items/upload";
-import {dialogList} from "./items/dialogList";
-
-import {dynamicTable} from "./items/dynamicTable";
-import {button} from "./items/button";
-import {divider} from "./items/divider";
-import {row} from "./items/row";
-import {table} from "./items/table";
-
-import {alert} from "./items/alert";
-import {link} from "./items/link";
-import {text} from "./items/text";
-import {barCode} from "./items/barCode";
-
-export  const formItems = [
-  input,select,radio,checkbox,Switch,inputNumber,textarea,slider
-  ,rate,date,time,editor,colorPicker,cascader,upload,dialogList,barCode,dynamicTable
-];
-export  const assistFormItems = [button,divider,alert,link,text];
-export  const layoutFormItems = [row,table];
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/Switch.js b/ruoyi-ui/src/components/FormDesigner/custom/items/Switch.js
deleted file mode 100644
index 228b775e..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/Switch.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 开关，switch是js关键字，所以s大写，避过
- */
-export let Switch = {
-  id:'',
-  _id:'',
-  compType: 'Switch',
-  ele: 'el-switch',
-  //控件名称(左侧显示)
-  compName:'开关',
-  label: '开关',
-  //图标
-  compIcon:'switch',
-  //展示表单的模式
-  viewType:'component',
-  //暂时默认为true，无法更改，后期考虑某些时候无法配置
-  config: true,
-  // 控件左侧label内容
-  showLabel:true,
-   //栅格间隔
-  gutter:15,
-  labelWidth: '80',
-  value: false,
-  rules:[],
-  span: 24,
-  disabled: false,
-  required: false,
-  'active-color': '#409EFF',
-  'inactive-color': '#DCDFE6',
-  'active-value': 'true',
-  'inactive-value': 'false'
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/alert.js b/ruoyi-ui/src/components/FormDesigner/custom/items/alert.js
deleted file mode 100644
index d57d00af..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/alert.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * 警告
- */
-export let alert = {
-  id:'',
-  _id:'',
-  compType: 'alert',
-  ele: 'el-alert',
-  compName:'警告',
-  compIcon:'alert',
-  //展示表单的模式
-  viewType:'component',
-  config: true,
-
-  form:false, //是否表单组件
-  // 控件左侧label内容
-  showLabel:false,
-  labelWidth: '0',
-  span:24,
-  //标题
-  title:'alert',     
-  //主题
-  type:'success',  
-  //辅助文字
-  description:'form-designer',  
-  //是否可关闭
-  closable:true,   
-  //是否居中
-  center:false,   
-  //关闭的按钮
-  'close-text':'', 
-  //是否显示图标 
-  'show-icon':false,  
-  //主题  light/dark
-  effect:'light'  
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/barCode.js b/ruoyi-ui/src/components/FormDesigner/custom/items/barCode.js
deleted file mode 100644
index b35595cf..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/barCode.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * 警告
- */
- export let barCode = {
-    id:'',
-    _id:'',
-    compType: 'barCode',
-    ele: 'fancy-bar-code',
-    compName:'条码',
-    compIcon:'barcode',
-    //展示表单的模式
-    viewType:'component',
-    config: true,
-  
-    form:true, //是否表单组件
-    // 控件左侧label内容
-    showLabel:false,
-    labelWidth: '0',
-    label:'条形码',
-    span:24,
-    value:'formDesigner',
-    format:'CODE128',
-    lineColor:'#000',
-    background:'#fff',
-    width:5,
-    height:30,
-    fontSize:12,
-    displayValue:true
-  }
-  
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/button.js b/ruoyi-ui/src/components/FormDesigner/custom/items/button.js
deleted file mode 100644
index 6bd3cae3..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/button.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * 单行&多行输入框
- */
-export let button = {
-  id:'',
-  _id:'',
-  compType: 'button',
-  ele: 'el-button',
-  //控件名称(左侧显示)
-  compName:'按钮',
-  //图标
-  compIcon:'button',
-  //展示表单的模式
-  viewType:'component',
-
-  //暂时默认为true，无法更改，后期考虑某些时候无法配置
-  config: true,
-  // 控件左侧label内容
-  showLabel:false,
-  label: '单行文本',
-  labelWidth: 0,
-  //是否可以禁用
-  disabled:false,
-  //大小，medium / small / mini
-  size:'medium',
-  //primary / success / warning / danger / info / text
-  type:'primary',
-  span:24,
-  text:'按钮',
-  //简单
-  plain:false,
-  //圆角
-  round:false,
-  //圆形
-  circle:false,
-  //加载中
-  loading:false,
-  //禁用
-  disabled:false,
-  //图标
-  icon:'',
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/cascader.js b/ruoyi-ui/src/components/FormDesigner/custom/items/cascader.js
deleted file mode 100644
index 7807950a..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/cascader.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * 级联选择器
- */
-export let cascader = {
-    id:'',
-    _id:'',
-    compType: 'cascader',
-    ele: 'el-cascader',
-    //控件名称(左侧显示)
-    compName:'级联选择器',
-    //图标
-    compIcon:'cascader',
-    //展示表单的模式
-    viewType:'component',
-    // 是否可配置
-    //暂时默认为true，无法更改，后期考虑某些时候无法配置
-    config: true,
-    // 控件左侧label内容
-    showLabel:true,
-    label: '级联选择',
-    labelWidth: '80',
-    placeholder: '请选择',
-    //栅格间隔
-    gutter:15,
-    //默认栅格
-    span:24,
-    value: [],
-    //大小
-    size:"medium",
-    //禁用
-    disabled:false,
-    //数据类型 static，dynamic
-    dataType:'static',
-    'china-area-data':false,
-    //请求地址
-    action:'https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/cascaderOptions',
-    props:{
-      //清空
-      clearable:true,
-      //分隔符
-      separator:"/",
-      //显示完整路径
-      'show-all-levels':false,
-      filterable:false,
-      props: {
-        
-        //触发方式,hover
-        expandTrigger:'click',
-        //多选
-        multiple:false,
-        //可选任一级
-        checkStrictly:false,
-        label: 'label',
-        value: 'value',
-        children: 'children'
-      }
-    },
-    options:[
-      {
-        value: 'zhinan',
-        label: '指南',
-        children: [{
-          value: 'shejiyuanze',
-          label: '设计原则',
-          children: [{
-            value: 'yizhi',
-            label: '一致'
-          }]
-        }]
-      }
-    ]
-  }
-  
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/checkbox.js b/ruoyi-ui/src/components/FormDesigner/custom/items/checkbox.js
deleted file mode 100644
index 0ea362e0..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/checkbox.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// export default (_self, h) => {
-//   return [
-//     h("Input", {})
-//   ];
-// };
-
-export let checkbox = {
-  id:'',
-  _id:'',
-  compType: 'checkbox',
-  //控件名称
-  compName:'复选框',
-  //element标签
-  ele: 'el-checkbox-group',
-  //图标
-  compIcon:'checkbox',
-  //展示表单的模式
-  viewType:'component',
-  // 是否可配置
-  config: true,
-  // 控件左侧label内容
-  label: '复选框',
-  placeholder: '请选择',
-  // 最大长度
-  maxLength: 50,
-  //表单栅格
-  span:24,
-  //栅格间隔
-  gutter:'15',
-  //标签宽度
-  labelWidth:80,
-  //显示标签
-  showLabel:true,
-  //必填
-  required:false,
-  //禁用
-  disabled:false,
-  //是否有边框
-  border:false,
-  //选项是否垂直
-  vertical:false,
-  //选项大小
-  size:'medium',
-  //是否是按钮
-  optionType:'default',
-  //选项列表
-  options:[{
-    label: '选项一',
-    value: 1
-  }, {
-    label: '选项二',
-    value: 2
-  }],
-  //数据类型 static，dynamic
-  dataType:'static',
-  //默认渲染的数据
-  action:'https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options',
-  value: [],
-  rules:[],
-  // 验证错误提示信息
-  ruleError: '该字段不能为空'
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/colorPicker.js b/ruoyi-ui/src/components/FormDesigner/custom/items/colorPicker.js
deleted file mode 100644
index 53048494..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/colorPicker.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * 单行&多行输入框
- */
-export let colorPicker = {
-    id:'',
-    _id:'',
-    compType: 'colorPicker',
-    ele: 'el-color-picker',
-    //控件名称(左侧显示)
-    compName:'颜色选择器',
-    //图标
-    compIcon:'colorpicker',
-    //展示表单的模式
-    viewType:'component',
-  
-    //暂时默认为true，无法更改，后期考虑某些时候无法配置
-    config: true,
-    // 控件左侧label内容
-    showLabel:false,
-    label: '单行文本',
-    labelWidth: 0,
-    //是否可以禁用
-    disabled:false,
-    //大小，medium / small / mini
-    size:'medium',
-    //primary / success / warning / danger / info / text
-    type:'primary',
-    span:24,
-    //选择透明度
-    'show-alpha':false,
-    //格式
-    'color-format':'hex',
-    //预定义颜色
-    predefine:[],
-    value:'#409EFF'
-  }
-  
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/date.js b/ruoyi-ui/src/components/FormDesigner/custom/items/date.js
deleted file mode 100644
index 9dc443bd..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/date.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * 单行&多行输入框
- */
-export let date = {
-  id:'',
-  _id:'',
-  compType: 'date',
-  ele: 'el-date-picker',
-  //控件名称(左侧显示)
-  compName:'日期',
-  //图标
-  compIcon:'date',
-  //展示表单的模式
-  viewType:'text',
-  // 是否可配置
-  //暂时默认为true，无法更改，后期考虑某些时候无法配置
-  config: true,
-  // 控件左侧label内容
-  showLabel:true,
-  label: '日期',
-  labelWidth: '80',
-  placeholder: '请选择',
-  // 是否必填
-  required: false,
-  // 最大长度
-  maxLength: 50,
-  //栅格间隔
-  gutter:15,
-  //默认栅格
-  span:24,
-  //是否可清空
-  clearable:true,
-  disabled:false,
-  readonly:false,
-  value: '',
-  rules:[],
-  //时间类型
-  type:'date',
-  format:'yyyy-MM-dd',
-  'value-format':'yyyy-MM-dd',
-  'range-separator':'-',
-  'start-placeholder':'开始日期',
-  'end-placeholder':'结束日期'
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/dialogList.js b/ruoyi-ui/src/components/FormDesigner/custom/items/dialogList.js
deleted file mode 100644
index 0f67dca8..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/dialogList.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * dialogList
- */
- export let dialogList = {
-    id:'',
-    _id:'',
-    compType: 'dialogList',
-    ele: 'fancy-dialog-list',
-    //控件名称(左侧显示)
-    compName:'选择列表',
-    //图标
-    compIcon:'dialog',
-    //展示表单的模式
-    viewType:'component',
-  
-    // 是否可配置
-    //暂时默认为true，无法更改，后期考虑某些时候无法配置
-    config: true,
-    // 控件左侧label内容
-    showLabel:true,
-    label: '选择列表',
-    labelWidth: '80',
-    showLabel: true,
-    labelWidth: 80,
-    // 是否必填
-    required: false,
-    //栅格间隔
-    gutter:15,
-    //默认栅格
-    span:24,
-    //禁用
-    disabled:false,
-    //标题
-    title:'请选择',
-    //多选
-    multi:false,
-    //显示序号
-    showIndex:false,
-    //请求地址
-    action:'https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/dialogListData',
-    //字段配置
-    colConf:'[{"index":0,"label":"姓名","property":"name","width":"250","show":true},{"index":1,"label":"日期","property":"date","width":"150","show":true},{"index":2,"label":"地址","property":"address","width":"","show":true}]',
-    // //值
-    dval:'id',
-    //字段
-    dlabel:'name',
-    height:500,
-    value: ''
-  }
-  
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/divider.js b/ruoyi-ui/src/components/FormDesigner/custom/items/divider.js
deleted file mode 100644
index 825a2ba1..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/divider.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * 分割线
- */
-export let divider = {
-  id:'',
-  _id:'',
-  compType: 'divider',
-  ele: 'el-divider',
-  compName:'分割线',
-  compIcon:'divider',
-  //展示表单的模式
-  viewType:'component',
-  config: true,
-  form:false,
-  //内容坐标 left|center|right
-  'content-position':'left',
-  text:'',
-  // 控件左侧label内容
-  showLabel:false,
-  labelWidth: '0'
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/dynamicTable.js b/ruoyi-ui/src/components/FormDesigner/custom/items/dynamicTable.js
deleted file mode 100644
index 7be10e8c..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/dynamicTable.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * 动态表单
- */
-export let dynamicTable = {
-    id:'',
-    _id:'',
-    compType: 'dynamicTable',
-    ele: 'dynamic-table',
-    //控件名称(左侧显示)
-    compName:'动态表格',
-    layout:'dynamicItem',
-    //图标
-    compIcon:'table',
-    // 是否可配置
-    //暂时默认为true，无法更改，后期考虑某些时候无法配置
-    //显示标签
-    labelWidth:0,
-    showLabel:false,
-    config: true,
-    //显示新增按钮
-    buttonAdd:true,
-    //显示删除按钮
-    buttonDel:true,
-    //显示行号
-    showIndex:true,
-    visible:true,
-    multiCheck:false,
-    //合计行
-    'show-summary':false,
-    'sum-text':'合计',
-    'summary-text':'元',
-    columns:[
-    ]
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/editor.js b/ruoyi-ui/src/components/FormDesigner/custom/items/editor.js
deleted file mode 100644
index 546965dd..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/editor.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * 富文本编辑器
- */
-export let editor = {
-    id:'',
-    _id:'',
-    compType: 'editor',
-    ele: 'fancy-editor',
-    compName:'编辑器',
-    compIcon:'editor',
-    //展示表单的模式
-    viewType:'html',
-    config: true,
-    form:true,
-    // 控件左侧label内容
-    showLabel:true,
-    labelWidth: '80',
-    label:'文本编辑器',
-    value:'',
-    required:false,
-    validateMaxText:false,
-    //最大长度
-    max:2000,
-    //自定义rules
-    customRules:[]
-  }
-  
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/html.js b/ruoyi-ui/src/components/FormDesigner/custom/items/html.js
deleted file mode 100644
index 8e2ff76b..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/html.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**废弃 */
-/**
- * html
- */
-export let html = {
-  id:'',
-  _id:'',
-  compType: 'html',
-  ele: 'fancy-html',
-  compName:'HTML',
-  compIcon:'html',
-  //展示表单的模式
-  viewType:'component',
-  config: true,
-  form:false,
-  text:'<span style="color:red">html</span>',
-  // 控件左侧label内容
-  showLabel:false,
-  label:'',
-  labelWidth: '0'
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/input.js b/ruoyi-ui/src/components/FormDesigner/custom/items/input.js
deleted file mode 100644
index 201877e4..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/input.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * 单行&多行输入框
- */
-export let input = {
-  id:'',
-  _id:'',
-  compType: 'input',
-  ele: 'el-input',
-  //控件名称(左侧显示)
-  compName:'单行文本',
-  //图标
-  compIcon:'input',
-  //展示表单的模式
-  viewType:'text',
-
-  // 是否可配置
-  //暂时默认为true，无法更改，后期考虑某些时候无法配置
-  config: true,
-  // 控件左侧label内容
-  showLabel:true,
-  label: '单行文本',
-  labelWidth: '80',
-  placeholder: '请输入文本',
-  // 是否必填
-  required: false,
-  // 最大长度
-  maxLength: 50,
-  //栅格间隔
-  gutter:15,
-  //默认栅格
-  span:24,
-  //组件长度
-  width: '100%',
-  //是否可清空
-  clearable:true,
-  disabled:false,
-  readonly:false,
-  //状态，正常，只读，禁用
-  status:'normal',
-  //前置图标
-  'prefix-icon':'',
-  //后置图标
-  'suffix-icon':'',
-  value: '',
-  //验证规则(字符,phone,email,number)
-  rules:[],
-  //验证规则
-  rulesType:'default',
-  //前缀
-  prepend:'',
-  //后缀
-  append:''
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/inputNumber.js b/ruoyi-ui/src/components/FormDesigner/custom/items/inputNumber.js
deleted file mode 100644
index 58b72f71..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/inputNumber.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * 计数器
- */
-export let inputNumber = {
-  id:'',
-  _id:'',
-  compType: 'inputNumber',
-  ele: 'el-inputNumber',
-  //控件名称(左侧显示)
-  compName:'计数器',
-  label: '计数器',
-  //图标
-  compIcon:'inputNumber',
-  //展示表单的模式
-  viewType:'text',
-  //暂时默认为true，无法更改，后期考虑某些时候无法配置
-  config: true,
-  // 控件左侧label内容
-  showLabel:true,
-   //栅格间隔
-  gutter:15,
-  labelWidth: '80',
-  value: 0,
-  rules:[],
-  span: 24,
-  min: 0,
-  max: 100,
-  step: 1,
-  'step-strictly': false,
-  precision: 0,
-  'controls-position': 'default',
-  disabled: false,
-  readonly: false,
-  required: false,
-  regList: []
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/link.js b/ruoyi-ui/src/components/FormDesigner/custom/items/link.js
deleted file mode 100644
index c9bafdda..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/link.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * 文字链接
- */
-export let link = {
-    id:'',
-    _id:'',
-    compType: 'link',
-    ele: 'el-link',
-    compName:'文字链接',
-    compIcon:'link',
-    //展示表单的模式
-    viewType:'component',
-    config: true,
-    
-    form:false, //是否表单组件
-    // 控件左侧label内容
-    showLabel:false,
-    labelWidth: '0',
-    span:24,
-    
-    //主题
-    type:'primary',  
-    //链接地址
-    href:'http://www.baidu.com',  
-    //是否下划线
-    underline:true,   
-    //是否禁用
-    disabled:false,
-    text:'链接',
-    target:'_blank'
-  }
-  
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/radio.js b/ruoyi-ui/src/components/FormDesigner/custom/items/radio.js
deleted file mode 100644
index 6cde4fc9..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/radio.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// export default (_self, h) => {
-//   return [
-//     h("Input", {})
-//   ];
-// };
-
-export let radio = {
-  id:'',
-  _id:'',
-  compType: 'radio',
-  //控件名称
-  compName:'单选框',
-  //element标签
-  ele: 'el-radio-group',
-  //图标
-  compIcon:'radio',
-  //展示表单的模式
-  viewType:'component',
-  // 是否可配置
-  config: true,
-  // 控件左侧label内容
-  label: '单选框',
-  placeholder: '请选择',
-  // 最大长度
-  maxLength: 50,
-  //表单栅格
-  span:24,
-  //栅格间隔
-  gutter:'15',
-  //标签宽度
-  labelWidth:80,
-  //显示标签
-  showLabel:true,
-  //必填
-  required:false,
-  //禁用
-  disabled:false,
-  //是否有边框
-  border:false,
-  //选项是否垂直
-  vertical:false,
-  //选项大小
-  size:'medium',
-  //是否是按钮
-  optionType:'default',
-  //选项列表
-  options:[{
-    label: '选项一',
-    value: 1
-  }, {
-    label: '选项二',
-    value: 2
-  }],
-  //数据类型 static，dynamic
-  dataType:'static',
-  //默认渲染的数据
-  action:'https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options',
-  value: '',
-  rules:[],
-  // 验证错误提示信息
-  ruleError: '该字段不能为空'
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/rate.js b/ruoyi-ui/src/components/FormDesigner/custom/items/rate.js
deleted file mode 100644
index 8f9d1e88..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/rate.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * 评分
- */
-export let rate = {
-  id:'',
-  _id:'',
-  compType: 'rate',
-  ele: 'el-rate',
-  //控件名称(左侧显示)
-  compName:'评分',
-  label: '评分',
-  //图标
-  compIcon:'rate',
-  //展示表单的模式
-  viewType:'component',
-  //暂时默认为true，无法更改，后期考虑某些时候无法配置
-  config: true,
-  // 控件左侧label内容
-  showLabel:true,
-   //栅格间隔
-  gutter:15,
-  labelWidth: '80',
-  value: 1,
-  rules:[],
-  span: 24,
-  disabled: false,
-  required: false,
-  max: 5,
-  'allow-half': false,
-  'show-score': false
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/row.js b/ruoyi-ui/src/components/FormDesigner/custom/items/row.js
deleted file mode 100644
index 43fbbe41..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/row.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * 栅格布局
- */
-
- // export default (_self, h) => {
-//   return [
-//     h("Input", {})
-//   ];
-// };
-
-export let row = {
-  id:'',
-  _id:'',
-  compType: 'row',
-  //控件名称
-  compName:'栅格布局',
-  //element标签
-  ele: 'el-row',
-  //图标
-  compIcon:'col',
-  layout:'rowItem',
-  // 是否可配置
-  config: true,
-  //
-  flex:'default',
-  justify:'start',
-  align:'top',
-  gutter:0,
-  columns:[
-    {
-      index:0,
-      span:12,
-      list:[]
-    },
-    {
-      index:1,
-      span:12,
-      list:[]
-    }
-  ],
-  
-  
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/select.js b/ruoyi-ui/src/components/FormDesigner/custom/items/select.js
deleted file mode 100644
index f66bece4..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/select.js
+++ /dev/null
@@ -1,56 +0,0 @@
-export let select = {
-  id:'',
-  _id:'',
-  compType: 'select',
-  //控件名称
-  compName:'下拉框',
-  //element标签
-  ele: 'el-select',
-  //图标
-  compIcon:'select',
-  //展示表单的模式
-  viewType:'component',
-  // 是否可配置
-  config: true,
-  // 控件左侧label内容
-  label: '下拉框',
-  placeholder: '请选择',
-  // 最大长度
-  maxLength: 50,
-  //表单栅格
-  span:24,
-  //栅格间隔
-  gutter:'15',
-  //标签宽度
-  labelWidth:80,
-  //显示标签
-  showLabel:true,
-  //必填
-  required:false,
-  //多选
-  multiple:false,
-  'collapse-tags':false,
-  //禁用
-  disabled:false,
-  //搜索
-  filterable:false,
-  
-  //选项列表
-  options:[{
-    label: '选项一',
-    value: 1
-  }, {
-    label: '选项二',
-    value: 2
-  }],
-  //数据类型 static，dynamic
-  dataType:'static',
-  //默认渲染的数据
-  action:'https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/options',
-  //是否可以清空
-  clearable:false,
-  value: '',
-  rules:[],
-  // 验证错误提示信息
-  ruleError: '该字段不能为空'
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/slider.js b/ruoyi-ui/src/components/FormDesigner/custom/items/slider.js
deleted file mode 100644
index dada6c18..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/slider.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * 单行&多行输入框
- */
-export let slider = {
-  id:'',
-  _id:'',
-  compType: 'slider',
-  ele: 'el-slider',
-  //控件名称(左侧显示)
-  compName:'滑块',
-  label: '滑块',
-  //图标
-  compIcon:'slider',
-  //展示表单的模式
-  viewType:'component',
-  //暂时默认为true，无法更改，后期考虑某些时候无法配置
-  config: true,
-  // 控件左侧label内容
-  showLabel:true,
-   //栅格间隔
-  gutter:15,
-  labelWidth: '80',
-  value: 0,
-  rules:[],
-  span: 24,
-  disabled: false,
-  required: false,
-  //最小值
-  min: 0,
-  //最大值
-  max: 20,
-  //步长
-  step: 1,
-  //是否显示断点
-  'show-stops': true,
-  //是否显示tooltip
-  'show-tooltip': true,
-  //范围选择  1,50
-  range: false
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/table.js b/ruoyi-ui/src/components/FormDesigner/custom/items/table.js
deleted file mode 100644
index 4741a7aa..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/table.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * 表格布局
- */
-import {getDefaultTrs} from '../../table/table'
-let trs = getDefaultTrs();
- export let table = {
-    id:'',
-    _id:'',
-    compType: 'table',
-    ele: 'fancy-table',
-    //控件名称(左侧显示)
-    compName:'表格布局',
-    //图标
-    compIcon:'table_layout',
-    layout:'tableItem',
-    // 是否可配置
-    //暂时默认为true，无法更改，后期考虑某些时候无法配置
-    config: true,
-    layoutArray:trs,
-    //单元格样式
-    tdStyle:'',
-    width:100,
-    height:50
-  }
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/text.js b/ruoyi-ui/src/components/FormDesigner/custom/items/text.js
deleted file mode 100644
index 9fddbb45..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/text.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * 文本
- */
-export let text = {
-    id:'',
-    _id:'',
-    compType: 'text',
-    ele: 'fancy-text',
-    compName:'文本',
-    compIcon:'text',
-    //展示表单的模式
-    viewType:'component',
-    config: true,
-    form:false,
-    show:true,
-    text:'文本',
-    align:'left',
-    color:'#000000',
-    size:'14',
-    bold:'400',
-    // 控件左侧label内容
-    showLabel:false,
-    labelWidth: '0'
-  }
-  
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/textarea.js b/ruoyi-ui/src/components/FormDesigner/custom/items/textarea.js
deleted file mode 100644
index fad6bdf9..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/textarea.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * 单行&多行输入框
- */
-export let textarea = {
-  id:'',
-  _id:'',
-  compType: 'textarea',
-  ele: 'el-input',
-  //控件名称(左侧显示)
-  compName:'多行文本',
-  //图标
-  compIcon:'textarea',
-  //展示表单的模式
-  viewType:'text',
-  // 是否可配置
-  //暂时默认为true，无法更改，后期考虑某些时候无法配置
-  config: true,
-  // 控件左侧label内容
-  showLabel:true,
-  label: '多行文本',
-  labelWidth: '80',
-  placeholder: '请输入文本',
-  type:'textarea',
-  // 是否必填
-  required: false,
-  // 最大长度
-  maxlength: 50,
-  //输入统计
-  'show-word-limit':false,
-  //栅格间隔
-  gutter:15,
-  //默认栅格
-  span:24,
-  //是否可清空
-  clearable:true,
-  disabled:false,
-  readonly:false,
-  rows:4,
-  //状态，正常，只读，禁用
-  status:'normal',
-  value: '',
-  rules:[],
-  // 验证错误提示信息
-  ruleError: '该字段不能为空'
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/time.js b/ruoyi-ui/src/components/FormDesigner/custom/items/time.js
deleted file mode 100644
index 8a8cf4b2..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/time.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * 单行&多行输入框
- */
-export let time = {
-  id:'',
-  _id:'',
-  compType: 'time',
-  ele: 'el-time-picker',
-  //控件名称(左侧显示)
-  compName:'时间',
-  //图标
-  compIcon:'time',
-  //展示表单的模式
-  viewType:'text',
-  // 是否可配置
-  //暂时默认为true，无法更改，后期考虑某些时候无法配置
-  config: true,
-  // 控件左侧label内容
-  showLabel:true,
-  label: '时间',
-  labelWidth: '80',
-  placeholder: '请选择',
-  // 是否必填
-  required: false,
-  // 最大长度
-  maxLength: 50,
-  //栅格间隔
-  gutter:15,
-  //默认栅格
-  span:24,
-  //是否可清空
-  clearable:true,
-  disabled:false,
-  readonly:false,
-  value: '',
-  rules:[],
-  'picker-options': {
-    selectableRange: '00:00:00-23:59:59'
-  },
-  'arrow-control':true,
-  align:'left',
-  format: 'HH:mm:ss',
-  'value-format': 'HH:mm:ss',
-  'is-range':false,
-  'range-separator':'-'
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/items/upload.js b/ruoyi-ui/src/components/FormDesigner/custom/items/upload.js
deleted file mode 100644
index 3a1e9f40..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/items/upload.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * 上传组件
- */
-export let upload = {
-  id:'',
-  _id:'',
-  compType: 'upload',
-  ele: 'el-upload',
-  //控件名称(左侧显示)
-  compName:'附件',
-  //图标
-  compIcon:'att',
-  //展示表单的模式
-  viewType:'component',
-
-  // 是否可配置
-  //暂时默认为true，无法更改，后期考虑某些时候无法配置
-  config: true,
-  // 控件左侧label内容
-  showLabel:true,
-  label: '附件上传',
-  labelWidth: '80',
-  //栅格间隔
-  gutter:15,
-  //默认栅格
-  span:24,
-  // 是否必填
-  required: false,
-  //上传地址
-  action:'https://jsonplaceholder.typicode.com/posts/',
-  //多选上传
-  multiple:false,
-  name:'file',
-  //显示上传文件列表
-  'show-file-list':true,
-  //文件列表类型
-  'list-type':'text',
-  value:'',
-  width:100,
-  //按钮文字
-  buttonText:'请上传附件',
-  //是否显示描述
-  showTip:false,
-  //描述内容
-  tips:'点击按钮上传附件',
-  //允许文件类型
-  accept:'.pdf, .doc, .docx, .xls, .xlsx',
-  //文件大小MB
-  fileSize:10,
-  headers:{'X-Access-Token':'token'},
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/mixin/index.js b/ruoyi-ui/src/components/FormDesigner/custom/mixin/index.js
deleted file mode 100644
index 36214d28..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/mixin/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-// 模态框
-export const remoteData = {
-    methods: {
-        getRemoteData(){
-            //动态数据
-            if(this.conf.dataType === 'dynamic'){
-                this.$axios.get(this.conf.action).then(res => {
-                    if(this.conf.options.length===0){
-                        this.conf.options = this.conf.options.concat(res.data);
-                    }
-                })
-            }
-        }
-    }
-}
-
-export const changeId = {
-    methods: {
-        handlerChangeId(val){
-            let idArray = this.getFormId(this.props._id);
-            console.log(idArray);
-            if(idArray.includes(val)){  //如果存在id相等，则提示
-                this.$message.error('该ID已经存在，请修改');
-                this.props.id=this.props._id;
-            }else{
-                this.props._id=val;
-            }
-        }
-    }
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/previewRender.js b/ruoyi-ui/src/components/FormDesigner/custom/previewRender.js
deleted file mode 100644
index 9ed5f04b..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/previewRender.js
+++ /dev/null
@@ -1,115 +0,0 @@
-import { isAttr,jsonClone } from '../utils';
-import childrenItem from './slot/index';
-import {remoteData} from './mixin';
-import Vue from 'vue'
-import { getToken } from "@/utils/auth";
-import { Message } from 'element-ui'
-import download from "@/plugins/download"
-//先修改在这里,后续需要优化
-function vModel(self, dataObject) {
-  dataObject.props.value = self.value;
-  dataObject.on.input = val => {
-    self.$emit('input', val)
-  }
-  //判断是否为上传组件
-  if(self.conf.compType === 'upload'){
-    dataObject.attrs['headers'] = {"Authorization":"Bearer " + getToken()};
-    console.log("dataObject.props.value",dataObject.props.value)
-    if(dataObject.props.value!==undefined && dataObject.props.value !==''){
-      const filevalue = JSON.parse(dataObject.props.value);
-      dataObject.props['file-list'] = filevalue;
-    }
-    
-    dataObject.attrs['before-upload'] = file=>{
-      //非限定后缀不允许上传
-      const fileName = file.name;
-      const suffixName = fileName.split('.').pop();
-      
-      if(!self.conf.accept.includes(suffixName)){ 
-        self.$message.error('该后缀文件不允许上传');
-        return false;
-      }
-      const fileSize = file.size;
-      if(fileSize>dataObject.props.fileSize*1024*1024){
-        self.$message.error('文件大小超出限制，请检查！');
-        return false;
-      }
-    }
-      dataObject.attrs['on-success'] = file=>{
-        if(file.code === 500){
-          Message({ message: file.msg,type: 'error' })
-          return false
-        }
-        console.log("on-success",file)
-        //获取文件名称
-        var filename=file.data.fileName.substring(file.data.fileName.lastIndexOf('/')+1)  
-        //获取文件路径
-        var url=file.data.url
-        // ossId
-        var ossId = file.data.ossId
-        let fileObj = {name: filename, url: url,ossId: ossId}
-        let oldValue = [];
-        if(dataObject.props.value) {
-          oldValue = JSON.parse(dataObject.props.value);
-        }else {
-          oldValue = [];
-        }
-        if (oldValue) {
-          oldValue.push(fileObj)
-        } else {
-          oldValue = [fileObj]
-        }
-        self.$emit('input',JSON.stringify(oldValue));
-    } 
-    dataObject.attrs['on-remove'] = (file, fileList) => {
-      let oldValue = JSON.parse(dataObject.props.value);
-      //file 删除的文件
-      //过滤掉删除的文件  
-      let newValue = oldValue.filter(item => item.name !== file.name)
-      self.$emit('input',JSON.stringify(newValue));
-    }
-    
-    dataObject.attrs['on-error'] = (file) => {
-      console.log("on-error file",file);
-    }
-    
-    dataObject.attrs['on-preview'] = (file) => {
-      console.log("on-preview file==",file);
-      download.oss(file.ossId);
-    }
-  }
-}
-
-export default {
-  render(h) {
-    let dataObject = {
-      attrs: {},
-      props: {},
-      on: {},
-      style: {}
-    }
-    //远程获取数据
-    this.getRemoteData();
-    const confClone = jsonClone(this.conf);
-    const children = childrenItem(h,confClone);
-    Object.keys(confClone).forEach(key => {
-      const val = confClone[key]
-      if (dataObject[key]) {
-        dataObject[key] = val
-      } else if(key ==='width'){
-        dataObject.style= 'width:'+val;
-      } else if (!isAttr(key)) {
-        dataObject.props[key] = val
-      }else {
-        if(key !== 'value'){
-          dataObject.attrs[key] = val
-        }
-      }
-    })
-    /*调整赋值模式，规避cascader组件赋值props会出现覆盖预制参数的bug */
-    vModel(this, dataObject);
-    return h(confClone.ele, dataObject, children)
-  },
-  props: ['conf','value'],
-  mixins:[remoteData]
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/register.js b/ruoyi-ui/src/components/FormDesigner/custom/register.js
deleted file mode 100644
index 4fe26a3b..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/register.js
+++ /dev/null
@@ -1,41 +0,0 @@
-//在此注册组件
-const components = [
-  'input',
-  'select',
-  'radio',
-  'checkbox',
-  'Switch',
-  'inputNumber',
-  'textarea',
-  'slider',
-  'rate',
-  'date',
-  'time',
-  'editor',
-  'colorPicker',
-  'cascader',
-  'upload',
-  'button',
-  'divider',
-  'alert',
-  'link',
-  'dialogList',
-  'barCode',
-  'text',
-  'html',
-  'row',
-  'dynamicTable',
-  'table',
-  'tdItem'
-];
-
-
-let comps = [];
-for (let i in components) {
-  const comp = {
-    name: components[i],
-    content : null
-  }
-  comps.push(comp);
-}
-export default comps;
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/render.js b/ruoyi-ui/src/components/FormDesigner/custom/render.js
deleted file mode 100644
index 95e68d6f..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/render.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import {isAttr,jsonClone} from '../utils/index';
-import childrenItem from './slot/index';
-import {remoteData} from './mixin';
-function vModel(self, dataObject) {
-  dataObject.on.input = val => {
-    self.$emit('input', val)
-  }
-}
-
-export default {
-   render(h) {
-    let dataObject = {
-      attrs: {},
-      props: {},
-      on: {},
-      style: {}
-    }
-
-    //远程获取数据
-    this.getRemoteData();
-    const confClone = jsonClone(this.conf);
-    const children = childrenItem(h,confClone);
-    Object.keys(confClone).forEach(key => {
-      const val = confClone[key]
-      if (dataObject[key]) {
-        dataObject[key] = val
-      } else if (!isAttr(key)) {
-        dataObject.props[key] = val
-      } else if(key ==='width'){
-        dataObject.style= 'width:'+val;
-      }else {
-        dataObject.attrs[key] = val
-      }
-    })
-    /*调整赋值模式，规避cascader组件赋值props会出现覆盖预制参数的bug */
-    vModel(this, dataObject);
-    return h(confClone.ele, dataObject, children)
-  },
-  props: ['conf'],
-  mixins:[remoteData]
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/rule/index.js b/ruoyi-ui/src/components/FormDesigner/custom/rule/index.js
deleted file mode 100644
index a659f2c9..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/rule/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-export default function checkRules(element) {
-    let r = [];
-    const _trigger = ['blur','change'];
-    if(element.required){
-        r.push({required: true, message: element.label+'不能为空', trigger:_trigger});
-    }
-    //判断是否有规则
-    if(element.rules){
-        element.rules.forEach(obj=>{
-            r.push({pattern:new RegExp(obj.rule),message:obj.msg, trigger:_trigger});
-        });
-    }
-    //编辑器最大字数验证
-    if(typeof element.validateMaxText !== 'undefined'&&element.validateMaxText){
-        const maxRules = {
-            max: element.max, message: element.label+'超出最大字数限制', trigger:_trigger
-        }
-        r.push(maxRules);
-    }
-    return r;
-};
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/slot/el-button.js b/ruoyi-ui/src/components/FormDesigner/custom/slot/el-button.js
deleted file mode 100644
index a9ed0c15..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/slot/el-button.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default {
-    slot(h,conf) {
-        return conf.text;
-    }
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/slot/el-checkbox-group.js b/ruoyi-ui/src/components/FormDesigner/custom/slot/el-checkbox-group.js
deleted file mode 100644
index e399f512..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/slot/el-checkbox-group.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export default {
-    slot(h,conf) {
-        const list = []
-        const vertical = conf.vertical?'display:block;':'';
-        conf.options.forEach(item => {
-            if (conf.optionType === 'button') list.push(<el-checkbox-button  label={item.value}>{item.label}</el-checkbox-button>)
-            else list.push(<el-checkbox label={item.value} style={vertical} border={conf.border}>{item.label}</el-checkbox>)
-        })
-        return list
-    }
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/slot/el-divider.js b/ruoyi-ui/src/components/FormDesigner/custom/slot/el-divider.js
deleted file mode 100644
index af75bf57..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/slot/el-divider.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import text from './el-button';
-export default text;
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/slot/el-input.js b/ruoyi-ui/src/components/FormDesigner/custom/slot/el-input.js
deleted file mode 100644
index ad1d2864..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/slot/el-input.js
+++ /dev/null
@@ -1,12 +0,0 @@
-export default {
-    slot(h,conf) {
-        const slotText = []
-        if(conf.prepend!==''){
-            slotText.push(<template slot="prepend">{conf.prepend}</template>);
-        }
-        if(conf.append!==''){
-            slotText.push(<template slot="append">{conf.append}</template>);
-        }
-        return slotText;
-    }
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/slot/el-link.js b/ruoyi-ui/src/components/FormDesigner/custom/slot/el-link.js
deleted file mode 100644
index af75bf57..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/slot/el-link.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import text from './el-button';
-export default text;
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/slot/el-radio-group.js b/ruoyi-ui/src/components/FormDesigner/custom/slot/el-radio-group.js
deleted file mode 100644
index 8f3f9986..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/slot/el-radio-group.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export default {
-    slot(h,conf) {
-        const list = [];
-        const vertical = conf.vertical?'display:block;':'';
-        conf.options.forEach(item => {
-        if (conf.optionType === 'button') list.push(<el-radio-button label={item.value} style="">{item.label}</el-radio-button>)
-        else list.push(<el-radio label={item.value} style={vertical} border={conf.border}>{item.label}</el-radio>)
-        })
-        return list
-    }
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/slot/el-select.js b/ruoyi-ui/src/components/FormDesigner/custom/slot/el-select.js
deleted file mode 100644
index 534a9bc5..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/slot/el-select.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export default {
-  slot(h,conf) {
-      const list = []
-      conf.options.forEach(item => {
-        list.push(<el-option label={item.label} value={item.value} disabled={item.disabled}></el-option>)
-      })
-      return list;
-    }
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/slot/el-upload.js b/ruoyi-ui/src/components/FormDesigner/custom/slot/el-upload.js
deleted file mode 100644
index af4bdf58..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/slot/el-upload.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export default {
-    slot(h,conf) {
-        const list = [];
-        if (conf['list-type'] === 'picture-card') {
-            list.push(<i class="el-icon-plus"/>)
-        } else {
-            list.push(<el-button size="small" type="primary" icon="el-icon-upload">{conf.buttonText}</el-button>)
-        }
-        if (conf.showTip) {
-            list.push(<div slot="tip" class="el-upload__tip">{conf.tips}</div>)
-        }
-        return list
-    }
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/slot/index.js b/ruoyi-ui/src/components/FormDesigner/custom/slot/index.js
deleted file mode 100644
index b560f62d..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/slot/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const slots = require.context('./', false, /\.js$/);
-const componentChild = {};
-slots.keys().forEach(obj=>{
-  const tag = obj.replace('./','').replace('.js','');
-  if(tag !=='index'){
-    componentChild[tag] = slots(obj).default;
-  }
-});
-
-
-export default function childrenItem(h,confClone) {
-  let children = [];
-  const childObjs = componentChild[confClone.ele]
-  if (childObjs&&childObjs.slot) {
-    Object.keys(childObjs).forEach(key => {
-      const childFunc = childObjs[key]
-      children.push(childFunc(h,confClone))
-    })
-  }
-  return children;
-};
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/custom/viewRender.js b/ruoyi-ui/src/components/FormDesigner/custom/viewRender.js
deleted file mode 100644
index 95036948..00000000
--- a/ruoyi-ui/src/components/FormDesigner/custom/viewRender.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import { isAttr,jsonClone } from '../utils';
-import childrenItem from './slot/index';
-import {remoteData} from './mixin';
-import Vue from 'vue'
-import { getToken } from "@/utils/auth";
-import download from "@/plugins/download"
-
-function vModel(self, dataObject) {
-  dataObject.props.value=self.value;
-  dataObject.on.input = val => {
-    self.$emit('input', val)
-  }
-  //判断是否为上传组件
-  if(self.conf.compType === 'upload'){
-    // add by nbacheng 2022-09-09
-    dataObject.attrs['headers'] = {"Authorization":"Bearer " + getToken()};
-    if(dataObject.props.value!==undefined && dataObject.props.value !==''){
-      const filevalue = JSON.parse(dataObject.props.value);
-      dataObject.props['file-list'] = filevalue;
-    }
-    dataObject.attrs['on-preview'] = (file) => {
-      console.log("on-preview file",file);
-      //download(file);
-      download.oss(file.ossId);
-    }
-  } 
-}
-
-export default {
-  render(h) {
-    let dataObject = {
-      attrs: {},
-      props: {},
-      on: {},
-      style: {}
-    }
-
-    //远程获取数据
-    this.getRemoteData();
-    const confClone = jsonClone(this.conf);
-    const children = childrenItem(h,confClone);
-    Object.keys(confClone).forEach(key => {
-      const val = confClone[key]
-      if (dataObject[key]) {
-        dataObject[key] = val
-      } else if(key ==='width'){
-        dataObject.style= 'width:'+val+'%';
-      } else if (!isAttr(key)) {
-        dataObject.props[key] = val
-      } else {
-        dataObject.attrs[key] = val
-      }
-    })
-    /*调整赋值模式，规避cascader组件赋值props会出现覆盖预制参数的bug */
-    vModel(this, dataObject);
-    return h(confClone.ele, dataObject, children)
-  },
-  props: ['conf','value'],
-  mixins:[remoteData]
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/designItem.vue b/ruoyi-ui/src/components/FormDesigner/designItem.vue
deleted file mode 100644
index 68f88fd8..00000000
--- a/ruoyi-ui/src/components/FormDesigner/designItem.vue
+++ /dev/null
@@ -1,255 +0,0 @@
-<script>
-import draggable from 'vuedraggable'
-import render from './custom/render'
-import {getSimpleId} from "./utils/IdGenerate";
-import {dynamicTableAllowedItems,tableAllowedItems} from "./custom/formConf";
-import dynamicTable from './dynamic/dynamicTable'
-import dynamicTableItem from './dynamic/dynamicTableItem'
-import fancyTable from './table/fancyTable'
-import fancyTableItem from './table/fancyTableItem'
-/**
- * 动态表单允许增加的组件列表
- */
-const components = {
-  itemBtns(h, element,parent) {
-    const {copyItem,deleteItem} = this.$listeners;
-    return [
-      <span class="drawing-item-copy" title="复制" onClick={event => {
-        copyItem(element,parent); event.stopPropagation();
-      }}>
-        <i class="el-icon-copy-document" />
-      </span>,
-      <span class="drawing-item-delete" title="删除" onClick={event => {
-        deleteItem(element,parent); event.stopPropagation();
-      }}>
-        <i class="el-icon-delete" />
-      </span>
-    ]
-  }
-}
-const layouts = {
-  colItem(h, element,parent) {
-    let className = this.activeItem.id === element.id ? 'drawing-item active-from-item' : 'drawing-item'
-    let labelWidth = element.labelWidth ? `${element.labelWidth}px` : null
-    const {onActiveItemChange} = this.$listeners;
-    return (
-        <el-col class={className} span={element.span} nativeOnClick={event => { onActiveItemChange(element); event.stopPropagation()}}>
-          <span class="component-name component-id">{element.id}</span>
-          <el-form-item label={element.showLabel ? element.label : ''}
-                        label-width={labelWidth}
-                        required={element.required} >
-            
-            <render key={element.id} conf={element} onInput={ event => {
-                this.$set(element, 'value', event)
-              }}
-            />
-          </el-form-item>
-          {components.itemBtns.apply(this, arguments)}
-        </el-col>
-    )
-  },
-  rowItem(h, element){
-    const { onActiveItemChange } = this.$listeners
-    const className = this.activeItem.id === element.id ? 'drawing-item drawing-row-item active-from-item' : 'drawing-item drawing-row-item'    
-    return (
-        <el-col class={className} >
-          <el-row  gutter={element.gutter}  nativeOnClick={event => { onActiveItemChange(element); event.stopPropagation()}}>
-            <span class="component-name">{element.id}</span>
-            <div class="drag-wrapper" style="padding-left: 7.5px; padding-right: 7.5px;">
-              {
-                element.columns.map((item,index) =>{
-                  return (
-                    <el-col class="drag-col-wrapper"  span={item.span}>
-                      <draggable class="drag-wrapper row-drag" v-model={item.list} animation="100" group="componentsGroup"
-                      onAdd={(e)=>{this.handlerAdd(e,item,element)}}
-                      >
-                        {
-                          item.list.map((obj,objIndex)=>{
-                            return renderChildren.call(this,h,obj,element)
-                          })
-                        }
-                      </draggable>
-                    </el-col>
-                  )
-                })
-              }
-            </div>
-          </el-row>
-          {components.itemBtns.call(this,h,element)}
-        </el-col>
-    )    
-  },
-  tableItem(h, element){
-    let className = "";
-    className = this.activeItem.id === element.id ? 'drawing-item drawing-row-item active-from-item' : 'drawing-item drawing-row-item'
-    const {onActiveItemChange} = this.$listeners;
-    return (
-      <el-col class={className} nativeOnClick={event => { onActiveItemChange(element); event.stopPropagation()}}>
-        <span class="component-name" style="margin-bottom:15px">{element.id}</span>
-        <fancy-table  layoutArray={element.layoutArray} 
-                      tdStyle={element.tdStyle} 
-                      width={element.width}
-                      height={element.height}
-                      onSelectItem={(item)=>{onActiveItemChange(item);}}
-                      scopedSlots={{
-                        default: (item) => {
-                          return (
-                                <draggable tag="div" class="table__content row-drag"
-                                           v-model={item.td.columns} animation="100"
-                                           group="componentsGroup"
-                                           onAdd={(e) => {this.handlerTableAdd(e, item.td);e.stopPropagation()}}
-                                >
-                                  {
-                                    item.td.columns.map((obj)=>{
-                                      return renderChildren.call(this,h,obj,item.td)
-                                    })
-                                  }
-                                </draggable>
-                          );
-                        }
-                      }}
-        />
-        {components.itemBtns.call(this,h,element)}
-      </el-col>
-    )
-  },
-  dynamicItem(h,element){
-    let className = "";
-    className = this.activeItem.id === element.id ? className+'drawing-item active-from-item' : className+'drawing-item'
-    const {onActiveItemChange} = this.$listeners;
-    return (
-        <el-col  class={className} >
-          <dynamic-table conf={element} activeItem={this.activeItem} nativeOnClick={event => { onActiveItemChange(element); event.stopPropagation()}}>
-            <draggable tag="div" class="dynamic-table__content row-drag" ghost-class="dynamicGhost" v-model={element.columns} animation="100"
-                       group="componentsGroup"
-                       onAdd={(e)=>{this.handlerDynamicAdd(e,element)}}
-            >
-              {
-                element.columns.map((item,index)=>{
-                  return (
-                      <dynamic-table-item item={item} activeItem={this.activeItem}
-                                          onSelectItem={(evt,item)=>{onActiveItemChange(item);evt.stopPropagation()}}
-                                          onCopyItem={(evt)=>{this.handlerCopyItem(evt,element,index);evt.stopPropagation()}}
-                                          onDeleteItem={(evt)=>{this.handlerDeleteItem(evt,element,index);evt.stopPropagation()}}
-                      />
-                  )
-                })
-              }
-            </draggable>
-          </dynamic-table>
-          {components.itemBtns.call(this,h,element)}
-        </el-col>
-    )
-  }
-}
-/**
- * 生成row的子选项
- */
-function renderChildren(h, element,parent) {
-  const layout = layouts[element.layout]
-  if (layout) {
-    
-    return layout.call(this, h, element,parent)
-  }
-  return layoutIsNotFound.call(this)
-}
-
-function layoutIsNotFound() {
-  throw new Error(`没有与${this.element.layout}匹配的layout`)
-}
-export default {
-  name:"designItem",
-  components: {
-    render,
-    draggable,
-    dynamicTable,
-    dynamicTableItem,
-    fancyTable,
-    fancyTableItem
-  },
-  props: {
-    model: { 
-      type: Object,
-      default:{}
-    },
-    activeItem: {
-      type: Object,
-      default:{}
-    }
-  },
-  data(){
-    return {
-      activeComponent:this.activeItem
-    }
-  },
-  render(h) {
-    const layout = layouts[this.model.layout]
-    if (layout) {
-      return layout.call(this, h, this.model)
-    }
-    return layoutIsNotFound.call(this)
-  },
-  methods:{
-    
-    handlerAdd(evt,item,row){
-      if(evt.pullMode === 'clone'){
-        if(!(evt.to.className.indexOf('row-drag')>-1&&this.activeItem.compType==='row')){
-          item.list.splice(evt.newIndex,0,this.activeItem);
-        }
-      }else{
-        if(evt.item.className.indexOf('el-row')>-1){  //防止row嵌套
-          const newIndex = evt.newIndex;
-          const oldIndex = evt.oldIndex;
-          const rowItem = item.list[newIndex];
-          item.list.splice(newIndex,1);
-          this.$message.error('布局组件不允许被嵌套！');
-          this.$emit('rowItemRollBack',rowItem,oldIndex);  //还原到原先的列表中
-          return false;
-        }
-      }
-    },
-    /**
-     * 动态表单
-     */
-    handlerDynamicAdd(evt,item){
-      if(evt.pullMode === 'clone'){
-        if(dynamicTableAllowedItems.includes(this.activeItem.compType)){
-          item.columns.splice(evt.newIndex,0,this.activeItem);
-        }else{
-          this.$message.error('该组件不允许被放入动态表格内！');
-        }
-      }else{
-        if(evt.item.className.indexOf('el-row')>-1){  //防止row嵌套
-          const newIndex = evt.newIndex;
-          const oldIndex = evt.oldIndex;
-          const rowItem = item.columns[newIndex];
-          item.columns.splice(newIndex,1);
-          this.$message.error('布局组件不允许放入动态表格！');
-          this.$emit('rowItemRollBack',rowItem,oldIndex);  //还原到原先的列表中
-          return false;
-        }
-      }
-    },
-    handlerTableAdd(evt,td){
-      if(evt.pullMode === 'clone'){
-        if(!tableAllowedItems.includes(this.activeItem.compType)){
-          td.columns.splice(evt.newIndex,0,this.activeItem);
-        }else{
-          this.$message.error('该组件不允许被放入表格内！');
-        }
-      }
-    },
-    handlerCopyItem(evt,element,index){
-      const item = element.columns[index];
-      const clone = JSON.parse(JSON.stringify(item))
-      let uId = "fd_"+getSimpleId();
-      clone.id = uId;
-      clone._id = uId;
-      element.columns.push(clone);
-    },
-    handlerDeleteItem(evt,element,index){
-      element.columns.splice(index,1);
-    }
-  }
-}
-</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/designer.vue b/ruoyi-ui/src/components/FormDesigner/designer.vue
deleted file mode 100644
index 56900cfd..00000000
--- a/ruoyi-ui/src/components/FormDesigner/designer.vue
+++ /dev/null
@@ -1,394 +0,0 @@
-<template>
-  <!--中间面板-->
-  <div class="center-board" >
-    <div class="action-bar">
-      <el-button icon="el-icon-view" type="text" @click="preview">
-        预览
-      </el-button>
-      <el-button icon="el-icon-view" type="text" @click="view">
-        查看
-      </el-button>
-      <el-button icon="el-icon-tickets" type="text" @click="viewJSON">
-        JSON
-      </el-button>
-      <el-button icon="el-icon-s-tools" type="text" @click="setting">
-        设置
-      </el-button>
-      <el-button class="delete-btn" icon="el-icon-delete-solid" type="text" @click="clear">
-        清空
-      </el-button>
-      <el-button icon="el-icon-question" type="text" @click="help">
-        帮助
-      </el-button>
-      <el-button icon="el-icon-circle-check" type="text" @click="saveForm">
-        保存
-      </el-button>
-    </div>
-    <el-scrollbar class="center-scrollbar">
-      <el-row class="center-board-row" :gutter="formConf.gutter">
-        <el-form
-          :size="formConf.size"
-          :label-position="formConf.labelPosition"
-          :disabled="formConf.disabled"
-          :label-width="formConf.labelWidth + 'px'"
-        >
-        <draggable class="drawing-board" 
-                   :list="list" 
-                   :animation="100" 
-                   group="componentsGroup" 
-                   draggable=".drawing-item"
-                   >
-        <design-item 
-            v-for="(element,index) in list" 
-            :key="index" 
-            :model="element" 
-            :activeItem="activeItem"
-            @rowItemRollBack="handlerRollBack"
-            @onActiveItemChange="handlerActiveItemChange"
-            @copyItem="handlerItemCopy"
-            @deleteItem="handlerItemDelete"/>
-        </draggable>
-          <div v-show="infoShow" class="empty-info">
-            <el-empty description="从左侧拖拽添加控件"></el-empty>
-          </div>
-          
-        </el-form>
-      </el-row>
-    </el-scrollbar>
-    <config-panel :activeItem="activeItem" :itemList="list"/>
-    <!-- 设计器配置弹出框 -->
-    <el-dialog  :visible.sync="formConfVisible" width="50%" top="30px" :center="true" append-to-body>
-      <el-tabs v-model="activeName">
-        <el-tab-pane label="表单配置" name="formConf">
-          <el-form ref="formConf" :model="formConf" label-width="100px">
-            <el-form-item label="表单名">
-                <el-input class="input" v-model="formConf.formRef"></el-input>
-            </el-form-item>
-            <el-form-item label="表单模型">
-                <el-input class="input" v-model="formConf.formModel"></el-input>
-            </el-form-item>
-            <el-form-item label="校验模型">
-                <el-input class="input" v-model="formConf.formRules"></el-input>
-            </el-form-item>
-            <el-form-item label="表单尺寸">
-                <el-radio-group v-model="formConf.size">
-                  <el-radio-button label="medium">中等</el-radio-button>
-                  <el-radio-button label="small">较小</el-radio-button>
-                  <el-radio-button label="mini">迷你</el-radio-button>
-                </el-radio-group>
-            </el-form-item>
-            <el-form-item label="标签对齐">
-                <el-radio-group v-model="formConf.labelPosition">
-                  <el-radio-button label="right">右对齐</el-radio-button>
-                  <el-radio-button label="left">左对齐</el-radio-button>
-                  <el-radio-button label="top">顶部对齐</el-radio-button>
-                </el-radio-group>
-            </el-form-item>
-            <el-form-item label="标签宽度">
-                <el-input-number v-model="formConf.labelWidth"  :min="60" :max="140"></el-input-number>
-            </el-form-item>
-            <el-form-item label="栅格间隔">
-                <el-input-number v-model="formConf.gutter"  :min="0" :max="30"></el-input-number>
-            </el-form-item>
-            <el-form-item label="动态表格支持组件高亮显示">
-              <el-switch v-model="formConfig.dynamicTableAllowed"></el-switch>
-            </el-form-item>
-            <el-form-item label="禁用表单">
-                <el-switch v-model="formConf.disabled"></el-switch>
-            </el-form-item>
-          </el-form>
-        </el-tab-pane>
-        <!-- <el-tab-pane label="提交前" name="fourth">开发中...</el-tab-pane> -->
-      </el-tabs>
-        <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="handlerSaveFormConf">确 定</el-button>
-        </span>
-    </el-dialog>
-    <el-dialog :visible.sync="previewVisible" width="70%" title="预览" append-to-body>
-      <preview :itemList="itemList"  :formConf="formConf" v-if="previewVisible"/>
-    </el-dialog>
-    <el-dialog :visible.sync="JSONVisible" width="70%" title="JSON" center :close-on-click-modal="false" append-to-body>
-      <codemirror v-model="viewCode" :options="options"/>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handlerSetJson()">确 定</el-button>
-      </span>
-    </el-dialog>
-    <el-dialog :visible.sync="processFormViewVisible" v-if="processFormViewVisible" fullscreen center :close-on-click-modal="false" append-to-body>
-      <processFormView/>
-    </el-dialog>
-    
-  </div>
-</template>
-<script>
-import draggable from "vuedraggable";
-import configPanel from './configPanel'
-import designItem from './designItem'
-import {getSimpleId} from "./utils/IdGenerate";
-import { isLayout, isTable, inTable,jsonClone } from "./utils/index";
-import formConf from "./custom/formConf";
-import preview from "./preview";
-import {codemirror} from 'vue-codemirror';
-import processFormView from './processFormView'
-// 核心样式
-import 'codemirror/lib/codemirror.css';
-// 引入主题后还需要在 options 中指定主题才会生效
-import 'codemirror/theme/dracula.css';
-import 'codemirror/mode/javascript/javascript'
-import { editForm } from "@/api/workflow/dynamicForm";
-
-export default {
-  name:"designer",
-  components:{
-    draggable,
-    configPanel,
-    designItem,
-    preview,
-    codemirror,
-    processFormView
-  },
-  props:{
-    list: { 
-      type: Array,
-      default:[]
-    },
-    formConfig:{
-      type:Object,
-      default:formConf
-    }
-  },
-  provide(){
-    return{
-      getContext:this
-    }
-  },
-  data() {
-    return {
-      formConf:formConf,
-      activeItem:{},
-      lastActiveItem:{},
-      formConfVisible:false,
-      previewVisible:false,
-      processFormViewVisible:false,
-      JSONVisible:false,
-      itemList:[],
-      activeName:'formConf',
-      editorCode:'',
-      viewCode:'',
-      // 默认配置
-      options: {
-        tabSize: 2, // 缩进格式
-        theme: 'dracula', // 主题，对应主题库 JS 需要提前引入
-        lineNumbers: true, // 显示行号
-        line: true,
-        styleActiveLine: true, // 高亮选中行
-        hintOptions: {
-          completeSingle: true // 当匹配只有一项的时候是否自动补全
-        }
-      },
-      formData:{}
-    }
-  },
-  mounted() {
-  },
-  methods: {
-    preview(){
-      const clone = JSON.parse(JSON.stringify(this.list))
-      this.itemList = clone;
-      this.previewVisible= true;
-    },
-    viewJSON(){
-      this.viewCode = this.code;
-      this.JSONVisible = true;
-    },
-    view(){
-      localStorage.setItem("formValue",this.code);
-      this.processFormViewVisible = true
-    },
-    setting(){
-      this.formConfVisible = true;
-    },
-    clear(){
-      this.$confirm('此操作将清空整个表单,是否继续?').then(() => {
-          this.$emit('clear'); 
-      })
-    },
-    help(){
-      window.open('https://gitee.com/wurong19870715/formDesigner')
-    },
-    handlerActiveItemChange(obj){
-      this.lastActiveItem = this.activeItem;
-      this.activeItem = obj;
-    },
-    handlerItemCopy(origin,parent){
-      if(isLayout(origin)){ //row
-          const clone = jsonClone(origin);
-          const uId = "row_"+getSimpleId();
-          console.log(uId);
-          clone.id = uId;
-          clone._id = uId;
-          clone.columns.map((column)=>{
-            let itemList = [];
-            column.list.map((item)=>{
-              const cloneitem = jsonClone(item);
-              const uId = "fd_"+getSimpleId();
-              cloneitem.id = uId;
-              cloneitem._id = uId;
-              itemList.push(cloneitem);
-            })
-            column.list = [];
-            column.list = itemList;
-          })
-          this.list.push(clone);
-          this.handlerActiveItemChange(clone);
-      }else if(isTable(origin)){  //表格布局
-        const clone = jsonClone(origin);
-          const uId = "table_"+getSimpleId();
-          clone.id = uId;
-          clone._id = uId;
-          clone.layoutArray.map((tr)=>{
-            tr.map(td=>{
-              let itemList = [];
-              td.id=getSimpleId();
-              td.columns.map((item,i)=>{
-                const cloneitem = jsonClone(item);
-                const uId = "fd_"+getSimpleId();
-                cloneitem.id = uId;
-                cloneitem._id = uId;
-                itemList.push(cloneitem);
-              })
-              td.columns = [];
-              td.columns = itemList;
-            });
-          })
-          this.list.push(clone);
-          this.handlerActiveItemChange(clone);
-      }else{  //如果是普通组件，需要判断他是否再布局组件下。
-        if(parent){
-          if (inTable(parent)) { //增加表格组件的支持
-            if (parent.columns.some(item => item.id === origin.id)) {
-              const clone = jsonClone(origin);
-              const uId = "fd_" + getSimpleId();
-              clone.id = uId;
-              clone._id = uId;
-              parent.columns.push(clone);
-              this.handlerActiveItemChange(clone);
-            }
-          } else {
-            parent.columns.map((column) => {
-              if (column.list.some(item => item.id === origin.id)) {
-                const clone = jsonClone(origin);
-                const uId = "fd_" + getSimpleId();
-                clone.id = uId;
-                clone._id = uId;
-                column.list.push(clone);
-                this.handlerActiveItemChange(clone);
-              }
-            })
-          }
-          
-        }else{
-          const clone = jsonClone(origin);
-          const uId = "fd_"+getSimpleId();
-          clone.id = uId;
-          clone._id = uId;
-          this.list.push(clone);
-          this.handlerActiveItemChange(clone);
-        }
-      }
-    },
-    handlerItemDelete(origin,parent){
-      if (isLayout(origin) || isTable(origin)){ //如果是布局组件,则直接删除
-        const index = this.list.findIndex(item=>item.id === origin.id);
-        this.list.splice(index,1);
-      }else{  //如果不是布局组件，则先判断是不是再布局内部，如果不是，则直接删除就可以，如果是，则要在布局内部删除
-        if(parent){
-          if (inTable(parent)){ //增加表格组件的支持
-            const colIndex = parent.columns.findIndex(item => item.id === origin.id);
-            if (colIndex > -1) {
-              parent.columns.splice(colIndex, 1);
-            }
-          }else{
-            parent.columns.map((column) => {
-              const colIndex = column.list.findIndex(item => item.id === origin.id);
-              if (colIndex > -1) {
-                column.list.splice(colIndex, 1);
-              }
-            })
-          }
-          
-        }else{
-          const index = this.list.findIndex(item=>item.id === origin.id);
-          this.list.splice(index,1);
-          
-        }
-      }
-    },
-    handlerSaveFormConf(){
-      this.formConfVisible = false
-    },
-    handlerRollBack(rowItem,oldIndex){  //还原
-      this.list.splice(oldIndex,0,rowItem);
-    },
-    handlerSetJson(){
-      this.$emit('updateJSON',this.viewCode);
-      this.JSONVisible = false;
-    },
-    //保存表单
-    saveForm(){
-      this.formData = {
-        id: this.$route.params.id,
-        formDesignerText: this.code
-      }
-      this.$modal.confirm('是否保存？').then(() => {
-        editForm(this.formData).then(response => {
-          this.$modal.msgSuccess("保存成功");
-        })
-      })
-    }
-  },
-  computed:{
-    infoShow() {
-      return this.list.length<1;
-    },
-    code() {
-      let json = {};
-      json.config = this.formConf;
-      json.list = this.list;
-      return JSON.stringify(json,null,4);
-    }
-  },
-  watch: {
-    activeItem (newValue,oldValue) {
-      this.lastActiveItem = oldValue;
-    }
-  }
-}
-
-</script>
-<style  scoped>
-.el-rate{
-  display:inline-block;
-}
-.center-scrollbar >>> .el-scrollbar__bar.is-horizontal {
-  display: none;
-}
-.center-scrollbar >>> .el-scrollbar__wrap{
-  overflow-x: hidden;
-}
-.empty-info >>> .el-empty__description p{
-  color: #ccb1ea;
-  font-size:16px;
-}
-.drawing-board >>> .el-radio.is-bordered+.el-radio.is-bordered{
-  margin-left:0px;
-}
-.drawing-board >>> .el-checkbox.is-bordered+.el-checkbox.is-bordered{
-  margin-left:0px;
-}
-</style>
-<style lang="scss">
-@import "./style/designer.scss";
-</style>
-<style>
-@import "./style/designer.css";
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/dynamic/dynamicTable.vue b/ruoyi-ui/src/components/FormDesigner/dynamic/dynamicTable.vue
deleted file mode 100644
index 3311e696..00000000
--- a/ruoyi-ui/src/components/FormDesigner/dynamic/dynamicTable.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--动态表单（设计器）-->
-<template>
-
-  <div class="dynamic-table">
-    <slot>
-    </slot>
-  </div>
-
-</template>
-<script>
-export default {
-  name:'dynamicTable',
-  props:['conf','activeItem'],
-  data(){
-    return {
-      test1:'',
-      list:[]
-    }
-  },
-  components:{
-  },
-  methods:{
-  }
-}
-</script>
-<style>
-
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/dynamic/dynamicTableItem.vue b/ruoyi-ui/src/components/FormDesigner/dynamic/dynamicTableItem.vue
deleted file mode 100644
index bca64757..00000000
--- a/ruoyi-ui/src/components/FormDesigner/dynamic/dynamicTableItem.vue
+++ /dev/null
@@ -1,112 +0,0 @@
-<!--动态表单（设计器）-->
-<script>
-import draggable from "vuedraggable";
-import render from '../custom/render'
-
-const colItem = function(h,element){
-  const { selectItem,copyItem,deleteItem} = this.$listeners
-  return (
-    <div class={{'dynamic-table__item':true,'active':this.isHover||this.isActive}}
-      style="min-width:200px;width: auto;position:relative" onClick={(e)=>{selectItem(e,element)}}
-      onMouseover={(e)=>{this.isHover = true}}
-      onMouseleave={(e)=>{this.isHover = false}}
-      >
-      <div class="dynamic-table__item_title">
-        {element.label}
-      </div>
-      <div class="dynamic-table__item_body">
-        <render conf={element}/><span v-show={element.required} style="color:#F56C6C">*</span>
-      </div>
-      <span class="dynamic-table-item-copy" title="复制" v-show={this.showbutton} onClick={(e)=>{copyItem(e,element)}}>
-        <i class="el-icon-copy-document" />
-      </span>
-      <span class="dynamic-table-item-delete" title="删除" v-show={this.showbutton} onClick={(e)=>{deleteItem(e,element)}}>
-        <i class="el-icon-delete" />
-      </span>
-    </div>
-  )
-}
-
-
-export default {
-  name:'dynamicTableItem',
-  props:['item','activeItem'],
-  data(){
-    return {
-      isActive:false,
-      isHover:false,
-    }
-  },
-  components:{
-    draggable,
-    render
-  },
-  methods:{
-    handlerCopy(evt){
-      this.$emit('copy',evt,this.item);
-    },
-    handlerDelete(evt){
-      this.$emit('delete',evt,this.item);
-    }
-  },
-  watch: {
-    activeItem(newvalue){
-      this.isActive = newvalue.id === this.item.id?true:false;
-    }
-  },
-  computed:{
-    showbutton(){
-      return this.isActive||this.isHover;
-    }
-  },
-  render:function(h){
-      return colItem.call(this,h,this.item);
-  }
-}
-</script>
-<style lang="scss" scoped>
-$lighterBlue: #409EFF;
-.active{
-  background: #E6F2FF;
-}
-.dynamic-table-item-copy{
-  position: absolute;
-  width: 22px;
-  height: 22px;
-  top:0px;
-  right:30px;
-  border: 1px solid;
-  border-radius: 50%;
-  cursor: pointer;
-  font-size: 12px;
-  line-height: 22px;
-  text-align: center;
-  color: $lighterBlue;
-  background: #fff;
-  z-index:2;
-}
-.dynamic-table-item-copy:hover{
-  color:  #fff;
-  background:$lighterBlue;
-}
-.dynamic-table-item-delete{
-  position: absolute;
-  width: 22px;
-  height: 22px;
-  top:0px;
-  right:0px;
-  border: 1px solid;
-  border-radius: 50%;
-  cursor: pointer;
-  font-size: 12px;
-  line-height: 22px;
-  text-align: center;
-  color: #F56C6C;
-  background: #fff;
-  z-index:2;
-}
-.dynamic-table-item-delete:hover{
-  color:  #fff;
-  background:#F56C6C;
-}
-</style>
diff --git a/ruoyi-ui/src/components/FormDesigner/dynamic/dynamicTableOptButton.vue b/ruoyi-ui/src/components/FormDesigner/dynamic/dynamicTableOptButton.vue
deleted file mode 100644
index a048c5b7..00000000
--- a/ruoyi-ui/src/components/FormDesigner/dynamic/dynamicTableOptButton.vue
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--操作区域，删除和复制，新增、序号，集成在一个文件中-->
-<template>
-    <div class="dynamic-table__item_opt" style="width: 100%;" >
-      <div class="dynamic-table__item_title">
-          操作
-      </div>
-      <div class="dynamic-table__item_body" style="text-align:center">
-        <i class="el-icon-document-copy" style="margin:2px"></i>
-        <i class="el-icon-delete" style="margin:2px"></i>
-      </div>
-    </div>
-</template>
-<script>
-export default {
-  name:'dynamicTableOptButton',
-  props:['type'],
-  data(){
-    return{
-
-    }
-  }
-}
-</script>
-<style scoped>
-
-.dynamic-table__item_opt{
-  padding-top:5px;
-}
-</style>
diff --git a/ruoyi-ui/src/components/FormDesigner/dynamic/fancyDynamicTable.vue b/ruoyi-ui/src/components/FormDesigner/dynamic/fancyDynamicTable.vue
deleted file mode 100644
index 03397844..00000000
--- a/ruoyi-ui/src/components/FormDesigner/dynamic/fancyDynamicTable.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-<!--动态表单（设计器）-->
-<template>
-<div class="fancyDynamicTable">
-  <el-table
-    :data="tableData"
-    :fit="true"
-    border
-    :ref="conf.id"
-    size="mini"
-    :cell-style="{padding:'5px 0'}"
-    :header-cell-style="{background:'#F5F7FA'}"
-    style="width: 100%"
-    :row-class-name="tableRowClassName"
-    @selection-change="handlerSelectionChange"
-    :show-summary="conf['show-summary']"
-    :summary-method="sumTotal"
-  >
-    <el-table-column align="center" type="selection" width="35px" v-if="conf.multiCheck" fixed="left"/>
-    <el-table-column align="center" type="index" label="序号" width="50px" v-if="conf.showIndex" fixed="left"/>
-    <el-table-column align="center" :prop="item.id" v-for="(item,index) in conf.columns" :key="index" min-width="240px;">
-      <template slot="header">
-        {{tableColumnLabels[index]}}
-      </template>
-      <template slot-scope="scope">
-          <slot name="item" :rowScope="scope" :item="item"></slot>
-      </template>
-    </el-table-column>
-    <el-table-column align="center" label="操作" width="100px" v-if="conf.buttonDel" fixed="right">
-      <template slot-scope="scope">
-        <el-form-item label-width="0px"  style="margin:10px 3px 15px 3px;" >
-          <i class="el-icon-delete optIcon" style="" @click="handlerDelete(scope,conf)"></i>
-        </el-form-item>
-      </template>
-    </el-table-column>
-  </el-table>
-  <div class="column-buttons">
-    <i class="el-icon-circle-plus-outline optIcon button-plus"  v-if="conf.buttonAdd" @click="handlerAdd(conf)"/>
-    <i class="el-icon-remove-outline optIcon button-plus " v-if="BachDeleteButtonShow(conf.id)" @click="handlerBachDelete"/>
-  </div>
-</div>
-</template>
-<script>
-export default {
-  name:'fancyDynamicTable',
-  props:['data','conf'],
-  data(){
-    return {
-      tableData:this.data,
-      tableColumns:[],
-      tableColumnLabels:[],
-      multipleSelection: [],
-      componentsMount:false
-    }
-  },
-  mounted(){
-    this.conf.columns.forEach(element =>{
-      this.tableColumnLabels.push(element.label);
-      let tableCol = {};
-      Object.assign(tableCol,element);
-      this.tableColumns.push(tableCol);
-    });
-    this.componentsMount = true;
-  },
-  components:{
-  },
-  methods:{
-    handlerAdd(origin){
-      this.$emit('addRow',origin);
-    },
-    handlerDelete(scope,element){
-      this.$emit('deleteRow',scope,element);
-    },
-    handlerBachDelete(){
-      this.$confirm('确认删除选中的数据?').then(() => {
-        const indexs = [];
-        this.multipleSelection.forEach(item=>indexs.push(item.index));
-        this.$emit('batchDeleteRow',indexs,this.conf);
-      })
-    },
-    handlerSelectionChange(val) {
-      this.multipleSelection = val;
-
-    },
-    tableRowClassName(row) {
-      row.row.index = row.rowIndex;
-    },
-    sumTotal(param){
-      const { columns, data } = param;
-      const sums = [];
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = this.conf['sum-text'];
-          return;
-        }
-        const values = data.map(item => Number(item[column.property]));
-        if (!values.every(value => isNaN(value))) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return prev + curr;
-            } else {
-              return prev;
-            }
-          }, 0);
-          sums[index] += ' '+this.conf['summary-text'];
-        } else {
-          sums[index] = '';
-        }
-      });
-
-      return sums;
-    }
-  },
-  computed:{
-    BachDeleteButtonShow(){
-      return function(id){
-        if(this.componentsMount){
-          return this.conf.multiCheck&&this.$refs[id].selection.length>0;
-        }
-      }
-    }
-  }
-}
-</script>
-<style scoped>
-.fancyDynamicTable{
-  width: 100%;
-  padding:10px;
-}
-.column-buttons{
-  padding:5px 0 5px 0;
-  text-align: center;
-  background-color: #f6f6f6;
-}
-.optIcon{
-  font-size:18px;
-  margin-right:5px;
-  cursor: pointer;
-}
-.button-plus{
-  font-size:30px;
-  margin-right:10px;
-}
-.button-plus:hover{
-  color: #000000;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/dynamic/fancyDynamicTableItem.vue b/ruoyi-ui/src/components/FormDesigner/dynamic/fancyDynamicTableItem.vue
deleted file mode 100644
index 2ef42d4d..00000000
--- a/ruoyi-ui/src/components/FormDesigner/dynamic/fancyDynamicTableItem.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-<script>
-import render from '../custom/previewRender'
-import checkRules from '../custom/rule';
-const layouts = {
-  colItem(element,value,parent,index) {
-    const {valChange} = this.$listeners;
-    let rules = [];
-    if(element&&element.rules) {
-      rules = rules.concat(checkRules(element));
-      return (
-          <el-form-item label={''}
-                        label-width={'0px'}
-                        prop={parent.id + '.' + index + '.' + element.id}
-                        rules={rules}
-          >
-            <render key={element.id} conf={element} value={value} onInput={event => {
-              this.eleValue = event;
-              valChange(this.eleParent.id, this.index, element.id, this.eleValue);
-            }}/>
-            {element.required ? <span style="color:#F56C6C">*</span> : ''}
-          </el-form-item>
-      )
-    }
-  }
-}
-
-export default {
-  name:"fancyDynamicTableItem",
-  components: {
-    render
-  },
-  props: ['model','value','parent','index'],
-  mounted(){
-    
-    let __eleConfig = {};
-    Object.assign(__eleConfig,this.model);
-    this.eleConfig = __eleConfig;
-  },
-  data(){
-    return {
-      eleConfig:{},
-      eleParent:this.parent,
-      eleValue:this.value
-    }
-  },
-  render() {
-    return layouts.colItem.call(this,this.eleConfig,this.eleValue,this.eleParent,this.index)
-  },
-  watch:{
-    value(newVal){
-      this.eleValue=newVal;
-    }
-  }
-}
-</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/dynamic/fancyDynamicTableViewItem.vue b/ruoyi-ui/src/components/FormDesigner/dynamic/fancyDynamicTableViewItem.vue
deleted file mode 100644
index a8df2ea1..00000000
--- a/ruoyi-ui/src/components/FormDesigner/dynamic/fancyDynamicTableViewItem.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<script>
-import render from '../custom/viewRender'
-const layouts = {
-  colItem(h, element,value) {
-    element.disabled= true;
-    let labelWidth = element.labelWidth ? `${element.labelWidth}px` : null
-    if(element.viewType === 'component'){
-      return (
-          <render key={element.id} conf={element} value={value} onInput={ event => {
-              this.$set(element,'value',event);
-            }}/>
-      )
-    }else if(element.viewType === 'html'){
-      return (
-        <fancy-html text={value}/>
-      )
-    }else{
-      return (
-        <fancy-text text={value}  align="center"/>
-      )
-    }
-  }
-}
-
-export default {
-  name:"fancyDynamicTableViewItem",
-  components: {
-    render
-  },
-  props: ['model','value'],
-  data(){
-    return {
-      eleConfig:this.model
-    }
-  },
-  render(h) {
-    return layouts.colItem.call(this, h, this.eleConfig,this.value)
-  }
-}
-</script>
-<style>
-/* .el-form-item__label{
-  font-weight: 600;
-} */
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/dynamic/fancyDynamicViewTable.vue b/ruoyi-ui/src/components/FormDesigner/dynamic/fancyDynamicViewTable.vue
deleted file mode 100644
index 732bdab9..00000000
--- a/ruoyi-ui/src/components/FormDesigner/dynamic/fancyDynamicViewTable.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<!--动态表单（设计器）-->
-<template>
-<div class="fancyDynamicTable">
-  <el-table
-    :data="data"
-    :fit="true"
-    border
-    size="mini"
-    :cell-style="{padding:'5px 0'}"
-    :header-cell-style="{background:'#F5F7FA'}"
-    :show-summary="conf['show-summary']"
-    :summary-method="sumTotal"
-    style="width: 100%">
-    <el-table-column align="center" type="index" label="序号" width="50px" v-if="conf.showIndex" fixed="left"/>
-    <el-table-column align="center" :prop="item.id" v-for="(item,index) in conf.columns" :key="index" min-width="150px;">
-      <template slot="header">
-        {{tableColumnLables[index]}}
-      </template>
-      <template slot-scope="scope">
-          <slot name="item" :rowScope="scope" :item="item"></slot>
-      </template>
-    </el-table-column>
-  </el-table>
-</div>
-</template>
-<script>
-export default {
-  name:'fancyDynamicViewTable',
-  props:['data','conf'],
-  data(){
-    return {
-      tableColumns:[],
-      tableColumnLables:[]
-    }
-  },
-  mounted(){
-    this.conf.columns.forEach(element =>{
-      this.tableColumnLables.push(element.label);
-      let tableCol = {};
-      Object.assign(tableCol,element);
-      this.tableColumns.push(tableCol);
-    });
-  },
-  methods:{
-    sumTotal(param){
-      const { columns, data } = param;
-      const sums = [];
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = this.conf['sum-text'];
-          return;
-        }
-        const values = data.map(item => Number(item[column.property]));
-        if (!values.every(value => isNaN(value))) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return prev + curr;
-            } else {
-              return prev;
-            }
-          }, 0);
-          sums[index] += ' '+this.conf['summary-text'];
-        } else {
-          sums[index] = '';
-        }
-      });
-
-      return sums;
-    }
-  }
-}
-</script>
-<style scoped>
-.fancyDynamicTable{
-  widows: 100%;
-  padding:10px;
-}
-.column-buttons{
-  margin-top:15px;
-  text-align: center;
-}
-.optIcon{
-  font-size:18px;
-  margin-right:5px;
-  cursor: pointer;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/extend/fancyDialogList.vue b/ruoyi-ui/src/components/FormDesigner/extend/fancyDialogList.vue
deleted file mode 100644
index ae26df13..00000000
--- a/ruoyi-ui/src/components/FormDesigner/extend/fancyDialogList.vue
+++ /dev/null
@@ -1,259 +0,0 @@
-<!--文本扩展-->
-<template>
-  <div class="dialog-list">
-      <el-input v-model="dialogValue" readonly  @click.native="handlerShowDialog" :disabled="disabled" style="width:95%" suffix-icon="el-icon-search"></el-input>
-      <el-dialog 
-      :visible.sync="dialogVisible" 
-      :title="title"
-      width="60%"
-      center
-      :append-to-body="true"
-      :show-close="true"
-      :lock-scroll="true"
-      @open="show()"
-      :destroy-on-close="true"
-      top="15px"
-      >
-      <!--搜索暂不启用-->
-        <!-- <div class="search-text" v-show="searchable">
-            <el-input v-model="searchText" placeholder="请输入筛选内容" size="mini" suffix-icon="el-icon-search" clearable style="width:30%"></el-input>
-        </div> -->
-        <el-table 
-            ref="dataTable"
-            :data="filterGridData"
-            border
-            :row-class-name="tableRowClassName"
-            :row-style="{height: '10px'}"
-            :cell-style="{padding: '5px 0'}"
-            :header-cell-style="{
-                'background-color': '#fafafa',
-                'border-bottom': '1px #e6f7ff solid'
-            }"
-            :highlight-current-row="!multi"
-            :max-height="height"
-            @row-dblclick="handlerRowDoubleClick"
-            @current-change="handleCurrentChange"
-            @selection-change="handleSelectionChange"
-        >
-            <el-table-column type="selection" width="55" v-if="multi"></el-table-column>
-            <el-table-column type="index" v-if="showIndex" align="center"></el-table-column>
-            <el-table-column :property="item.property"  :label="item.label" :width="item.width" align="center" :key="index" v-for="(item,index) in jsonColConf"/>
-        </el-table>
-        <span slot="footer" class="dialog-footer">
-            <el-button type="primary" @click="handlerSelect">确 定</el-button>
-            <el-button @click="handlerHideDialog">取 消</el-button>
-        </span>
-      </el-dialog>
-  </div>
-  
-</template>
-
-<script>
-const splitKey = ";";
-import axios from 'axios'
-export default {
-    name:"fancyDialogList",
-    props:{
-        value: {
-            type: String,
-            default:''
-        },
-        title:{ 
-            type:String,
-            default:'请选择'
-        },
-        multi:{
-            type:Boolean,
-            default:false
-        },
-        disabled:{
-            type:Boolean,
-            default:false
-        },
-        showIndex:{ //显示序号
-            type:Boolean,
-            default:false
-        },
-        action:{
-            type:String,
-            default:''
-        },
-        height:{
-            type:Number,
-            default:600
-        },
-        colConf:{
-            type:String,
-            default:''
-        },
-        dval:{
-            type:String,
-            default:'id'
-        },
-        dlabel:{
-            type:String,
-            default:'name'
-        }
-    },
-    data() {
-        return {
-            currentRow: null,
-            dialogValue:'',
-            dialogVisible:false,
-            gridData: []
-        }
-    },
-    mounted(){
-        this.$nextTick(() => {
-            axios.get(this.action).then(res => {
-                this.gridData = [];
-                this.gridData = this.gridData.concat(res.data.list);
-                if(this.value !=='' && this.dialogValue ===''){
-                    if(this.multi){
-                        const ids = this.value.split(splitKey);
-                        this.currentRow = [];
-                        ids.forEach(e=>{
-                            const index = this.gridData.findIndex(element=>(element[this.dval]+"") == e);
-                            if(index>0){
-                                const row = this.gridData[index];
-                                this.currentRow.push(row);
-                            }
-                        })
-                        this.dialogValue = this.selectName;
-                    }else{
-                        const index = this.gridData.findIndex(element=>element[this.dval] == this.value);
-                        if(index>0){
-                            const row = this.gridData[index];
-                            this.dialogValue = row[this.dlabel];
-                        }
-                    }
-                    
-                }
-            })  
-        })
-    },
-    methods:{
-        handlerShowDialog(){
-            if(this.disabled) return;
-            this.dialogVisible = true;
-        },
-        handleClose(){
-
-        },
-        tableRowClassName(v){
-            if(v.rowIndex%2 ==1){
-                return 'odd-row';
-            }
-            return '';
-        },
-        handleCurrentChange(val) {
-            if(!this.multi){
-                this.currentRow = val;
-            }
-        },
-        
-        handlerRowDoubleClick(val){
-            if(!this.multi){
-                this.currentRow = val;
-                this.handlerSelect();
-            }
-        },
-        handleSelectionChange(val){
-            this.currentRow = val;
-        },
-        handlerSelect(){
-            this.dialogVisible = false;
-            let dialogVal = '';
-            let dialogId = '';
-            dialogVal = this.selectName;
-            dialogId = this.selectId;
-            this.dialogValue = dialogVal;
-            this.$emit('input',dialogId+'');
-        },
-        handlerHideDialog(){
-            this.dialogVisible = false;
-            this.dialogValue = '';
-            this.$emit('input','');
-        },
-        setDialogValue(){
-            if(this.multi){
-                const ids = this.value.split(splitKey);
-                this.currentRow = [];
-                ids.forEach(e=>{
-                    const index = this.gridData.findIndex(element=>element[this.dval] == e);
-                    if(index>0){
-                        const row = this.gridData[index];
-                        this.$refs.dataTable.toggleRowSelection(row);
-                    }
-                })
-            }else{
-                const index = this.gridData.findIndex(element=>element[this.dval] == this.value);
-                const row = this.gridData[index];
-                this.$refs.dataTable.setCurrentRow(row);
-            }
-            
-        },
-        show(){
-            this.$nextTick(() => {
-                this.setDialogValue();
-            })
-        }
-    },
-    computed:{
-        jsonColConf(){
-            return JSON.parse(this.colConf);
-        },
-        selectName(){
-            if(this.currentRow == null){
-                return '';
-            }
-            if(this.multi){
-                let names = '';
-                this.currentRow.forEach(element=>{
-                    names = names+splitKey+element[this.dlabel];
-                })
-                if(names.length>0){
-                    names = names.substring(1);
-                }
-                return names;
-            }else{
-                return this.currentRow[this.dlabel];
-            }
-        },
-        selectId(){
-            if(this.currentRow == null){
-                return '';
-            }
-            if(this.multi){
-                let ids = '';
-                this.currentRow.forEach(element=>{
-                    ids = ids+splitKey+element[this.dval];
-                })
-                if(ids.length>0){
-                    ids = ids.substring(1);
-                }
-                return ids;
-            }else{
-                return this.currentRow[this.dval];
-            }
-        },
-        filterGridData(){
-            return this.gridData;
-        }
-    }
-}
-</script>
-<style scoped>
-/**#e6f7ff; */
-.dialog-list >>>.el-table--enable-row-hover .el-table__body tr:hover>td{
-    background-color: #d1dfd5
-}
-.search-text{
-    margin-bottom: 10px;
-}
-</style>
-<style>
-.el-table .odd-row {
-    background-color:#FAFAFA;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/extend/fancyEditor.vue b/ruoyi-ui/src/components/FormDesigner/extend/fancyEditor.vue
deleted file mode 100644
index ae8155a0..00000000
--- a/ruoyi-ui/src/components/FormDesigner/extend/fancyEditor.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<template>
-  <div class="edit_container" :class="{warn_edit_container:warnTextLength}">
-        <quill-editor 
-            v-model="content" 
-            ref="myQuillEditor" 
-            :options="editorOption" 
-            @blur="onEditorBlur($event)" @focus="onEditorFocus($event)"
-            @change="onEditorChange($event)">
-        </quill-editor>
-        <div class="text_number_tips" :class="{warn_text_number_tips:warnTextLength}">{{currentLength}}/{{maxTextLength}}</div>
-    </div>
-</template>
-
-<script>
-import 'quill/dist/quill.core.css'
-import 'quill/dist/quill.snow.css'
-import 'quill/dist/quill.bubble.css'
-import { quillEditor } from 'vue-quill-editor'
-export default {
-    components:{
-        quillEditor
-    },
-    props:{
-        value:{
-            type:String,
-            default:''
-        },
-        max:{
-            type:Number,
-            default:0
-        },
-        validateMaxText:{
-            type:Boolean,
-            default:false
-        },
-        id:{
-            type:String,
-            default:''
-        }
-    },
-    data() {
-        return {
-            content: this.value,
-            currentLength:0,
-            defaultMaxLength:2000,
-            editorOption: {}
-        }
-    },
-    methods: {
-        
-        onEditorBlur(editor){
-            
-        }, // 失去焦点事件
-        onEditorFocus(v){
-        }, // 获得焦点事件
-        onEditorChange(v){
-            this.currentLength = v.text.length-1;
-            this.$emit('input',this.content);
-        }, // 内容改变事件
-    },
-    computed: {
-        editor() {
-            return this.$refs.myQuillEditor.quill;
-        },
-        maxTextLength(){
-            let len = this.defaultMaxLength;
-            if(this.max>=1){
-                len = this.max;
-            }
-            return len;
-        },
-        warnTextLength(){
-            const warn =this.validateMaxText&&this.currentLength>this.maxTextLength;
-            return warn;
-        }
-    },
-    watch:{
-        value(newVal){
-            this.content = newVal;
-        },
-        
-    }
-
-}
-</script>
-
-<style>
-.ql-editor{
-    height:400px;
-}
-.edit_container .text_number_tips{
-    float:right;
-    margin-top:-30px;
-    padding-right:10px;
-}
-.warn_edit_container{
-    border: solid 1px #F56C6C;
-}
-.warn_text_number_tips{
-    color:#F56C6C;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/extend/fancyHtml.vue b/ruoyi-ui/src/components/FormDesigner/extend/fancyHtml.vue
deleted file mode 100644
index 80141ea5..00000000
--- a/ruoyi-ui/src/components/FormDesigner/extend/fancyHtml.vue
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--废弃-->
-<!--文本扩展-->
-<template>
-  <div v-if="show">
-      <p v-html="text"/>
-  </div>
-  
-</template>
-
-<script>
-export default {
-    name:"fancyHtml",
-    props:{
-        text: { 
-            type: String,
-            default:''
-        },
-        show:{
-            type:Boolean,
-            default:true
-        }
-    }
-}
-</script>
diff --git a/ruoyi-ui/src/components/FormDesigner/extend/fancyText.vue b/ruoyi-ui/src/components/FormDesigner/extend/fancyText.vue
deleted file mode 100644
index 0222e095..00000000
--- a/ruoyi-ui/src/components/FormDesigner/extend/fancyText.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--文本扩展-->
-<template>
-  <div v-show="show" class="test">
-      <p v-html="text" style="margin-block-start:0em;margin-block-end:0em;" 
-        :style="{'text-align':align,
-        'color':color,
-        'font-size':size+'px',
-        'font-weight':bold
-        }"/>
-  </div>
-  
-</template>
-
-<script>
-export default {
-    name:"fancyText", 
-    props:{
-        text: { 
-            type: String,
-            default:''
-        },
-        show:{
-            type:Boolean,
-            default:true
-        },
-        align:{
-            type:String,
-            default:'left'
-        },
-        color:{
-            type:String,
-            default:''
-        },
-        size:{
-            type:Number,
-            default:14,
-        },
-        bold:{
-            type:Number,
-            default:400,
-        }
-    },
-    data(){
-        return {
-            htmlText:''
-        }
-    }
-}
-</script>
-<style>
-</style>
diff --git a/ruoyi-ui/src/components/FormDesigner/formBuilder.vue b/ruoyi-ui/src/components/FormDesigner/formBuilder.vue
deleted file mode 100644
index db80cb70..00000000
--- a/ruoyi-ui/src/components/FormDesigner/formBuilder.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<template>
-  <div >
-    <el-row  :gutter="formConf.gutter" class="form-builder">
-      <el-form
-          :rules="rules"
-          :ref="formConf.formModel"
-          :size="formConf.size"
-          :model="form"
-          :label-position="formConf.labelPosition"
-          :disabled="formConf.disabled"
-          :validate-on-rule-change="false"
-          :label-width="formConf.labelWidth + 'px'"
-        >
-          <template v-for="(element,index) in itemList"  >
-             <preview-row-item 
-              v-if="element.compType === 'row'"
-              :key="'row-'+index" 
-              :model="element"
-              >
-              <el-col v-for="(column) in element.columns" :key="column.index" :span="column.span">
-                <template v-for="(col) in column.list">
-                  <preview-item
-                      v-if="col.compType!== 'dynamicTable'"
-                      :key="col.id"
-                      :model="col"
-                      v-model="form[col.id]"
-                      @valChange="handlerValChange"
-                  />
-                  <fancy-dynamic-table
-                      v-else-if="col.compType === 'dynamicTable'"
-                      ref="dynamicTable"
-                      :key="'dynamic-'+index"
-                      :data="form[col.id]"
-                      :conf="col"
-                      @addRow="handlerAddRow"
-                      @deleteRow="handlerDeleteRow"
-                  >
-                    <template v-slot:item="{rowScope,item}">
-                      <fancy-dynamic-table-item
-                          :model="item"
-                          :parent="col"
-                          :key="'tableIndex-'+rowScope.$index"
-                          :index="rowScope.$index"
-                          v-model="rowScope.row[item.id]"
-                          @valChange="handlerDynamicValChange"
-                      />
-                    </template>
-                  </fancy-dynamic-table>
-                </template>
-              </el-col>
-            </preview-row-item>
-            <fancy-dynamic-table
-                v-else-if="element.compType === 'dynamicTable'"
-                :key="'dynamic-'+index"
-                :data="form[element.id]"
-                :ref="element.id"
-                :conf="element"
-                @addRow="handlerAddRow"
-                @deleteRow="handlerDeleteRow"
-            >
-              <template v-slot:item="{rowScope,item}">
-                <fancy-dynamic-table-item
-                    :model="item"
-                    :ref="item.id+rowScope.$index"
-                    :parent="element"
-                    :key="'tableIndex-'+rowScope.$index"
-                    :index="rowScope.$index"
-                    v-model="rowScope.row[item.id]"
-                    @valChange="handlerDynamicValChange"
-                />
-              </template>
-            </fancy-dynamic-table>
-            <fancy-edit-table
-              v-else-if="element.compType === 'table'"
-              :layoutArray="element.layoutArray"
-              :tdStyle="element.tdStyle"
-              :width="element.width"
-              :height="element.height"
-            >
-             <template v-slot="{td}">
-              <template v-for="(col) in td.columns">
-                  <preview-item
-                    v-if="col.compType!== 'dynamicTable'"
-                    :key="col.id"
-                    :model="col"
-                    v-model="form[col.id]"
-                    @valChange="handlerValChange"
-                  />
-             </template>
-            </template>
-            </fancy-edit-table>
-            <!--item-->
-            
-            <el-col class="drag-col-wrapper" :key="index"   :span="element.span" v-else>
-              <preview-item 
-                :model="element"
-                v-model="form[element.id]"
-                @valChange="handlerValChange"
-              />
-            </el-col>
-          </template>
-          
-        </el-form>
-    </el-row>
-  </div>
-</template>
-<script>
-import previewItem from "./previewItem";
-import previewRowItem from "./previewRowItem";
-import fancyDynamicTable from "./dynamic/fancyDynamicTable";
-import fancyDynamicTableItem from "./dynamic/fancyDynamicTableItem";
-import {datas,addRow,deleteRow,fillDatas} from "./custom/formDraw";
-import fancyEditTable from "./table/fancyEditTable";
-export default {
-  name:'formBuilder',
-  props:{
-    value:{
-      type:String,
-      default:''
-    },
-    buildData:{
-      type:String,
-      default:''
-    },
-    disabled:{
-      type:Boolean,
-      default:false
-    }
-  },
-  components:{
-    previewItem,
-    previewRowItem,
-    fancyDynamicTable,
-    fancyDynamicTableItem,
-    fancyEditTable
-  },
-  data(){
-    return{
-      form:{},
-      rules:{},
-      currentIndex:-1
-    }
-  },
-  mounted() {
-    this.$nextTick(()=> {
-      if(this.value !==''){
-        const jsonValue = JSON.parse(this.value)
-        this.handlerFillDatas(jsonValue);
-      }
-    })
-  },
-  methods:{
-    handlerValChange(key,origin){
-      this.$set(this.form,key,origin);
-    },
-    handlerDynamicValChange(parentId,index,key,origin){
-      this.$set(this.form[parentId][index],key,origin);
-      this.currentIndex = index;
-    },
-    validate(){
-      this.$refs[this.formConf.formModel].validate((valid) => {
-        if (valid) {
-          this.$message.success('success');
-          this.$emit('input',JSON.stringify(this.form,null,4));
-        }else{
-          this.$emit('input','');
-        }
-      });
-    },
-    handlerAddRow:addRow,
-    handlerDeleteRow:deleteRow,
-    handlerInitDatas:datas,
-    handlerFillDatas:fillDatas
-  },
-  created(){
-    this.handlerInitDatas();
-  },
-  computed:{
-    itemList(){
-      if(this.buildData!==''){
-        const buildData = JSON.parse(this.buildData);
-        return buildData.list;
-      }else{
-        return [];
-      }
-    },
-    formConf(){
-      if(this.buildData!==''){
-        const buildData = JSON.parse(this.buildData);
-        buildData.config.disabled = this.disabled;
-        return buildData.config;
-      }else{
-        return {};
-      }
-    }
-  }
-}
-</script>
-<style scoped>
-.preview-board{
-  border: 1px dashed #ccc
-}
-.form-builder{
-  padding: 20px;
-  border:1px solid #dcdfe6;
-}
-.el-form-item{
-  margin-left:10px;
-  margin-right:10px;
-}
-.form-builder >>> .el-radio.is-bordered+.el-radio.is-bordered{
-  margin-left:0px;
-}
-.form-builder >>> .el-checkbox.is-bordered+.el-checkbox.is-bordered{
-  margin-left:0px;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/formDesigner.vue b/ruoyi-ui/src/components/FormDesigner/formDesigner.vue
deleted file mode 100644
index 457b2a89..00000000
--- a/ruoyi-ui/src/components/FormDesigner/formDesigner.vue
+++ /dev/null
@@ -1,213 +0,0 @@
-<template>
-  <div class="container">
-    <div class="left-board">
-      <div class="d-logo-wrapper">
-        <div class="d-logo">
-          Form designer
-        </div>
-      </div>
-      
-      <el-scrollbar class="left-scrollbar">
-        <!--左侧组件列表-->
-        <div class="components-list">
-          <div class="components-title">
-            常用组件
-          </div>
-          <draggable
-            class="components-draggable"
-            :list="formItems"
-            :group="{ name: 'componentsGroup', pull: 'clone', put: false }"
-            :clone="cloneComponent"
-            draggable=".components-item"
-            :sort="false"
-            @start="onStart"
-            @end="onEnd"
-          >
-            <div
-              v-for="(element, index) in formItems" :key="index" class="components-item"
-              @click="addComponent(element)"
-            >
-              <div class="components-body" :class="{ 'dynamicTable-tips': dynamicTableExist(element)}">
-                <icon :code="element.compIcon" :text="element.compName"/>
-              </div>
-            </div>
-          </draggable>
-          <div class="components-title">
-            布局组件
-          </div>
-          <draggable
-            class="components-draggable"
-            :list="layoutFormItems"
-            :group="{ name: 'componentsGroup', pull: 'clone', put: false }"
-            :clone="cloneComponent"
-            draggable=".components-item"
-            :sort="false"
-            @start="onStart"
-            @end="onEnd"
-          >
-            <div
-              v-for="(element, index) in layoutFormItems" :key="index" class="components-item"
-              @click="addComponent(element)"
-            >
-              <div class="components-body">
-                <icon :code="element.compIcon" :text="element.compName"/>
-              </div>
-            </div>
-          </draggable>
-          <div class="components-title">
-            辅助组件
-          </div>
-          <draggable
-            class="components-draggable"
-            :list="assistFormItems"
-            :group="{ name: 'componentsGroup', pull: 'clone', put: false }"
-            :clone="cloneComponent"
-            draggable=".components-item"
-            :sort="false"
-            @start="onStart"
-            @end="onEnd"
-          >
-            <div
-              v-for="(element, index) in assistFormItems" :key="index" class="components-item"
-              @click="addComponent(element)"
-            >
-              <div class="components-body">
-                <icon :code="element.compIcon" :text="element.compName"/>
-              </div>
-            </div>
-          </draggable>
-        </div>
-      </el-scrollbar>
-    </div>
-    <designer ref="designer" :list="designList" :formConfig="formConfig" @clear="designList = []" @updateJSON="handlerUpdateJSON" :activeData="activeData"/>
-  </div>
-</template>
-<script>
-/**
- * 1.0版本
- */
-import draggable from "vuedraggable";
-import {formItems,assistFormItems,layoutFormItems} from "./custom/itemList";
-import designer from "./designer";
-import icon from "./icon";
-import {getSimpleId,setTableId} from "./utils/IdGenerate";
-import formConf from "./custom/formConf";
-import {dynamicTableAllowedItems} from "./custom/formConf";
-let tempActiveData;
-
-export default {
-  name:"formDesigner",
-  components:{
-    draggable
-    ,icon,
-    designer
-  },
-  data() {
-    return {
-      formItems:formItems,
-      assistFormItems:assistFormItems,
-      layoutFormItems:layoutFormItems,
-      designList:[],
-      activeData:{},
-      formConfig:formConf
-    }
-  },
-  props:{
-    value:{
-      type:String,
-      default:''
-    }
-  },
-  mounted() {
-    
-  },
-  methods: {
-    addComponent(element){
-
-    },
-    cloneComponent(origin){
-      const clone = JSON.parse(JSON.stringify(origin))
-      if (!clone.layout) clone.layout = 'colItem'
-      if (clone.layout === 'colItem'||clone.layout === 'dynamicItem') {
-        let uId = "fd_"+getSimpleId();
-        clone.id = uId;
-        clone._id = uId;
-        tempActiveData = clone;
-      }else if (clone.layout === 'rowItem'){
-        let uId = "row_"+getSimpleId();
-        clone.id = uId;
-        clone._id = uId;
-        tempActiveData = clone;
-      }else if(clone.layout === 'tableItem'){
-        let uId = "table_"+getSimpleId();
-        clone.id = uId;
-        clone._id = uId;
-        //增加td默认的id
-        setTableId(clone);
-        tempActiveData = clone;
-      }
-      this.$refs.designer.activeItem = tempActiveData;
-    },
-    onStart(obj){
-      
-    },
-    onEnd(obj){
-      if(obj.from !== obj.to){
-        this.activeData = tempActiveData;
-        this.$refs.designer.activeItem = this.activeData;
-        if(obj.to.className.indexOf('row-drag')<0){
-          this.designList.splice(obj.newIndex,0,this.activeData);
-        }
-      }else{
-        this.$refs.designer.activeItem = {};
-      }
-      
-    },
-    getFormData(){
-      return this.formData;
-    },
-    handlerUpdateJSON(json){
-      const jsonObject = JSON.parse(json);
-      this.designList = [];
-      this.designList = this.designList.concat(jsonObject.list);
-    }
-  },
-  computed:{
-    formData:function(){
-      const list = this.designList;
-      const config = this.formConfig;
-      let formData = {};
-      formData.list = list;
-      formData.config = config;
-      console.log(formData);
-      return JSON.stringify(formData);
-        //this.$emit('input',JSON.stringify(formData));
-    },
-    dynamicTableExist(){
-      return function(element){
-        return  this.formConfig.dynamicTableAllowed
-            &&this.designList.filter(item=>item.compType === 'dynamicTable').length>0
-            &&dynamicTableAllowedItems.includes(element.compType);
-      }
-    }
-  },
-  watch:{
-    value(newVal){
-      if(newVal !=='' && newVal !== null){
-        const formData = JSON.parse(newVal);
-        this.designList= formData.list;
-        this.formConfig = formData.config;
-      }
-    }
-  }
-}
-
-</script>
-<style scoped>
-.container{
-  padding:0px
-}
-.dynamicTable-tips{
-  border:1px solid#F08080
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/formViewItem.vue b/ruoyi-ui/src/components/FormDesigner/formViewItem.vue
deleted file mode 100644
index 8c22510b..00000000
--- a/ruoyi-ui/src/components/FormDesigner/formViewItem.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<script>
-import render from './custom/viewRender'
-
-const layouts = {
-  colItem(h, element,value) {
-    element.disabled= true;
-    let labelWidth = element.labelWidth ? `${element.labelWidth}px` : null
-    if(element.viewType === 'component'){
-      return (
-          <el-form-item label={element.showLabel ? element.label : ''}
-            label-width={labelWidth} 
-            prop={element.id}
-            >
-            <render key={element.id} conf={element} value={value} onInput={ event => {
-              this.$set(element,'value',event);
-            }}/>
-          </el-form-item>
-      )
-    }else if(element.viewType === 'html'){
-      return (
-        <el-form-item label={element.showLabel ? element.label : ''}
-          label-width={labelWidth} 
-          prop={element.id}
-        >
-          <fancy-html text={value}/>
-        </el-form-item>
-      )
-    }else{
-      if(typeof value === 'object'){
-        value = value[0] + ' ' + element['range-separator'] + ' ' + value[1];
-      }
-      return (
-        <el-form-item label={element.showLabel ? element.label : ''}
-          label-width={labelWidth} 
-          prop={element.id}
-        >
-          {value}
-        </el-form-item>
-      )
-    }
-    
-  }
-}
-
-export default {
-  name:"formViewItem",
-  components: {
-    render
-  },
-  props: ['model','value'],
-  data(){
-    return {
-      eleConfig:this.model
-    }
-  },
-  render(h) {
-    return layouts.colItem.call(this, h, this.eleConfig,this.value)
-  }
-}
-</script>
-<style scoped>
-.el-form-item{
-  margin-left:10px;
-  margin-right:10px;
-  margin-bottom: 5px;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/formViewer.vue b/ruoyi-ui/src/components/FormDesigner/formViewer.vue
deleted file mode 100644
index a8ec8f96..00000000
--- a/ruoyi-ui/src/components/FormDesigner/formViewer.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<!--表单查看页面-->
-<template>
-  <div class="form-viewer">
-    <el-row  :gutter="formConf.gutter" >
-      <el-form
-          :ref="formConf.formModel"
-          :size="formConf.size"
-          :model="form"
-          :label-position="formConf.labelPosition"
-          :disabled="formConf.disabled"
-        >
-          <template v-for="(element,index) in itemList"  >
-             <preview-row-item 
-              v-if="element.compType === 'row'"
-              :key="'row-'+index" 
-              :model="element"
-              >
-              <el-col v-for="(column) in element.columns" :key="column.index" :span="column.span">
-                <form-view-item 
-                v-for="(item) in column.list"
-                :key="item.id" 
-                :model="item"
-                v-model="form[item.id]"
-                />
-              </el-col>
-            </preview-row-item>
-            <fancy-dynamic-view-table
-                v-else-if="element.compType === 'dynamicTable'"
-                :key="'dynamic-'+index"
-                :data="form[element.id]"
-                :ref="element.id"
-                :conf="element"
-            >
-              <template v-slot:item="{rowScope,item}">
-                <fancy-dynamic-table-view-item
-                    :model="item"
-                    :ref="item.id+rowScope.$index"
-                    :parent="element"
-                    :key="'tableIndex-'+rowScope.$index"
-                    :index="rowScope.$index"
-                    v-model="rowScope.row[item.id]"
-                />
-              </template>
-            </fancy-dynamic-view-table>
-            <fancy-edit-table
-              v-else-if="element.compType === 'table'"
-              :layoutArray="element.layoutArray"
-              :tdStyle="element.tdStyle"
-              :width="element.width"
-              :height="element.height"
-            >
-             <template v-slot="{td}">
-                <form-view-item 
-                  v-for="(item) in td.columns"
-                  :key="item.id" 
-                  :model="item"
-                  v-model="form[item.id]"
-                  />
-            </template>
-            </fancy-edit-table>
-            <!--item-->
-            <el-col class="drag-col-wrapper" :key="index"   :span="element.span" v-else>
-              <form-view-item
-                :model="element"
-                v-model="form[element.id]"
-              />
-            </el-col>
-          </template>
-        </el-form>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import formViewItem from "./formViewItem";
-import previewRowItem from "./previewRowItem";
-import fancyDynamicViewTable from "./dynamic/fancyDynamicViewTable";
-import fancyDynamicTableViewItem from "./dynamic/fancyDynamicTableViewItem";
-import fancyEditTable from "./table/fancyEditTable";
-export default {
-  name:'formViewer',
-  data(){
-    return{
-    }
-  },
-  props:{
-    value:{
-      type:String,
-      default:''
-    },
-    buildData:{
-      type:String,
-      default:''
-    }
-  },
-  components:{
-    formViewItem,
-    previewRowItem,
-    fancyDynamicViewTable,
-    fancyDynamicTableViewItem,
-    fancyEditTable
-  },
-  mounted() {
-    this.$nextTick(()=> {
-    })
-  },
-  computed:{
-    itemList(){
-      if(this.buildData!==''){
-        const buildData = JSON.parse(this.buildData);
-        return buildData.list;
-      }else{
-        return [];
-      }
-    },
-    form(){ //转换成json的值
-      if(this.value!==''){
-        const value = JSON.parse(this.value);
-        return value;
-      }else{
-        return {};
-      }
-    },
-    formConf(){
-      if(this.buildData!==''){
-        const buildData = JSON.parse(this.buildData);
-        buildData.config.disabled = this.disabled;
-        return buildData.config;
-      }else{
-        return {};
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.preview-board{
-  border: 1px dashed #ccc
-}
-.form-viewer{
-  padding: 20px;
-  border:1px solid #dcdfe6;
-}
-.el-form-item{
-  margin-left:10px;
-  margin-right:10px;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/generator/html.js b/ruoyi-ui/src/components/FormDesigner/generator/html.js
deleted file mode 100644
index 07c05418..00000000
--- a/ruoyi-ui/src/components/FormDesigner/generator/html.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * 生成html的核心js函数
- */
-let globalConfig
-
-
-export function vueTemplate(str) {
-  return `<template>
-    <div>
-      ${str}
-    </div>
-  </template>`
-}
-
-export function vueScript(str) {
-  return `<script>
-    ${str}
-  </script>`
-}
-
-export function cssStyle(cssStr) {
-  return `<style>
-    ${cssStr}
-  </style>`
-}
-
-const items = {
-  'input':el =>{
-    const {
-      disabled, vModel, clearable, placeholder, width
-    } = attrBuilder(el)
-    const maxlength = el.maxlength ? `:maxlength="${el.maxlength}"` : ''
-    //const showWordLimit = el['show-word-limit'] ? 'show-word-limit' : ''
-    const readonly = el.readonly ? 'readonly' : ''
-    return `<${el.ele} ${vModel} ${placeholder} ${maxlength} ${readonly} ${disabled} ${clearable} />`
-  },
-  'textarea':el =>{
-    const {
-      disabled, vModel, clearable, placeholder, width
-    } = attrBuilder(el)
-    const maxlength = el.maxlength ? `:maxlength="${el.maxlength}"` : ''
-    //const showWordLimit = el['show-word-limit'] ? 'show-word-limit' : ''
-    const readonly = el.readonly ? 'readonly' : ''
-    const type = el.type ? `type="${el.type}"` : ''
-    return `<${el.ele} ${vModel} ${type} ${placeholder} ${maxlength} ${readonly} ${disabled} ${clearable} />`
-  }
-}
-
-
-function colWrapper(element,str){
-  if (element.span) {
-    return `<el-col :span="${element.span}">
-              ${str}
-            </el-col>`
-  }
-  return str
-}
-
-function attrBuilder(el) {
-  return {
-    vModel: `v-model="${globalConfig.formModel}.${el.id}"`,
-    clearable: el.clearable ? 'clearable' : '',
-    placeholder: el.placeholder ? `placeholder="${el.placeholder}"` : '',
-    //width: el.style && el.style.width ? ':style="{width: \'100%\'}"' : '',
-    disabled: el.disabled ? ':disabled=\'true\'' : ''
-  }
-}
-
-
-const layout = {
-  colFormItem(element) {
-    let labelWidth = `label-width="${globalConfig.labelWidth}px"`
-    let label = `label="${element.label}"`
-    if (element.labelWidth && element.labelWidth !== globalConfig.labelWidth) {
-      labelWidth = `label-width="${element.labelWidth}px"`
-    }
-    if (element.showLabel === false) {
-      labelWidth = 'label-width="0"'
-      label = ''
-    }
-    const required = element.required ? 'required' : ''
-    const itemDom = items[element.compType] ? items[element.compType](element) : null
-    let str = `<el-form-item ${labelWidth} ${label} ${required}>
-                ${itemDom}
-               </el-form-item>`
-    str = colWrapper(element,str);
-    return str;
-  }
-}
-
-
-/**
- * 生成html源码
- * 表单配置和组件列表
- */
-export function buildHtmlSource(itemList,formConf){
-  globalConfig = formConf;
-  const htmlCode = []
-  itemList.forEach(el => {
-    htmlCode.push(layout['colFormItem'](el))
-  })
-  const htmlStr = htmlCode.join('\n') 
-  //console.log(htmlStr)
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/generator/js.js b/ruoyi-ui/src/components/FormDesigner/generator/js.js
deleted file mode 100644
index 7da257ca..00000000
--- a/ruoyi-ui/src/components/FormDesigner/generator/js.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * 生成js的核心js函数
- */
-let globalConfig
-
-export function buildJsSource(itemList,formConf){
-  globalConfig = JSON.parse(JSON.stringify(formConf))
-  const dataList = []
-  const optionsList = []
-  const propsList = []
-  itemList.forEach(el =>{
-    buildAttributes(el, dataList, optionsList, propsList)
-  })
-
-  const script = buildexport(
-    formConf,
-    dataList.join('\n'),
-    optionsList.join('\n'),
-    propsList.join('\n'),
-  )
-  globalConfig = null;
-  console.log(script);
-  return script;
-}
-
-function buildAttributes(el, dataList, optionsList, propsList) {
-  buildData(el, dataList)
-
-  if (el.options && el.options.length) {
-    buildOptions(el, optionsList)
-  }
-
-  if (el.props && el.props.props) {
-    buildProps(el, propsList)
-  }
-
-  // if (el.children) {
-  //   el.children.forEach(el2 => {
-  //     buildAttributes(el2, dataList, ruleList, optionsList, methodList, propsList, uploadVarList)
-  //   })
-  // }
-}
-
-function buildData(conf, dataList) {
-  let value
-  if (typeof (conf.value) === 'string' && !conf.multiple) {
-    value = `'${conf.value}'`
-  } else {
-    value = `${JSON.stringify(conf.value)}`
-  }
-  if(typeof(value) === 'undefined'||value === 'undefined') value = `''`;
-  console.log(value);
-  dataList.push(`${conf.id}: ${value},`)
-}
-
-function buildOptions(conf, optionsList) {
-  const str = `${conf.id}Options: ${JSON.stringify(conf.options)},`
-  optionsList.push(str)
-}
-
-function buildProps(conf, propsList) {
-  const str = `${conf.id}Props: ${JSON.stringify(conf.props.props)},`
-  propsList.push(str)
-}
-
-function buildexport(conf, data, props) {
-  const str = `export default {
-  components: {},
-  props: [],
-  data () {
-    return {
-      ${conf.formModel}: {
-        ${data}
-      }
-    }
-  },
-  computed: {},
-  watch: {},
-  created () {},
-  mounted () {},
-}`
-  return str
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/icon.vue b/ruoyi-ui/src/components/FormDesigner/icon.vue
deleted file mode 100644
index 57e7a335..00000000
--- a/ruoyi-ui/src/components/FormDesigner/icon.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-  <div class="text">
-    <svg class="icon" aria-hidden="true">
-      <use :xlink:href="iconFont"></use>
-    </svg>
-    {{text}}
-  </div>
-</template>
-<script>
-  export default {
-    name:'icon',
-    props:['code','text'],
-    computed: {
-      iconFont(){
-        return '#icon-'+this.code;
-      }
-    }
-  }
-</script>
-<style scoped>
-.icon{
-  width:20px;
-  height:20px;
-  vertical-align:-5px;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/iconDialog.vue b/ruoyi-ui/src/components/FormDesigner/iconDialog.vue
deleted file mode 100644
index 8c5cfdb4..00000000
--- a/ruoyi-ui/src/components/FormDesigner/iconDialog.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-<!--elementUI 图标选择器-->
-<template>
-  <div >
-    <el-dialog title="选择icon" width="60%" top="0vh" :visible.sync="dialogVisible" append-to-body>
-      <ul class="icon-list">
-        <li v-for="iconName in icons" :key="iconName" @click="handlerSelectIcon(iconName)" :class="{activeIcon:iconName ===value}">
-            <i :class="iconName"></i>
-            <!-- <div class="icon-name">{{iconName}}</div> -->
-        </li>
-      </ul>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import iconList from './utils/icon.json';
-export default {
-  props:{
-    visible:{
-      type: Boolean,
-      default:true
-    },
-    value:{
-      type:String,
-      default:''
-    }
-  },
-  data(){
-    return{
-      icons:iconList,
-    } 
-  },
-  methods:{
-    handlerSelectIcon(iconName){
-      this.$emit('input',iconName);
-      this.$emit('update:visible',false); 
-    }
-  },
-  computed:{
-    dialogVisible:{
-       // getter
-      get: function () {
-        return this.visible;
-      },
-      // setter
-      set: function (newValue) {
-        this.$emit('update:visible',false); 
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.icon-list{
-  padding:0;
-  margin:0;
-  font-size:0;
-}
-.icon-list li{
-  width: 10%;
-  height:60px;
-  font-size:14px;
-  text-align: center;
-  list-style-type: none;
-  overflow: hidden;
-  padding: 15px 6px 6px 0px;
-  display: inline-block;
-  box-sizing: border-box;
-}
-.icon-list li:hover{
-  background-color: #F2F6FC;
-  cursor: pointer;
-}
-.activeIcon{
-  background-color: #F2F6FC;
-  cursor: pointer;
-}
-.icon-list li i{
-  width:100%;
-  font-size: 30px;
-  padding: 6px 6px 6px 0px;
-}
-.icon-name{
-  display: block;
-  padding-left:6px;
-}
-.el-dialog {
-  border-radius: 8px;
-  margin-bottom: 0;
-  margin-top: 4vh !important;
-  display: flex;
-  flex-direction: column;
-  max-height: 92vh;
-  overflow: hidden;
-  box-sizing: border-box;
-}
-.el-dialog .el-dialog__header {
-  padding-top: 14px;
-}
-.el-dialog .el-dialog__body {
-  margin: 0 20px 20px 20px;
-  padding: 0;
-  overflow: auto;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/index.js b/ruoyi-ui/src/components/FormDesigner/index.js
deleted file mode 100644
index 16e84e15..00000000
--- a/ruoyi-ui/src/components/FormDesigner/index.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import formDesigner from './formDesigner';
-import fancyEditor from './extend/fancyEditor';
-import fancyHtml from './extend/fancyHtml';
-import fancyText from './extend/fancyText';
-import fancyBarCode from 'vue-barcode';
-import fancyDialogList from './extend/fancyDialogList';
-import iconDialog from './iconDialog';
-const plugins = {
-  install : function (Vue) {
-    Vue.component('form-designer',formDesigner);
-    Vue.component('fancy-editor',fancyEditor);
-    Vue.component('fancy-html',fancyHtml);
-    Vue.component('fancy-text',fancyText);
-    Vue.component('fancy-bar-code',fancyBarCode);
-    Vue.component('fancy-dialog-list',fancyDialogList);
-    Vue.component('icon-dialog',iconDialog);
-  }
-};
-// 这一步判断window.Vue是否存在，因为直接引用vue.min.js， 它会把Vue绑到Window上，我们直接引用打包好的js才能正常跑起来。
-if (typeof window !== 'undefined' && window.Vue) {
-  window.Vue.use(plugins);
-}
-export default plugins;
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/preview.vue b/ruoyi-ui/src/components/FormDesigner/preview.vue
deleted file mode 100644
index a5b9bcab..00000000
--- a/ruoyi-ui/src/components/FormDesigner/preview.vue
+++ /dev/null
@@ -1,183 +0,0 @@
-<template>
-  <div class="preview">
-    <el-row  :gutter="formConf.gutter">
-      <el-form
-          :rules="rules"
-          :ref="formConf.formModel"
-          :size="formConf.size"
-          :model="form"
-          :label-position="formConf.labelPosition"
-          :disabled="formConf.disabled"
-          :validate-on-rule-change="false"
-          label-width="formConf.labelWidth + 'px'"
-        >
-          <template v-for="(element,index) in list"  >
-            <!-- <el-input v-model="element.id" placeholder=""></el-input> -->
-             <preview-row-item 
-              v-if="element.compType === 'row'"
-              :key="'row-'+index" 
-              :model="element"
-              >
-              <el-col v-for="(column) in element.columns" :key="column.index" :span="column.span">
-                <template v-for="(col) in column.list">
-                  <preview-item
-                    v-if="col.compType!== 'dynamicTable'"
-                    :key="col.id"
-                    :model="col"
-                    v-model="form[col.id]"
-                    @valChange="handlerValChange"
-                  />
-                  <fancy-dynamic-table
-                      v-else-if="col.compType === 'dynamicTable'"
-                      ref="dynamicTable"
-                      :key="'dynamic-'+index"
-                      :data="form[col.id]"
-                      :conf="col"
-                      @addRow="handlerAddRow"
-                      @deleteRow="handlerDeleteRow"
-                      @batchDeleteRow="handlerBatchDeleteRow"
-                  >
-                    <template v-slot:item="{rowScope,item}">
-                      <fancy-dynamic-table-item
-                          :model="item"
-                          :parent="col"
-                          :key="'tableIndex-'+rowScope.$index"
-                          :index="rowScope.$index"
-                          v-model="rowScope.row[item.id]"
-                          @valChange="handlerDynamicValChange"
-                      />
-                    </template>
-                  </fancy-dynamic-table>
-                </template>
-              </el-col>
-            </preview-row-item>
-            <fancy-dynamic-table
-                v-else-if="element.compType === 'dynamicTable'"
-                :key="'dynamic-'+index"
-                :data="form[element.id]"
-                :ref="element.id"
-                :conf="element"
-                @addRow="handlerAddRow"
-                @deleteRow="handlerDeleteRow"
-                @batchDeleteRow="handlerBatchDeleteRow"
-            >
-              <template v-slot:item="{rowScope,item}">
-                <fancy-dynamic-table-item
-                    :model="item"
-                    :ref="item.id+rowScope.$index"
-                    :parent="element"
-                    :key="'tableIndex-'+rowScope.$index"
-                    :index="rowScope.$index"
-                    v-model="rowScope.row[item.id]"
-                    @valChange="handlerDynamicValChange"
-                />
-              </template>
-            </fancy-dynamic-table>
-            <fancy-edit-table
-              v-else-if="element.compType === 'table'"
-              :layoutArray="element.layoutArray"
-              :tdStyle="element.tdStyle"
-              :width="element.width"
-              :height="element.height"
-            >
-             <template v-slot="{td}">
-              <template v-for="(col) in td.columns">
-                  <preview-item                   
-                    :model="col"
-                    v-model="form[col.id]"
-                    @valChange="handlerValChange"
-                  />
-             </template>
-            </template>
-            </fancy-edit-table>
-            <!--item-->
-            <el-col class="drag-col-wrapper" :key="index"   :span="element.span" v-else>
-              <preview-item 
-                :model="element"
-                v-model="form[element.id]"
-                @valChange="handlerValChange"
-              />
-            </el-col>
-          </template>
-          
-        </el-form>
-    </el-row>
-    <el-divider></el-divider>
-    <div style="text-align: center;">
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handlerSubForm">提交</el-button>
-      </span>
-    </div>
-  </div>
-</template>
-<script>
-import previewItem from "./previewItem";
-import previewRowItem from "./previewRowItem";
-import fancyDynamicTable from "./dynamic/fancyDynamicTable";
-import fancyDynamicTableItem from "./dynamic/fancyDynamicTableItem";
-import fancyEditTable from "./table/fancyEditTable";
-import {datas,addRow,batchDeleteRow,deleteRow} from "./custom/formDraw";
-export default {
-  name:'preview',
-  props:['itemList','formConf'],
-  components:{
-    previewItem,
-    previewRowItem,
-    fancyDynamicTable,
-    fancyDynamicTableItem,
-    fancyEditTable
-  },
-  data(){
-    return{
-      list: this.itemList,
-      form:{},
-      rules:{},
-      currentIndex:-1
-    }
-  },
-  methods:{
-    handlerValChange(key,origin){
-      console.log(key);
-      this.$set(this.form,key,origin);
-    },
-    handlerDynamicValChange(parentId,index,key,origin){
-      this.$set(this.form[parentId][index],key,origin);
-      this.currentIndex = index;
-    },
-    handlerSubForm(){
-      this.$refs[this.formConf.formModel].validate((valid) => {
-        if (valid) {
-          this.$message.success('success');
-        }
-      });
-    },
-    handlerAddRow:addRow,
-    handlerDeleteRow:deleteRow,
-    handlerBatchDeleteRow:batchDeleteRow,
-    handlerInitDatas:datas,
-  },
-  created(){
-    this.handlerInitDatas();//初始化表单
-  },
-  mounted() {
-    this.$nextTick(()=> {
-    })
-  },
-  beforeCreate(){
-  },
-  computed:{
-  }
-}
-</script>
-<style scoped>
-.preview-board{
-  border: 1px dashed #ccc
-}
-.preview >>> .el-radio.is-bordered+.el-radio.is-bordered{
-  margin-left:0px;
-}
-.preview >>> .el-checkbox.is-bordered+.el-checkbox.is-bordered{
-  margin-left:0px;
-}
-
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/previewItem.vue b/ruoyi-ui/src/components/FormDesigner/previewItem.vue
deleted file mode 100644
index 30530e6e..00000000
--- a/ruoyi-ui/src/components/FormDesigner/previewItem.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<script>
-import render from './custom/previewRender'
-import checkRules from './custom/rule';
-
-const layouts = {
-  colItem(h, element,value) {
-    let labelWidth = element.labelWidth ? `${element.labelWidth}px` : null
-    const {valChange} = this.$listeners;
-    const rules = checkRules(element);
-    return (
-        <el-col  style="padding: 0px 7.5px 30px 7.5px">
-          <el-form-item label={element.showLabel ? element.label : ''}
-                        label-width={labelWidth}
-                        prop={element.id}
-                        rules={rules}
-                        >
-            <render key={element.id} conf={element} value={value} onInput={ event => {
-              this.$set(element,'value',event);
-              valChange(element.id,event);
-            }}/>
-          </el-form-item>
-        </el-col>
-    )
-  }
-}
-
-export default {
-  name:"previewItem",
-  components: {
-    render
-  },
-  props: ['model','value'],
-  data(){
-    return {
-      eleConfig:this.model
-    }
-  },
-  render(h) {
-    return layouts.colItem.call(this, h, this.eleConfig,this.value)
-  }
-}
-</script>
-<style scoped>
-.el-form-item{
-  margin-left:10px;
-  margin-right:10px;
-  margin-bottom: 5px;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/previewRowItem.vue b/ruoyi-ui/src/components/FormDesigner/previewRowItem.vue
deleted file mode 100644
index 3181114e..00000000
--- a/ruoyi-ui/src/components/FormDesigner/previewRowItem.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<template>
-  <el-col>
-    <el-row  :gutter="model.gutter">
-      <div class="drag-wrapper">
-        <slot></slot>
-      </div>
-    </el-row>
-  </el-col>
-</template>
-<script>
-
-
-
-export default {
-  name:"previewRowItem",
-  components: {
-  },
-  props: ['model','value'],
-  data(){
-    return {
-      
-    }
-  },
-  computed:{
-  }
-}
-</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/processFormView.vue b/ruoyi-ui/src/components/FormDesigner/processFormView.vue
deleted file mode 100644
index 18e1e985..00000000
--- a/ruoyi-ui/src/components/FormDesigner/processFormView.vue
+++ /dev/null
@@ -1,147 +0,0 @@
-<template>
-  <div >
-    <el-card class="box-card">
-      <el-tabs v-model="tabName">
-        <el-tab-pane
-          :key="item.name"
-          v-for="item in tableTabs"
-          :label="item.title"
-          :name="item.name"
-          class="tab-pane"
-        >
-          <div v-if="item.name ==='form'">
-            <form-builder ref="formBuilder" v-model="formVal" :buildData="formCode" v-if="itemList.length>0"/>
-            <div style="margin-bottom:15px;text-align:center">
-                <el-button type="primary" class="button" @click="handlerSubForm">提交</el-button>
-            </div>
-          </div>
-          <codemirror v-model="code" :options="codeMirror" v-show="item.name ==='config'||item.name ==='value'"/>
-          <div v-if="item.name==='view'">
-            <form-viewer ref="formViewer" v-model="formVal" :buildData="formCode"></form-viewer>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
-
-    </el-card>
-  </div>
-</template>
-
-<script>
-import formBuilder from '@/components/FormDesigner/formBuilder'
-import formViewer from '@/components/FormDesigner/formViewer'
-import {codemirror} from 'vue-codemirror';
-import axios from 'axios'
-// 核心样式
-import 'codemirror/lib/codemirror.css';
-// 引入主题后还需要在 options 中指定主题才会生效
-import 'codemirror/theme/dracula.css';
-import 'codemirror/mode/javascript/javascript'
-const options = {
-    tabSize: 2, // 缩进格式
-    theme: 'dracula', // 主题，对应主题库 JS 需要提前引入
-    lineNumbers: true, // 显示行号
-    line: true,
-    styleActiveLine: true, // 高亮选中行
-    hintOptions: {
-      completeSingle: true // 当匹配只有一项的时候是否自动补全
-    }
-  }
-export default {
-  components:{
-    formBuilder,
-    codemirror,
-    formViewer
-  },
-  data(){
-    return{
-      formCode:'',
-      formVal:'',
-      tabName:'form',
-      tableTabs: [{
-          title: '编辑表单',
-          name: 'form',
-        }, {
-          title: '配置',
-          name: 'config',
-        }, {
-          title: '数据',
-          name: 'value',
-        }],
-      codeMirror:options
-    } 
-  },
-  mounted(){
-    this.$nextTick(()=> {
-      const formValue = localStorage.getItem("formValue");
-      this.formCode = formValue;
-      axios.get('https://www.fastmock.site/mock/51715c0157535b99010bde55f2df33c8/formDesigner/api/cascaderOptions')
-        .then(res => {
-          //console.log(res.data);
-        })
-    })
-    
-  },
-  methods:{
-    handlerchangeopen(){
-    },
-    handlerSubForm(){
-      this.$refs['formBuilder'][0].validate();
-      if(this.formVal!==''){
-        this.addNewTab();
-      }
-    },
-    addNewTab(){
-      if(this.tableTabs.length<4){
-        this.tableTabs.push({
-          title: '查看表单',
-          name: 'view'
-        });
-      }
-      
-    }
-  },
-  computed:{
-    itemList(){
-      if(this.formCode!==''){
-        const form = JSON.parse(this.formCode);
-        return form.list;
-      }else{
-        return [];
-      }
-    },
-    code:{
-      get() {
-        if(this.tabName ==='form'){
-          return ''
-        }else if(this.tabName === 'config'){
-          return this.formCode
-        }else{
-          return this.formVal
-        }
-      },
-      set(){}
-    }
-  }
-}
-</script>
-
-<style scoped>
-/* .box-card >>> .el-tabs__header{
-  margin: 0px 0px 0px 0px;
-} */
-
-.box-card{
-  width:60%;
-  position:absolute;
-  top:0;
-  left:0;
-  right:0;
-  bottom:0;
-  margin:auto;
-  overflow: auto;
-  display: block;
-}
-#app{
-  position: relative;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/style/designer.css b/ruoyi-ui/src/components/FormDesigner/style/designer.css
deleted file mode 100644
index b42ac2fe..00000000
--- a/ruoyi-ui/src/components/FormDesigner/style/designer.css
+++ /dev/null
@@ -1,197 +0,0 @@
-
-body{
-  margin:0px;
-}
-.container {
-  position: relative;
-  width: 100%;
-  height: 100%;
-}
-.left-board {
-  width: 260px;
-  position: absolute;
-  left: 0;
-  top: 0;
-  height: 100vh;
-}
-.d-logo-wrapper{
-  position: relative;
-  height: 42px;
-  background: #ffffff;
-  border-bottom: 1px solid #f1e8e8;
-  box-sizing: border-box;
-}
-.d-logo{
-  position: absolute;
-  left: 12px;
-  top: 6px;
-  line-height: 30px;
-  color: #409eff;
-  font-weight: 600;
-  font-size: 17px;
-  white-space: nowrap;
-}
-.d-logo img{
-  width: 30px;
-  height: 30px;
-  vertical-align: top;
-}
-.components-title{
-  font-size: 14px;
-  color: #222;
-  margin: 6px 6px;
-  font-weight:700
-}
-.components-draggable{
-  padding-bottom: 20px;
-}
-.components-list {
-  padding: 8px;
-  box-sizing: border-box;
-  height: 100%;
-}
-.components-list .components-item {
-  display: inline-block;
-  width: 48%;
-  margin: 1%;
-  transition: transform 0ms !important;
-}
-.components-body {
-  padding: 8px 10px;
-  background: #f4f6fc;
-  font-size: 12px;
-  margin-left: 5px;
-  padding-top: 5px;
-  cursor: move;
-  border: 1px solid #409eff;
-  border-radius: 3px;
-}
-.components-body:hover {
-  border: 1px dashed #f56c6c;
-  color: #f56c6c;
-}
-.center-board {
-  height: 100vh;
-  width: auto;
-  margin: 0 350px 0 260px;
-  box-sizing: border-box;
-}
-.empty-info{
-  position: absolute;
-  top: 30%;
-  left: 0;
-  right: 0;
-  text-align: center;
-  font-size: 18px;
-  letter-spacing: 4px;
-}
-.action-bar{
-  position: relative;
-  height: 42px;
-  text-align: right;
-  padding: 0 15px;
-  box-sizing: border-box;;
-  border: 1px solid #f1e8e8;
-  border-top: none;
-  border-left: none;
-  background: #ffffff;
-}
-.action-bar .el-button{
-  font-size: 18px;
-  vertical-align: middle;
-  position: relative;
-  top: -1px;
-  color:#409EFF
-}
-.action-bar .delete-btn{
-  color: #F56C6C;
-}
-.center-scrollbar {
-  height: calc(100vh - 42px);
-  overflow: hidden;
-  border-left: 1px solid #f1e8e8;
-  border-right: 1px solid #f1e8e8;
-  box-sizing: border-box;
-}
-
-.center-board-row {
-  padding: 10px 12px 100px 12px;
-  box-sizing: border-box;
-}
-.center-board-row .el-form {
-  height: calc(100vh - 69px);
-}
-
-.dynamic-table{
-  margin: 0px;
-  height: auto;
-  min-height: 120px;
-  padding: 10px 0px;
-}
-.dynamic-table__content{
-  width:100%;
-  height:100%;
-  display: flex;
-  overflow-y: hidden;
-  outline: 1px dashed #ccc;
-  outline-offset: -1px;
-  min-height: 100px;
-  float:left
-}
-.dynamic-table__item {
-  margin:1px;
-  padding-top:5px;
-  border: 1px solid #EBEEF5;
-  background:#f2f6fc;
-  border-radius: 2px;
-}
-.dynamic-table__item:hover {
-  border: 1px solid #409EFF;
-}
-.dynamic-table__item_title{
-  width:100%;
-  padding-top:8px;
-  line-height: 23px;
-  text-align: center;
-  border-bottom: 1px solid #EBEEF5;
-  font-size: 14px;
-  color:#606266;
-  height:30px;
-}
-.dynamic-table__item_body{
-  padding:10px;
-  text-align: center;
-}
-.table__content{
-  width:100%;
-  height:100%;
-  overflow-y: hidden;
-  outline: 1px dashed #ccc;
-  outline-offset: -1px;
-  min-height: 100px;
-  float:left
-}
-.el-radio:last-child {
-  margin-right:30px;
-}
-.el-checkbox:last-of-type{
-  margin-right:30px;
-}
-.el-rate{
-  margin-top:10px;
-}
-
-.component-id{
-  position: absolute;
-  top: 0;
-  left: 0;
-  font-size: 12px;
-  color: #bbb;
-  display: inline-block;
-  margin: 0 6px;
-}
-
-/* .dynamic-table.active{
-  border-left: 3px solid #409eff;
-  background:#ecf5ff
-} */
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/style/designer.scss b/ruoyi-ui/src/components/FormDesigner/style/designer.scss
deleted file mode 100644
index 4b4f50a7..00000000
--- a/ruoyi-ui/src/components/FormDesigner/style/designer.scss
+++ /dev/null
@@ -1,304 +0,0 @@
-$selectedColor: #e6f2ff;
-$lighterBlue: #409EFF;
-.drawing-board {
-  height: 100%;
-  position: relative;
-  border:1px dashed #ccc;
-  .components-body {
-    padding: 0;
-    margin: 0;
-    font-size: 0;
-  }
-  .sortable-ghost {
-    position: relative;
-    display: block;
-    overflow: hidden;
-    &::before {
-      content: " ";
-      position: absolute;
-      left: 0;
-      right: 0;
-      top: 0;
-      height: 3px;
-      background: #409EFF;
-      z-index: 2;
-    }
-  }
-  .components-item.sortable-ghost {
-    width: 100%;
-    height: 5px;
-    background-color: $selectedColor;
-  }
-  .drawing-item.sortable-ghost {
-    width: 100%;
-    height: 5px;
-    background-color: $selectedColor;
-  }
-  .active-from-item {
-    & > .el-form-item{
-      background: $selectedColor;
-      border-radius:6px;
-      margin-top:15px;
-    }
-    & > .dynamic-table{
-      background: $selectedColor;
-      border-radius:6px;
-    }
-    & > .drawing-item-copy, & > .drawing-item-delete{
-      display: initial;
-    }
-    & > .component-name{
-      color: $lighterBlue;
-    }
-  }
-  
-  .el-form-item{
-    margin-bottom: 5px;
-  }
-}
-.drawing-item{
-  position: relative;
-  cursor: move;
-  &.unfocus-bordered:not(.active-from-item) > div:first-child {
-    border: 1px dashed #ccc;
-  }
-  .el-form-item{
-    padding: 12px 10px;
-    margin-top:15px;
-  }
-}
-.drawing-item{
-  position: relative;
-  border: 1px dashed #ccc;
-  cursor: move;
-  .dynamic-table{
-    padding: 12px 5px;
-    
-  }
-}
-.drawing-row-item{
-  position: relative;
-  cursor: move;
-  box-sizing: border-box;
-  border: 1px dashed #ccc;
-  border-radius: 3px;
-  padding: 0 2px;
-  margin-bottom: 15px;
-  .el-col{
-    margin-top: 15px;
-  }
-  .el-form-item{
-    margin-bottom: 15px;
-  }
-  .drag-wrapper{
-    min-height: 80px;
-  }
-  .drag-col-wrapper{
-    height: auto;
-    border: 1px dashed #ccc;
-  }
-  &.active-from-item{
-    border: 2px solid #e6a23c;
-    
-  }
-  .component-name{
-    position: absolute;
-    top: 0;
-    left: 0;
-    font-size: 12px;
-    color: #bbb;
-    display: inline-block;
-    padding: 0 6px;
-  }
-}
-.drawing-item, .drawing-row-item{
-  &:hover {
-    & > .el-form-item{
-      background: #ebeef5;
-    }
-    & > .drawing-item-copy, & > .drawing-item-delete{
-      display: initial;
-    }
-  }
-  & > .drawing-item-copy, & > .drawing-item-delete{
-    display: none;
-    position: absolute;
-    top: -10px;
-    width: 22px;
-    height: 22px;
-    line-height: 22px;
-    text-align: center;
-    border-radius: 50%;
-    font-size: 12px;
-    border: 1px solid;
-    cursor: pointer;
-    z-index: 1;
-  }
-  & > .drawing-item-copy{
-    right: 56px;
-    border-color: $lighterBlue;
-    color: $lighterBlue;
-    background: #fff;
-    &:hover{
-      background: $lighterBlue;
-      color: #fff;
-    }
-  }
-  & > .drawing-item-delete{
-    right: 24px;
-    border-color: #F56C6C;
-    color: #F56C6C;
-    background: #fff;
-    &:hover{
-      background: #F56C6C;
-      color: #fff;
-    }
-  }
-}
-.drawing-item, .drawing-form-item{
-  &:hover {
-    & > .el-form-item{
-      background: #ebeef5;
-    }
-    & > .drawing-item-copy, & > .drawing-item-delete{
-      display: initial;
-    }
-  }
-  & > .drawing-item-copy, & > .drawing-item-delete{
-    display: none;
-    position: absolute;
-    top: -10px;
-    width: 22px;
-    height: 22px;
-    line-height: 22px;
-    text-align: center;
-    border-radius: 50%;
-    font-size: 12px;
-    border: 1px solid;
-    cursor: pointer;
-    z-index: 1;
-  }
-  & > .drawing-item-copy{
-    right: 56px;
-    border-color: $lighterBlue;
-    color: $lighterBlue;
-    background: #fff;
-    &:hover{
-      background: $lighterBlue;
-      color: #fff;
-    }
-  }
-  & > .drawing-item-delete{
-    right: 24px;
-    border-color: #F56C6C;
-    color: #F56C6C;
-    background: #fff;
-    &:hover{
-      background: #F56C6C;
-      color: #fff;
-    }
-  }
-}
-.right-board {
-  width: 350px;
-  position: absolute;
-  right: 0;
-  top: 0;
-  padding-top: 3px;
-  .field-box {
-    position: relative;
-    height: calc(100vh - 42px);
-    box-sizing: border-box;
-    overflow: hidden;
-  }
-  .el-scrollbar {
-    height: 100%;
-  }
-}
-.select-item {
-  display: flex;
-  border: 1px dashed #fff;
-  box-sizing: border-box;
-  & .close-btn {
-    cursor: pointer;
-    color: #f56c6c;
-  }
-  & .el-input + .el-input {
-    margin-left: 4px;
-  }
-}
-.select-item + .select-item {
-  margin-top: 4px;
-}
-.select-item.sortable-chosen {
-  border: 1px dashed #409eff;
-}
-.select-line-icon {
-  line-height: 32px;
-  font-size: 22px;
-  padding: 0 4px;
-  color: #777;
-}
-.option-drag {
-  cursor: move;
-}
-.time-range {
-  .el-date-editor {
-    width: 227px;
-  }
-  ::v-deep .el-icon-time {
-    display: none;
-  }
-}
-.document-link {
-  position: absolute;
-  display: block;
-  width: 26px;
-  height: 26px;
-  top: 0;
-  left: 0;
-  cursor: pointer;
-  background: #409eff;
-  z-index: 1;
-  border-radius: 0 0 6px 0;
-  text-align: center;
-  line-height: 26px;
-  color: #fff;
-  font-size: 18px;
-}
-.node-label{
-  font-size: 14px;
-}
-.node-icon{
-  color: #bebfc3;
-}
-.center-tabs{
-  .el-tabs__header{
-    margin-bottom: 0!important;
-  }
-  .el-tabs__item{
-    width: 100%;
-    text-align: center;
-  }
-  .el-tabs__nav{
-    width: 100%;
-  }
-}
-.right-scrollbar {
-  .el-scrollbar__view {
-    padding: 12px 18px 15px 15px;
-  }
-}
-.drawing-row-item .el-col{
-  margin-bottom:5px;
-}
-.components-item.dynamicGhost {
-  width: 5px;
-  height: 120px;
-  background-color: #409EFF;
-}
-.dynamic-table_item.dynamicGhost {
-  width: 5px;
-  height: 120px;
-  background-color: #409EFF;
-}
diff --git a/ruoyi-ui/src/components/FormDesigner/table/fancyEditTable.vue b/ruoyi-ui/src/components/FormDesigner/table/fancyEditTable.vue
deleted file mode 100644
index 79dd03b1..00000000
--- a/ruoyi-ui/src/components/FormDesigner/table/fancyEditTable.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-    <div>
-        <div style="padding:5px;margin-top:10px">
-            <table class="table-layout" :style="tableWidth">
-                <tbody>
-                    <tr v-for="(tr, trIndex) in layoutArray" :key="trIndex" :style="trHeight">
-                        <fancy-edit-table-item v-for="(td,tdIndex) in tr" :key="tdIndex" 
-                            :item="td" 
-                            :tdIndex="tdIndex" 
-                            :trIndex="trIndex" 
-                            :tdStyle="tdStyle" 
-                        >
-                            <slot :td="td" />
-                        </fancy-edit-table-item>
-                    </tr>
-                </tbody>
-            </table>
-        </div>
-    </div>
-</template>
-
-<script>
-import fancyEditTableItem from './fancyEditTableItem';
-export default {
-    name: 'fancyEditTable',
-    components: {
-        fancyEditTableItem
-    },
-    props: {
-        layoutArray: {
-            type: Array,
-            default: () => []
-        },
-        tdStyle:{
-            type:String,
-            default:''
-        },
-        width:{
-            type:Number,
-            default:100
-        },
-        height:{
-            type:Number,
-            default:100
-        }
-    },
-    data() {
-        return {
-        }
-    },
-    mounted() {
-       
-    },
-    destroyed() {
-    },
-    methods: {
-    },
-    computed: {
-        tableWidth(){
-            return 'width:'+this.width+'%';
-        },
-        trHeight(){
-            return 'height:'+this.height+'px';
-        }
-    }
-}
-</script>
-
-<style scoped>
-table {
-    border-spacing: 0;
-    width: 100%
-}
-
-tbody {
-    display: table-row-group;
-    vertical-align: middle;
-    border-color: inherit;
-}
-
-td {
-    border: 1px #d2d2d2 solid;
-}
-
-.table-layout {
-    background-color: #ffffff;
-    border-collapse: collapse;
-
-    padding: 8px !important;
-    text-align: left;
-    margin: 0 auto;
-    width: 100%;
-    table-layout: fixed;
-}
-
-.table-layout>tbody>tr>td {
-    padding: 6px;
-    word-break: break-word;
-    border: 1px solid #d2d2d2;
-    height: 20px;
-}
-
-.table-layout>tbody>tr {
-    border-bottom: 1px solid #d2d2d2;
-    border-top: 1px solid #d2d2d2;
-}
-
-.right-menu {
-    background-color: #ffffff;
-    z-index: 100;
-    width: 200px;
-    position: fixed;
-    border: 1px solid #ccc;
-    box-shadow: 3px 3px 8px #999;
-    border-radius: 3px;
-    padding: 8px 0;
-}
-
-.right-menu ul {
-    margin: 0px;
-    padding: 0px;
-}
-
-.right-menu ul li {
-    padding: 0 15px;
-    height: 30px;
-    line-height: 30px;
-}
-
-.right-menu ul li:hover {
-    cursor: pointer;
-    background-color: #ccc;
-}
-
-.CellHide {
-    display: none;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/table/fancyEditTableItem.vue b/ruoyi-ui/src/components/FormDesigner/table/fancyEditTableItem.vue
deleted file mode 100644
index 83383026..00000000
--- a/ruoyi-ui/src/components/FormDesigner/table/fancyEditTableItem.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<template>
-    <td  
-        :colspan="item.col" 
-        :rowspan="item.row" 
-        :class="{cellHide:item.hide} " 
-        :style="{tdStyle,'background-color':item.style.background,'width':item.style.width+'%'}"
-        style=""
-        @contextmenu.prevent="rightClick($event,trIndex,tdIndex)"
-    >
-        <slot :td="item" />
-    </td>
-</template>
-
-<script>
-export default {
-    name:'fancyEditTableItem',
-    components:{
-    },
-    props:{
-        item: {
-            type: Object,
-            default:{}
-        },
-        tdIndex: {
-            type: Number,
-            default:0
-        },
-        trIndex: {
-            type: Number,
-            default:0
-        },
-        tdStyle: {
-            type: String,
-            default:''
-        }
-    }
-}
-</script>
-
-<style scoped>
-
-td{
-    border:1px #d2d2d2 solid;
-    padding: 6px;
-    padding-top:0px;
-    word-break: break-word;
-    border: 1px solid #d2d2d2;
-    height: 20px;
-    height:20px;
-}
-.cellHide{
-  display: none;
-}
-.activeItem{
-    border:2px solid #e6a23c
-}
-
-.component-td{
-    font-size:12px;
-    color:#bbb;
-}
-.activeItem div span{
-    color:#409EFF
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/table/fancyTable.vue b/ruoyi-ui/src/components/FormDesigner/table/fancyTable.vue
deleted file mode 100644
index bcdcd2cc..00000000
--- a/ruoyi-ui/src/components/FormDesigner/table/fancyTable.vue
+++ /dev/null
@@ -1,265 +0,0 @@
-<template>
-  <div>
-    <div style="padding:5px;margin-top:10px">
-      <table class="table-layout" :style="tableStyle">
-        <tbody>
-          <tr v-for="(tr,trIndex) in layoutArray" :key="trIndex" :style="trHeight">
-            <fancy-table-item v-for="(td,tdIndex) in tr" :key="tdIndex" 
-              :item="td" 
-              :tdIndex="tdIndex" 
-              :trIndex="trIndex" 
-              :tdStyle="tdStyle" 
-              @rightClick="rightClick"
-              @click.native="handlerSelectedTd($event,td)"
-            >
-              <slot :td="td" />
-            </fancy-table-item>
-          </tr>
-        </tbody>
-      </table>
-    </div>
-    <div v-show="showContextMunu" class="right-menu" :style="{ top:  + positionY+'px',left:  + positionX+'px', }">
-      <ul style="list-style-type: none">
-        <li @click="handlerRightCol" v-if="showRightColMenu">
-          <icon code="zuoyouhebing" text="向右合并单元格" />
-        </li>
-        <li @click="handlerDownRow" v-if="showDownRowMenu">
-          <icon code="shangxiahebing" text="向下合并单元格" />
-        </li>
-        <li @click="handlerResetTable" v-if="showResetTableMenu">
-          <icon code="chaifen" text="拆分单元格" />
-        </li>
-        <li @click="handlerAppendCol">
-          <icon code="zhuijiahang" text="追加行" />
-        </li>
-        <li @click="handlerAppendRow">
-          <icon code="zhuijialie" text="追加列" />
-        </li>
-      </ul>
-    </div>
-  </div>
-</template>
-
-<script>
-import icon from '../icon';
-import fancyTableItem from './fancyTableItem';
-import {jsonClone} from "../utils";
-import {getTrItem,getTdItem} from "./table";
-import { getSimpleId } from '../utils/IdGenerate';
-let tr = getTrItem();
-export default {
-  name:'fancyTable',
-  components:{
-    icon,
-    fancyTableItem
-  },
-  props:{
-    layoutArray:{
-      type:Array,
-      default:()=>[]
-    },
-    tdStyle:{
-      type:String,
-      default:''
-    },
-    width:{
-      type:Number,
-      default:100
-    },
-    height:{
-      type:Number,
-      default:100
-    }
-  },
-  data(){
-    return{
-      positionX:0,
-      positionY:0,
-      showContextMunu:false,
-      currentRowIndex:0,
-      currentColIndex:0,
-      //columns: this.trs
-    }
-  },
-  mounted() {
-    // 添加监听取消右键菜单
-    document.addEventListener("click", this.hideRightContextMenu, true);
-    document.addEventListener("contextmenu", this.hideRightContextMenu, true);
-    // this.handlerAppendCol();
-    // this.handlerAppendCol();
-  },
-  destroyed() {
-    // 移除监听
-    document.removeEventListener("click", this.hideRightContextMenu, true);
-    document.removeEventListener("contextmenu",this.hideRightContextMenu,true);
-  },
-  methods:{
-    rightClick(e,rowIndex,colIndex){
-      this.positionX = e.clientX;
-      this.positionY = e.clientY;
-      this.showContextMunu = true;
-      this.currentRowIndex = rowIndex;
-      this.currentColIndex = colIndex;
-    },
-    hideRightContextMenu(){
-      this.showContextMunu = false;
-    },
-    //向右合并单元格
-    handlerRightCol(){
-      let col = this.layoutArray[this.currentRowIndex][this.currentColIndex].col;
-      let row = this.layoutArray[this.currentRowIndex][this.currentColIndex].row;
-      if(row>1){
-        for(let i =0;i<row;i++){
-          this.layoutArray[this.currentRowIndex+i][this.currentColIndex+col].hide=true;
-          this.layoutArray[this.currentRowIndex][this.currentColIndex].col=col+1;
-        }
-      }else{
-        this.layoutArray[this.currentRowIndex][this.currentColIndex+col].hide=true;
-        this.layoutArray[this.currentRowIndex][this.currentColIndex].col=col+1;
-      }
-      
-    },
-    //向下合并单元格
-    handlerDownRow(){
-      let col = this.layoutArray[this.currentRowIndex][this.currentColIndex].col;
-      let row = this.layoutArray[this.currentRowIndex][this.currentColIndex].row;
-      if(col>1){
-        for(let i =0;i<col;i++){
-          this.layoutArray[this.currentRowIndex+row][this.currentColIndex+i].hide=true;
-          this.layoutArray[this.currentRowIndex][this.currentColIndex].row=row+1;
-        }
-      }else{
-        this.layoutArray[this.currentRowIndex+row][this.currentColIndex].hide=true;
-        this.layoutArray[this.currentRowIndex][this.currentColIndex].row=row+1;
-      }
-      // let nextCol = this.columns[this.currentRowIndex+1][this.currentColIndex].col;
-      // let nextRow = this.columns[this.currentRowIndex+1][this.currentColIndex].row;
-      // if(nextCol<2&nextRow<2){
-
-      // }else{
-      //     alert('请先拆分下方单元格！');
-      // }
-
-    },
-    handlerResetTable(){
-      //debugger;
-      let col = this.layoutArray[this.currentRowIndex][this.currentColIndex].col;
-      let row = this.layoutArray[this.currentRowIndex][this.currentColIndex].row;
-      if(col===1&&row===1)return;
-
-      for(let i = 0;i<row;i++){
-        for(let j = 0;j<col;j++){
-          this.layoutArray[this.currentRowIndex+i][this.currentColIndex+j].hide = false;
-        }
-      }
-      this.layoutArray[this.currentRowIndex][this.currentColIndex].row=1;
-      this.layoutArray[this.currentRowIndex][this.currentColIndex].col=1;
-    },
-    handlerSelectedTd(e,td){
-      this.$emit('selectItem',td);
-      e.stopPropagation();
-    },
-    //追加行
-    handlerAppendCol(){
-      let _trItem = jsonClone(tr);
-      _trItem.map(item=>item.id=getSimpleId());
-      this.layoutArray.push(_trItem);
-    },
-    handlerAppendRow(){
-      tr.push(getTdItem());
-      this.layoutArray.forEach(item=>{
-        const _td = jsonClone(getTdItem());
-        item.push(_td);
-      })
-    }
-  },
-  computed:{
-    showRightColMenu(){
-      if(this.showContextMunu){
-        const col = this.layoutArray[this.currentRowIndex][this.currentColIndex].col;
-        const td = this.layoutArray[this.currentRowIndex][this.currentColIndex+col];
-        return (td&&td.row<2&&td.col<2&&!td.hide);
-      }else{
-        return false;
-      }
-    },
-    showDownRowMenu(){
-      if(this.showContextMunu){
-        const row = this.layoutArray[this.currentRowIndex][this.currentColIndex].row;
-        let td = undefined;
-        if(typeof this.layoutArray[this.currentRowIndex+row] !== 'undefined'){
-          td = this.layoutArray[this.currentRowIndex+row][this.currentColIndex];
-        }
-        return (td&&td.row<2&&td.col<2&&!td.hide);
-      }else{
-        return false;
-      }
-    },
-    showResetTableMenu(){
-      if(this.showContextMunu){
-        const td = this.layoutArray[this.currentRowIndex][this.currentColIndex];
-        return !(td.row<2&&td.col<2&&!td.hide);
-      }else{
-        return false;
-      }
-    },
-    tableStyle(){
-      return 'width:'+this.width+'%;';
-    },
-    trHeight(){
-      return 'height:'+this.height+'px';
-    }
-  }
-}
-</script>
-
-<style scoped>
-table{
-  border-spacing:0;
-  width:100%
-}
-tbody{
-  display: table-row-group;
-  vertical-align: middle;
-  border-color: inherit;
-}
-.table-layout{
-  background-color: #ffffff;
-  border-collapse: collapse;
-
-  padding: 8px !important;
-  text-align: left;
-  margin: 0 auto;
-  width: 100%; 
-  table-layout: fixed;
-}
-
-.table-layout > tbody > tr{
-  border-bottom: 1px solid #d2d2d2;
-  border-top: 1px solid #d2d2d2;
-}
-.right-menu{
-  background-color:#ffffff;
-  z-index:100;
-  width:200px;
-  position: fixed;
-  border: 1px solid #ccc;
-  box-shadow: 3px 3px 8px #999;
-  border-radius: 3px;
-  padding: 8px 0;
-}
-.right-menu ul{
-  margin:0px;
-  padding:0px;
-}
-.right-menu ul li{
-  padding:0 15px;
-  height:30px;
-  line-height: 30px;
-}
-.right-menu ul li:hover{
-  cursor: pointer;
-  background-color: #ccc;
-}
-
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/table/fancyTableItem.vue b/ruoyi-ui/src/components/FormDesigner/table/fancyTableItem.vue
deleted file mode 100644
index f3238543..00000000
--- a/ruoyi-ui/src/components/FormDesigner/table/fancyTableItem.vue
+++ /dev/null
@@ -1,84 +0,0 @@
-<template>
-    <td  
-        :colspan="item.col" 
-        :rowspan="item.row" 
-        :class="{cellHide:item.hide,activeItem:isActiveItem} " 
-        :style="{tdStyle,'background-color':item.style.background,'width':item.style.width+'%'}"
-        style=""
-        @contextmenu.prevent="rightClick($event,trIndex,tdIndex)"
-    >
-    <div class="component-td">
-        <span >{{item.id}}</span>
-        <slot :td="item" />
-    </div>
-    </td>
-</template>
-
-<script>
-export default {
-    name:'fancyTableItem',
-    components:{
-    },
-    props:{
-        item: {
-            type: Object,
-            default:{}
-        },
-        tdIndex: {
-            type: Number,
-            default:0
-        },
-        trIndex: {
-            type: Number,
-            default:0
-        },
-        tdStyle: {
-            type: String,
-            default:''
-        }
-    },
-    data(){
-        return{
-        }
-    },
-    inject:['getContext'],
-    methods:{
-        rightClick(e,rowIndex,colIndex){
-            this.$emit('rightClick',e,rowIndex,colIndex);
-        }
-    },
-    computed:{
-        isActiveItem() {
-            return this.getContext.activeItem.id===this.item.id?true:false;
-            //this.designerActiveItem
-        }
-    }
-}
-</script>
-
-<style scoped>
-
-td{
-    border:1px #d2d2d2 solid;
-    padding: 6px;
-    padding-top:0px;
-    word-break: break-word;
-    border: 1px solid #d2d2d2;
-    height: 20px;
-    height:20px;
-}
-.cellHide{
-  display: none;
-}
-.activeItem{
-    border:2px solid #e6a23c
-}
-
-.component-td{
-    font-size:12px;
-    color:#bbb;
-}
-.activeItem div span{
-    color:#409EFF
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/table/table.js b/ruoyi-ui/src/components/FormDesigner/table/table.js
deleted file mode 100644
index cd568d53..00000000
--- a/ruoyi-ui/src/components/FormDesigner/table/table.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import {getSimpleId} from "../utils/IdGenerate";
-import constant from '../utils/constants'
-import {jsonClone} from "../utils";
-
-let tdItemObj = {
-    id:'',
-    col:1,
-    row:1,
-    hide:false,
-    compType:'tdItem',
-    style:{
-      background:constant.defaultTdBackgroundColor,
-      width:35
-    },
-    columns:[]
-  }
-
-export function getTdItem(){
-    let tdItem = cloneObj(tdItemObj);
-    tdItem.id = getSimpleId();
-    return tdItem;
-}
-export function getTitleTdItem(){
-    let tdItem = cloneObj(tdItemObj);
-    tdItem.style.background = constant.defaultTitleTdBackgroundColor;
-    tdItem.style.width = 15;
-    tdItem.id = getSimpleId();
-    return tdItem;
-}
-
-function cloneObj(source){
-    let target = jsonClone(source);
-    target.id = getSimpleId();
-    return target;
-}
-
-export function getTrItem(){
-    let trItem= [getTitleTdItem(),getTdItem(),getTitleTdItem(),getTdItem()];
-    return trItem;
-}
-export function getDefaultTrs(){
-    let trs = [getTrItem(),getTrItem()];
-    return trs;
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/utils/IdGenerate.js b/ruoyi-ui/src/components/FormDesigner/utils/IdGenerate.js
deleted file mode 100644
index 5474624d..00000000
--- a/ruoyi-ui/src/components/FormDesigner/utils/IdGenerate.js
+++ /dev/null
@@ -1,17 +0,0 @@
-export function getSimpleId(){
-  sleep(10); //主要为了延时工作
-  return new Date().getTime();
-}
-
-const sleep = function(time) {
-  const startTime = new Date().getTime() + parseInt(time, 10);
-  while(new Date().getTime() < startTime) {}
-};
-
-export function setTableId(table){
-  table.layoutArray.map((tr,trIndex)=>{
-    tr[0].id=getSimpleId();
-    tr[1].id=getSimpleId();
-  })
-  return table;
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/utils/chinaAreaData.js b/ruoyi-ui/src/components/FormDesigner/utils/chinaAreaData.js
deleted file mode 100644
index e648d099..00000000
--- a/ruoyi-ui/src/components/FormDesigner/utils/chinaAreaData.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import allData from 'china-area-data/v5/data';
-
-export function areaData(){
-  let options = [];
-  const allProvinceData = allData['86']; //得到全中国的省
-  Object.keys(allProvinceData).forEach(key=>{
-    let provinceObj={};
-    provinceObj.label= allProvinceData[key];
-    provinceObj.value= key;
-    const cityData = allData[key];  //市
-    provinceObj.children = [];
-    Object.keys(cityData).forEach(ckey=>{
-      let cityObj = {};
-      cityObj.label = cityData[ckey];
-      cityObj.value = ckey;
-      const areaData = allData[ckey]; //区
-      if(typeof areaData !== 'undefined'){
-        cityObj.children = [];
-        Object.keys(areaData).forEach(akey=>{
-          let areaObj = {};
-          areaObj.label = areaData[akey];
-          areaObj.value = akey;
-          cityObj.children.push(areaObj);
-        });
-      }
-      
-      provinceObj.children.push(cityObj);
-    })
-    options.push(provinceObj);
-  });
-  return options;
-}
-
diff --git a/ruoyi-ui/src/components/FormDesigner/utils/constants.js b/ruoyi-ui/src/components/FormDesigner/utils/constants.js
deleted file mode 100644
index 9a5c87df..00000000
--- a/ruoyi-ui/src/components/FormDesigner/utils/constants.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * js的常量就在这里
- */
-export default {
-    defaultTdBackgroundColor:'#FFFFFF',
-    defaultTitleTdBackgroundColor:'#F6F6F6'
-}
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/utils/icon.json b/ruoyi-ui/src/components/FormDesigner/utils/icon.json
deleted file mode 100644
index 07a240e8..00000000
--- a/ruoyi-ui/src/components/FormDesigner/utils/icon.json
+++ /dev/null
@@ -1,282 +0,0 @@
-[
-"el-icon-platform-eleme", 
-"el-icon-eleme", 
-"el-icon-delete-solid", 
-"el-icon-delete", 
-"el-icon-s-tools", 
-"el-icon-setting", 
-"el-icon-user-solid", 
-"el-icon-user", 
-"el-icon-phone", 
-"el-icon-phone-outline", 
-"el-icon-more", 
-"el-icon-more-outline", 
-"el-icon-star-on", 
-"el-icon-star-off", 
-"el-icon-s-goods", 
-"el-icon-goods", 
-"el-icon-warning", 
-"el-icon-warning-outline", 
-"el-icon-question", 
-"el-icon-info", 
-"el-icon-remove", 
-"el-icon-circle-plus", 
-"el-icon-success", 
-"el-icon-error", 
-"el-icon-zoom-in", 
-"el-icon-zoom-out", 
-"el-icon-remove-outline", 
-"el-icon-circle-plus-outline", 
-"el-icon-circle-check", 
-"el-icon-circle-close", 
-"el-icon-s-help", 
-"el-icon-help", 
-"el-icon-minus", 
-"el-icon-plus", 
-"el-icon-check", 
-"el-icon-close", 
-"el-icon-picture", 
-"el-icon-picture-outline", 
-"el-icon-picture-outline-round", 
-"el-icon-upload", 
-"el-icon-upload2", 
-"el-icon-download", 
-"el-icon-camera-solid", 
-"el-icon-camera", 
-"el-icon-video-camera-solid", 
-"el-icon-video-camera", 
-"el-icon-message-solid", 
-"el-icon-bell", 
-"el-icon-s-cooperation", 
-"el-icon-s-order", 
-"el-icon-s-platform", 
-"el-icon-s-fold", 
-"el-icon-s-unfold", 
-"el-icon-s-operation", 
-"el-icon-s-promotion", 
-"el-icon-s-home", 
-"el-icon-s-release", 
-"el-icon-s-ticket", 
-"el-icon-s-management", 
-"el-icon-s-open", 
-"el-icon-s-shop", 
-"el-icon-s-marketing", 
-"el-icon-s-flag", 
-"el-icon-s-comment", 
-"el-icon-s-finance", 
-"el-icon-s-claim", 
-"el-icon-s-custom", 
-"el-icon-s-opportunity", 
-"el-icon-s-data", 
-"el-icon-s-check", 
-"el-icon-s-grid", 
-"el-icon-menu", 
-"el-icon-share", 
-"el-icon-d-caret", 
-"el-icon-caret-left", 
-"el-icon-caret-right", 
-"el-icon-caret-bottom", 
-"el-icon-caret-top", 
-"el-icon-bottom-left", 
-"el-icon-bottom-right", 
-"el-icon-back", 
-"el-icon-right", 
-"el-icon-bottom", 
-"el-icon-top", 
-"el-icon-top-left", 
-"el-icon-top-right", 
-"el-icon-arrow-left", 
-"el-icon-arrow-right", 
-"el-icon-arrow-down", 
-"el-icon-arrow-up", 
-"el-icon-d-arrow-left", 
-"el-icon-d-arrow-right", 
-"el-icon-video-pause", 
-"el-icon-video-play", 
-"el-icon-refresh", 
-"el-icon-refresh-right", 
-"el-icon-refresh-left", 
-"el-icon-finished", 
-"el-icon-sort", 
-"el-icon-sort-up", 
-"el-icon-sort-down", 
-"el-icon-rank", 
-"el-icon-loading", 
-"el-icon-view", 
-"el-icon-c-scale-to-original", 
-"el-icon-date", 
-"el-icon-edit", 
-"el-icon-edit-outline", 
-"el-icon-folder", 
-"el-icon-folder-opened", 
-"el-icon-folder-add", 
-"el-icon-folder-remove", 
-"el-icon-folder-delete", 
-"el-icon-folder-checked", 
-"el-icon-tickets", 
-"el-icon-document-remove", 
-"el-icon-document-delete", 
-"el-icon-document-copy", 
-"el-icon-document-checked", 
-"el-icon-document", 
-"el-icon-document-add", 
-"el-icon-printer", 
-"el-icon-paperclip", 
-"el-icon-takeaway-box", 
-"el-icon-search", 
-"el-icon-monitor", 
-"el-icon-attract", 
-"el-icon-mobile", 
-"el-icon-scissors", 
-"el-icon-umbrella", 
-"el-icon-headset", 
-"el-icon-brush", 
-"el-icon-mouse", 
-"el-icon-coordinate", 
-"el-icon-magic-stick", 
-"el-icon-reading", 
-"el-icon-data-line", 
-"el-icon-data-board", 
-"el-icon-pie-chart", 
-"el-icon-data-analysis", 
-"el-icon-collection-tag", 
-"el-icon-film", 
-"el-icon-suitcase", 
-"el-icon-suitcase-1", 
-"el-icon-receiving", 
-"el-icon-collection", 
-"el-icon-files", 
-"el-icon-notebook-1", 
-"el-icon-notebook-2", 
-"el-icon-toilet-paper", 
-"el-icon-office-building", 
-"el-icon-school", 
-"el-icon-table-lamp", 
-"el-icon-house", 
-"el-icon-no-smoking", 
-"el-icon-smoking", 
-"el-icon-shopping-cart-full", 
-"el-icon-shopping-cart-1", 
-"el-icon-shopping-cart-2", 
-"el-icon-shopping-bag-1", 
-"el-icon-shopping-bag-2", 
-"el-icon-sold-out", 
-"el-icon-sell", 
-"el-icon-present", 
-"el-icon-box", 
-"el-icon-bank-card", 
-"el-icon-money", 
-"el-icon-coin", 
-"el-icon-wallet", 
-"el-icon-discount", 
-"el-icon-price-tag", 
-"el-icon-news", 
-"el-icon-guide", 
-"el-icon-male", 
-"el-icon-female", 
-"el-icon-thumb", 
-"el-icon-cpu", 
-"el-icon-link", 
-"el-icon-connection", 
-"el-icon-open", 
-"el-icon-turn-off", 
-"el-icon-set-up", 
-"el-icon-chat-round", 
-"el-icon-chat-line-round", 
-"el-icon-chat-square", 
-"el-icon-chat-dot-round", 
-"el-icon-chat-dot-square", 
-"el-icon-chat-line-square", 
-"el-icon-message", 
-"el-icon-postcard", 
-"el-icon-position", 
-"el-icon-turn-off-microphone", 
-"el-icon-microphone", 
-"el-icon-close-notification", 
-"el-icon-bangzhu", 
-"el-icon-time", 
-"el-icon-odometer", 
-"el-icon-crop", 
-"el-icon-aim", 
-"el-icon-switch-button", 
-"el-icon-full-screen", 
-"el-icon-copy-document", 
-"el-icon-mic", 
-"el-icon-stopwatch", 
-"el-icon-medal-1", 
-"el-icon-medal", 
-"el-icon-trophy", 
-"el-icon-trophy-1", 
-"el-icon-first-aid-kit", 
-"el-icon-discover", 
-"el-icon-place", 
-"el-icon-location", 
-"el-icon-location-outline", 
-"el-icon-location-information", 
-"el-icon-add-location", 
-"el-icon-delete-location", 
-"el-icon-map-location", 
-"el-icon-alarm-clock", 
-"el-icon-timer", 
-"el-icon-watch-1", 
-"el-icon-watch", 
-"el-icon-lock", 
-"el-icon-unlock", 
-"el-icon-key", 
-"el-icon-service", 
-"el-icon-mobile-phone", 
-"el-icon-bicycle", 
-"el-icon-truck", 
-"el-icon-ship", 
-"el-icon-basketball", 
-"el-icon-football", 
-"el-icon-soccer", 
-"el-icon-baseball", 
-"el-icon-wind-power", 
-"el-icon-light-rain", 
-"el-icon-lightning", 
-"el-icon-heavy-rain", 
-"el-icon-sunrise", 
-"el-icon-sunrise-1", 
-"el-icon-sunset", 
-"el-icon-sunny", 
-"el-icon-cloudy", 
-"el-icon-partly-cloudy", 
-"el-icon-cloudy-and-sunny", 
-"el-icon-moon", 
-"el-icon-moon-night", 
-"el-icon-dish", 
-"el-icon-dish-1", 
-"el-icon-food", 
-"el-icon-chicken", 
-"el-icon-fork-spoon", 
-"el-icon-knife-fork", 
-"el-icon-burger", 
-"el-icon-tableware", 
-"el-icon-sugar", 
-"el-icon-dessert", 
-"el-icon-ice-cream", 
-"el-icon-hot-water", 
-"el-icon-water-cup", 
-"el-icon-coffee-cup", 
-"el-icon-cold-drink", 
-"el-icon-goblet", 
-"el-icon-goblet-full", 
-"el-icon-goblet-square", 
-"el-icon-goblet-square-full", 
-"el-icon-refrigerator", 
-"el-icon-grape", 
-"el-icon-watermelon", 
-"el-icon-cherry", 
-"el-icon-apple", 
-"el-icon-pear", 
-"el-icon-orange", 
-"el-icon-coffee", 
-"el-icon-ice-tea", 
-"el-icon-ice-drink", 
-"el-icon-milk-tea", 
-"el-icon-potato-strips", 
-"el-icon-lollipop", 
-"el-icon-ice-cream-square", 
-"el-icon-ice-cream-round"
-]
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/FormDesigner/utils/index.js b/ruoyi-ui/src/components/FormDesigner/utils/index.js
deleted file mode 100644
index d900a9ef..00000000
--- a/ruoyi-ui/src/components/FormDesigner/utils/index.js
+++ /dev/null
@@ -1,138 +0,0 @@
-export function makeMap(str, expectsLowerCase) {
-  const map = Object.create(null)
-  const list = str.split(',')
-  for (let i = 0; i < list.length; i++) {
-    map[list[i]] = true
-  }
-  return expectsLowerCase
-    ? val => map[val.toLowerCase()]
-    : val => map[val]
-}
-
-/**
- * num 小于0，左缩进num*2个空格； 大于0，右缩进num*2个空格。
- * @param {string} str 代码
- * @param {number} num 缩进次数
- * @param {number} len 【可选】缩进单位，空格数
- */
-export function indent(str, num, len = 2) {
-  if (num === 0) return str
-  const isLeft = num < 0; const result = []; let reg; let
-    spaces = ''
-  if (isLeft) {
-    num *= -1
-    reg = new RegExp(`(^\\s{0,${num * len}})`, 'g')
-  } else {
-    for (let i = 0; i < num * len; i++) spaces += ' '
-  }
-
-  str.split('\n').forEach(line => {
-    line = isLeft ? line.replace(reg, '') : spaces + line
-    result.push(line)
-  })
-  return result.join('\n')
-}
-
-// 首字母大小
-export function titleCase(str) {
-  return str.replace(/( |^)[a-z]/g, L => L.toUpperCase())
-}
-
-// 下划转驼峰
-export function camelCase(str) {
-  return str.replace(/-[a-z]/g, str1 => str1.substr(-1).toUpperCase())
-}
-
-export function isNumberStr(str) {
-  return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
-}
-
-
-export const beautifierConf = {
-  html: {
-    indent_size: '2',
-    indent_char: ' ',
-    max_preserve_newlines: '-1',
-    preserve_newlines: false,
-    keep_array_indentation: false,
-    break_chained_methods: false,
-    indent_scripts: 'separate',
-    brace_style: 'end-expand',
-    space_before_conditional: true,
-    unescape_strings: false,
-    jslint_happy: false,
-    end_with_newline: true,
-    wrap_line_length: '110',
-    indent_inner_html: true,
-    comma_first: false,
-    e4x: true,
-    indent_empty_lines: true
-  },
-  js: {
-    indent_size: '2',
-    indent_char: ' ',
-    max_preserve_newlines: '-1',
-    preserve_newlines: false,
-    keep_array_indentation: false,
-    break_chained_methods: false,
-    indent_scripts: 'normal',
-    brace_style: 'end-expand',
-    space_before_conditional: true,
-    unescape_strings: false,
-    jslint_happy: true,
-    end_with_newline: true,
-    wrap_line_length: '110',
-    indent_inner_html: true,
-    comma_first: false,
-    e4x: true,
-    indent_empty_lines: true
-  }
-}
-
-function stringify(obj) {
-  return JSON.stringify(obj, (key, val) => {
-    if (typeof val === 'function') {
-      return `${val}`
-    }
-    return val
-  })
-}
-
-function parse(str) {
-  return JSON.parse(str, (k, v) => {
-    if (v!==null&&v.indexOf && v.indexOf('function') > -1) {
-      return eval(`(${v})`)
-    }
-    return v
-  })
-}
-
-export function jsonClone(obj) {
-  return parse(stringify(obj));
-}
-
-export function isLayout(obj) {
-  return obj.compType === 'row';
-}
-export function isTable(obj) {
-  return obj.compType === 'table';
-}
-export function inTable(obj) {
-  return obj.col&&obj.row;
-}
-
-export const isAttr = makeMap(
-  'accept,accept-charset,accesskey,action,align,alt,async,autocomplete,'
-  + 'autofocus,autoplay,autosave,bgcolor,border,buffered,challenge,charset,'
-  + 'checked,cite,class,code,codebase,color,cols,colspan,content,http-equiv,'
-  + 'name,contenteditable,contextmenu,controls,coords,data,datetime,default,'
-  + 'defer,dir,dirname,disabled,download,draggable,dropzone,enctype,method,for,'
-  + 'form,formaction,headers,height,hidden,high,href,hreflang,http-equiv,'
-  + 'icon,id,ismap,itemprop,keytype,kind,label,lang,language,list,loop,low,'
-  + 'manifest,max,maxlength,media,method,GET,POST,min,multiple,email,file,'
-  + 'muted,name,novalidate,open,optimum,pattern,ping,placeholder,poster,'
-  + 'preload,radiogroup,readonly,rel,required,reversed,rows,rowspan,sandbox,'
-  + 'scope,scoped,seamless,selected,shape,size,type,text,password,sizes,span,'
-  + 'spellcheck,src,srcdoc,srclang,srcset,start,step,style,summary,tabindex,'
-  + 'target,title,type,usemap,value,width,wrap'
-)
\ No newline at end of file
diff --git a/ruoyi-ui/src/components/Process/Back.vue b/ruoyi-ui/src/components/Process/Back.vue
deleted file mode 100644
index dc7f0304..00000000
--- a/ruoyi-ui/src/components/Process/Back.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<template>
-    <el-dialog title="审批驳回" :visible.sync="visible" :close-on-click-modal="false" width="600px" append-to-body destroy-on-close>
-        <el-form v-loading="loading" :rules="rules" ref="formData" :model="formData" status-icon>
-            <el-form-item label="审批意见" prop="message" label-width="120px">
-                <el-input type="textarea" v-model="formData.comment" maxlength="300"  placeholder="请输入审批意见" :autosize="{ minRows: 4}" show-word-limit></el-input>
-            </el-form-item>
-            <el-form-item label="驳回到" prop="targetActivityId" label-width="120px">
-                <el-select v-model="formData.targetActivityId" placeholder="请选择">
-                    <el-option v-for="item in options" :key="item.nodeId"
-                        :value="item.nodeId" :label="item.nodeName">
-                    </el-option>
-                </el-select>
-            </el-form-item>
-            <el-form-item align="center">
-                <el-button type="primary" @click="submitForm('formData')" size="mini">提交</el-button>
-                <el-button size="mini" @click="visible=false">取消</el-button>
-            </el-form-item>
-        </el-form>
-    </el-dialog>
-</template>
-<script>
-import api from '@/api/workflow/task'
-
-export default {
-    props: {
-        taskId: String,
-        backNodeList: Array,
-        sendMessage: Object
-    },
-
-    data() {
-        return {
-            visible: false, // 弹出窗口，true弹出
-            loading: false,
-            formData: {
-                taskId: null,
-                targetActivityId: null,
-                comment: null,
-                sendMessage: {}
-            },
-            rules: {
-                targetActivityId: [
-                    {required: true, message: '请选择驳回目标', trigger: 'change'},
-                ]
-            },
-            options: [], // 驳回目标选项
-        }
-    },
-
-    watch: {
-      async visible(newVal) {
-          if(newVal) {
-            this.options = []
-            this.formData.targetActivityId = this.backNodeList[0].nodeId
-            this.options = this.backNodeList
-          }
-      }
-    },
-
-    methods: {
-        // 提交表单数据
-        submitForm(formName) {
-            this.$refs[formName].validate( async (valid) => {
-                if (valid) {
-                    // 校验通过，提交表单数据
-                    this.loading = true
-                    try {
-                      this.formData = {
-                        taskId: this.taskId,
-                        targetActivityId: this.formData.targetActivityId,
-                        comment: this.formData.comment,
-                      }
-                      //消息提醒
-                      this.formData.sendMessage = {
-                          title: this.sendMessage.title,
-                          type: this.sendMessageType,
-                          messageContent: this.$store.state.user.name+"驳回了"+this.sendMessage.messageContent
-                      }
-                      let response = await api.backProcess(this.formData)
-                      if(response.code === 200) {
-                          this.$message.success('提交成功')
-                          // 将表单清空
-                          this.$refs['formData'].resetFields()
-                          // 关闭窗口
-                          this.visible = false
-                          // 事件
-                          this.$emit("callBack")
-                      }
-                      this.loading = false
-                    } catch(e) {
-                      this.loading = false
-                    }
-                }
-            })
-        },
-
-    }
-}
-</script>
diff --git a/ruoyi-ui/src/components/Process/History.vue b/ruoyi-ui/src/components/Process/History.vue
deleted file mode 100644
index 6f691194..00000000
--- a/ruoyi-ui/src/components/Process/History.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<template>
-    <div>
-      <el-tabs  type="border-card" >
-        <el-tab-pane label="审批意见" v-loading="loading">
-            <el-table :data="list" border stripe style="width: 100%" max-height="570">
-              <el-table-column label="流程审批历史记录" align="center">
-                <el-table-column type="index" label="序号" align="center" width="50"></el-table-column>
-                <el-table-column prop="name" label="任务名称" align="center" ></el-table-column>
-                <el-table-column prop="nickName" label="办理人" align="center" ></el-table-column>
-                <el-table-column prop="status" label="状态" align="center" ></el-table-column>
-                <el-table-column prop="comment" label="审批意见" align="center" ></el-table-column>
-                <el-table-column prop="startTime" label="开始时间" align="center" ></el-table-column>
-                <el-table-column prop="endTime" label="结束时间" align="center" ></el-table-column>
-                <el-table-column fixed="right" label="操作" v-if="editMessage" align="center" width="80">
-                  <template slot-scope="scope">
-                    <el-button @click="handleClick(scope.row)" type="text" v-if="scope.row.commentId" size="small">编辑意见</el-button>
-                  </template>
-                </el-table-column>
-              </el-table-column>
-            </el-table>
-        </el-tab-pane>
-        <el-tab-pane label="流程进度">
-           <el-image v-if="processInstanceId" :src="url" style="font-size: 20px; margin: 50px;">
-              <div slot="placeholder"><i class="el-icon-loading"></i> 流程审批历史图加载中……</div>
-           </el-image>
-        </el-tab-pane>
-      </el-tabs>
-      <el-dialog
-          title="编辑意见"
-          :close-on-click-modal="false"
-          :visible.sync="dialogVisible"
-          v-if="dialogVisible"
-          append-to-body
-          width="60%">
-          <el-input  type="textarea" v-model="comment" maxlength="300" placeholder="请输入意见"
-          :autosize="{ minRows: 4 }" show-word-limit ></el-input>
-          <span slot="footer" class="dialog-footer">
-            <el-button type="primary" size="small" @click="clickUpdate">确 定</el-button>
-            <el-button size="small" @click="dialogVisible = false">取 消</el-button>
-          </span>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import apiProcessInst from '@/api/workflow/processInst'
-import taskApi from '@/api/workflow/task'
-
-export default {
-    props: {
-      processInstanceId: String,
-      editMessage: {
-        type: Boolean,
-        default: false
-      },
-    },
-    data() {
-      return {
-        loading: false,
-        url: null,
-        list: [],
-        dialogVisible: false,
-        commentId: undefined,
-        comment: undefined
-      }
-    },
-    watch: {
-      processInstanceId: {
-        handler(newVal,oldVal){
-          if(newVal) {
-            this.loading = true
-            // 审批历史数据
-            this.getHistoryInfoList()
-            // 通过流程实例id获取历史流程图
-            this.url = process.env.VUE_APP_BASE_API+'/workflow/processInstance/getHistoryProcessImage?processInstanceId='+newVal
-          }
-        },
-        immediate: true,
-        deep:true
-      }
-    },
-
-    methods: {
-        // 查询审批历史记录
-        async getHistoryInfoList() {
-            const { data } = await apiProcessInst.getHistoryInfoList(this.processInstanceId)
-            this.list = data
-            this.loading = false
-        },
-        // 打开编辑意见
-        handleClick(row){
-          this.commentId = row.commentId
-          this.comment = row.comment
-          this.dialogVisible = true
-        },
-        // 编辑意见
-        async clickUpdate(){
-          const {code,msg} = await taskApi.editComment(this.commentId,this.comment)
-          if(code === 200){
-             this.$modal.msgSuccess(msg);
-             this.dialogVisible = false
-             this.getHistoryInfoList()
-          }
-        }
-    }
-
-}
-</script>
-<style>
-/* 修改滚动条样式 */
-.el-table__body-wrapper::-webkit-scrollbar-thumb {
-	border-radius: 10px;
-}
-.el-table__body-wrapper::-webkit-scrollbar {
-  width: 5px;
-}
-</style>
diff --git a/ruoyi-ui/src/components/Process/Verify.vue b/ruoyi-ui/src/components/Process/Verify.vue
deleted file mode 100644
index 8bf936e5..00000000
--- a/ruoyi-ui/src/components/Process/Verify.vue
+++ /dev/null
@@ -1,546 +0,0 @@
-<template>
-<div v-if="visible">
-  <!-- 提交申请开始 -->
-  <el-dialog  v-if="visible"  title="提交申请" :visible.sync="visible"  width="800px" :close-on-click-modal="false"
-  append-to-body destroy-on-close @close="closeDialog" >
-    <el-form v-loading="loading"  :rules="rules" ref="formData" :model="formData" status-icon >
-      <el-form-item label="审批意见" prop="message" v-if="businessStatus.status==='waiting'" label-width="120px">
-        <el-input  type="textarea" v-model="formData.message" maxlength="300" placeholder="请输入审批意见" :autosize="{ minRows: 4 }" show-word-limit ></el-input>
-      </el-form-item>
-      <el-form-item v-if="nextNodes && nextNodes.length > 0" label="下一步审批人"  prop="assigneeMap" label-width="120px" >
-        <div v-for="(item, index) in nextNodes" :key="index">
-          <span>【{{ item.nodeName }}】：</span>
-          <el-input v-show="false" v-model="formData.assigneeMap[item.nodeId]" />
-          <el-input  placeholder="请选择审批人" readonly v-model="nickName[item.nodeId]" >
-              <el-button  @click="choosePeople(item.chooseWay, item.assigneeId, item.nodeId) " slot="append" icon="el-icon-search" >选择</el-button>
-          </el-input>
-        </div>
-      </el-form-item>
-      <el-form-item label="是否抄送" prop="isCopy" label-width="120px" v-if="setting.isCopy">
-         <el-col :span="12">
-           <div class="grid-content bg-purple">
-             <el-radio-group v-model="formData.isCopy" size="small">
-              <el-radio :label="true" border>是</el-radio>
-              <el-radio :label="false" border>否</el-radio>
-            </el-radio-group>
-           </div>
-        </el-col>
-         <el-col :span="12" v-if="formData.isCopy">
-           <div class="grid-content bg-purple">
-             <el-input v-show="false" v-model="formData.assigneeIds"/>
-             <el-input size="small" v-model="formData.assigneeNames" readonly placeholder="请选择人员" class="input-with-select">
-              <el-button slot="append" @click="chooseCopyUser" icon="el-icon-search"></el-button>
-            </el-input>
-           </div>
-        </el-col>
-      </el-form-item>
-      <el-form-item align="center">
-        <el-button type="primary" @click="submitForm('formData')" size="small">提交</el-button>
-        <el-button type="primary" v-if="backNodeList && backNodeList.length>0" @click="openBack()" size="small">退回</el-button>
-        <el-button type="primary" v-if="isMultiInstance && setting.addMultiInstance" @click="addMultiClick()" size="small">加签</el-button>
-        <el-button type="primary" v-if="multiList && multiList.length>0 && setting.deleteMultiInstance" @click="deleteMultiClick()" size="small">减签</el-button>
-        <el-button type="primary" v-if="setting.isDelegate" @click="delegateClick()" size="small">委托</el-button>
-        <el-button type="primary" v-if="setting.isTransmit" @click="transmitClick()" size="small">转办</el-button>
-        <el-button size="small" @click="closeDialog()">取消</el-button>
-      </el-form-item>
-    </el-form>
-  </el-dialog>
-  <!-- 提交申请结束 -->
-
-  <!-- 选择人员组件开始 -->
-  <chooseWorkflowUser :dataObj="dataObj" :nodeId="nodeId" @confirmUser="clickUser" ref="wfUserRef"/>
-  <sys-dept-user :propUserList="copyUserList" ref="userCopyRef" @confirmUser="confirmCopyUser"/>
-  <!-- 选择人员组件结束 -->
-  <!-- 委托申请开始 -->
-  <el-dialog :close-on-click-modal="false" title="委托申请" :visible.sync="delegateVisible" width="700px"  append-to-body>
-    <el-form  ref="delegateData" :model="delegateForm" status-icon >
-      <!-- <el-form-item label-width="80px" label="审批意见">
-        <el-input  type="textarea" v-model="delegateForm.message" maxlength="300"  placeholder="请输入审批意见" :autosize="{ minRows: 4 }" show-word-limit ></el-input>
-      </el-form-item> -->
-      <el-form-item label-width="80px" label="委托人" prop="userName">
-        <el-input  placeholder="请选择委托人" readonly v-model="delegateForm.delegateUserName" >
-            <el-button  @click="delegatePeople() " slot="append" icon="el-icon-search" >选择</el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item align="center">
-        <el-button type="primary" @click="delegateSubmit()" size="small">提交</el-button>
-        <el-button size="small" @click="delegateVisible = false">取消</el-button>
-      </el-form-item>
-    </el-form>
-    <sys-dept-user :propUserList="delegateUserList" :multiple = false ref="delegateUserRef" @confirmUser="confirmDelegateUser"/>
-  </el-dialog>
-  <!-- 委托申请结束 -->
-  <!-- 转办申请开始 -->
-  <el-dialog :close-on-click-modal="false" title="转发申请" :visible.sync="transmitVisible" width="700px"  append-to-body>
-    <el-form  ref="transmitData" :model="transmitForm" :rules="transmitRules"  status-icon >
-      <el-form-item label-width="80px" label="审批意见">
-        <el-input  type="textarea" v-model="transmitForm.message" maxlength="300"  placeholder="请输入审批意见" :autosize="{ minRows: 4 }" show-word-limit ></el-input>
-      </el-form-item>
-      <el-form-item label-width="80px" label="转办人" prop="userName">
-        <el-input  placeholder="请选择转办人" readonly v-model="transmitForm.userName" >
-            <el-button  @click="transmitPeople() " slot="append" icon="el-icon-search" >选择</el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item align="center">
-        <el-button type="primary" @click="transmitSubmit('transmitData')" size="small">提交</el-button>
-        <el-button size="small" @click="transmitVisible = false">取消</el-button>
-      </el-form-item>
-    </el-form>
-    <sys-dept-user :propUserList="transmitUserList" :multiple = false ref="transmitUserRef" @confirmUser="confirmTransmitUser"/>
-  </el-dialog>
-  <!-- 转办申请结束 -->
-  <!-- 加签开始 -->
-  <el-dialog  :close-on-click-modal="false" title="加签" :visible.sync="addMultiVisible" width="700px"  append-to-body>
-    <el-form  :model="addMultiForm" status-icon >
-      <el-form-item label-width="80px" label="加签人" prop="nickNames">
-        <el-input placeholder="请选择加签人" readonly v-model="addMultiForm.nickNames" >
-            <el-button  @click="addMultiPeople() " slot="append" icon="el-icon-search" >选择</el-button>
-        </el-input>
-      </el-form-item>
-      <el-form-item align="center">
-        <el-button type="primary" @click="addMultiSubmit()" size="small">提交</el-button>
-        <el-button size="small" @click="addMultiVisible = false">取消</el-button>
-      </el-form-item>
-    </el-form>
-    <multi-user :taskId="taskId" :propUserList="addMultiUserList" ref="addMultiUserRef" @confirmUser="confirmAddMultiUser"/>
-  </el-dialog>
-  <!-- 加签结束 -->
-  <!-- 减签开始 -->
-  <el-dialog :close-on-click-modal="false" title="减签" :visible.sync="deleteMultiVisible" width="700px"  append-to-body>
-    <el-table border  @selection-change="handleSelectionMultiList" :data="multiList" style="width: 100%">
-      <el-table-column type="selection" width="55"/>
-      <el-table-column prop="name" label="任务名称" width="200"/>
-      <el-table-column prop="assignee" label="办理人" width="200"/>
-      <el-table-column prop="assigneeId" v-show="false" label="办理人ID" width="200"/>
-    </el-table>
-    <span slot="footer" class="dialog-footer">
-      <el-button size="small" type="primary" @click="deleteMultiSubmit()">确定</el-button>
-      <el-button size="small" @click="deleteMultiVisible = false">取消</el-button>
-    </span>
-  </el-dialog>
-  <!-- 减签结束 -->
-  <!-- 驳回开始 -->
-  <back ref="backRef" :taskId = "taskId" @callBack="callBack()"
-  :backNodeList = "backNodeList" :sendMessage="sendMessage"/>
-  <!-- 驳回结束 -->
-</div>
-</template>
-<script>
-import api from "@/api/workflow/task";
-import ChooseWorkflowUser from "@/views/components/user/choose-workflow-user ";
-import  SysDeptUser from "@/views/components/user/sys-dept-user";
-import  MultiUser from "@/views/components/user/multi-user";
-import Back from "@/components/Process/Back";
-export default {
-  props: {
-    taskId: String,
-    taskVariables: Object,
-    sendMessage: Object
-  },
-  components: {
-    ChooseWorkflowUser,
-    SysDeptUser,
-    Back,
-    MultiUser
-  },
-  data() {
-    return {
-      //弹出窗口，true弹出
-      visible: false,
-      loading: false,
-      transmitVisible: false,
-      delegateVisible: false,
-      addMultiVisible: false,
-      deleteMultiVisible: false,
-      //提交表单数据
-      formData: {
-        message: null,
-        assigneeMap: {},
-        //是否抄送
-        isCopy: false,
-        //抄送人id
-        assigneeIds: undefined,
-        //抄送人名称
-        assigneeNames: undefined,
-        //消息提醒
-        sendMessage: {}
-      },
-      //转办
-      transmitForm: {
-        message: null,
-        userId: null,
-        userName: null,
-        taskId: null,
-        sendMessage: {}
-      },
-      //委托
-      delegateForm:{
-        delegateUserId: null,
-        delegateUserName: null,
-        taskId: null,
-        sendMessage: {}
-      },
-      //是否抄送
-      isCopy: '2',
-      //下一节点
-      nextNodes: [],
-      rules: {
-        assigneeMap: [
-          { required: true, message: "请输入下一步审批人", trigger: "blur" },
-        ],
-      },
-      transmitRules: {
-        userName: [
-          { required: true, message: "请输入转办人", trigger: "blur" },
-        ],
-      },
-      nickName: {},
-      //查询审批人条件
-      dataObj: {},
-      //节点id
-      nodeId: undefined,
-      //委托用户反选
-      delegateUserList: [],
-      //抄送用户反选
-      copyUserList: [],
-      //转发用户反选
-      transmitUserList: [],
-      //加签用户反选
-      addMultiUserList: [],
-      //是否为会签
-      isMultiInstance: false,
-      //加签
-      addMultiForm: {},
-      //减签
-      deleteMultiForm: {},
-      //可以减签的集合
-      multiList: [],
-      //可驳回的集合
-      backNodeList: [],
-      //按钮设置
-      setting: {},
-      //流程状态
-      businessStatus: {},
-      //消息提醒类型1.站内信,2.邮箱,3.短信
-      sendMessageType:[1],
-    };
-  },
-
-  watch: {
-    async visible(newVal) {
-      if (newVal) {
-        try {
-          this.loading = true;
-          // 获取下一节点信息
-          let params = {
-             taskId: this.taskId,
-             variables: this.taskVariables
-          }
-          const { data } = await api.getNextNodeInfo(params);
-          this.nextNodes = data.list;
-          this.isMultiInstance = data.isMultiInstance;
-          this.multiList = data.multiList;
-          this.backNodeList = data.backNodeList;
-          this.setting = data.setting
-          this.businessStatus = data.businessStatus
-          this.loading = false;
-        } catch (error) {
-          this.loading = false;
-        }
-      }
-    },
-  },
-  methods: {
-    // 提交表单数据
-    async submitForm(formName) {
-      this.$refs[formName].validate(async (valid) => {
-        if (valid) {
-          this.loading = true;
-          try {
-            this.formData.variables = this.taskVariables
-            this.formData.taskId = this.taskId
-            //消息提醒
-            this.formData.sendMessage = {
-                title: this.sendMessage.title,
-                type: this.sendMessageType,
-                messageContent: this.$store.state.user.name+"提交了"+this.sendMessage.messageContent
-            }
-            if(this.businessStatus.status === 'draft'){
-                 this.formData.message = '提交单据'
-            }
-            let response = await api.completeTask(this.formData);
-            if (response.code === 200) {
-              // 刷新数据
-              this.$message.success("办理成功");
-              // 将表单清空
-              this.$refs[formName].resetFields();
-              // 关闭窗口
-              this.visible = false;
-              // 回调事件
-              this.$emit("submitCallback")
-            }
-            this.loading = false;
-          } catch (e) {
-            this.loading = false;
-          }
-        }
-      });
-    },
-    // 关闭
-    closeDialog() {
-      // 将表单清空
-      this.$refs["formData"].resetFields();
-      this.formData = {
-          message: null,
-          assigneeMap: {},
-          isCopy: false
-      }
-      this.visible = false;
-    },
-    // 选择人员
-    choosePeople(chooseWay, assigneeId, nodeId) {
-      this.propUserList = [];
-      if (chooseWay) {
-        if (this.formData.assigneeMap[nodeId]) {
-          this.dataObj = {
-            chooseWay: chooseWay,
-            assigneeId: assigneeId,
-            ids: this.formData.assigneeMap[nodeId].split(",")
-          };
-        }else{
-           this.dataObj = {
-            chooseWay: chooseWay,
-            assigneeId: assigneeId,
-            ids: []
-          };
-        }
-        this.nodeId = nodeId;
-        this.$refs.wfUserRef.visible = true;
-      }
-    },
-    //确定选择人员
-    clickUser(userList, nodeId) {
-      let assignee = userList.map((item) => {
-        return item.userId;
-      });
-      let nickName = userList.map((item) => {
-        return item.nickName;
-      });
-      let arrAssignee = assignee.join(",");
-      let arrNickName = nickName.join(",");
-
-      this.formData.assigneeMap[nodeId] = arrAssignee;
-      this.nickName[nodeId] = arrNickName
-      this.$forceUpdate();
-    },
-    //提交委托申请
-    async delegateSubmit(){
-      this.delegateForm.taskId = this.taskId
-      //消息提醒
-      this.delegateForm.sendMessage = {
-          title: this.sendMessage.title,
-          type: this.sendMessageType,
-          messageContent: this.$store.state.user.name+"委托了"+this.sendMessage.messageContent
-      }
-      let response = await api.delegateTask(this.delegateForm);
-      if(response.code === 200){
-        // 刷新数据
-        this.$message.success("办理成功");
-        // 将表单清空
-        this.delegateForm = {};
-        // 关闭窗口
-        this.visible = false;
-        // 回调事件
-        this.$emit("submitCallback")
-      }
-      this.loading = false;
-    },
-    //打开委托申请
-    delegateClick(){
-      this.delegateForm = {}
-      this.delegateVisible = true
-    },
-    //打开委托人员组件
-    delegatePeople(){
-      this.delegateUserList = []
-      this.delegateUserList.push(this.delegateForm.delegateUserId)
-      this.$refs.delegateUserRef.visible = true
-    },
-    //确认委托人员
-    confirmDelegateUser(data){
-      this.delegateForm.delegateUserId = data[0].userId
-      this.delegateForm.delegateUserName = data[0].nickName
-      this.$forceUpdate()
-      this.$refs.delegateUserRef.visible = false
-    },
-    //选择抄送人
-    chooseCopyUser(){
-      this.copyUserList = []
-      this.copyUserList.push(this.formData.delegateUserId)
-      this.$refs.userCopyRef.visible = true
-    },
-    //确认抄送人员
-    confirmCopyUser(data){
-      let assignee = data.map((item) => {
-        return item.userId;
-      });
-      let nickName = data.map((item) => {
-        return item.nickName;
-      });
-      this.formData.assigneeIds = assignee.join(",")
-      this.formData.assigneeNames = nickName.join(",")
-      this.$refs.userCopyRef.visible = false
-    },
-    //打开转发窗口
-    transmitClick(){
-       this.transmitForm = {}
-       this.transmitVisible = true
-    },
-    //提交转发
-    transmitSubmit(formName){
-        this.transmitForm = {
-           transmitUserId: this.transmitForm.userId,
-           taskId: this.taskId,
-           comment: this.transmitForm.message
-        }
-        //消息提醒
-        this.transmitForm.sendMessage = {
-            title: this.sendMessage.title,
-            type: this.sendMessageType,
-            messageContent: this.$store.state.user.name+"转发了"+this.sendMessage.messageContent
-        }
-        api.transmitTask(this.transmitForm).then(response=>{
-          if(response.code === 200){
-            // 刷新数据
-            this.$message.success("办理成功");
-            // 将表单清空
-            this.$refs[formName].resetFields();
-            // 关闭窗口
-            this.visible = false;
-            this.transmitVisible = false;
-            // 回调事件
-            this.$emit("submitCallback")
-          }
-          this.loading = false;
-        })
-    },
-    //打开转办人员组件
-    transmitPeople(){
-      this.transmitUserList = []
-      this.transmitUserList.push(this.transmitForm.userId)
-      this.$refs.transmitUserRef.visible = true
-    },
-    //确认转办人员
-    confirmTransmitUser(data){
-      this.transmitForm.userId = data[0].userId
-      this.transmitForm.userName = data[0].nickName
-      this.$forceUpdate()
-      this.$refs.transmitUserRef.visible = false
-    },
-    //打开加签窗口
-    addMultiClick(){
-       this.addMultiForm = {}
-       this.addMultiVisible = true
-    },
-    //打开加签人员组件
-    addMultiPeople(){
-      this.addMultiUserList = []
-      this.addMultiUserList = this.addMultiForm.assignees
-      this.$refs.addMultiUserRef.visible = true
-    },
-    //确认加签人员
-    confirmAddMultiUser(data){
-      let assignees = data.map((item) => {
-        return item.userId;
-      });
-      let assigneeNames = data.map((item) => {
-        return item.nickName;
-      });
-      this.addMultiForm = {
-        taskId: this.taskId,
-        assignees: assignees,
-        assigneeNames: assigneeNames,
-        nickNames: assigneeNames.join(",")
-      }
-      this.$forceUpdate()
-      this.$refs.addMultiUserRef.visible = false
-    },
-    //加签
-    addMultiSubmit(){
-      api.addMultiInstanceExecution(this.addMultiForm).then(response => {
-        if(response.code === 200){
-          // 刷新数据
-            this.$message.success("办理成功");
-            // 将表单清空
-            this.addMultiForm = {}
-            // 关闭窗口
-            this.visible = false;
-            this.addMultiVisible = false;
-            // 回调事件
-            this.$emit("submitCallback")
-        }
-      })
-    },
-     //打开减签窗口
-    deleteMultiClick(){
-       this.deleteMultiVisible = true
-    },
-    //减签复选框
-    handleSelectionMultiList(val){
-      let executionIds = val.map((item) => {
-        return item.executionId;
-      });
-      let taskIds = val.map((item) => {
-        return item.id;
-      });
-      let assigneeIds = val.map((item) => {
-        return item.assigneeId;
-      });
-      let assigneeNames = val.map((item) => {
-        return item.assignee;
-      });
-      this.deleteMultiForm = {
-        taskId: this.taskId,
-        taskIds: taskIds,
-        executionIds: executionIds,
-        assigneeIds: assigneeIds,
-        assigneeNames: assigneeNames
-      }
-    },
-    //减签
-    deleteMultiSubmit(){
-      api.deleteMultiInstanceExecution(this.deleteMultiForm).then(response => {
-        if(response.code === 200){
-          // 刷新数据
-            this.$message.success("办理成功");
-            // 关闭窗口
-            this.visible = false;
-            this.deleteMultiVisible = false;
-            // 回调事件
-            this.$emit("submitCallback")
-        }
-      })
-    },
-    //打开驳回弹窗
-    openBack(){
-        this.$refs.backRef.visible = true
-    },
-    //关闭退出弹窗
-    callBack(){
-        // 关闭窗口
-        this.visible = false;
-        // 回调事件
-        this.$emit("submitCallback")
-    },
-    //重置表单
-    reset(){
-        this.isCopy = false
-        this.delegate = '2'
-        this.transmitForm = {}
-        this.formData.message = null
-        this.formData.assigneeMap = {}
-        this.nickName = {}
-    }
-  }
-};
-</script>
diff --git a/ruoyi-ui/src/views/components/approvalForm.vue b/ruoyi-ui/src/views/components/approvalForm.vue
deleted file mode 100644
index 664cd9de..00000000
--- a/ruoyi-ui/src/views/components/approvalForm.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<template>
-    <el-tabs type="border-card" class="container-tab">
-    <el-tab-pane label="业务单据" v-loading="loading">
-        <component :is="currProcessForm" 
-            :businessKey="businessKey" 
-            :parentTaskId="parentTaskId" 
-            @closeForm="closeForm" 
-            :taskId="taskId" 
-            :buildData="dynamicFormData.formText"
-             v-model="dynamicFormData.formValue"
-             :dynamicFormData="dynamicFormData"
-         ></component>
-    </el-tab-pane>
-    <el-tab-pane label="审批意见" v-loading="loading">
-        <el-table :data="list" border stripe style="width: 100%" max-height="570">
-            <el-table-column label="流程审批历史记录" align="center">
-            <el-table-column type="index" label="序号" align="center" width="50"></el-table-column>
-            <el-table-column prop="name" label="任务名称" align="center" ></el-table-column>
-            <el-table-column prop="nickName" label="办理人" align="center" ></el-table-column>
-            <el-table-column prop="status" label="状态" align="center" ></el-table-column>
-            <el-table-column prop="comment" label="审批意见" align="center" ></el-table-column>
-            <el-table-column prop="startTime" label="开始时间" align="center" ></el-table-column>
-            <el-table-column prop="endTime" label="结束时间" align="center" ></el-table-column>
-            </el-table-column>
-        </el-table>
-    </el-tab-pane>
-    <el-tab-pane label="流程进度">
-        <el-image v-if="processInstanceId" :src="url" style="font-size: 20px; margin: 50px;">
-            <div slot="placeholder"><i class="el-icon-loading"></i> 流程审批历史图加载中……</div>
-        </el-image>
-    </el-tab-pane>
-    </el-tabs>
-</template>
-
-<script>
-// 导入@/views/components/form 目录下所有组件
-const allComponents = require.context('@/views/components/form', false,/\.vue$/)
-// 组件名: 引用的组件
-let components = {}
-allComponents.keys().forEach(fileName => {
-  let componentName = allComponents(fileName)
-  components[fileName.replace(/^\.\/(.*)\.\w+$/, '$1')] = componentName.default
-})
-import api from '@/api/workflow/processInst'
-export default {
-    props: {
-      processInstanceId: String, // 流程实例id
-      businessKey: String, // 业务唯一标识
-      taskId: String, // 任务id
-      parentTaskId: String, // 父级任务id
-      currProcessForm: String, // 当前流程表单组件
-      dynamicFormData: {} //动态表单数据
-    },
-    components: components,
-    data() {
-      return {
-        loading: false,
-        visible: false,
-        url: null,
-        list: []
-      }
-    },
-    created(){
-        // 审批历史数据
-        this.getHistoryInfoList()
-        // 通过流程实例id获取历史流程图
-        this.url = process.env.VUE_APP_BASE_API+'/workflow/processInstance/getHistoryProcessImage?processInstanceId='+this.processInstanceId
-    },
-    methods: {
-        // 查询审批历史记录
-        async getHistoryInfoList() {
-            const { data } = await api.getHistoryInfoList(this.processInstanceId)
-            this.list = data
-        },
-        // 关闭弹窗
-        closeForm(){
-          this.visible = false
-          this.$emit("closeForm")
-        }
-    }
-
-}
-</script>
-<style scoped>
-.container-tab{
-    height: calc(100vh - 155px);
-    overflow-y: auto;
-}
-/* 修改滚动条样式 */
-.container-tab::-webkit-scrollbar {
-    width: 4px;
-}
-.container-tab::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-}
-</style>
diff --git a/ruoyi-ui/src/views/components/dept/sys-dept.vue b/ruoyi-ui/src/views/components/dept/sys-dept.vue
deleted file mode 100644
index ba5d6817..00000000
--- a/ruoyi-ui/src/views/components/dept/sys-dept.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-<el-dialog title="用户" :visible.sync="visible" v-if="visible" width="60%" append-to-body v-dialogDrag :close-on-click-modal="false">
-  <div class="app-container">
-    <el-input placeholder="输入关键字进行过滤" v-model="filterText"></el-input>
-    <el-tree
-    :data="deptList"
-    show-checkbox
-    node-key="deptId"
-    accordion
-    ref="tree"
-    default-expand-all
-    :filter-node-method = "filterNode"
-    :props="defaultProps"
-    :check-strictly = 'isLinked'
-    >
-  </el-tree>
-  </div>
-  <div slot="footer" class="dialog-footer">
-        <el-button size="small" type="primary" @click="confirmUser">确认</el-button>
-        <el-button size="small" @click="visible=false">取 消</el-button>
-  </div>
-</el-dialog>
-</template>
-
-<script>
-import { getWorkflowUserListByPage } from "@/api/workflow/workflowUser";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "Dept",
-  dicts: ['sys_normal_disable'],
-  components: { Treeselect },
-  props: {
-    // 回显的数据
-    propDeptList: {
-      type: Array,
-      default:()=>[]
-    },
-    // 是否与子级联动 false为联动
-    isLinked: {
-      type: Boolean,
-      default:false
-    }
-  },
-  data() {
-    return {
-      defaultProps: {
-          children: 'children',
-          label: 'deptName'
-      },
-      // 遮罩层
-      loading: true,
-      visible: false,
-      // 过滤字段
-      filterText: null,
-      // 表格树数据
-      deptList: [],
-      //回显id
-      deptIds: [],
-      // 查询参数
-      queryParams: {
-        type: 'dept'
-      },
-    };
-  },
-
-  watch: {
-     propDeptList(val) {
-       if(val.length>0){
-          this.deptIds = []
-          this.getList()
-          val.forEach(deptId => {
-            this.deptIds.push(deptId)
-          })
-       }else{
-          this.deptIds = []
-          this.getList()
-       }
-     },
-    filterText(val) {
-      this.$refs.tree.filter(val);
-    }
-  },
-  methods: {
-    //过滤
-    filterNode(value, data) {
-        if (!value) return true;
-        return data.deptName.indexOf(value) !== -1;
-    },
-    /** 查询部门列表 */
-    getList() {
-      this.loading = true;
-      getWorkflowUserListByPage(this.queryParams).then(response => {
-        this.deptList = this.handleTree(response.data.list, "deptId");
-        this.loading = false;
-        this.$nextTick(() => {
-          if(this.deptIds.length > 0){
-            this.$refs.tree.setCheckedKeys(this.deptIds);
-          }
-        })
-      });
-    },
-    // 确认
-    confirmUser(){
-      let deptList = this.$refs.tree.getCheckedNodes();
-      if(deptList.length>0){
-        this.$emit("confirmUser",deptList)
-      }else{
-        this.$modal.msgWarning("请选择部门！");
-      }
-    }
-  }
-};
-</script>
diff --git a/ruoyi-ui/src/views/components/echarts-3d.vue b/ruoyi-ui/src/views/components/echarts-3d.vue
deleted file mode 100644
index 93b79eca..00000000
--- a/ruoyi-ui/src/views/components/echarts-3d.vue
+++ /dev/null
@@ -1,236 +0,0 @@
-<template>
-  <div class="pine-3d-box" ref="pineChart3d"></div>
-</template>
-<script>
-import echarts from 'echarts'
-export default {
-  name: 'echarts3d',
-  data () {
-    return {
-      pineData: [
-        { name: '满意', value: 30, itemStyle: { color: 'red' }, startRatio: 0, endRatio: 10 },
-        { name: '非常满意', value: 45, itemStyle: { color: '#7BDDD0' }, startRatio: 0.7, endRatio: 1 },
-        { name: '满意', value: 6, itemStyle: { color: '#FAC858' }, startRatio: 0.7, endRatio: 1 },
-        { name: '基本满意', value: 14, itemStyle: { color: '#5DA6FC' }, startRatio: 0.7, endRatio: 1 },
-        { name: '不满意', value: 5, itemStyle: { color: '#ccc' }, startRatio: 0.7, endRatio: 1 },
-      ],
-      optionConfig: {}
-    }
-  },
-  methods: {
-    getPie3D(pieData, internalDiameterRatio) {
-
-let series = [];
-let sumValue = 0;
-let startValue = 0;
-let endValue = 0;
-let legendData = [];
-let k = 1;
-
-// 为每一个饼图数据，生成一个 series-surface 配置
-for (let i = 0; i < pieData.length; i++) {
-
-    sumValue += pieData[i].value;
-
-    let seriesItem = {
-        name: typeof pieData[i].name === 'undefined' ? `series${i}` : pieData[i].name,
-        type: 'surface',
-       
-        parametric: true,
-        wireframe: {
-            show: false
-        },
-        pieData: pieData[i],
-        pieStatus: {
-            selected: false,
-            hovered: false,
-            k: k
-        },
-        labelLine:{
-            show:true
-        },
-        label:{
-            show:true
-        }
-    };
-
-    if (typeof pieData[i].itemStyle != 'undefined') {
-
-        let itemStyle = {};
-
-        typeof pieData[i].itemStyle.color != 'undefined' ? itemStyle.color = pieData[i].itemStyle.color : null;
-        typeof pieData[i].itemStyle.opacity != 'undefined' ? itemStyle.opacity = pieData[i].itemStyle.opacity : null;
-
-        seriesItem.itemStyle = itemStyle;
-    }
-    series.push(seriesItem);
-}
-
-// 使用上一次遍历时，计算出的数据和 sumValue，调用 getParametricEquation 函数，
-// 向每个 series-surface 传入不同的参数方程 series-surface.parametricEquation，也就是实现每一个扇形。
-for (let i = 0; i < series.length; i++) {
-    endValue = startValue + series[i].pieData.value;
-    console.log(series[i]);
-    series[i].pieData.startRatio = startValue / sumValue;
-    series[i].pieData.endRatio = endValue / sumValue;
-    series[i].parametricEquation = this.getParametricEquation(series[i].pieData.startRatio, series[i].pieData.endRatio, false, false, k,series[i].pieData.value);
-
-    startValue = endValue;
-
-    legendData.push(series[i].name);
-}
-
-let boxHeight = this.getHeight3D(series, 3);
-
-// 准备待返回的配置项，把准备好的 legendData、series 传入。
-let option = {
-    tooltip: {
-        formatter: params => {
-            if (params.seriesName !== 'mouseoutSeries') {
-                return `${params.seriesName}<br/><span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:${params.color};"></span>${option.series[params.seriesIndex].pieData.value}`;
-            }
-        }
-    },
-    labelLine:{
-        show:true,
-    },
-    label:{
-        show:true,
-    },
-    legend: {
-        data: legendData,
-        textStyle:{
-            color:'#fff',
-            fontSize:14
-        }
-    },
-    xAxis3D: {
-        min: -1,
-        max: 1
-    },
-    yAxis3D: {
-        min: -1,
-        max: 1
-    },
-    zAxis3D: {
-        min: -1,
-        max: 1
-    },
-    grid3D: {
-        show: false,
-        boxHeight: boxHeight, //圆环的高度
-        //top: '30%',
-        bottom: '50%',
-        viewControl:{
-            distance:300,
-            alpha:25,
-            beta:130,
-            rotateSensitivity: 0, //设置为0无法旋转
-            zoomSensitivity: 0, //设置为0无法缩放
-            panSensitivity: 0, //设置为0无法平移
-        },
-        
-    },
-    series: series
-};
-return option;
-},
-    getHeight3D(series, height) {
-        series.sort((a, b) => {
-            return b.pieData.value - a.pieData.value;
-        });
-        return (height * 25) / series[0].pieData.value;
-    },
-    getParametricEquation(startRatio, endRatio, isSelected, isHovered, k,height) {
-
-// 计算
-let midRatio = (startRatio + endRatio) / 2;
-
-let startRadian = startRatio * Math.PI * 2;
-let endRadian = endRatio * Math.PI * 2;
-let midRadian = midRatio * Math.PI * 2;
-
-// 如果只有一个扇形，则不实现选中效果。
-if (startRatio === 0 && endRatio === 1) {
-    isSelected = false;
-}
-
-// 通过扇形内径/外径的值，换算出辅助参数 k（默认值 1/3）
-k = typeof k !== 'undefined' ? k : 1 / 3 ;
-
-// 计算选中效果分别在 x 轴、y 轴方向上的位移（未选中，则位移均为 0）
-let offsetX = isSelected ? Math.cos(midRadian) * 0.1 : 0;
-let offsetY = isSelected ? Math.sin(midRadian) * 0.1 : 0;
-
-// 计算高亮效果的放大比例（未高亮，则比例为 1）
-let hoverRate = isHovered ? 1.05 : 1;
-
-// 返回曲面参数方程
-return {
-
-    u: {
-        min: -Math.PI,
-        max: Math.PI * 3,
-        step: Math.PI / 32
-    },
-    
-    v: {
-        min: 0,
-        max: Math.PI * 2,
-        step: Math.PI / 20
-    },
-    
-    x: function(u, v) {
-        if (u < startRadian) {
-            return offsetX + Math.cos(startRadian) * (1 + Math.cos(v) * k) * hoverRate;
-        }
-        if (u > endRadian ){
-            return offsetX + Math.cos(endRadian) * (1 + Math.cos(v) * k) * hoverRate;
-        }
-        return offsetX + Math.cos(u) * (1 + Math.cos(v) * k) * hoverRate;
-    },
-    
-    y: function(u, v) {
-        if (u < startRadian) {
-            return offsetY + Math.sin(startRadian) * (1 + Math.cos(v) * k) * hoverRate;
-        }
-        if (u > endRadian ){
-            return offsetY + Math.sin(endRadian) * (1 + Math.cos(v) * k) * hoverRate;
-        }
-        return offsetY + Math.sin(u) * (1 + Math.cos(v) * k) * hoverRate;
-    },
-    
-    z: function(u, v) {
-        if (u < - Math.PI * 0.5 ) {
-            return Math.sin(u);
-        }
-        if (u > Math.PI * 2.5 ){
-            return Math.sin(u);
-        }
-        return Math.sin(v) > 0 ? 1*height : -1;
-    }
-};
-    },
-    chart () {
-      var option = {}
-      option = this.getPie3D(this.pineData,0);
-      let chart = echarts.init(this.$refs.pineChart3d)
-      chart.setOption(option)
-      window.addEventListener('resize', () => {
-        if (chart) {
-          chart.resize()
-        }
-      })
-    }
-  },
-  mounted () {
-    this.chart()
-  }
-}
-</script>
-<style lang="scss">
-.pine-3d-box{
-  width:auto;
-  height:200px;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/components/form/dynamicFormEdit.vue b/ruoyi-ui/src/views/components/form/dynamicFormEdit.vue
deleted file mode 100644
index 3e8f8f4a..00000000
--- a/ruoyi-ui/src/views/components/form/dynamicFormEdit.vue
+++ /dev/null
@@ -1,282 +0,0 @@
-<template>
-  <div>
-    <div class="btn" v-show="parentTaskId===null">
-        <div class="btn-content">
-          <span>
-            <el-button type="info" @click="submitCallback">关闭</el-button>
-            <el-button type="primary" @click="submitForm">提交</el-button>
-          </span>
-        </div>
-    </div>
-    <div>
-      <el-row  :gutter="formConf.gutter" class="form-builder">
-        <el-form
-            :rules="rules"
-            :ref="formConf.formModel"
-            :size="formConf.size"
-            :model="form"
-            :label-position="formConf.labelPosition"
-            :disabled="formConf.disabled"
-            :validate-on-rule-change="false"
-            :label-width="formConf.labelWidth + 'px'"
-          >
-            <template v-for="(element,index) in itemList"  >
-              <preview-row-item 
-                v-if="element.compType === 'row'"
-                :key="'row-'+index" 
-                :model="element"
-                >
-                <el-col v-for="(column) in element.columns" :key="column.index" :span="column.span">
-                  <template v-for="(col) in column.list">
-                    <preview-item
-                        v-if="col.compType!== 'dynamicTable'"
-                        :key="col.id"
-                        :model="col"
-                        v-model="form[col.id]"
-                        @valChange="handlerValChange"
-                    />
-                    <fancy-dynamic-table
-                        v-else-if="col.compType === 'dynamicTable'"
-                        ref="dynamicTable"
-                        :key="'dynamic-'+index"
-                        :data="form[col.id]"
-                        :conf="col"
-                        @addRow="handlerAddRow"
-                        @deleteRow="handlerDeleteRow"
-                    >
-                      <template v-slot:item="{rowScope,item}">
-                        <fancy-dynamic-table-item
-                            :model="item"
-                            :parent="col"
-                            :key="'tableIndex-'+rowScope.$index"
-                            :index="rowScope.$index"
-                            v-model="rowScope.row[item.id]"
-                            @valChange="handlerDynamicValChange"
-                        />
-                      </template>
-                    </fancy-dynamic-table>
-                  </template>
-                </el-col>
-              </preview-row-item>
-              <fancy-dynamic-table
-                  v-else-if="element.compType === 'dynamicTable'"
-                  :key="'dynamic-'+index"
-                  :data="form[element.id]"
-                  :ref="element.id"
-                  :conf="element"
-                  @addRow="handlerAddRow"
-                  @deleteRow="handlerDeleteRow"
-              >
-                <template v-slot:item="{rowScope,item}">
-                  <fancy-dynamic-table-item
-                      :model="item"
-                      :ref="item.id+rowScope.$index"
-                      :parent="element"
-                      :key="'tableIndex-'+rowScope.$index"
-                      :index="rowScope.$index"
-                      v-model="rowScope.row[item.id]"
-                      @valChange="handlerDynamicValChange"
-                  />
-                </template>
-              </fancy-dynamic-table>
-              <fancy-edit-table
-                v-else-if="element.compType === 'table'"
-                :layoutArray="element.layoutArray"
-                :tdStyle="element.tdStyle"
-                :width="element.width"
-                :height="element.height"
-              >
-              <template v-slot="{td}">
-                <template v-for="(col) in td.columns">
-                    <preview-item
-                      v-if="col.compType!== 'dynamicTable'"
-                      :key="col.id"
-                      :model="col"
-                      v-model="form[col.id]"
-                      @valChange="handlerValChange"
-                    />
-              </template>
-              </template>
-              </fancy-edit-table>
-              <!--item-->
-              
-              <el-col class="drag-col-wrapper" :key="index"   :span="element.span" v-else>
-                <preview-item 
-                  :model="element"
-                  v-model="form[element.id]"
-                  @valChange="handlerValChange"
-                />
-              </el-col>
-            </template>
-            
-          </el-form>
-      </el-row>
-    </div>
-     <!-- 工作流开始 -->
-     <verify ref="verifyRef" :taskId="taskId" @submitCallback="submitCallback"
-      :taskVariables="taskVariables" :sendMessage="sendMessage"></verify>
-      <!-- 工作流结束 -->
-  </div>
-</template>
-<script>
-import previewItem from "@/components/FormDesigner/previewItem";
-import previewRowItem from "@/components/FormDesigner/previewRowItem";
-import fancyDynamicTable from "@/components/FormDesigner/dynamic/fancyDynamicTable";
-import fancyDynamicTableItem from "@/components/FormDesigner/dynamic/fancyDynamicTableItem";
-import {datas,addRow,deleteRow,fillDatas} from "@/components/FormDesigner/custom/formDraw";
-import fancyEditTable from "@/components/FormDesigner/table/fancyEditTable";
-import verify from "@/components/Process/Verify";
-export default {
-  name:'dynamicFormEdit',
-  props:{
-    value:{
-      type:String,
-      default:''
-    },
-    buildData:{
-      type:String,
-      default:''
-    },
-    disabled:{
-      type:Boolean,
-      default:false
-    },
-    // 动态表单数据
-    dynamicFormData: {
-      type:Object,
-      default:()=>{}
-    },
-    // 任务id
-    taskId: {
-      type:String,
-      default:''
-    },
-    // 父级任务id
-    parentTaskId: String, 
-  },
-  components:{
-    previewItem,
-    previewRowItem,
-    fancyDynamicTable,
-    fancyDynamicTableItem,
-    fancyEditTable,
-    verify
-  },
-  data(){
-    return{
-      form:{},
-      rules:{},
-      currentIndex:-1,
-      formVal: '',
-      sendMessage: {},
-      taskVariables: {}
-    }
-  },
-  mounted() {
-    this.$nextTick(()=> {
-      if(this.value !=='' && this.value !==null){
-        const jsonValue = JSON.parse(this.value)
-        this.handlerFillDatas(jsonValue);
-      }
-    })
-  },
-  methods:{
-    //关闭
-    submitCallback(){
-      this.$emit("closeForm")
-    },
-    //提交
-    submitForm(){
-      this.validate()
-      this.$refs[this.formConf.formModel].validate((valid) => {
-        if (valid) {
-          this.taskVariables = {
-            entity: this.dynamicFormData.variableMap,
-          };
-          this.sendMessage = {
-            title: this.dynamicFormData.formName,
-            messageContent:'单据【'+this.dynamicFormData.applyCode+"】申请"
-          }
-          this.$refs.verifyRef.visible = true
-          this.$refs.verifyRef.reset()
-        }
-      });
-    },
-    handlerValChange(key,origin){
-      this.$set(this.form,key,origin);
-    },
-    handlerDynamicValChange(parentId,index,key,origin){
-      this.$set(this.form[parentId][index],key,origin);
-      this.currentIndex = index;
-    },
-    validate(){
-      this.$refs[this.formConf.formModel].validate((valid) => {
-        if (valid) {
-          this.formVal = JSON.stringify(this.form,null,4)
-          this.$emit('input',JSON.stringify(this.form,null,4));
-        }else{
-          this.$emit('input','');
-        }
-      });
-    },
-    handlerAddRow:addRow,
-    handlerDeleteRow:deleteRow,
-    handlerInitDatas:datas,
-    handlerFillDatas:fillDatas
-  },
-  created(){
-    this.handlerInitDatas();
-  },
-  computed:{
-    itemList(){
-      if(this.buildData!==''){
-        const buildData = JSON.parse(this.buildData);
-        return buildData.list;
-      }else{
-        return [];
-      }
-    },
-    formConf(){
-      if(this.buildData!==''){
-        const buildData = JSON.parse(this.buildData);
-        buildData.config.disabled = this.disabled;
-        return buildData.config;
-      }else{
-        return {};
-      }
-    }
-  }
-}
-</script>
-<style scoped>
-.preview-board{
-  border: 1px dashed #ccc
-}
-.form-builder{
-  padding: 20px;
-  border:1px solid #dcdfe6;
-}
-.el-form-item{
-  margin-left:10px;
-  margin-right:10px;
-}
-.form-builder >>> .el-radio.is-bordered+.el-radio.is-bordered{
-  margin-left:0px;
-}
-.form-builder >>> .el-checkbox.is-bordered+.el-checkbox.is-bordered{
-  margin-left:0px;
-}
-.btn{
-    position: relative;
-    height: 50px;
-    background: #fff;
-}
-.btn .btn-content{
-    z-index: 10;
-    height: 50px;
-    background: #fff;
-}
-.btn .btn-content span{
-    float: left;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/components/form/leaveForm.vue b/ruoyi-ui/src/views/components/form/leaveForm.vue
deleted file mode 100644
index e61b8900..00000000
--- a/ruoyi-ui/src/views/components/form/leaveForm.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 添加或修改请假业务对话框 -->
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="申请人用户名" prop="username">
-          <el-input v-model="form.username" placeholder="请输入申请人用户名" />
-        </el-form-item>
-        <el-form-item label="请假时长" prop="duration">
-          <el-input v-model="form.duration" placeholder="请输入请假时长，单位：天" />
-        </el-form-item>
-        <el-form-item label="工作委托人" prop="principal">
-          <el-input v-model="form.principal" placeholder="请输入工作委托人" />
-        </el-form-item>
-        <el-form-item label="联系电话" prop="contactPhone">
-          <el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
-        </el-form-item>
-        <el-form-item label="请假类型" prop="leaveType">
-          <el-select style="width:100%" v-model="form.leaveType" placeholder="请选择请假类型">
-            <el-option
-              v-for="dict in dict.type.bs_leave_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入标题" />
-        </el-form-item>
-        <el-form-item label="请假原因" prop="leaveReason">
-          <el-input v-model="form.leaveReason" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="请假开始时间" prop="startDate">
-          <el-date-picker clearable size="small"
-            style="width:100%"
-            v-model="form.startDate"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择请假开始时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="请假结束时间" prop="endDate">
-          <el-date-picker style="width:100%" clearable size="small"
-            v-model="form.endDate"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择请假结束时间">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <div v-show="parentTaskId===null" class="dialog-footer" style="text-align:center">
-        <el-button :loading="buttonLoading" size="small" type="info" @click="submitCallback">关闭</el-button>
-        <el-button :loading="buttonLoading" size="small" type="primary" @click="submitForm">提交</el-button>
-      </div>
-      <!-- 工作流开始 -->
-      <verify ref="verifyRef" :taskId="taskId" @submitCallback="submitCallback"
-      :taskVariables="taskVariables" :sendMessage="sendMessage"></verify>
-      <!-- 工作流结束 -->
-  </div>
-</template>
-
-<script>
-import { getLeave} from "@/api/demo/leave";
-import verify from "@/components/Process/Verify";
-export default {
-  name: "Leave",
-  dicts: ['bs_leave_type'],
-  props: {
-      businessKey: String, // 业务唯一标识
-      parentTaskId: String, // 父级任务id
-      taskId: String // 任务id
-  },
-  components: {
-      verify
-  },
-  data() {
-    return {
-      // 按钮loading
-      buttonLoading: false,
-      // 遮罩层
-      loading: true,
-      // 请假业务表格数据
-      leaveList: [],
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "主键ID不能为空", trigger: "blur" }
-        ],
-        username: [
-          { required: true, message: "申请人用户名不能为空", trigger: "blur" }
-        ],
-        duration: [
-          { required: true, message: "请假时长，单位：天不能为空", trigger: "blur" }
-        ],
-        principal: [
-          { required: true, message: "工作委托人不能为空", trigger: "blur" }
-        ],
-        contactPhone: [
-          { required: true, message: "联系电话不能为空", trigger: "blur" }
-        ],
-        leaveType: [
-          { required: true, message: "请假类型不能为空", trigger: "change" }
-        ],
-        title: [
-          { required: true, message: "标题不能为空", trigger: "blur" }
-        ],
-        leaveReason: [
-          { required: true, message: "请假原因不能为空", trigger: "blur" }
-        ],
-        startDate: [
-          { required: true, message: "请假开始时间不能为空", trigger: "blur" }
-        ],
-        endDate: [
-          { required: true, message: "请假结束时间不能为空", trigger: "blur" }
-        ]
-      },
-      taskVariables: undefined,
-      //消息提醒
-      sendMessage: {}
-    };
-  },
-  watch: {
-      businessKey: {
-          immediate: true, // 很重要！！！
-          handler (newVal) {
-              if(newVal) {
-                  this.getById()
-              }
-          }
-      }
-  },
-  methods: {
-    submitCallback(){
-      this.$emit("closeForm")
-    },
-    async getById() {
-        const {data} = await getLeave(this.businessKey)
-        this.form = data;
-    },
-    /** 提交按钮 */
-    submitForm() {
-      getLeave(this.businessKey).then(response => {
-          this.taskVariables = {
-                entity: response.data,
-                userId :1
-          };
-          this.sendMessage = {
-            title:'请假申请',
-            messageContent:'单据【'+this.form.id+"】申请"
-          }
-      });
-      this.$refs.verifyRef.visible = true
-      this.$refs.verifyRef.reset()
-    }
-  }
-};
-</script>
diff --git a/ruoyi-ui/src/views/components/role/sys-role.vue b/ruoyi-ui/src/views/components/role/sys-role.vue
deleted file mode 100644
index 9d31f7cc..00000000
--- a/ruoyi-ui/src/views/components/role/sys-role.vue
+++ /dev/null
@@ -1,202 +0,0 @@
-<template>
-<el-dialog title="角色" :visible.sync="visible" v-if="visible" width="60%" append-to-body v-dialogDrag :close-on-click-modal="false">
-
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true">
-      <el-form-item label="角色名称" prop="roleName">
-        <el-input
-          v-model="queryParams.roleName"
-          placeholder="请输入角色名称"
-          clearable
-          size="small"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="权限字符" prop="roleKey">
-        <el-input
-          v-model="queryParams.roleKey"
-          placeholder="请输入权限字符"
-          clearable
-          size="small"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" ref="multipleTable" :data="roleList" :row-key="getRowKey" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" :reserve-selection="true" width="55" align="center" />
-      <el-table-column label="角色编号" prop="roleId" width="120" />
-      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="显示顺序" prop="roleSort" width="100" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 选中的角色 -->
-    <div>
-      <el-tag v-for="role in chooseRoleList" :key="role.roleId" style="margin:2px"
-      closable @close="handleCloseTag(role)" >{{role.roleName}} </el-tag>
-    </div>
-  </div>
-  <div slot="footer" class="dialog-footer">
-        <el-button size="small" type="primary" @click="confirmUser">确认</el-button>
-        <el-button size="small" @click="visible=false">取 消</el-button>
-  </div>
-</el-dialog>
-</template>
-
-<script>
-import { getWorkflowUserListByPage } from "@/api/workflow/workflowUser";
-export default {
-  name: "Role",
-  props: {
-    //回显的数据
-    propRoleList: {
-      type: Array,
-      default:()=>[]
-    }
-  },
-  data() {
-    return {
-      visible: false,
-      // 遮罩层
-      loading: true,
-      // 导出遮罩层
-      exportLoading: false,
-      // 选中数组
-      ids: [],
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 角色表格数据
-      roleList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        roleName: undefined,
-        roleKey: undefined,
-        type: 'role',
-        ids:[]
-      },
-      getRowKey(row) {
-        return row.roleId
-      },
-      //选中的角色
-      chooseRoleList: [],
-      flag: false
-    };
-  },
-  watch: {
-    propRoleList(val) {
-      if(val.length>0){
-         this.queryParams.ids = val
-         this.flag = true
-         this.getList()
-      }else{
-         this.chooseRoleList = []
-      }
-    }
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询角色列表 */
-    getList() {
-      this.loading = true;
-      getWorkflowUserListByPage(this.queryParams).then(response => {
-          let res = response.data.page
-          this.roleList = res.rows;
-          this.total = res.total;
-           //反选
-          if(this.flag && response.data.list){
-            this.chooseRoleList = response.data.list
-            response.data.list.forEach(row => {
-              this.$refs.multipleTable.toggleRowSelection(row,true);
-            })
-          }
-          this.loading = false;
-        });
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.flag = false
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(val) {
-      if(this.multiple){
-          this.chooseRoleList = val.filter((element,index,self)=>{
-             return self.findIndex(x=>x.roleId===element.roleId) === index
-          })
-        }else{
-          this.chooseRoleList = val
-          if (val.length > 1) {
-            let delRow = val.shift();
-            this.$refs.multipleTable.toggleRowSelection(delRow, false);
-          }
-          if(val.length === 0){
-            this.chooseRoleList = null
-          }
-        }
-    },
-    // 删除tag
-    handleCloseTag(role){
-       this.chooseRoleList.splice(this.chooseRoleList.indexOf(role), 1);
-       this.$refs.multipleTable.toggleRowSelection(role,false)
-       this.roleList.forEach((row,index)=>{
-          if(role.roleId === row.roleId){
-             this.$refs.multipleTable.toggleRowSelection(this.roleList[index],false)
-          }
-       })
-    },
-    // 确认
-    confirmUser(){
-      if(this.chooseRoleList.length>0){
-        this.$emit("confirmUser",this.chooseRoleList)
-      }else{
-        this.$modal.msgWarning("请选择角色！");
-      }
-    }
-  }
-};
-</script>
diff --git a/ruoyi-ui/src/views/components/user/choose-workflow-user .vue b/ruoyi-ui/src/views/components/user/choose-workflow-user .vue
deleted file mode 100644
index 6db5afe7..00000000
--- a/ruoyi-ui/src/views/components/user/choose-workflow-user .vue	
+++ /dev/null
@@ -1,243 +0,0 @@
-<template>
-<el-dialog title="用户" :visible.sync="visible" @close="close"  width="60%" append-to-body v-dialogDrag :close-on-click-modal="false">
-  <div class="app-container">
-    <el-row :gutter="20">
-      <!--用户数据-->
-      <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="归属部门" prop="deptId">
-            <treeselect v-model="queryParams.deptId" style="width: 240px" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
-          </el-form-item>
-          <el-form-item label="用户名称" prop="userName">
-            <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入用户名称"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="手机号码" prop="phonenumber">
-            <el-input
-              v-model="queryParams.phonenumber"
-              placeholder="请输入手机号码"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="userList" ref="multipleTable" :row-key="getRowKey" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" :reserve-selection="true" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[5].visible" width="160">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
-      </el-col>
-    </el-row>
-  </div>
-  <!-- 选中的用户 -->
-  <div>
-    <el-tag v-for="user in chooseUserList" :key="user.userName" style="margin:2px"
-    closable @close="handleCloseTag(user)" >{{user.userName}} </el-tag>
-  </div>
-  <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="confirmUser">确认</el-button>
-        <el-button @click="cancel">取 消</el-button>
-  </div>
-</el-dialog>
-</template>
-
-<script>
-import { getWorkflowUserListByPage } from "@/api/workflow/workflowUser";
-import { deptTreeSelect } from "@/api/system/user";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  props: {
-    //是否多选
-    multiple: {
-      type: Boolean,
-      default: true,
-    },
-    //传入的条件
-    dataObj: {
-      type: Object,
-      default: {}
-    },
-    // 节点id
-    nodeId: {
-      type: String,
-      default: ''
-    }
-  },
-  name: "User",
-  dicts: ['sys_user_sex'],
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      buttonLoading: false,
-      // 是否显示弹出层
-      visible: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 用户表格数据
-      userList: [],
-      // 部门树选项
-      deptOptions: undefined,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        userName: undefined,
-        phonenumber: undefined,
-        deptId: undefined,
-        type: undefined,
-        params: undefined,
-        ids:[]
-      },
-      // 列信息
-      columns: [
-        { key: 0, label: `用户编号`, visible: true },
-        { key: 1, label: `用户名称`, visible: true },
-        { key: 2, label: `用户昵称`, visible: true },
-        { key: 3, label: `部门`, visible: true },
-        { key: 4, label: `手机号码`, visible: true },
-        { key: 5, label: `创建时间`, visible: true }
-      ],
-      // 保存选择的用户
-      chooseUserList: [],
-      getRowKey(row) {
-        return row.userId
-      }
-    };
-  },
-  watch: {
-    dataObj(val) {
-       this.queryParams.params = val.assigneeId
-       this.queryParams.type = val.chooseWay
-       this.queryParams.ids = val.ids
-       this.$nextTick(() => {
-           this.$refs.multipleTable.clearSelection();
-       });
-       this.getList()
-    },
-  },
-  created() {
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询用户列表 */
-    getList() {
-      this.loading = true;
-      this.chooseUserList = []
-      getWorkflowUserListByPage(this.queryParams).then(response => {
-          let res = response.data.page
-          this.userList = res.rows;
-          this.total = res.total;
-          //反选
-          if(response.data.list){
-            this.chooseUserList = response.data.list
-            response.data.list.forEach(row => {
-              this.$refs.multipleTable.toggleRowSelection(row,true);
-            })
-          }
-          this.loading = false;
-      });
-    },
-    /** 查询部门下拉树结构 */
-    getTreeselect() {
-      deptTreeSelect().then(response => {
-        this.deptOptions = response.data;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.visible = false
-      this.chooseUserList = []
-    },
-    // 关闭
-    close() {
-      this.visible = false
-      this.chooseUserList = []
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      //this.resetForm("queryForm");
-    },
-    // 多选框选中数据
-    handleSelectionChange(val) {
-        if(this.multiple){
-          this.chooseUserList = val.filter((element,index,self)=>{
-             return self.findIndex(x=>x.userId===element.userId) === index
-          })
-        }else{
-          this.chooseUserList = val
-          if (val.length > 1) {
-            let delRow = val.shift();
-            this.$refs.multipleTable.toggleRowSelection(delRow, false);
-          }
-          if(val.length === 0){
-            this.chooseUserList = null
-          }
-        }
-    },
-    // 删除tag
-    handleCloseTag(user){
-      this.chooseUserList.splice(this.chooseUserList.indexOf(user), 1);
-       this.$refs.multipleTable.toggleRowSelection(user,false)
-       this.userList.forEach((row,index)=>{
-          if(user.userId === row.userId){
-             this.$refs.multipleTable.toggleRowSelection(this.userList[index],false)
-          }
-       })
-    },
-    // 确认
-    confirmUser(){
-      if(this.chooseUserList.length>0){
-        this.$emit("confirmUser",this.chooseUserList,this.nodeId)
-        this.visible = false
-      }else{
-        this.$modal.msgWarning("请选择人员！");
-      }
-    }
-  }
-};
-</script>
-<style scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/components/user/multi-user.vue b/ruoyi-ui/src/views/components/user/multi-user.vue
deleted file mode 100644
index d674646a..00000000
--- a/ruoyi-ui/src/views/components/user/multi-user.vue
+++ /dev/null
@@ -1,275 +0,0 @@
-<template>
-<el-dialog title="用户" :visible.sync="visible" v-if="visible" width="60%" append-to-body v-dialogDrag @close="multiClose" :close-on-click-modal="false">
-  <div class="app-container">
-    <el-row :gutter="20">
-      <!--部门数据-->
-      <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input
-            v-model="deptName"
-            placeholder="请输入部门名称"
-            clearable
-            size="mini"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
-        </div>
-        <div class="head-container">
-          <el-tree
-            :data="deptOptions"
-            :props="defaultProps"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            default-expand-all
-            @node-click="handleNodeClick"
-          />
-        </div>
-      </el-col>
-      <!--用户数据-->
-      <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" size="mini" v-show="showSearch" label-width="68px">
-          <el-form-item label="用户名称" prop="userName">
-            <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入用户名称"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="手机号码" prop="phonenumber">
-            <el-input
-              v-model="queryParams.phonenumber"
-              placeholder="请输入手机号码"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="userList" ref="multipleTable" :row-key="getRowKey" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" :reserve-selection="true" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[5].visible" width="160">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
-      </el-col>
-    </el-row>
-  </div>
-  <!-- 选中的用户 -->
-  <div>
-    <el-tag v-for="user in chooseUserList" :key="user.userId" style="margin:2px"
-    closable @close="handleCloseTag(user)" >{{user.userName}} </el-tag>
-  </div>
-  <div slot="footer" class="dialog-footer">
-        <el-button size="small" type="primary" @click="confirmUser">确认</el-button>
-        <el-button size="small" @click="multiClose">取 消</el-button>
-  </div>
-</el-dialog>
-</template>
-
-<script>
-import { getWorkflowAddMultiListByPage } from "@/api/workflow/workflowUser";
-import { deptTreeSelect } from "@/api/system/user";
-
-export default {
-  props: {
-    //是否多选
-    multiple: {
-      type: Boolean,
-      default: true,
-    },
-    //回显的数据
-    propUserList: {
-      type: Array,
-      default:()=>[]
-    },
-    //任务id
-    taskId: {
-      type: String
-    }
-  },
-  name: "User",
-  dicts: ['sys_user_sex'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      visible: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 用户表格数据
-      userList: [],
-      // 部门树选项
-      deptOptions: [],
-      // 是否显示弹出层
-      open: false,
-      // 部门名称
-      deptName: undefined,
-      defaultProps: {
-        children: "children",
-        label: "label"
-      },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        userName: undefined,
-        phonenumber: undefined,
-        deptId: undefined,
-        taskId: this.taskId,
-        ids:[]
-      },
-      // 列信息
-      columns: [
-        { key: 0, label: `用户编号`, visible: true },
-        { key: 1, label: `用户名称`, visible: true },
-        { key: 2, label: `用户昵称`, visible: true },
-        { key: 3, label: `部门`, visible: true },
-        { key: 4, label: `手机号码`, visible: true },
-        { key: 5, label: `创建时间`, visible: true }
-      ],
-      getRowKey(row) {
-        return row.userId
-      },
-      // 保存选择的用户
-      chooseUserList: [],
-      flag: false
-    };
-  },
-  watch: {
-    // 根据名称筛选部门树
-    deptName(val) {
-      this.$refs.tree.filter(val);
-    },
-    propUserList(val) {
-      if(val.length>0){
-         this.queryParams.ids = val
-         this.getList()
-         this.flag = true
-      }else{
-         this.chooseUserList = []
-      }
-    }
-  },
-  created() {
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询用户列表 */
-    getList() {
-      this.loading = true;
-      getWorkflowAddMultiListByPage(this.queryParams).then(response => {
-          let res = response.data.page
-          this.userList = res.rows;
-          this.total = res.total;
-           //反选
-          if(this.flag && response.data.list){
-            this.chooseUserList = response.data.list
-            response.data.list.forEach(row => {
-              this.$refs.multipleTable.toggleRowSelection(row,true);
-            })
-          }
-          this.loading = false;
-      });
-    },
-    /** 查询部门下拉树结构 */
-    getTreeselect() {
-      deptTreeSelect().then(response => {
-        this.deptOptions = response.data;
-      });
-    },
-    // 筛选节点
-    filterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
-    },
-    // 节点单击事件
-    handleNodeClick(data) {
-      this.queryParams.deptId = data.id;
-      this.getList();
-    },
-    //关闭
-    multiClose(){
-      this.visible = false
-      this.$emit("multiClose")
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.flag = false
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.queryParams.deptId = ''
-      this.queryParams.phonenumber = ''
-      this.queryParams.userName = ''
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(val) {
-        if(this.multiple){
-          this.chooseUserList = val.filter((element,index,self)=>{
-             return self.findIndex(x=>x.userId===element.userId) === index
-          })
-        }else{
-          this.chooseUserList = val
-          if (val.length > 1) {
-            let delRow = val.shift();
-            this.$refs.multipleTable.toggleRowSelection(delRow, false);
-          }
-          if(val.length === 0){
-            this.chooseUserList = null
-          }
-        }
-    },
-    // 删除tag
-    handleCloseTag(user){
-       this.chooseUserList.splice(this.chooseUserList.indexOf(user), 1);
-       this.$refs.multipleTable.toggleRowSelection(user,false)
-       this.userList.forEach((row,index)=>{
-          if(user.userId === row.userId){
-             this.$refs.multipleTable.toggleRowSelection(this.userList[index],false)
-          }
-       })
-    },
-    // 确认
-    confirmUser(){
-      if(this.chooseUserList.length>0){
-        this.$emit("confirmUser",this.chooseUserList)
-      }else{
-        this.$modal.msgWarning("请选择人员！");
-      }
-    }
-  }
-};
-</script>
diff --git a/ruoyi-ui/src/views/components/user/sys-dept-user.vue b/ruoyi-ui/src/views/components/user/sys-dept-user.vue
deleted file mode 100644
index 115d24a9..00000000
--- a/ruoyi-ui/src/views/components/user/sys-dept-user.vue
+++ /dev/null
@@ -1,272 +0,0 @@
-<template>
-<el-dialog title="用户" :visible.sync="visible" v-if="visible" width="60%" append-to-body v-dialogDrag :close-on-click-modal="false">
-  <div class="app-container">
-    <el-row :gutter="20">
-      <!--部门数据-->
-      <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input
-            v-model="deptName"
-            placeholder="请输入部门名称"
-            clearable
-            size="mini"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
-        </div>
-        <div class="head-container">
-          <el-tree
-            :data="deptOptions"
-            :props="defaultProps"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            default-expand-all
-            @node-click="handleNodeClick"
-          />
-        </div>
-      </el-col>
-      <!--用户数据-->
-      <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" size="mini" v-show="showSearch" label-width="68px">
-          <el-form-item label="用户名称" prop="userName">
-            <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入用户名称"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="手机号码" prop="phonenumber">
-            <el-input
-              v-model="queryParams.phonenumber"
-              placeholder="请输入手机号码"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="userList" ref="multipleTable" :row-key="getRowKey" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" :reserve-selection="true" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[5].visible" width="160">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
-      </el-col>
-    </el-row>
-  </div>
-  <!-- 选中的用户 -->
-  <div>
-    <el-tag v-for="user in chooseUserList" :key="user.userId" style="margin:2px"
-    closable @close="handleCloseTag(user)" >{{user.userName}} </el-tag>
-  </div>
-  <div slot="footer" class="dialog-footer">
-        <el-button size="small" type="primary" @click="confirmUser">确认</el-button>
-        <el-button size="small" @click="visible=false">取 消</el-button>
-  </div>
-</el-dialog>
-</template>
-
-<script>
-import { getWorkflowUserListByPage } from "@/api/workflow/workflowUser";
-import { deptTreeSelect } from "@/api/system/user";
-
-export default {
-  props: {
-    //是否多选
-    multiple: {
-      type: Boolean,
-      default: true,
-    },
-    //回显的数据
-    propUserList: {
-      type: Array,
-      default:()=>[]
-    }
-  },
-  name: "User",
-  dicts: ['sys_user_sex'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      visible: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 用户表格数据
-      userList: [],
-      // 部门树选项
-      deptOptions: [],
-      // 是否显示弹出层
-      open: false,
-      // 部门名称
-      deptName: undefined,
-      defaultProps: {
-        children: "children",
-        label: "label"
-      },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        userName: undefined,
-        phonenumber: undefined,
-        deptId: undefined,
-        type: 'person',
-        ids:[]
-      },
-      // 列信息
-      columns: [
-        { key: 0, label: `用户编号`, visible: true },
-        { key: 1, label: `用户名称`, visible: true },
-        { key: 2, label: `用户昵称`, visible: true },
-        { key: 3, label: `部门`, visible: true },
-        { key: 4, label: `手机号码`, visible: true },
-        { key: 5, label: `创建时间`, visible: true }
-      ],
-      getRowKey(row) {
-        return row.userId
-      },
-      // 保存选择的用户
-      chooseUserList: [],
-      flag: false
-    };
-  },
-  watch: {
-    // 根据名称筛选部门树
-    deptName(val) {
-      this.$refs.tree.filter(val);
-    },
-    propUserList(val) {
-      if(val.length>0){
-         this.queryParams.ids = val
-         this.getList()
-         this.flag = true
-      }else{
-         this.chooseUserList = []
-      }
-    }
-  },
-  created() {
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询用户列表 */
-    getList() {
-      this.loading = true;
-      getWorkflowUserListByPage(this.queryParams).then(response => {
-          let res = response.data.page
-          this.userList = res.rows;
-          this.total = res.total;
-           //反选
-          if(this.flag && response.data.list){
-            this.chooseUserList = response.data.list
-            response.data.list.forEach(row => {
-              this.$refs.multipleTable.toggleRowSelection(row,true);
-            })
-          }
-          this.loading = false;
-        });
-    },
-    /** 查询部门下拉树结构 */
-    getTreeselect() {
-      deptTreeSelect().then(response => {
-        this.deptOptions = response.data;
-      });
-    },
-    // 筛选节点
-    filterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
-    },
-    // 节点单击事件
-    handleNodeClick(data) {
-      this.queryParams.deptId = data.id;
-      this.getList();
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.flag = false
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.queryParams.deptId = ''
-      this.queryParams.phonenumber = ''
-      this.queryParams.userName = ''
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(val) {
-        if(this.multiple){
-          this.chooseUserList = val.filter((element,index,self)=>{
-             return self.findIndex(x=>x.userId===element.userId) === index
-          })
-        }else{
-          this.chooseUserList = val
-          if (val.length > 1) {
-            let delRow = val.shift();
-            this.$refs.multipleTable.toggleRowSelection(delRow, false);
-          }
-          if(val.length === 0){
-            this.chooseUserList = null
-          }
-        }
-    },
-    // 删除tag
-    handleCloseTag(user){
-       this.chooseUserList.splice(this.chooseUserList.indexOf(user), 1);
-       this.$refs.multipleTable.toggleRowSelection(user,false)
-       this.userList.forEach((row,index)=>{
-          if(user.userId === row.userId){
-             this.$refs.multipleTable.toggleRowSelection(this.userList[index],false)
-          }
-       })
-    },
-    // 确认
-    confirmUser(){
-      if(this.chooseUserList.length>0){
-        this.$emit("confirmUser",this.chooseUserList)
-      }else{
-        this.$modal.msgWarning("请选择人员！");
-      }
-    }
-  }
-};
-</script>
diff --git a/ruoyi-ui/src/views/components/user/sys-user.vue b/ruoyi-ui/src/views/components/user/sys-user.vue
deleted file mode 100644
index cfed5fd9..00000000
--- a/ruoyi-ui/src/views/components/user/sys-user.vue
+++ /dev/null
@@ -1,267 +0,0 @@
-<template>
-<el-dialog title="用户" :visible.sync="visible" v-if="visible" width="60%" append-to-body v-dialogDrag :close-on-click-modal="false">
-  <div class="app-container">
-    <el-row :gutter="20">
-      <!--用户数据-->
-      <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="归属部门" prop="deptId">
-            <treeselect v-model="queryParams.deptId" style="width: 240px" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
-          </el-form-item>
-          <el-form-item label="用户名称" prop="userName">
-            <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入用户名称"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="手机号码" prop="phonenumber">
-            <el-input
-              v-model="queryParams.phonenumber"
-              placeholder="请输入手机号码"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="创建时间">
-            <el-date-picker
-              v-model="dateRange"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="userList" ref="multipleTable" :row-key="getRowKey" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" :reserve-selection="true" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[5].visible" width="160">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
-      </el-col>
-    </el-row>
-  </div>
-  <!-- 选中的用户 -->
-  <div>
-    <el-tag v-for="user in chooseUserList" :key="user.userName" style="margin:2px"
-    closable @close="handleCloseTag(user)" >{{user.userName}} </el-tag>
-  </div>
-  <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="primary">确认</el-button>
-        <el-button @click="visible=false">取 消</el-button>
-  </div>
-</el-dialog>
-</template>
-
-<script>
-import { getWorkflowUserListByPage } from "@/api/workflow/workflowUser";
-import { deptTreeSelect } from "@/api/system/user";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  props: {
-    //是否多选
-    multiple: {
-      type: Boolean,
-      default: true,
-    },
-    //回显的数据
-    propUserList: {
-      type: Array,
-      default:()=>[]
-    }
-  },
-  name: "User",
-  dicts: ['sys_user_sex'],
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      buttonLoading: false,
-      visible: false,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 用户表格数据
-      userList: [],
-      // 部门树选项
-      deptOptions: [],
-      // 是否显示弹出层
-      open: false,
-      // 部门名称
-      deptName: undefined,
-      // 日期范围
-      dateRange: [],
-      defaultProps: {
-        children: "children",
-        label: "label"
-      },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        userName: undefined,
-        phonenumber: undefined,
-        deptId: undefined,
-        type: undefined,
-        params: undefined,
-        ids:[]
-      },
-      // 列信息
-      columns: [
-        { key: 0, label: `用户编号`, visible: true },
-        { key: 1, label: `用户名称`, visible: true },
-        { key: 2, label: `用户昵称`, visible: true },
-        { key: 3, label: `部门`, visible: true },
-        { key: 4, label: `手机号码`, visible: true },
-        { key: 5, label: `创建时间`, visible: true }
-      ],
-      // 保存选择的用户
-      chooseUserList: [],
-      flag: false
-    };
-  },
-  watch: {
-    // 根据名称筛选部门树
-    deptName(val) {
-      this.$refs.tree.filter(val);
-    },
-    propUserList(val) {
-      if(val.length>0){
-         this.queryParams.ids = val
-         this.flag = true
-         this.getList()
-      }else{
-       this.chooseUserList = []
-      }
-    }
-  },
-  created() {
-    this.getList();
-    this.getTreeselect();
-  },
-  methods: {
-    /** 查询用户列表 */
-    getList() {
-      this.loading = true;
-      getWorkflowUserListByPage(this.queryParams).then(response => {
-          let res = response.data.page
-          this.userList = res.rows;
-          this.total = res.total;
-           //反选
-          if(this.flag && response.data.list){
-            this.chooseUserList = response.data.list
-            response.data.list.forEach(row => {
-              this.$refs.multipleTable.toggleRowSelection(row,true);
-            })
-          }
-          this.loading = false;
-        }
-      );
-    },
-    /** 查询部门下拉树结构 */
-    getTreeselect() {
-      deptTreeSelect().then(response => {
-        this.deptOptions = response.data;
-      });
-    },
-    // 筛选节点
-    filterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
-    },
-    // 节点单击事件
-    handleNodeClick(data) {
-      this.queryParams.deptId = data.id;
-      this.getList();
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.flag = false
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(val) {
-        if(this.multiple){
-          this.chooseUserList = val.filter((element,index,self)=>{
-             return self.findIndex(x=>x.userId===element.userId) === index
-          })
-        }else{
-          this.chooseUserList = val
-          if (val.length > 1) {
-            let delRow = val.shift();
-            this.$refs.multipleTable.toggleRowSelection(delRow, false);
-          }
-          if(val.length === 0){
-            this.chooseUserList = null
-          }
-        }
-    },
-    getRowKey(row) {
-        return row.userId
-    },
-    // 删除tag
-    handleCloseTag(user){
-      this.chooseUserList.splice(this.chooseUserList.indexOf(user), 1);
-      this.$refs.multipleTable.toggleRowSelection(user, false)
-    },
-    // 确认
-    primary(){
-      if(this.chooseUserList.length>0){
-        this.$emit("confirmUser",this.chooseUserList)
-      }else{
-        this.$modal.msgWarning("请选择人员！");
-      }
-    }
-  }
-};
-</script>
-<style scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 84eb9806..b19d81eb 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">智能作业系统</h3>
+      <h3 class="title">若依后台管理系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -55,6 +55,9 @@
       </el-form-item>
     </el-form>
     <!--  底部  -->
+    <div class="el-login-footer">
+      <span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span>
+    </div>
   </div>
 </template>
 
diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue
index 762d97f6..b6f752b9 100644
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">智能作业系统</h3>
+      <h3 class="title">若依后台管理系统</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -60,6 +60,9 @@
       </el-form-item>
     </el-form>
     <!--  底部  -->
+    <div class="el-register-footer">
+      <span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span>
+    </div>
   </div>
 </template>
 
diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/org/index.vue
similarity index 75%
rename from ruoyi-ui/src/views/system/dept/index.vue
rename to ruoyi-ui/src/views/system/org/index.vue
index 486c56cc..585a7f93 100644
--- a/ruoyi-ui/src/views/system/dept/index.vue
+++ b/ruoyi-ui/src/views/system/org/index.vue
@@ -1,336 +1,336 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="部门名称" prop="deptName">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:dept:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="el-icon-sort"
-          size="mini"
-          @click="toggleExpandAll"
-        >展开/折叠</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table
-      v-if="refreshTable"
-      v-loading="loading"
-      :data="deptList"
-      row-key="deptId"
-      :default-expand-all="isExpandAll"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-    >
-      <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
-      <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
-      <el-table-column prop="status" label="状态" width="100">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dept:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-            v-hasPermi="['system:dept:add']"
-          >新增</el-button>
-          <el-button
-            v-if="scope.row.parentId != 0"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dept:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="24" v-if="form.parentId !== 0">
-            <el-form-item label="上级部门" prop="parentId">
-              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="部门名称" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入部门名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="显示排序" prop="orderNum">
-              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="负责人" prop="leader">
-              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="部门状态">
-              <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "Dept",
-  dicts: ['sys_normal_disable'],
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 表格树数据
-      deptList: [],
-      // 部门树选项
-      deptOptions: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 是否展开，默认全部展开
-      isExpandAll: true,
-      // 重新渲染表格状态
-      refreshTable: true,
-      // 查询参数
-      queryParams: {
-        deptName: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        parentId: [
-          { required: true, message: "上级部门不能为空", trigger: "blur" }
-        ],
-        deptName: [
-          { required: true, message: "部门名称不能为空", trigger: "blur" }
-        ],
-        orderNum: [
-          { required: true, message: "显示排序不能为空", trigger: "blur" }
-        ],
-        email: [
-          {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        phone: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询部门列表 */
-    getList() {
-      this.loading = true;
-      listDept(this.queryParams).then(response => {
-        this.deptList = this.handleTree(response.data, "deptId");
-        this.loading = false;
-      });
-    },
-    /** 转换部门数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.deptId,
-        label: node.deptName,
-        children: node.children
-      };
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        deptId: undefined,
-        parentId: undefined,
-        deptName: undefined,
-        orderNum: undefined,
-        leader: undefined,
-        phone: undefined,
-        email: undefined,
-        status: "0"
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.reset();
-      if (row != undefined) {
-        this.form.parentId = row.deptId;
-      }
-      this.open = true;
-      this.title = "添加部门";
-      listDept().then(response => {
-        this.deptOptions = this.handleTree(response.data, "deptId");
-      });
-    },
-    /** 展开/折叠操作 */
-    toggleExpandAll() {
-      this.refreshTable = false;
-      this.isExpandAll = !this.isExpandAll;
-      this.$nextTick(() => {
-        this.refreshTable = true;
-      });
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      getDept(row.deptId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改部门";
-      });
-      listDeptExcludeChild(row.deptId).then(response => {
-        this.deptOptions = this.handleTree(response.data, "deptId");
-      });
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.deptId != undefined) {
-            updateDept(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addDept(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function() {
-        return delDept(row.deptId);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    }
-  }
-};
-</script>
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+      <el-form-item label="机构名称" prop="orgName">
+        <el-input
+          v-model="queryParams.orgName"
+          placeholder="请输入机构名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="机构状态" clearable>
+          <el-option
+            v-for="dict in dict.type.sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:sysOrg:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="sysOrgList"
+      row-key="orgId"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column prop="orgName" label="机构名称" width="260"></el-table-column>
+      <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
+      <el-table-column prop="status" label="状态" width="100">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:sysOrg:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['system:sysOrg:add']"
+          >新增</el-button>
+          <el-button
+            v-if="scope.row.parentId != 0"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:sysOrg:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改机构对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="24" v-if="form.parentId !== 0">
+            <el-form-item label="上级机构" prop="parentId">
+              <treeselect v-model="form.parentId" :options="sysOrgOptions" :normalizer="normalizer" placeholder="选择上级机构" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="机构名称" prop="orgName">
+              <el-input v-model="form.orgName" placeholder="请输入机构名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="显示排序" prop="orderNum">
+              <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="负责人" prop="leader">
+              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系电话" prop="phone">
+              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="机构状态">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listSysOrg, getSysOrg, delSysOrg, addSysOrg, updateSysOrg, listSysOrgExcludeChild } from "@/api/system/org";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "SysOrg",
+  dicts: ['sys_normal_disable'],
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 表格树数据
+      sysOrgList: [],
+      // 机构树选项
+      sysOrgOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 查询参数
+      queryParams: {
+        orgName: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        parentId: [
+          { required: true, message: "上级机构不能为空", trigger: "blur" }
+        ],
+        orgName: [
+          { required: true, message: "机构名称不能为空", trigger: "blur" }
+        ],
+        orderNum: [
+          { required: true, message: "显示排序不能为空", trigger: "blur" }
+        ],
+        email: [
+          {
+            type: "email",
+            message: "请输入正确的邮箱地址",
+            trigger: ["blur", "change"]
+          }
+        ],
+        phone: [
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询机构列表 */
+    getList() {
+      this.loading = true;
+      listSysOrg(this.queryParams).then(response => {
+        this.sysOrgList = this.handleTree(response.data, "orgId");
+        this.loading = false;
+      });
+    },
+    /** 转换机构数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.orgId,
+        label: node.orgName,
+        children: node.children
+      };
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        orgId: undefined,
+        parentId: undefined,
+        orgName: undefined,
+        orderNum: undefined,
+        leader: undefined,
+        phone: undefined,
+        email: undefined,
+        status: "0"
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      if (row != undefined) {
+        this.form.parentId = row.orgId;
+      }
+      this.open = true;
+      this.title = "添加机构";
+      listSysOrg().then(response => {
+        this.sysOrgOptions = this.handleTree(response.data, "orgId");
+      });
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      getSysOrg(row.orgId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改机构";
+      });
+      listSysOrgExcludeChild(row.orgId).then(response => {
+        this.sysOrgOptions = this.handleTree(response.data, "orgId");
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.orgId != undefined) {
+            updateSysOrg(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addSysOrg(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除名称为"' + row.orgName + '"的数据项？').then(function() {
+        return delSysOrg(row.orgId);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index 0681d3d2..65efa569 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -1,607 +1,607 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="角色名称" prop="roleName">
-        <el-input
-          v-model="queryParams.roleName"
-          placeholder="请输入角色名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="权限字符" prop="roleKey">
-        <el-input
-          v-model="queryParams.roleKey"
-          placeholder="请输入权限字符"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="角色状态"
-          clearable
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in dict.type.sys_normal_disable"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker
-          v-model="dateRange"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:role:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:role:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:role:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:role:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="角色编号" prop="roleId" width="120" />
-      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
-      <el-table-column label="显示顺序" prop="roleSort" width="100" />
-      <el-table-column label="状态" align="center" width="100">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.status"
-            active-value="0"
-            inactive-value="1"
-            @change="handleStatusChange(scope.row)"
-          ></el-switch>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:role:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:role:remove']"
-          >删除</el-button>
-          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
-            <span class="el-dropdown-link">
-              <i class="el-icon-d-arrow-right el-icon--right"></i>更多
-            </span>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
-                v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>
-              <el-dropdown-item command="handleAuthUser" icon="el-icon-user"
-                v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="角色名称" prop="roleName">
-          <el-input v-model="form.roleName" placeholder="请输入角色名称" />
-        </el-form-item>
-        <el-form-item prop="roleKey">
-          <span slot="label">
-            <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-            权限字符
-          </span>
-          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
-        </el-form-item>
-        <el-form-item label="角色顺序" prop="roleSort">
-          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in dict.type.sys_normal_disable"
-              :key="dict.value"
-              :label="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="菜单权限">
-          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
-          <el-tree
-            class="tree-border"
-            :data="menuOptions"
-            show-checkbox
-            ref="menu"
-            node-key="id"
-            :check-strictly="!form.menuCheckStrictly"
-            empty-text="加载中，请稍候"
-            :props="defaultProps"
-          ></el-tree>
-        </el-form-item>
-        <el-form-item label="备注">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 分配角色数据权限对话框 -->
-    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
-      <el-form :model="form" label-width="80px">
-        <el-form-item label="角色名称">
-          <el-input v-model="form.roleName" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="权限字符">
-          <el-input v-model="form.roleKey" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="权限范围">
-          <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
-            <el-option
-              v-for="item in dataScopeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="数据权限" v-show="form.dataScope == 2">
-          <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">展开/折叠</el-checkbox>
-          <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">全选/全不选</el-checkbox>
-          <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">父子联动</el-checkbox>
-          <el-tree
-            class="tree-border"
-            :data="deptOptions"
-            show-checkbox
-            default-expand-all
-            ref="dept"
-            node-key="id"
-            :check-strictly="!form.deptCheckStrictly"
-            empty-text="加载中，请稍候"
-            :props="defaultProps"
-          ></el-tree>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitDataScope">确 定</el-button>
-        <el-button @click="cancelDataScope">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
-import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
-
-export default {
-  name: "Role",
-  dicts: ['sys_normal_disable'],
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 角色表格数据
-      roleList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 是否显示弹出层（数据权限）
-      openDataScope: false,
-      menuExpand: false,
-      menuNodeAll: false,
-      deptExpand: true,
-      deptNodeAll: false,
-      // 日期范围
-      dateRange: [],
-      // 数据范围选项
-      dataScopeOptions: [
-        {
-          value: "1",
-          label: "全部数据权限"
-        },
-        {
-          value: "2",
-          label: "自定数据权限"
-        },
-        {
-          value: "3",
-          label: "本部门数据权限"
-        },
-        {
-          value: "4",
-          label: "本部门及以下数据权限"
-        },
-        {
-          value: "5",
-          label: "仅本人数据权限"
-        }
-      ],
-      // 菜单列表
-      menuOptions: [],
-      // 部门列表
-      deptOptions: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        roleName: undefined,
-        roleKey: undefined,
-        status: undefined
-      },
-      // 表单参数
-      form: {},
-      defaultProps: {
-        children: "children",
-        label: "label"
-      },
-      // 表单校验
-      rules: {
-        roleName: [
-          { required: true, message: "角色名称不能为空", trigger: "blur" }
-        ],
-        roleKey: [
-          { required: true, message: "权限字符不能为空", trigger: "blur" }
-        ],
-        roleSort: [
-          { required: true, message: "角色顺序不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询角色列表 */
-    getList() {
-      this.loading = true;
-      listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.roleList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
-    /** 查询菜单树结构 */
-    getMenuTreeselect() {
-      menuTreeselect().then(response => {
-        this.menuOptions = response.data;
-      });
-    },
-    // 所有菜单节点数据
-    getMenuAllCheckedKeys() {
-      // 目前被选中的菜单节点
-      let checkedKeys = this.$refs.menu.getCheckedKeys();
-      // 半选中的菜单节点
-      let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-      return checkedKeys;
-    },
-    // 所有部门节点数据
-    getDeptAllCheckedKeys() {
-      // 目前被选中的部门节点
-      let checkedKeys = this.$refs.dept.getCheckedKeys();
-      // 半选中的部门节点
-      let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-      return checkedKeys;
-    },
-    /** 根据角色ID查询菜单树结构 */
-    getRoleMenuTreeselect(roleId) {
-      return roleMenuTreeselect(roleId).then(response => {
-        this.menuOptions = response.menus;
-        return response;
-      });
-    },
-    /** 根据角色ID查询部门树结构 */
-    getDeptTree(roleId) {
-      return deptTreeSelect(roleId).then(response => {
-        this.deptOptions = response.depts;
-        return response;
-      });
-    },
-    // 角色状态修改
-    handleStatusChange(row) {
-      let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function() {
-        return changeRoleStatus(row.roleId, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0";
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 取消按钮（数据权限）
-    cancelDataScope() {
-      this.openDataScope = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      if (this.$refs.menu != undefined) {
-        this.$refs.menu.setCheckedKeys([]);
-      }
-      this.menuExpand = false,
-      this.menuNodeAll = false,
-      this.deptExpand = true,
-      this.deptNodeAll = false,
-      this.form = {
-        roleId: undefined,
-        roleName: undefined,
-        roleKey: undefined,
-        roleSort: 0,
-        status: "0",
-        menuIds: [],
-        deptIds: [],
-        menuCheckStrictly: true,
-        deptCheckStrictly: true,
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.roleId)
-      this.single = selection.length!=1
-      this.multiple = !selection.length
-    },
-    // 更多操作触发
-    handleCommand(command, row) {
-      switch (command) {
-        case "handleDataScope":
-          this.handleDataScope(row);
-          break;
-        case "handleAuthUser":
-          this.handleAuthUser(row);
-          break;
-        default:
-          break;
-      }
-    },
-    // 树权限（展开/折叠）
-    handleCheckedTreeExpand(value, type) {
-      if (type == 'menu') {
-        let treeList = this.menuOptions;
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
-        }
-      } else if (type == 'dept') {
-        let treeList = this.deptOptions;
-        for (let i = 0; i < treeList.length; i++) {
-          this.$refs.dept.store.nodesMap[treeList[i].id].expanded = value;
-        }
-      }
-    },
-    // 树权限（全选/全不选）
-    handleCheckedTreeNodeAll(value, type) {
-      if (type == 'menu') {
-        this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
-      } else if (type == 'dept') {
-        this.$refs.dept.setCheckedNodes(value ? this.deptOptions: []);
-      }
-    },
-    // 树权限（父子联动）
-    handleCheckedTreeConnect(value, type) {
-      if (type == 'menu') {
-        this.form.menuCheckStrictly = value ? true: false;
-      } else if (type == 'dept') {
-        this.form.deptCheckStrictly = value ? true: false;
-      }
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.getMenuTreeselect();
-      this.open = true;
-      this.title = "添加角色";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const roleId = row.roleId || this.ids
-      const roleMenu = this.getRoleMenuTreeselect(roleId);
-      getRole(roleId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.$nextTick(() => {
-          roleMenu.then(res => {
-            let checkedKeys = res.checkedKeys
-            checkedKeys.forEach((v) => {
-                this.$nextTick(()=>{
-                    this.$refs.menu.setChecked(v, true ,false);
-                })
-            })
-          });
-        });
-        this.title = "修改角色";
-      });
-    },
-    /** 选择角色权限范围触发 */
-    dataScopeSelectChange(value) {
-      if(value !== '2') {
-        this.$refs.dept.setCheckedKeys([]);
-      }
-    },
-    /** 分配数据权限操作 */
-    handleDataScope(row) {
-      this.reset();
-      const deptTreeSelect = this.getDeptTree(row.roleId);
-      getRole(row.roleId).then(response => {
-        this.form = response.data;
-        this.openDataScope = true;
-        this.$nextTick(() => {
-          deptTreeSelect.then(res => {
-            this.$refs.dept.setCheckedKeys(res.checkedKeys);
-          });
-        });
-        this.title = "分配数据权限";
-      });
-    },
-    /** 分配用户操作 */
-    handleAuthUser: function(row) {
-      const roleId = row.roleId;
-      this.$router.push("/system/role-auth/user/" + roleId);
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.roleId != undefined) {
-            this.form.menuIds = this.getMenuAllCheckedKeys();
-            updateRole(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            this.form.menuIds = this.getMenuAllCheckedKeys();
-            addRole(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 提交按钮（数据权限） */
-    submitDataScope: function() {
-      if (this.form.roleId != undefined) {
-        this.form.deptIds = this.getDeptAllCheckedKeys();
-        dataScope(this.form).then(response => {
-          this.$modal.msgSuccess("修改成功");
-          this.openDataScope = false;
-          this.getList();
-        });
-      }
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const roleIds = row.roleId || this.ids;
-      this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
-        return delRole(roleIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/role/export', {
-        ...this.queryParams
-      }, `role_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
\ No newline at end of file
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+      <el-form-item label="角色名称" prop="roleName">
+        <el-input
+          v-model="queryParams.roleName"
+          placeholder="请输入角色名称"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="权限字符" prop="roleKey">
+        <el-input
+          v-model="queryParams.roleKey"
+          placeholder="请输入权限字符"
+          clearable
+          style="width: 240px"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="角色状态"
+          clearable
+          style="width: 240px"
+        >
+          <el-option
+            v-for="dict in dict.type.sys_normal_disable"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:role:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:role:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:role:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:role:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="角色编号" prop="roleId" width="120" />
+      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
+      <el-table-column label="显示顺序" prop="roleSort" width="100" />
+      <el-table-column label="状态" align="center" width="100">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.status"
+            active-value="0"
+            inactive-value="1"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:role:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:role:remove']"
+          >删除</el-button>
+          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
+            <span class="el-dropdown-link">
+              <i class="el-icon-d-arrow-right el-icon--right"></i>更多
+            </span>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
+                v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>
+              <el-dropdown-item command="handleAuthUser" icon="el-icon-user"
+                v-hasPermi="['system:role:edit']">分配用户</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改角色配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="角色名称" prop="roleName">
+          <el-input v-model="form.roleName" placeholder="请输入角色名称" />
+        </el-form-item>
+        <el-form-item prop="roleKey">
+          <span slot="label">
+            <el-tooltip content="控制器中定义的权限字符，如：@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+            权限字符
+          </span>
+          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
+        </el-form-item>
+        <el-form-item label="角色顺序" prop="roleSort">
+          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="form.status">
+            <el-radio
+              v-for="dict in dict.type.sys_normal_disable"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="菜单权限">
+          <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
+          <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
+          <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">父子联动</el-checkbox>
+          <el-tree
+            class="tree-border"
+            :data="menuOptions"
+            show-checkbox
+            ref="menu"
+            node-key="id"
+            :check-strictly="!form.menuCheckStrictly"
+            empty-text="加载中，请稍候"
+            :props="defaultProps"
+          ></el-tree>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 分配角色数据权限对话框 -->
+    <el-dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
+      <el-form :model="form" label-width="80px">
+        <el-form-item label="角色名称">
+          <el-input v-model="form.roleName" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="权限字符">
+          <el-input v-model="form.roleKey" :disabled="true" />
+        </el-form-item>
+        <el-form-item label="权限范围">
+          <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
+            <el-option
+              v-for="item in dataScopeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="数据权限" v-show="form.dataScope == 2">
+          <el-checkbox v-model="sysOrgExpand" @change="handleCheckedTreeExpand($event, 'sysOrg')">展开/折叠</el-checkbox>
+          <el-checkbox v-model="orgNodeAll" @change="handleCheckedTreeNodeAll($event, 'sysOrg')">全选/全不选</el-checkbox>
+          <el-checkbox v-model="form.orgCheckStrictly" @change="handleCheckedTreeConnect($event, 'sysOrg')">父子联动</el-checkbox>
+          <el-tree
+            class="tree-border"
+            :data="sysOrgOptions"
+            show-checkbox
+            default-expand-all
+            ref="sysOrg"
+            node-key="id"
+            :check-strictly="!form.orgCheckStrictly"
+            empty-text="加载中，请稍候"
+            :props="defaultProps"
+          ></el-tree>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitDataScope">确 定</el-button>
+        <el-button @click="cancelDataScope">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listRole, getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, sysOrgTreeSelect } from "@/api/system/role";
+import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
+
+export default {
+  name: "Role",
+  dicts: ['sys_normal_disable'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 角色表格数据
+      roleList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示弹出层（数据权限）
+      openDataScope: false,
+      menuExpand: false,
+      menuNodeAll: false,
+      sysOrgExpand: true,
+      orgNodeAll: false,
+      // 日期范围
+      dateRange: [],
+      // 数据范围选项
+      dataScopeOptions: [
+        {
+          value: "1",
+          label: "全部数据权限"
+        },
+        {
+          value: "2",
+          label: "自定数据权限"
+        },
+        {
+          value: "3",
+          label: "本机构数据权限"
+        },
+        {
+          value: "4",
+          label: "本机构及以下数据权限"
+        },
+        {
+          value: "5",
+          label: "仅本人数据权限"
+        }
+      ],
+      // 菜单列表
+      menuOptions: [],
+      // 机构列表
+      sysOrgOptions: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        roleName: undefined,
+        roleKey: undefined,
+        status: undefined
+      },
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 表单校验
+      rules: {
+        roleName: [
+          { required: true, message: "角色名称不能为空", trigger: "blur" }
+        ],
+        roleKey: [
+          { required: true, message: "权限字符不能为空", trigger: "blur" }
+        ],
+        roleSort: [
+          { required: true, message: "角色顺序不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询角色列表 */
+    getList() {
+      this.loading = true;
+      listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.roleList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 查询菜单树结构 */
+    getMenuTreeselect() {
+      menuTreeselect().then(response => {
+        this.menuOptions = response.data;
+      });
+    },
+    // 所有菜单节点数据
+    getMenuAllCheckedKeys() {
+      // 目前被选中的菜单节点
+      let checkedKeys = this.$refs.menu.getCheckedKeys();
+      // 半选中的菜单节点
+      let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
+      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
+      return checkedKeys;
+    },
+    // 所有机构节点数据
+    getSysOrgAllCheckedKeys() {
+      // 目前被选中的机构节点
+      let checkedKeys = this.$refs.sysOrg.getCheckedKeys();
+      // 半选中的机构节点
+      let halfCheckedKeys = this.$refs.sysOrg.getHalfCheckedKeys();
+      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
+      return checkedKeys;
+    },
+    /** 根据角色ID查询菜单树结构 */
+    getRoleMenuTreeselect(roleId) {
+      return roleMenuTreeselect(roleId).then(response => {
+        this.menuOptions = response.menus;
+        return response;
+      });
+    },
+    /** 根据角色ID查询机构树结构 */
+    getSysOrgTree(roleId) {
+      return sysOrgTreeSelect(roleId).then(response => {
+        this.sysOrgOptions = response.sysOrgs;
+        return response;
+      });
+    },
+    // 角色状态修改
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function() {
+        return changeRoleStatus(row.roleId, row.status);
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.status = row.status === "0" ? "1" : "0";
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 取消按钮（数据权限）
+    cancelDataScope() {
+      this.openDataScope = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      if (this.$refs.menu != undefined) {
+        this.$refs.menu.setCheckedKeys([]);
+      }
+      this.menuExpand = false,
+      this.menuNodeAll = false,
+      this.sysOrgExpand = true,
+      this.orgNodeAll = false,
+      this.form = {
+        roleId: undefined,
+        roleName: undefined,
+        roleKey: undefined,
+        roleSort: 0,
+        status: "0",
+        menuIds: [],
+        orgIds: [],
+        menuCheckStrictly: true,
+        orgCheckStrictly: true,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.roleId)
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleDataScope":
+          this.handleDataScope(row);
+          break;
+        case "handleAuthUser":
+          this.handleAuthUser(row);
+          break;
+        default:
+          break;
+      }
+    },
+    // 树权限（展开/折叠）
+    handleCheckedTreeExpand(value, type) {
+      if (type == 'menu') {
+        let treeList = this.menuOptions;
+        for (let i = 0; i < treeList.length; i++) {
+          this.$refs.menu.store.nodesMap[treeList[i].id].expanded = value;
+        }
+      } else if (type == 'sysOrg') {
+        let treeList = this.sysOrgOptions;
+        for (let i = 0; i < treeList.length; i++) {
+          this.$refs.sysOrg.store.nodesMap[treeList[i].id].expanded = value;
+        }
+      }
+    },
+    // 树权限（全选/全不选）
+    handleCheckedTreeNodeAll(value, type) {
+      if (type == 'menu') {
+        this.$refs.menu.setCheckedNodes(value ? this.menuOptions: []);
+      } else if (type == 'sysOrg') {
+        this.$refs.sysOrg.setCheckedNodes(value ? this.sysOrgOptions: []);
+      }
+    },
+    // 树权限（父子联动）
+    handleCheckedTreeConnect(value, type) {
+      if (type == 'menu') {
+        this.form.menuCheckStrictly = value ? true: false;
+      } else if (type == 'sysOrg') {
+        this.form.orgCheckStrictly = value ? true: false;
+      }
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.getMenuTreeselect();
+      this.open = true;
+      this.title = "添加角色";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const roleId = row.roleId || this.ids
+      const roleMenu = this.getRoleMenuTreeselect(roleId);
+      getRole(roleId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.$nextTick(() => {
+          roleMenu.then(res => {
+            let checkedKeys = res.checkedKeys
+            checkedKeys.forEach((v) => {
+                this.$nextTick(()=>{
+                    this.$refs.menu.setChecked(v, true ,false);
+                })
+            })
+          });
+        });
+        this.title = "修改角色";
+      });
+    },
+    /** 选择角色权限范围触发 */
+    dataScopeSelectChange(value) {
+      if(value !== '2') {
+        this.$refs.sysOrg.setCheckedKeys([]);
+      }
+    },
+    /** 分配数据权限操作 */
+    handleDataScope(row) {
+      this.reset();
+      const sysOrgTreeSelect = this.getSysOrgTree(row.roleId);
+      getRole(row.roleId).then(response => {
+        this.form = response.data;
+        this.openDataScope = true;
+        this.$nextTick(() => {
+          sysOrgTreeSelect.then(res => {
+            this.$refs.sysOrg.setCheckedKeys(res.checkedKeys);
+          });
+        });
+        this.title = "分配数据权限";
+      });
+    },
+    /** 分配用户操作 */
+    handleAuthUser: function(row) {
+      const roleId = row.roleId;
+      this.$router.push("/system/role-auth/user/" + roleId);
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.roleId != undefined) {
+            this.form.menuIds = this.getMenuAllCheckedKeys();
+            updateRole(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            this.form.menuIds = this.getMenuAllCheckedKeys();
+            addRole(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 提交按钮（数据权限） */
+    submitDataScope: function() {
+      if (this.form.roleId != undefined) {
+        this.form.orgIds = this.getSysOrgAllCheckedKeys();
+        dataScope(this.form).then(response => {
+          this.$modal.msgSuccess("修改成功");
+          this.openDataScope = false;
+          this.getList();
+        });
+      }
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const roleIds = row.roleId || this.ids;
+      this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
+        return delRole(roleIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/role/export', {
+        ...this.queryParams
+      }, `role_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 2494fa24..04bc0f06 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -1,669 +1,669 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <!--部门数据-->
-      <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input
-            v-model="deptName"
-            placeholder="请输入部门名称"
-            clearable
-            size="small"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
-        </div>
-        <div class="head-container">
-          <el-tree
-            :data="deptOptions"
-            :props="defaultProps"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            ref="tree"
-            default-expand-all
-            highlight-current
-            @node-click="handleNodeClick"
-          />
-        </div>
-      </el-col>
-      <!--用户数据-->
-      <el-col :span="20" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="用户名称" prop="userName">
-            <el-input
-              v-model="queryParams.userName"
-              placeholder="请输入用户名称"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="手机号码" prop="phonenumber">
-            <el-input
-              v-model="queryParams.phonenumber"
-              placeholder="请输入手机号码"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="状态" prop="status">
-            <el-select
-              v-model="queryParams.status"
-              placeholder="用户状态"
-              clearable
-              style="width: 240px"
-            >
-              <el-option
-                v-for="dict in dict.type.sys_normal_disable"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="创建时间">
-            <el-date-picker
-              v-model="dateRange"
-              style="width: 240px"
-              value-format="yyyy-MM-dd"
-              type="daterange"
-              range-separator="-"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              type="primary"
-              plain
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-              v-hasPermi="['system:user:add']"
-            >新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
-            >修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              size="mini"
-              :disabled="multiple"
-              @click="handleDelete"
-              v-hasPermi="['system:user:remove']"
-            >删除</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="info"
-              plain
-              icon="el-icon-upload2"
-              size="mini"
-              @click="handleImport"
-              v-hasPermi="['system:user:import']"
-            >导入</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="warning"
-              plain
-              icon="el-icon-download"
-              size="mini"
-              @click="handleExport"
-              v-hasPermi="['system:user:export']"
-            >导出</el-button>
-          </el-col>
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.status"
-                active-value="0"
-                inactive-value="1"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
-            </template>
-          </el-table-column>
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column
-            label="操作"
-            align="center"
-            width="160"
-            class-name="small-padding fixed-width"
-          >
-            <template slot-scope="scope" v-if="scope.row.userId !== 1">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']"
-              >修改</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"
-              >删除</el-button>
-              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
-                <span class="el-dropdown-link">
-                  <i class="el-icon-d-arrow-right el-icon--right"></i>更多
-                </span>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
-                    v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
-                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
-                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
-      </el-col>
-    </el-row>
-
-    <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户昵称" prop="nickName">
-              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户性别">
-              <el-select v-model="form.sex" placeholder="请选择性别">
-                <el-option
-                  v-for="dict in dict.type.sys_user_sex"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.status">
-                <el-radio
-                  v-for="dict in dict.type.sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.value"
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
-                <el-option
-                  v-for="item in postOptions"
-                  :key="item.postId"
-                  :label="item.postName"
-                  :value="item.postId"
-                  :disabled="item.status == 1"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="角色">
-              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
-                <el-option
-                  v-for="item in roleOptions"
-                  :key="item.roleId"
-                  :label="item.roleName"
-                  :value="item.roleId"
-                  :disabled="item.status == 1"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 用户导入对话框 -->
-    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
-      <el-upload
-        ref="upload"
-        :limit="1"
-        accept=".xlsx, .xls"
-        :headers="upload.headers"
-        :action="upload.url + '?updateSupport=' + upload.updateSupport"
-        :disabled="upload.isUploading"
-        :on-progress="handleFileUploadProgress"
-        :on-success="handleFileSuccess"
-        :auto-upload="false"
-        drag
-      >
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-        <div class="el-upload__tip text-center" slot="tip">
-          <div class="el-upload__tip" slot="tip">
-            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
-          </div>
-          <span>仅允许导入xls、xlsx格式文件。</span>
-          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
-        </div>
-      </el-upload>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFileForm">确 定</el-button>
-        <el-button @click="upload.open = false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
-import { getToken } from "@/utils/auth";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  name: "User",
-  dicts: ['sys_normal_disable', 'sys_user_sex'],
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 用户表格数据
-      userList: null,
-      // 弹出层标题
-      title: "",
-      // 部门树选项
-      deptOptions: undefined,
-      // 是否显示弹出层
-      open: false,
-      // 部门名称
-      deptName: undefined,
-      // 默认密码
-      initPassword: undefined,
-      // 日期范围
-      dateRange: [],
-      // 岗位选项
-      postOptions: [],
-      // 角色选项
-      roleOptions: [],
-      // 表单参数
-      form: {},
-      defaultProps: {
-        children: "children",
-        label: "label"
-      },
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
-      },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        userName: undefined,
-        phonenumber: undefined,
-        status: undefined,
-        deptId: undefined
-      },
-      // 列信息
-      columns: [
-        { key: 0, label: `用户编号`, visible: true },
-        { key: 1, label: `用户名称`, visible: true },
-        { key: 2, label: `用户昵称`, visible: true },
-        { key: 3, label: `部门`, visible: true },
-        { key: 4, label: `手机号码`, visible: true },
-        { key: 5, label: `状态`, visible: true },
-        { key: 6, label: `创建时间`, visible: true }
-      ],
-      // 表单校验
-      rules: {
-        userName: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" },
-          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
-        ],
-        nickName: [
-          { required: true, message: "用户昵称不能为空", trigger: "blur" }
-        ],
-        password: [
-          { required: true, message: "用户密码不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
-        ],
-        email: [
-          {
-            type: "email",
-            message: "请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        phonenumber: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
-      }
-    };
-  },
-  watch: {
-    // 根据名称筛选部门树
-    deptName(val) {
-      this.$refs.tree.filter(val);
-    }
-  },
-  created() {
-    this.getList();
-    this.getDeptTree();
-    this.getConfigKey("sys.user.initPassword").then(response => {
-      this.initPassword = response.msg;
-    });
-  },
-  methods: {
-    /** 查询用户列表 */
-    getList() {
-      this.loading = true;
-      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.userList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
-    /** 查询部门下拉树结构 */
-    getDeptTree() {
-      deptTreeSelect().then(response => {
-        this.deptOptions = response.data;
-      });
-    },
-    // 筛选节点
-    filterNode(value, data) {
-      if (!value) return true;
-      return data.label.indexOf(value) !== -1;
-    },
-    // 节点单击事件
-    handleNodeClick(data) {
-      this.queryParams.deptId = data.id;
-      this.handleQuery();
-    },
-    // 用户状态修改
-    handleStatusChange(row) {
-      let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
-        return changeUserStatus(row.userId, row.status);
-      }).then(() => {
-        this.$modal.msgSuccess(text + "成功");
-      }).catch(function() {
-        row.status = row.status === "0" ? "1" : "0";
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        userId: undefined,
-        deptId: undefined,
-        userName: undefined,
-        nickName: undefined,
-        password: undefined,
-        phonenumber: undefined,
-        email: undefined,
-        sex: undefined,
-        status: "0",
-        remark: undefined,
-        postIds: [],
-        roleIds: []
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId);
-      this.single = selection.length != 1;
-      this.multiple = !selection.length;
-    },
-    // 更多操作触发
-    handleCommand(command, row) {
-      switch (command) {
-        case "handleResetPwd":
-          this.handleResetPwd(row);
-          break;
-        case "handleAuthRole":
-          this.handleAuthRole(row);
-          break;
-        default:
-          break;
-      }
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      getUser().then(response => {
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.open = true;
-        this.title = "添加用户";
-        this.form.password = this.initPassword;
-      });
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const userId = row.userId || this.ids;
-      getUser(userId).then(response => {
-        this.form = response.data;
-        this.postOptions = response.posts;
-        this.roleOptions = response.roles;
-        this.$set(this.form, "postIds", response.postIds);
-        this.$set(this.form, "roleIds", response.roleIds);
-        this.open = true;
-        this.title = "修改用户";
-        this.form.password = "";
-      });
-    },
-    /** 重置密码按钮操作 */
-    handleResetPwd(row) {
-      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        closeOnClickModal: false,
-        inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
-      }).then(({ value }) => {
-          resetUserPwd(row.userId, value).then(response => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value);
-          });
-        }).catch(() => {});
-    },
-    /** 分配角色操作 */
-    handleAuthRole: function(row) {
-      const userId = row.userId;
-      this.$router.push("/system/user-auth/role/" + userId);
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.userId != undefined) {
-            updateUser(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addUser(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const userIds = row.userId || this.ids;
-      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
-        return delUser(userIds);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('system/user/export', {
-        ...this.queryParams
-      }, `user_${new Date().getTime()}.xlsx`)
-    },
-    /** 导入按钮操作 */
-    handleImport() {
-      this.upload.title = "用户导入";
-      this.upload.open = true;
-    },
-    /** 下载模板操作 */
-    importTemplate() {
-      this.download('system/user/importTemplate', {
-      }, `user_template_${new Date().getTime()}.xlsx`)
-    },
-    // 文件上传中处理
-    handleFileUploadProgress(event, file, fileList) {
-      this.upload.isUploading = true;
-    },
-    // 文件上传成功处理
-    handleFileSuccess(response, file, fileList) {
-      this.upload.open = false;
-      this.upload.isUploading = false;
-      this.$refs.upload.clearFiles();
-      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
-      this.getList();
-    },
-    // 提交上传文件
-    submitFileForm() {
-      this.$refs.upload.submit();
-    }
-  }
-};
-</script>
\ No newline at end of file
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--机构数据-->
+      <el-col :span="4" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="orgName"
+            placeholder="请输入机构名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="sysOrgOptions"
+            :props="defaultProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="20" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form-item label="用户名称" prop="userName">
+            <el-input
+              v-model="queryParams.userName"
+              placeholder="请输入用户名称"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="手机号码" prop="phonenumber">
+            <el-input
+              v-model="queryParams.phonenumber"
+              placeholder="请输入手机号码"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-select
+              v-model="queryParams.status"
+              placeholder="用户状态"
+              clearable
+              style="width: 240px"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_normal_disable"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="创建时间">
+            <el-date-picker
+              v-model="dateRange"
+              style="width: 240px"
+              value-format="yyyy-MM-dd"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['system:user:add']"
+            >新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleUpdate"
+              v-hasPermi="['system:user:edit']"
+            >修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="danger"
+              plain
+              icon="el-icon-delete"
+              size="mini"
+              :disabled="multiple"
+              @click="handleDelete"
+              v-hasPermi="['system:user:remove']"
+            >删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="info"
+              plain
+              icon="el-icon-upload2"
+              size="mini"
+              @click="handleImport"
+              v-hasPermi="['system:user:import']"
+            >导入</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="warning"
+              plain
+              icon="el-icon-download"
+              size="mini"
+              @click="handleExport"
+              v-hasPermi="['system:user:export']"
+            >导出</el-button>
+          </el-col>
+          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="机构" align="center" key="orgName" prop="sysOrg.orgName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
+          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+            <template slot-scope="scope">
+              <el-switch
+                v-model="scope.row.status"
+                active-value="0"
+                inactive-value="1"
+                @change="handleStatusChange(scope.row)"
+              ></el-switch>
+            </template>
+          </el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope" v-if="scope.row.userId !== 1">
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['system:user:edit']"
+              >修改</el-button>
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.row)"
+                v-hasPermi="['system:user:remove']"
+              >删除</el-button>
+              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
+                <span class="el-dropdown-link">
+                  <i class="el-icon-d-arrow-right el-icon--right"></i>更多
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
+                    v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>
+                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"
+                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+
+    <!-- 添加或修改用户配置对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户昵称" prop="nickName">
+              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="归属机构" prop="orgId">
+              <treeselect v-model="form.orgId" :options="sysOrgOptions" :show-count="true" placeholder="请选择归属机构" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="手机号码" prop="phonenumber">
+              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
+              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="用户性别">
+              <el-select v-model="form.sex" placeholder="请选择性别">
+                <el-option
+                  v-for="dict in dict.type.sys_user_sex"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="状态">
+              <el-radio-group v-model="form.status">
+                <el-radio
+                  v-for="dict in dict.type.sys_normal_disable"
+                  :key="dict.value"
+                  :label="dict.value"
+                >{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="岗位">
+              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
+                <el-option
+                  v-for="item in postOptions"
+                  :key="item.postId"
+                  :label="item.postName"
+                  :value="item.postId"
+                  :disabled="item.status == 1"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="角色">
+              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+                <el-option
+                  v-for="item in roleOptions"
+                  :key="item.roleId"
+                  :label="item.roleName"
+                  :value="item.roleId"
+                  :disabled="item.status == 1"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+      <el-upload
+        ref="upload"
+        :limit="1"
+        accept=".xlsx, .xls"
+        :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        :auto-upload="false"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <div class="el-upload__tip text-center" slot="tip">
+          <div class="el-upload__tip" slot="tip">
+            <el-checkbox v-model="upload.updateSupport" /> 是否更新已经存在的用户数据
+          </div>
+          <span>仅允许导入xls、xlsx格式文件。</span>
+          <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;" @click="importTemplate">下载模板</el-link>
+        </div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFileForm">确 定</el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, sysOrgTreeSelect } from "@/api/system/user";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "User",
+  dicts: ['sys_normal_disable', 'sys_user_sex'],
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用户表格数据
+      userList: null,
+      // 弹出层标题
+      title: "",
+      // 机构树选项
+      sysOrgOptions: undefined,
+      // 是否显示弹出层
+      open: false,
+      // 机构名称
+      orgName: undefined,
+      // 默认密码
+      initPassword: undefined,
+      // 日期范围
+      dateRange: [],
+      // 岗位选项
+      postOptions: [],
+      // 角色选项
+      roleOptions: [],
+      // 表单参数
+      form: {},
+      defaultProps: {
+        children: "children",
+        label: "label"
+      },
+      // 用户导入参数
+      upload: {
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/system/user/importData"
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        userName: undefined,
+        phonenumber: undefined,
+        status: undefined,
+        orgId: undefined
+      },
+      // 列信息
+      columns: [
+        { key: 0, label: `用户编号`, visible: true },
+        { key: 1, label: `用户名称`, visible: true },
+        { key: 2, label: `用户昵称`, visible: true },
+        { key: 3, label: `机构`, visible: true },
+        { key: 4, label: `手机号码`, visible: true },
+        { key: 5, label: `状态`, visible: true },
+        { key: 6, label: `创建时间`, visible: true }
+      ],
+      // 表单校验
+      rules: {
+        userName: [
+          { required: true, message: "用户名称不能为空", trigger: "blur" },
+          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+        ],
+        nickName: [
+          { required: true, message: "用户昵称不能为空", trigger: "blur" }
+        ],
+        password: [
+          { required: true, message: "用户密码不能为空", trigger: "blur" },
+          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+        ],
+        email: [
+          {
+            type: "email",
+            message: "请输入正确的邮箱地址",
+            trigger: ["blur", "change"]
+          }
+        ],
+        phonenumber: [
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+        ]
+      }
+    };
+  },
+  watch: {
+    // 根据名称筛选机构树
+    orgName(val) {
+      this.$refs.tree.filter(val);
+    }
+  },
+  created() {
+    this.getList();
+    this.getSysOrgTree();
+    this.getConfigKey("sys.user.initPassword").then(response => {
+      this.initPassword = response.msg;
+    });
+  },
+  methods: {
+    /** 查询用户列表 */
+    getList() {
+      this.loading = true;
+      listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+          this.userList = response.rows;
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
+    /** 查询机构下拉树结构 */
+    getSysOrgTree() {
+      sysOrgTreeSelect().then(response => {
+        this.sysOrgOptions = response.data;
+      });
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      this.queryParams.orgId = data.id;
+      this.handleQuery();
+    },
+    // 用户状态修改
+    handleStatusChange(row) {
+      let text = row.status === "0" ? "启用" : "停用";
+      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+        return changeUserStatus(row.userId, row.status);
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.status = row.status === "0" ? "1" : "0";
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        userId: undefined,
+        orgId: undefined,
+        userName: undefined,
+        nickName: undefined,
+        password: undefined,
+        phonenumber: undefined,
+        email: undefined,
+        sex: undefined,
+        status: "0",
+        remark: undefined,
+        postIds: [],
+        roleIds: []
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.userId);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleResetPwd":
+          this.handleResetPwd(row);
+          break;
+        case "handleAuthRole":
+          this.handleAuthRole(row);
+          break;
+        default:
+          break;
+      }
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      getUser().then(response => {
+        this.postOptions = response.posts;
+        this.roleOptions = response.roles;
+        this.open = true;
+        this.title = "添加用户";
+        this.form.password = this.initPassword;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const userId = row.userId || this.ids;
+      getUser(userId).then(response => {
+        this.form = response.data;
+        this.postOptions = response.posts;
+        this.roleOptions = response.roles;
+        this.$set(this.form, "postIds", response.postIds);
+        this.$set(this.form, "roleIds", response.roleIds);
+        this.open = true;
+        this.title = "修改用户";
+        this.form.password = "";
+      });
+    },
+    /** 重置密码按钮操作 */
+    handleResetPwd(row) {
+      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        closeOnClickModal: false,
+        inputPattern: /^.{5,20}$/,
+        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
+      }).then(({ value }) => {
+          resetUserPwd(row.userId, value).then(response => {
+            this.$modal.msgSuccess("修改成功，新密码是：" + value);
+          });
+        }).catch(() => {});
+    },
+    /** 分配角色操作 */
+    handleAuthRole: function(row) {
+      const userId = row.userId;
+      this.$router.push("/system/user-auth/role/" + userId);
+    },
+    /** 提交按钮 */
+    submitForm: function() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.userId != undefined) {
+            updateUser(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addUser(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const userIds = row.userId || this.ids;
+      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {
+        return delUser(userIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/user/export', {
+        ...this.queryParams
+      }, `user_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.download('system/user/importTemplate', {
+      }, `user_template_${new Date().getTime()}.xlsx`)
+    },
+    // 文件上传中处理
+    handleFileUploadProgress(event, file, fileList) {
+      this.upload.isUploading = true;
+    },
+    // 文件上传成功处理
+    handleFileSuccess(response, file, fileList) {
+      this.upload.open = false;
+      this.upload.isUploading = false;
+      this.$refs.upload.clearFiles();
+      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+      this.getList();
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/system/user/profile/index.vue b/ruoyi-ui/src/views/system/user/profile/index.vue
index ad530f9a..5683d4dd 100644
--- a/ruoyi-ui/src/views/system/user/profile/index.vue
+++ b/ruoyi-ui/src/views/system/user/profile/index.vue
@@ -24,8 +24,8 @@
                 <div class="pull-right">{{ user.email }}</div>
               </li>
               <li class="list-group-item">
-                <svg-icon icon-class="tree" />所属部门
-                <div class="pull-right" v-if="user.dept">{{ user.dept.deptName }} / {{ postGroup }}</div>
+                <svg-icon icon-class="tree" />所属机构
+                <div class="pull-right" v-if="user.sysOrg">{{ user.sysOrg.orgName }} / {{ postGroup }}</div>
               </li>
               <li class="list-group-item">
                 <svg-icon icon-class="peoples" />所属角色
diff --git a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue b/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
index bf6382d3..d97e675c 100644
--- a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
+++ b/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
@@ -1,299 +1,299 @@
-<template>
-  <el-form ref="genInfoForm" :model="info" :rules="rules" label-width="150px">
-    <el-row>
-      <el-col :span="12">
-        <el-form-item prop="tplCategory">
-          <span slot="label">生成模板</span>
-          <el-select v-model="info.tplCategory" @change="tplSelectChange">
-            <el-option label="单表（增删改查）" value="crud" />
-            <el-option label="树表（增删改查）" value="tree" />
-            <el-option label="主子表（增删改查）" value="sub" />
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item prop="packageName">
-          <span slot="label">
-            生成包路径
-            <el-tooltip content="生成在哪个java包下，例如 com.ruoyi.system" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-input v-model="info.packageName" />
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="12">
-        <el-form-item prop="moduleName">
-          <span slot="label">
-            生成模块名
-            <el-tooltip content="可理解为子系统名，例如 system" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-input v-model="info.moduleName" />
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="12">
-        <el-form-item prop="businessName">
-          <span slot="label">
-            生成业务名
-            <el-tooltip content="可理解为功能英文名，例如 user" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-input v-model="info.businessName" />
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="12">
-        <el-form-item prop="functionName">
-          <span slot="label">
-            生成功能名
-            <el-tooltip content="用作类描述，例如 用户" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-input v-model="info.functionName" />
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="12">
-        <el-form-item>
-          <span slot="label">
-            上级菜单
-            <el-tooltip content="分配到指定菜单下，例如 系统管理" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <treeselect
-            :append-to-body="true"
-            v-model="info.parentMenuId"
-            :options="menus"
-            :normalizer="normalizer"
-            :show-count="true"
-            placeholder="请选择系统菜单"
-          />
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="12">
-        <el-form-item prop="genType">
-          <span slot="label">
-            生成代码方式
-            <el-tooltip content="默认为zip压缩包下载，也可以自定义生成路径" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-radio v-model="info.genType" label="0">zip压缩包</el-radio>
-          <el-radio v-model="info.genType" label="1">自定义路径</el-radio>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="24" v-if="info.genType == '1'">
-        <el-form-item prop="genPath">
-          <span slot="label">
-            自定义路径
-            <el-tooltip content="填写磁盘绝对路径，若不填写，则生成到当前Web项目下" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-input v-model="info.genPath">
-            <el-dropdown slot="append">
-              <el-button type="primary">
-                最近路径快速选择
-                <i class="el-icon-arrow-down el-icon--right"></i>
-              </el-button>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item @click.native="info.genPath = '/'">恢复默认的生成基础路径</el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-    <el-row v-show="info.tplCategory == 'tree'">
-      <h4 class="form-header">其他信息</h4>
-      <el-col :span="12">
-        <el-form-item>
-          <span slot="label">
-            树编码字段
-            <el-tooltip content="树显示的编码字段名， 如：dept_id" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-select v-model="info.treeCode" placeholder="请选择">
-            <el-option
-              v-for="(column, index) in info.columns"
-              :key="index"
-              :label="column.columnName + '：' + column.columnComment"
-              :value="column.columnName"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item>
-          <span slot="label">
-            树父编码字段
-            <el-tooltip content="树显示的父编码字段名， 如：parent_Id" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-select v-model="info.treeParentCode" placeholder="请选择">
-            <el-option
-              v-for="(column, index) in info.columns"
-              :key="index"
-              :label="column.columnName + '：' + column.columnComment"
-              :value="column.columnName"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item>
-          <span slot="label">
-            树名称字段
-            <el-tooltip content="树节点的显示名称字段名， 如：dept_name" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-select v-model="info.treeName" placeholder="请选择">
-            <el-option
-              v-for="(column, index) in info.columns"
-              :key="index"
-              :label="column.columnName + '：' + column.columnComment"
-              :value="column.columnName"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row v-show="info.tplCategory == 'sub'">
-      <h4 class="form-header">关联信息</h4>
-      <el-col :span="12">
-        <el-form-item>
-          <span slot="label">
-            关联子表的表名
-            <el-tooltip content="关联子表的表名， 如：sys_user" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-select v-model="info.subTableName" placeholder="请选择" @change="subSelectChange">
-            <el-option
-              v-for="(table, index) in tables"
-              :key="index"
-              :label="table.tableName + '：' + table.tableComment"
-              :value="table.tableName"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-      <el-col :span="12">
-        <el-form-item>
-          <span slot="label">
-            子表关联的外键名
-            <el-tooltip content="子表关联的外键名， 如：user_id" placement="top">
-              <i class="el-icon-question"></i>
-            </el-tooltip>
-          </span>
-          <el-select v-model="info.subTableFkName" placeholder="请选择">
-            <el-option
-              v-for="(column, index) in subColumns"
-              :key="index"
-              :label="column.columnName + '：' + column.columnComment"
-              :value="column.columnName"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
-    </el-row>
-  </el-form>
-</template>
-
-<script>
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-
-export default {
-  components: { Treeselect },
-  props: {
-    info: {
-      type: Object,
-      default: null
-    },
-    tables: {
-      type: Array,
-      default: null
-    },
-    menus: {
-      type: Array,
-      default: []
-    },
-  },
-  data() {
-    return {
-      subColumns: [],
-      rules: {
-        tplCategory: [
-          { required: true, message: "请选择生成模板", trigger: "blur" }
-        ],
-        packageName: [
-          { required: true, message: "请输入生成包路径", trigger: "blur" }
-        ],
-        moduleName: [
-          { required: true, message: "请输入生成模块名", trigger: "blur" }
-        ],
-        businessName: [
-          { required: true, message: "请输入生成业务名", trigger: "blur" }
-        ],
-        functionName: [
-          { required: true, message: "请输入生成功能名", trigger: "blur" }
-        ],
-      }
-    };
-  },
-  created() {},
-  watch: {
-    'info.subTableName': function(val) {
-      this.setSubTableColumns(val);
-    }
-  },
-  methods: {
-    /** 转换菜单数据结构 */
-    normalizer(node) {
-      if (node.children && !node.children.length) {
-        delete node.children;
-      }
-      return {
-        id: node.menuId,
-        label: node.menuName,
-        children: node.children
-      };
-    },
-    /** 选择子表名触发 */
-    subSelectChange(value) {
-      this.info.subTableFkName = '';
-    },
-    /** 选择生成模板触发 */
-    tplSelectChange(value) {
-      if(value !== 'sub') {
-        this.info.subTableName = '';
-        this.info.subTableFkName = '';
-      }
-    },
-    /** 设置关联外键 */
-    setSubTableColumns(value) {
-      for (var item in this.tables) {
-        const name = this.tables[item].tableName;
-        if (value === name) {
-          this.subColumns = this.tables[item].columns;
-          break;
-        }
-      }
-    }
-  }
-};
-</script>
+<template>
+  <el-form ref="genInfoForm" :model="info" :rules="rules" label-width="150px">
+    <el-row>
+      <el-col :span="12">
+        <el-form-item prop="tplCategory">
+          <span slot="label">生成模板</span>
+          <el-select v-model="info.tplCategory" @change="tplSelectChange">
+            <el-option label="单表（增删改查）" value="crud" />
+            <el-option label="树表（增删改查）" value="tree" />
+            <el-option label="主子表（增删改查）" value="sub" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item prop="packageName">
+          <span slot="label">
+            生成包路径
+            <el-tooltip content="生成在哪个java包下，例如 com.ruoyi.system" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-input v-model="info.packageName" />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item prop="moduleName">
+          <span slot="label">
+            生成模块名
+            <el-tooltip content="可理解为子系统名，例如 system" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-input v-model="info.moduleName" />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item prop="businessName">
+          <span slot="label">
+            生成业务名
+            <el-tooltip content="可理解为功能英文名，例如 user" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-input v-model="info.businessName" />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item prop="functionName">
+          <span slot="label">
+            生成功能名
+            <el-tooltip content="用作类描述，例如 用户" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-input v-model="info.functionName" />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item>
+          <span slot="label">
+            上级菜单
+            <el-tooltip content="分配到指定菜单下，例如 系统管理" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <treeselect
+            :append-to-body="true"
+            v-model="info.parentMenuId"
+            :options="menus"
+            :normalizer="normalizer"
+            :show-count="true"
+            placeholder="请选择系统菜单"
+          />
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="12">
+        <el-form-item prop="genType">
+          <span slot="label">
+            生成代码方式
+            <el-tooltip content="默认为zip压缩包下载，也可以自定义生成路径" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-radio v-model="info.genType" label="0">zip压缩包</el-radio>
+          <el-radio v-model="info.genType" label="1">自定义路径</el-radio>
+        </el-form-item>
+      </el-col>
+
+      <el-col :span="24" v-if="info.genType == '1'">
+        <el-form-item prop="genPath">
+          <span slot="label">
+            自定义路径
+            <el-tooltip content="填写磁盘绝对路径，若不填写，则生成到当前Web项目下" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-input v-model="info.genPath">
+            <el-dropdown slot="append">
+              <el-button type="primary">
+                最近路径快速选择
+                <i class="el-icon-arrow-down el-icon--right"></i>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item @click.native="info.genPath = '/'">恢复默认的生成基础路径</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
+
+    <el-row v-show="info.tplCategory == 'tree'">
+      <h4 class="form-header">其他信息</h4>
+      <el-col :span="12">
+        <el-form-item>
+          <span slot="label">
+            树编码字段
+            <el-tooltip content="树显示的编码字段名， 如：org_id" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-select v-model="info.treeCode" placeholder="请选择">
+            <el-option
+              v-for="(column, index) in info.columns"
+              :key="index"
+              :label="column.columnName + '：' + column.columnComment"
+              :value="column.columnName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item>
+          <span slot="label">
+            树父编码字段
+            <el-tooltip content="树显示的父编码字段名， 如：parent_Id" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-select v-model="info.treeParentCode" placeholder="请选择">
+            <el-option
+              v-for="(column, index) in info.columns"
+              :key="index"
+              :label="column.columnName + '：' + column.columnComment"
+              :value="column.columnName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item>
+          <span slot="label">
+            树名称字段
+            <el-tooltip content="树节点的显示名称字段名， 如：org_name" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-select v-model="info.treeName" placeholder="请选择">
+            <el-option
+              v-for="(column, index) in info.columns"
+              :key="index"
+              :label="column.columnName + '：' + column.columnComment"
+              :value="column.columnName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row v-show="info.tplCategory == 'sub'">
+      <h4 class="form-header">关联信息</h4>
+      <el-col :span="12">
+        <el-form-item>
+          <span slot="label">
+            关联子表的表名
+            <el-tooltip content="关联子表的表名， 如：sys_user" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-select v-model="info.subTableName" placeholder="请选择" @change="subSelectChange">
+            <el-option
+              v-for="(table, index) in tables"
+              :key="index"
+              :label="table.tableName + '：' + table.tableComment"
+              :value="table.tableName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col :span="12">
+        <el-form-item>
+          <span slot="label">
+            子表关联的外键名
+            <el-tooltip content="子表关联的外键名， 如：user_id" placement="top">
+              <i class="el-icon-question"></i>
+            </el-tooltip>
+          </span>
+          <el-select v-model="info.subTableFkName" placeholder="请选择">
+            <el-option
+              v-for="(column, index) in subColumns"
+              :key="index"
+              :label="column.columnName + '：' + column.columnComment"
+              :value="column.columnName"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  components: { Treeselect },
+  props: {
+    info: {
+      type: Object,
+      default: null
+    },
+    tables: {
+      type: Array,
+      default: null
+    },
+    menus: {
+      type: Array,
+      default: []
+    },
+  },
+  data() {
+    return {
+      subColumns: [],
+      rules: {
+        tplCategory: [
+          { required: true, message: "请选择生成模板", trigger: "blur" }
+        ],
+        packageName: [
+          { required: true, message: "请输入生成包路径", trigger: "blur" }
+        ],
+        moduleName: [
+          { required: true, message: "请输入生成模块名", trigger: "blur" }
+        ],
+        businessName: [
+          { required: true, message: "请输入生成业务名", trigger: "blur" }
+        ],
+        functionName: [
+          { required: true, message: "请输入生成功能名", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {},
+  watch: {
+    'info.subTableName': function(val) {
+      this.setSubTableColumns(val);
+    }
+  },
+  methods: {
+    /** 转换菜单数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.menuId,
+        label: node.menuName,
+        children: node.children
+      };
+    },
+    /** 选择子表名触发 */
+    subSelectChange(value) {
+      this.info.subTableFkName = '';
+    },
+    /** 选择生成模板触发 */
+    tplSelectChange(value) {
+      if(value !== 'sub') {
+        this.info.subTableName = '';
+        this.info.subTableFkName = '';
+      }
+    },
+    /** 设置关联外键 */
+    setSubTableColumns(value) {
+      for (var item in this.tables) {
+        const name = this.tables[item].tableName;
+        if (value === name) {
+          this.subColumns = this.tables[item].columns;
+          break;
+        }
+      }
+    }
+  }
+};
+</script>
diff --git a/ruoyi-ui/src/views/work/components/custInfo/components/bg.png b/ruoyi-ui/src/views/work/components/custInfo/components/bg.png
deleted file mode 100644
index ddfb0d52..00000000
Binary files a/ruoyi-ui/src/views/work/components/custInfo/components/bg.png and /dev/null differ
diff --git a/ruoyi-ui/src/views/work/components/custInfo/components/headerName.vue b/ruoyi-ui/src/views/work/components/custInfo/components/headerName.vue
deleted file mode 100644
index 2a0e2d1b..00000000
--- a/ruoyi-ui/src/views/work/components/custInfo/components/headerName.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-<!-- 
-  用法： 
-  <header-Name :name="headerTitle"></header-Name>  
-  
-    import HeaderName from './headerName.vue';
-	components: {
-		HeaderName
-	}, 
- 
- -->
-
-<template>
-  <div class="header">
-  	<el-row>
-  		<el-col :span="12">
-  			<div class="col_content">
-  				<img 
-  				  style="width: 16px;height: 16px;"
-  				  :src="require('@/assets/img/work/custInfo/module_header_left.png')"
-  				  class="img"
-  				  alt=""
-  				/>
-  				<span style="margin-left: 10px;">{{name}}</span>
-  			</div>
-  		</el-col>
-  		<el-col :span="12">
-  			<div  class="col_content" style="justify-content: flex-end;">
-  				<img
-  				   style="width: 24px;height: 24px;"
-  				  :src="require('@/assets/img/work/custInfo/module_header_share.png')"
-  				  class="img"
-  				  alt=""
-  				/>
-  			</div>
-  		</el-col>
-  	</el-row>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex' 
-export default {
-  name: 'work',
-  props: { 
-    name:{
-      type:String,
-      default:''
-    },
-  },
-  components: {
-
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    ...mapGetters({
-      codeCombo: 'getCodeCombo',
-      permissionList: 'getPermission',
-      userInfo: 'getUserInfo',
-    }),
-  },
-  activated() {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-	.header {
-		width: 100%;
-		height: 72px; 
-		box-sizing: border-box;
-		padding: 0px 24px;
-		.col_content{ 
-			height: 72px;
-			width: 100%;
-			display: flex;
-			justify-content: flex-start;
-			align-items: center; 
-			font-size: 15px; 
-			font-weight: bold;
-			color: #096DD9; 
-		}
-	
-	}
-	
-</style>
diff --git a/ruoyi-ui/src/views/work/components/custInfo/components/index.vue b/ruoyi-ui/src/views/work/components/custInfo/components/index.vue
deleted file mode 100644
index 1c066b6f..00000000
--- a/ruoyi-ui/src/views/work/components/custInfo/components/index.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'work',
-  components: {
-
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    ...mapGetters({
-      codeCombo: 'getCodeCombo',
-      permissionList: 'getPermission',
-      userInfo: 'getUserInfo',
-    }),
-  },
-  activated() {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/work/components/custInfo/components/property-analysis.vue b/ruoyi-ui/src/views/work/components/custInfo/components/property-analysis.vue
deleted file mode 100644
index 46ee948e..00000000
--- a/ruoyi-ui/src/views/work/components/custInfo/components/property-analysis.vue
+++ /dev/null
@@ -1,350 +0,0 @@
-<template>
-  <div class="pro-ana-wrap">
-    <p class="word-box">康希诺生物股份公司的整体知识产权共<span>279</span>件，其中专利<span>89</span>件，商标<span>62</span>件，软件著作量<span>32</span>件，作品著作量<span>96</span>件，ICP<span>0</span>件。康希诺生物股份公司的专利中发明公布为<span>50</span>件，发明授权为<span>28</span>件，实用新型为<span>10</span>件，外观设计为<span>1</span>件。</p>
-    <el-row>
-      <el-col :span="12">
-        <h3 class="pro-title">知识产权总申请量</h3>
-        <echarts-3d ref="Echarts3d"></echarts-3d>
-      </el-col>
-      <el-col :span="12">
-        <h3 class="pro-title">专利类型分析</h3>
-        <div ref="secondChart" class="second-chart"></div>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="12">
-        <div ref="thirdChart" class="second-chart"></div>
-      </el-col>
-      <el-col :span="12">
-        <div ref="forthChart" class="second-chart"></div>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-<script>
-import Echarts3d from '../../../../components/echarts-3d.vue'
-import echarts from 'echarts'
-export default {
-  name: 'propertyAnalysis',
-  components: {
-    Echarts3d
-  },
-  mounted () {
-    this.initSecond()
-    this.initThird()
-    this.initForth()
-  },
-  methods: {
-    initSecond () {
-      let secondOption = {
-        color: ['#73C4F7', '#7BDDD0', '#FAC858', '#5DA6FC', '#CCCCCC'],
-        tooltip: {
-          trigger: 'axis',
-        },
-        legend: {
-          data: ['发明公布', '发明授权', '实用新型', '外观设计'],
-          icon: "circle",
-          itemHeight: 8
-        },
-        grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true,
-          borderColor: '#DDD'
-        },
-        xAxis: {
-          type: 'value',
-          boundaryGap: [0, 0.01],
-          axisLine: {
-            lineStyle: {
-              color: 'transparent'
-            }
-          },
-          axisLabel: {
-            color: '#555'
-          },
-          splitLine: {
-            show: true,
-            lineStyle: {
-              color: '#f5f5f5',//网格线的颜色
-              width: 1,
-              type: 'dashed'
-            }
-          },
-          axisTick: {
-            alignWithLabel: true
-          }
-        },
-        yAxis: {
-          type: 'category',
-          data: ['发明公布', '发明授权', '实用新型', '外观设计'],
-          axisLine: {
-            lineStyle: {
-              color: '#ddd'
-            }
-          },
-          axisLabel: {
-            color: '#222'
-          },
-          axisTick: {
-            alignWithLabel: true
-          }
-        },
-        series: [
-          {
-            name: '发明公布',
-            data: [12, 0, 0, 0],
-            type: 'bar',
-            barWidth: 16,
-            stack: 'total',
-            label: {
-              show: true,
-              position: 'right'
-            },
-            itemStyle: {
-              barBorderRadius: [0, 3, 3, 0],
-            }
-          },
-          {
-            name: '发明授权',
-            data: [0, 20, 0, 0],
-            type: 'bar',
-            barWidth: 16,
-            stack: 'total',
-            label: {
-              show: true,
-              position: 'right'
-            },
-            itemStyle: {
-              barBorderRadius: [0, 3, 3, 0],
-            }
-          },
-          {
-            name: '实用新型',
-            data: [0, 0, 15, 0],
-            type: 'bar',
-            barWidth: 16,
-            stack: 'total',
-            label: {
-              show: true,
-              position: 'right'
-            },
-            itemStyle: {
-              barBorderRadius: [0, 3, 3, 0],
-            }
-          },
-          {
-            name: '外观设计',
-            data: [0, 0, 0, 80],
-            type: 'bar',
-            barWidth: 16,
-            stack: 'total',
-            label: {
-              show: true,
-              position: 'right'
-            },
-            itemStyle: {
-              barBorderRadius: [0, 3, 3, 0],
-            }
-          }
-        ]
-      };
-      let chart2 = echarts.init(this.$refs.secondChart)
-      chart2.setOption(secondOption)
-      window.addEventListener('resize', () => {
-        if (chart2) {
-          chart2.resize()
-        }
-      })
-    },
-    initThird () {
-      let thirdOption = {
-        color: ['#5DA6FC'],
-        tooltip: {
-          trigger: 'axis',
-          // axisPointer: {
-          //   type: 'shadow',
-          //   shadowStyle: {
-          //     color: 'rgba(123,221,208,0.05)',
-          //   }
-          // }
-        },
-        grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true,
-          borderColor: '#eee'
-        },
-        yAxis: {
-          type: 'value',
-          boundaryGap: [0, 0.01],
-          axisLine: {
-            lineStyle: {
-              color: 'transparent'
-            }
-          },
-          axisLabel: {
-            color: '#999'
-          },
-          splitLine: {
-            show: true,
-            lineStyle: {
-              color: '#eee',//网格线的颜色
-              width: 1,
-              type: 'dashed'
-            }
-          },
-          axisTick: {
-            alignWithLabel: true
-          }
-        },
-        xAxis: [{
-          type: 'category',
-          data: ['法人风险实体', '股东风险实体', '子公司风险实体', '关联人','法人风险实体', '股东风险实体', '子公司风险实体', '关联人'],
-          axisLine: {
-            lineStyle: {
-              color: '#ddd'
-            }
-          },
-          axisLabel: {
-            color: '#999',
-            rotate: 45
-          },
-          axisTick: {
-            alignWithLabel: true
-          }
-        }],
-        series: [
-          {
-            data: [12, 23, 34, 45,12, 23, 34, 45],
-            type: 'bar',
-            barWidth: 24,
-            itemStyle: {
-              barBorderRadius: [4, 4, 0, 0],
-            }
-          },
-        ]
-      };
-      let chart3 = echarts.init(this.$refs.thirdChart)
-      chart3.setOption(thirdOption)
-      window.addEventListener('resize', () => {
-        if (chart3) {
-          chart3.resize()
-        }
-      })
-    },
-    initForth () {
-      let forthOption = {
-        color: ['#5DA6FC'],
-        tooltip: {
-          trigger: 'axis',
-          // axisPointer: {
-          //   type: 'shadow',
-          //   shadowStyle: {
-          //     color: 'rgba(123,221,208,0.05)',
-          //   }
-          // }
-        },
-        grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true,
-          borderColor: '#eee'
-        },
-        yAxis: {
-          type: 'value',
-          boundaryGap: [0, 0.01],
-          axisLine: {
-            lineStyle: {
-              color: 'transparent'
-            }
-          },
-          axisLabel: {
-            color: '#999'
-          },
-          splitLine: {
-            show: true,
-            lineStyle: {
-              color: '#eee',//网格线的颜色
-              width: 1,
-              type: 'dashed'
-            }
-          },
-          axisTick: {
-            alignWithLabel: true
-          }
-        },
-        xAxis: [{
-          type: 'category',
-          data: ['法人风险实体', '股东风险实体', '子公司风险实体', '关联人','法人风险实体', '股东风险实体', '子公司风险实体', '关联人', '子公司风险实体', '关联人'],
-          axisLine: {
-            lineStyle: {
-              color: '#ddd'
-            }
-          },
-          axisLabel: {
-            color: '#999',
-            rotate: 45
-          },
-          axisTick: {
-            alignWithLabel: true
-          }
-        }],
-        series: [
-          {
-            data: [12, 23, 34, 45,12, 23, 34, 45, 34, 45],
-            type: 'bar',
-            barWidth: 12,
-            itemStyle: {
-              barBorderRadius: [13, 13, 0, 0],
-            }
-          },
-        ]
-      };
-      let chart4 = echarts.init(this.$refs.forthChart)
-      chart4.setOption(forthOption)
-      window.addEventListener('resize', () => {
-        if (chart4) {
-          chart4.resize()
-        }
-      })
-    },
-  }
-}
-</script>
-<style lang="scss">
-.pro-ana-wrap {
-  background-image: url(./bg.png);
-  background-size: cover;
-  font-family: SourceHanSansCN-Regular, SourceHanSansCN;
-  .word-box{
-    color:#888;
-    margin-top:30px;
-    margin-bottom:68px;
-    line-height: 22px;
-    span{
-      color:#222;
-    }
-  }
-  .pro-title {
-    font-weight: bold;
-    &::before{
-      width: 4px;
-      height: 14px;
-      display: inline-block;
-      background: #096DD9;
-      border-radius: 2px;
-      margin-right:10px;
-      vertical-align: top;
-      content: ''
-    }
-  }
-  .second-chart{
-    width:auto;
-    height:300px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/work/components/custInfo/components/riskOverview.vue b/ruoyi-ui/src/views/work/components/custInfo/components/riskOverview.vue
deleted file mode 100644
index a86a290c..00000000
--- a/ruoyi-ui/src/views/work/components/custInfo/components/riskOverview.vue
+++ /dev/null
@@ -1,350 +0,0 @@
-<template>
-	<div class="riskOverview">
-		<header-Name :name="headerTitle"></header-Name>
-		<div class="content">
-			<div class="riskSignal">
-				<div class="left">
-					<img style="width: 40px;height: 40px;"
-						:src="require('@/assets/img/work/custInfo/riskOverviewBgroundSigle.png')" class="img" alt="" />
-					<div class="self">
-						<span class="text">自身风险信号数：</span>
-						<span class="number">82</span>
-					</div>
-					<div class="time">
-						<span class="text">更新时间：</span>
-						<span class="number">2022-10-14</span>
-					</div>
-				</div>
-				<div class="right">
-					<span>
-						自身风险信号为<span class="span">82</span>个,
-						特大风险信号为<span class="span">0</span>个,
-						预警风险信号为<span class="span">1</span>个,
-						关注风险信号为<span class="span">1</span>个,
-						提示风险信号为<span class="span">80</span>个;
-						涉及关联风险的数量为<span class="span">2226</span>个,
-						其中涉及特大风险的为<span class="span">5</span>个,
-						涉及预警风险的为<span class="span">13</span>个,
-						涉及关注风险的为<span class="span">27</span>个,
-						涉及提示风险的为<span class="span">2131</span>个。
-					</span>
-				</div>
-			</div>
-			<div class="detail">
-				<el-row>
-					<el-col :span="8">
-						<div class="selfRisk detailItem">
-							<div class="title">
-								<div class="blueLine"></div>
-								<div class="name">关联实体</div>
-								<img 
-								  :src="require('@/assets/img/work/custInfo/riskOverview_sigh.png')" 
-								  alt=""
-								/>
-								<span>共累计<span class="spanYellow"> 2226 </span>条风险</span>
-							</div>
-							<div class="riskList">
-								<div class="listTitle">
-									<img
-									  :src="require('@/assets/img/work/custInfo/riskOverview_iconRisk1.png')" 
-									  alt=""
-									/>
-									<div class="text">特大风险</div>
-									<div class="dot"></div>
-									<div class="number">3</div> 
-								</div>
-								<div class="listLabel">
-									<div class="labelItem">破产清算</div>
-									<div class="labelItem">破产清算</div>
-									<div class="labelItem">破产清算</div>
-									<div class="labelItem">破产清算</div>
-									<div class="labelItem">破产破产清算清算</div>
-									<div class="labelItem">破产破产清算清算</div>
-									<div class="labelItem">破产清算</div> 
-								</div>
-								<div class="explain">
-									<img
-									  :src="require('@/assets/img/work/custInfo/riskOverview_sigh.png')" 
-									  alt=""
-									/>
-									以上标签包含<span class="number">5</span>条风险
-								</div>
-							</div>
-						</div>
-					</el-col>
-					<el-col :span="8">
-						<div class="relationEntity detailItem">
-							<div class="title">
-								<div class="blueLine"></div>
-								<div class="name">关联实体</div>
-								<img 
-								  :src="require('@/assets/img/work/custInfo/riskOverview_sigh.png')" 
-								  alt=""
-								/>
-								<span>共累计<span class="spanBlack"> 1111 </span>条,其中风险实体<span class="spanYellow"> 81 </span>个</span>
-							</div>
-						</div>
-					</el-col>
-					<el-col :span="8">
-						<div class="relationRisk detailItem">
-						</div>
-					</el-col>
-				</el-row>
-			</div>
-		</div>
-	</div>
-</template>
-
-<script>
-	import {
-		mapGetters
-	} from 'vuex'
-	import HeaderName from './headerName.vue';
-	export default {
-		name: 'riskOverview', //风险总览
-		components: {
-			HeaderName
-		},
-		data() {
-			return {
-				headerTitle: "风险总览",
-				selfRisk:{
-					total:2226,
-					risk:[{
-						img:require('@/assets/img/work/custInfo/riskOverview_iconRisk1.png'),
-						name:"特大风险",
-						riskNum:3,
-						labelNum:5,
-						labelList:[]
-						
-						
-					}]
-				}
-			}
-		},
-		computed: {
-			...mapGetters({
-				codeCombo: 'getCodeCombo',
-				permissionList: 'getPermission',
-				userInfo: 'getUserInfo',
-			}),
-		},
-		activated() {
-
-		},
-		created() {
-
-		},
-		methods: {
-
-		},
-	}
-</script>
-
-<style lang="scss" scoped>
-	.riskOverview {
-		max-width: 1200px;
-		width: 100%;
-		height: 760px;
-		background-color: #FFFFFF;
-		background-image: url('../../../../../assets/img/work/custInfo/riskOverviewBground.png');
-		background-size: 100% 100%;
-
-		.content {
-			margin-top: 16px;
-			width: 100%;
-			height: calc(100% - 72px);
-			box-sizing: border-box;
-			padding-top: 16px;
-			padding: 0px 24px;
-			.detail{
-				margin-top: 62px;
-				width: 100%;
-				.detailItem{
-					min-height: 450px; 
-					.riskList{ 
-						.listLabel{
-							min-height: 16px; 
-							width: 90%; 
-							display: flex;
-							flex-wrap:wrap;
-							.labelItem{ 
-								min-width: 60px;
-								height: 20px;
-								background: rgba(254,106,65,0.1);
-								border-radius: 2px; 
-								font-size: 12px; 
-								font-weight: 400;
-								color: #FE6A41; 
-								line-height: 20px;
-								margin-bottom: 10px;
-								margin-right: 10px;
-								box-sizing: border-box;
-								padding: 0px 6px;
-								text-align: center;
-							}
-							
-						}
-						.explain{
-							width: 100%;
-							height: 16px;
-							line-height: 16px;
-							color: #888888;
-							font-size: 12px;
-							line-height: 16px; 
-							margin-top: 2px;
-							margin-bottom: 32px;
-							img{
-								height: 18px;
-								width: 18px; 
-								margin-top: -4px;
-							}
-							.number{
-								color: #555555;
-								font-size: 16px;
-								margin: 0px 3px;
-							}
-						}
-						.listTitle{
-							height: 16px;
-							width: 100%;
-							display: flex;
-							align-items: center;
-							margin-bottom: 16px;
-							img{
-								height: 14px;
-								width: 14px;
-								margin-right: 10px;
-							}
-							.dot{
-								width: 4px;
-								height: 4px;
-								background: #FE6A41;
-								margin: 0px 6px;
-							}
-							.number{ 
-								font-size: 16px; 
-								font-weight: 500;
-								color: #222222;  
-								margin-top: 2px;
-							}
-							.text{ 
-								font-size: 14px; 
-								font-weight: 400;
-								color: #222222; 
-							}
-						}
-					}
-					.title{
-						height:14px ;
-						width: 100%;
-						display: flex;
-						align-items: center;
-						margin-bottom: 24px;
-						img{
-							width: 20px;
-							height: 20px;
-							margin-left: 10px;
-							margin-right: 4px;
-						}
-						.blueLine{
-							width: 4px;
-							height: 14px;
-							background: #096DD9;
-							border-radius: 2px; 
-						}
-						.name{ 
-							font-size: 14px; 
-							font-weight: bold;
-							color: #222222; 
-							margin-left: 10px;
-						}
-						span{
-							color:#888888 ; 
-							.spanBlack{
-								color:#555555;
-							}
-							.spanYellow{
-								color:#FA6400;
-							}
-						}
-						
-						
-					}
-				}
-			}
-			.riskSignal {
-				height: 68px;
-				width: 100%;
-				display: flex;
-				flex-direction: row;
-				align-items: center;
-
-				.right {
-					height: 68px;
-					flex: 1;
-					box-sizing: border-box;
-					padding-left: 24px;
-					display: flex;
-					align-items: center;
-					color: #888888;
-					font-size: 14px;
-					line-height: 20px;
-
-					.span {
-						color: #FA6400;
-					}
-				}
-
-				.left {
-					margin-left: 14px;
-					width: 240px;
-					height: 68px;
-					background: #03C6CC;
-					border-radius: 42px;
-					padding-left: 50px;
-					box-sizing: border-box;
-					position: relative;
-
-					.img {
-						position: absolute;
-						left: -14px;
-						top: 14px;
-					}
-
-					.self {
-						margin-top: 11px;
-						display: flex;
-						align-items: center;
-						height: 18px;
-						font-size: 18px;
-						font-weight: 500;
-						color: #FFFFFF;
-
-						.text {
-							font-weight: 400;
-							font-size: 14px;
-						}
-
-						.number {
-							margin-left: 6px;
-						}
-					}
-
-					.time {
-						height: 14px;
-						font-size: 14px;
-						font-weight: 400;
-						color: #FFFFFF;
-						margin-top: 10px;
-
-						.number {
-							margin-left: 6px;
-						}
-					}
-				}
-			}
-		}
-
-	}
-</style>
diff --git a/ruoyi-ui/src/views/work/components/custInfo/custInfo.vue b/ruoyi-ui/src/views/work/components/custInfo/custInfo.vue
deleted file mode 100644
index 1c066b6f..00000000
--- a/ruoyi-ui/src/views/work/components/custInfo/custInfo.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'work',
-  components: {
-
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    ...mapGetters({
-      codeCombo: 'getCodeCombo',
-      permissionList: 'getPermission',
-      userInfo: 'getUserInfo',
-    }),
-  },
-  activated() {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/work/components/duty/components/index.vue b/ruoyi-ui/src/views/work/components/duty/components/index.vue
deleted file mode 100644
index 1c066b6f..00000000
--- a/ruoyi-ui/src/views/work/components/duty/components/index.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'work',
-  components: {
-
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    ...mapGetters({
-      codeCombo: 'getCodeCombo',
-      permissionList: 'getPermission',
-      userInfo: 'getUserInfo',
-    }),
-  },
-  activated() {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/work/components/duty/index.vue b/ruoyi-ui/src/views/work/components/duty/index.vue
deleted file mode 100644
index 1c066b6f..00000000
--- a/ruoyi-ui/src/views/work/components/duty/index.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'work',
-  components: {
-
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    ...mapGetters({
-      codeCombo: 'getCodeCombo',
-      permissionList: 'getPermission',
-      userInfo: 'getUserInfo',
-    }),
-  },
-  activated() {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/work/components/loan/components/index.vue b/ruoyi-ui/src/views/work/components/loan/components/index.vue
deleted file mode 100644
index 1c066b6f..00000000
--- a/ruoyi-ui/src/views/work/components/loan/components/index.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'work',
-  components: {
-
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    ...mapGetters({
-      codeCombo: 'getCodeCombo',
-      permissionList: 'getPermission',
-      userInfo: 'getUserInfo',
-    }),
-  },
-  activated() {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/work/components/loan/loanSurvey.vue b/ruoyi-ui/src/views/work/components/loan/loanSurvey.vue
deleted file mode 100644
index 1c066b6f..00000000
--- a/ruoyi-ui/src/views/work/components/loan/loanSurvey.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'work',
-  components: {
-
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    ...mapGetters({
-      codeCombo: 'getCodeCombo',
-      permissionList: 'getPermission',
-      userInfo: 'getUserInfo',
-    }),
-  },
-  activated() {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/work/components/process/components/index.vue b/ruoyi-ui/src/views/work/components/process/components/index.vue
deleted file mode 100644
index 1c066b6f..00000000
--- a/ruoyi-ui/src/views/work/components/process/components/index.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'work',
-  components: {
-
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    ...mapGetters({
-      codeCombo: 'getCodeCombo',
-      permissionList: 'getPermission',
-      userInfo: 'getUserInfo',
-    }),
-  },
-  activated() {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/work/components/process/processShow.vue b/ruoyi-ui/src/views/work/components/process/processShow.vue
deleted file mode 100644
index 1c066b6f..00000000
--- a/ruoyi-ui/src/views/work/components/process/processShow.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'work',
-  components: {
-
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    ...mapGetters({
-      codeCombo: 'getCodeCombo',
-      permissionList: 'getPermission',
-      userInfo: 'getUserInfo',
-    }),
-  },
-  activated() {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/work/components/product/components/index.vue b/ruoyi-ui/src/views/work/components/product/components/index.vue
deleted file mode 100644
index 1c066b6f..00000000
--- a/ruoyi-ui/src/views/work/components/product/components/index.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'work',
-  components: {
-
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    ...mapGetters({
-      codeCombo: 'getCodeCombo',
-      permissionList: 'getPermission',
-      userInfo: 'getUserInfo',
-    }),
-  },
-  activated() {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/work/components/product/productDesign.vue b/ruoyi-ui/src/views/work/components/product/productDesign.vue
deleted file mode 100644
index 1c066b6f..00000000
--- a/ruoyi-ui/src/views/work/components/product/productDesign.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'work',
-  components: {
-
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    ...mapGetters({
-      codeCombo: 'getCodeCombo',
-      permissionList: 'getPermission',
-      userInfo: 'getUserInfo',
-    }),
-  },
-  activated() {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/work/components/risk/components/index.vue b/ruoyi-ui/src/views/work/components/risk/components/index.vue
deleted file mode 100644
index 1c066b6f..00000000
--- a/ruoyi-ui/src/views/work/components/risk/components/index.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'work',
-  components: {
-
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    ...mapGetters({
-      codeCombo: 'getCodeCombo',
-      permissionList: 'getPermission',
-      userInfo: 'getUserInfo',
-    }),
-  },
-  activated() {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/work/components/risk/riskSurvey.vue b/ruoyi-ui/src/views/work/components/risk/riskSurvey.vue
deleted file mode 100644
index 1c066b6f..00000000
--- a/ruoyi-ui/src/views/work/components/risk/riskSurvey.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'work',
-  components: {
-
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    ...mapGetters({
-      codeCombo: 'getCodeCombo',
-      permissionList: 'getPermission',
-      userInfo: 'getUserInfo',
-    }),
-  },
-  activated() {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/work/components/touch/components/index.vue b/ruoyi-ui/src/views/work/components/touch/components/index.vue
deleted file mode 100644
index 1c066b6f..00000000
--- a/ruoyi-ui/src/views/work/components/touch/components/index.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'work',
-  components: {
-
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    ...mapGetters({
-      codeCombo: 'getCodeCombo',
-      permissionList: 'getPermission',
-      userInfo: 'getUserInfo',
-    }),
-  },
-  activated() {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/work/components/touch/touchCust.vue b/ruoyi-ui/src/views/work/components/touch/touchCust.vue
deleted file mode 100644
index 1c066b6f..00000000
--- a/ruoyi-ui/src/views/work/components/touch/touchCust.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'work',
-  components: {
-
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    ...mapGetters({
-      codeCombo: 'getCodeCombo',
-      permissionList: 'getPermission',
-      userInfo: 'getUserInfo',
-    }),
-  },
-  activated() {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/ruoyi-ui/src/views/work/index.vue b/ruoyi-ui/src/views/work/index.vue
deleted file mode 100644
index 999e9678..00000000
--- a/ruoyi-ui/src/views/work/index.vue
+++ /dev/null
@@ -1,80 +0,0 @@
-<template>
-  <div>
-
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex'
-
-export default {
-  name: 'work',
-  components: {
-
-  },
-  data() {
-    return {
-
-    }
-  },
-  computed: {
-    ...mapGetters({
-      codeCombo: 'getCodeCombo',
-      permissionList: 'getPermission',
-      userInfo: 'getUserInfo',
-    }),
-  },
-  activated() {
-
-  },
-  created() {
-
-  },
-  methods: {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-.layout-box-main {
-  padding: 0;
-}
-.home_wrap {
-  background: #eef2fb;
-  padding: 20px;
-  min-width: 1200px;
-}
-
-.bg_wrap {
-  position: relative;
-  // width: 67%;
-  // margin: 30px auto 0;
-  width: 100%;
-  height: calc(100vh - 1.26rem);
-  // margin: -.2rem;
-  background-image: url('../../assets/img/home/home_bg.png');
-  background-size: 100% 100%;
-  .home_bg {
-    width: 100%;
-    display: block;
-    height: auto;
-  }
-  .txt_wrap {
-    position: absolute;
-    top: 1rem;
-    left: 0.34rem;
-    .txt_one {
-      font-size: 0.3rem;
-      line-height: 0.36rem;
-      font-weight: bold;
-    }
-    .txt_two {
-      font-size: 0.24rem;
-      line-height: 0.28rem;
-      margin-top: 0.1rem;
-      margin-left: 0.06rem;
-    }
-  }
-}
-</style>
diff --git a/ruoyi-ui/src/views/workflow/businessForm/dynamicFormEdit.vue b/ruoyi-ui/src/views/workflow/businessForm/dynamicFormEdit.vue
deleted file mode 100644
index caccf1d3..00000000
--- a/ruoyi-ui/src/views/workflow/businessForm/dynamicFormEdit.vue
+++ /dev/null
@@ -1,255 +0,0 @@
-<template>
-  <div >
-    <div class="btn">
-        <div class="btn-content">
-          <span>
-            <el-button type="info" @click="draftForm">暂存</el-button>
-            <el-button type="primary" @click="submitForm">提交</el-button>
-          </span>
-        </div>
-    </div>
-    <div>
-      <el-row  :gutter="formConf.gutter" class="form-builder">
-        <el-form
-            :rules="rules"
-            :ref="formConf.formModel"
-            :size="formConf.size"
-            :model="form"
-            :label-position="formConf.labelPosition"
-            :disabled="formConf.disabled"
-            :validate-on-rule-change="false"
-            :label-width="formConf.labelWidth + 'px'"
-          >
-            <template v-for="(element,index) in itemList"  >
-              <preview-row-item 
-                v-if="element.compType === 'row'"
-                :key="'row-'+index" 
-                :model="element"
-                >
-                <el-col v-for="(column) in element.columns" :key="column.index" :span="column.span">
-                  <template v-for="(col) in column.list">
-                    <preview-item
-                        v-if="col.compType!== 'dynamicTable'"
-                        :key="col.id"
-                        :model="col"
-                        v-model="form[col.id]"
-                        @valChange="handlerValChange"
-                    />
-                    <fancy-dynamic-table
-                        v-else-if="col.compType === 'dynamicTable'"
-                        ref="dynamicTable"
-                        :key="'dynamic-'+index"
-                        :data="form[col.id]"
-                        :conf="col"
-                        @addRow="handlerAddRow"
-                        @deleteRow="handlerDeleteRow"
-                    >
-                      <template v-slot:item="{rowScope,item}">
-                        <fancy-dynamic-table-item
-                            :model="item"
-                            :parent="col"
-                            :key="'tableIndex-'+rowScope.$index"
-                            :index="rowScope.$index"
-                            v-model="rowScope.row[item.id]"
-                            @valChange="handlerDynamicValChange"
-                        />
-                      </template>
-                    </fancy-dynamic-table>
-                  </template>
-                </el-col>
-              </preview-row-item>
-              <fancy-dynamic-table
-                  v-else-if="element.compType === 'dynamicTable'"
-                  :key="'dynamic-'+index"
-                  :data="form[element.id]"
-                  :ref="element.id"
-                  :conf="element"
-                  @addRow="handlerAddRow"
-                  @deleteRow="handlerDeleteRow"
-              >
-                <template v-slot:item="{rowScope,item}">
-                  <fancy-dynamic-table-item
-                      :model="item"
-                      :ref="item.id+rowScope.$index"
-                      :parent="element"
-                      :key="'tableIndex-'+rowScope.$index"
-                      :index="rowScope.$index"
-                      v-model="rowScope.row[item.id]"
-                      @valChange="handlerDynamicValChange"
-                  />
-                </template>
-              </fancy-dynamic-table>
-              <fancy-edit-table
-                v-else-if="element.compType === 'table'"
-                :layoutArray="element.layoutArray"
-                :tdStyle="element.tdStyle"
-                :width="element.width"
-                :height="element.height"
-              >
-              <template v-slot="{td}">
-                <template v-for="(col) in td.columns">
-                    <preview-item
-                      v-if="col.compType!== 'dynamicTable'"
-                      :key="col.id"
-                      :model="col"
-                      v-model="form[col.id]"
-                      @valChange="handlerValChange"
-                    />
-              </template>
-              </template>
-              </fancy-edit-table>
-              <!--item-->
-              
-              <el-col class="drag-col-wrapper" :key="index"   :span="element.span" v-else>
-                <preview-item 
-                  :model="element"
-                  v-model="form[element.id]"
-                  @valChange="handlerValChange"
-                />
-              </el-col>
-            </template>
-            
-          </el-form>
-      </el-row>
-    </div>
-  </div>
-</template>
-<script>
-import previewItem from "@/components/FormDesigner/previewItem";
-import previewRowItem from "@/components/FormDesigner/previewRowItem";
-import fancyDynamicTable from "@/components/FormDesigner/dynamic/fancyDynamicTable";
-import fancyDynamicTableItem from "@/components/FormDesigner/dynamic/fancyDynamicTableItem";
-import {datas,addRow,deleteRow,fillDatas} from "@/components/FormDesigner/custom/formDraw";
-import fancyEditTable from "@/components/FormDesigner/table/fancyEditTable";
-export default {
-  name:'dynamicFormEdit',
-  props:{
-    value:{
-      type:String,
-      default:''
-    },
-    buildData:{
-      type:String,
-      default:''
-    },
-    disabled:{
-      type:Boolean,
-      default:false
-    }
-  },
-  components:{
-    previewItem,
-    previewRowItem,
-    fancyDynamicTable,
-    fancyDynamicTableItem,
-    fancyEditTable
-  },
-  data(){
-    return{
-      form:{},
-      rules:{},
-      currentIndex:-1,
-      formVal: ''
-    }
-  },
-  mounted() {
-    this.$nextTick(()=> {
-      if(this.value !=='' && this.value !==null){
-        const jsonValue = JSON.parse(this.value)
-        this.handlerFillDatas(jsonValue);
-      }
-    })
-  },
-  methods:{
-    //暂存
-    draftForm(){
-      this.validate()
-      this.$emit('draftForm',this.buildData,this.formVal);
-    },
-    //提交
-    submitForm(){
-      this.validate()
-      this.$refs[this.formConf.formModel].validate((valid) => {
-        if (valid) {
-          this.$emit('submitForm',this.buildData,this.formVal);
-        }
-      });
-    },
-    handlerValChange(key,origin){
-      this.$set(this.form,key,origin);
-    },
-    handlerDynamicValChange(parentId,index,key,origin){
-      this.$set(this.form[parentId][index],key,origin);
-      this.currentIndex = index;
-    },
-    validate(){
-      this.$refs[this.formConf.formModel].validate((valid) => {
-        if (valid) {
-          this.formVal = JSON.stringify(this.form,null,4)
-          this.$emit('input',JSON.stringify(this.form,null,4));
-        }else{
-          this.$emit('input','');
-        }
-      });
-    },
-    handlerAddRow:addRow,
-    handlerDeleteRow:deleteRow,
-    handlerInitDatas:datas,
-    handlerFillDatas:fillDatas
-  },
-  created(){
-    this.handlerInitDatas();
-  },
-  computed:{
-    itemList(){
-      if(this.buildData!==''){
-        const buildData = JSON.parse(this.buildData);
-        return buildData.list;
-      }else{
-        return [];
-      }
-    },
-    formConf(){
-      if(this.buildData!==''){
-        const buildData = JSON.parse(this.buildData);
-        buildData.config.disabled = this.disabled;
-        return buildData.config;
-      }else{
-        return {};
-      }
-    }
-  }
-}
-</script>
-<style scoped>
-.preview-board{
-  border: 1px dashed #ccc
-}
-.form-builder{
-  padding: 20px;
-  border:1px solid #dcdfe6;
-}
-.el-form-item{
-  margin-left:10px;
-  margin-right:10px;
-}
-.form-builder >>> .el-radio.is-bordered+.el-radio.is-bordered{
-  margin-left:0px;
-}
-.form-builder >>> .el-checkbox.is-bordered+.el-checkbox.is-bordered{
-  margin-left:0px;
-}
-.btn{
-    position: relative;
-    height: 50px;
-    background: #fff;
-}
-.btn .btn-content{
-    z-index: 10;
-    height: 50px;
-    background: #fff;
-}
-.btn .btn-content span{
-    float: left;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/workflow/businessForm/dynamicFormView.vue b/ruoyi-ui/src/views/workflow/businessForm/dynamicFormView.vue
deleted file mode 100644
index bf63561d..00000000
--- a/ruoyi-ui/src/views/workflow/businessForm/dynamicFormView.vue
+++ /dev/null
@@ -1,149 +0,0 @@
-<!--表单查看页面-->
-<template>
-  <div class="form-viewer">
-    <el-row  :gutter="formConf.gutter" >
-      <el-form
-          :ref="formConf.formModel"
-          :size="formConf.size"
-          :model="form"
-          :label-position="formConf.labelPosition"
-          :disabled="formConf.disabled"
-        >
-          <template v-for="(element,index) in itemList"  >
-             <preview-row-item 
-              v-if="element.compType === 'row'"
-              :key="'row-'+index" 
-              :model="element"
-              >
-              <el-col v-for="(column) in element.columns" :key="column.index" :span="column.span">
-                <form-view-item 
-                v-for="(item) in column.list"
-                :key="item.id" 
-                :model="item"
-                v-model="form[item.id]"
-                />
-              </el-col>
-            </preview-row-item>
-            <fancy-dynamic-view-table
-                v-else-if="element.compType === 'dynamicTable'"
-                :key="'dynamic-'+index"
-                :data="form[element.id]"
-                :ref="element.id"
-                :conf="element"
-            >
-              <template v-slot:item="{rowScope,item}">
-                <fancy-dynamic-table-view-item
-                    :model="item"
-                    :ref="item.id+rowScope.$index"
-                    :parent="element"
-                    :key="'tableIndex-'+rowScope.$index"
-                    :index="rowScope.$index"
-                    v-model="rowScope.row[item.id]"
-                />
-              </template>
-            </fancy-dynamic-view-table>
-            <fancy-edit-table
-              v-else-if="element.compType === 'table'"
-              :layoutArray="element.layoutArray"
-              :tdStyle="element.tdStyle"
-              :width="element.width"
-              :height="element.height"
-            >
-             <template v-slot="{td}">
-                <form-view-item 
-                  v-for="(item) in td.columns"
-                  :key="item.id" 
-                  :model="item"
-                  v-model="form[item.id]"
-                  />
-            </template>
-            </fancy-edit-table>
-            <!--item-->
-            <el-col class="drag-col-wrapper" :key="index"   :span="element.span" v-else>
-              <form-view-item
-                :model="element"
-                v-model="form[element.id]"
-              />
-            </el-col>
-          </template>
-        </el-form>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import formViewItem from "@/components/FormDesigner/formViewItem";
-import previewRowItem from "@/components/FormDesigner/previewRowItem";
-import fancyDynamicViewTable from "@/components/FormDesigner/dynamic/fancyDynamicViewTable";
-import fancyDynamicTableViewItem from "@/components/FormDesigner/dynamic/fancyDynamicTableViewItem";
-import fancyEditTable from "@/components/FormDesigner/table/fancyEditTable";
-export default {
-  name:'dynamicFormView',
-  data(){
-    return{
-    }
-  },
-  props:{
-    value:{
-      type:String,
-      default:''
-    },
-    buildData:{
-      type:String,
-      default:''
-    }
-  },
-  components:{
-    formViewItem,
-    previewRowItem,
-    fancyDynamicViewTable,
-    fancyDynamicTableViewItem,
-    fancyEditTable
-  },
-  mounted() {
-    this.$nextTick(()=> {
-    })
-  },
-  computed:{
-    itemList(){
-      if(this.buildData!==''){
-        const buildData = JSON.parse(this.buildData);
-        return buildData.list;
-      }else{
-        return [];
-      }
-    },
-    form(){ //转换成json的值
-      if(this.value!=='' && this.value!==null){
-        const value = JSON.parse(this.value);
-        return value;
-      }else{
-        return {};
-      }
-    },
-    formConf(){
-      if(this.buildData!==''){
-        const buildData = JSON.parse(this.buildData);
-        buildData.config.disabled = this.disabled;
-        return buildData.config;
-      }else{
-        return {};
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-.preview-board{
-  border: 1px dashed #ccc
-}
-.form-viewer{
-  padding: 20px;
-  border:1px solid #dcdfe6;
-}
-.el-form-item{
-  margin-left:10px;
-  margin-right:10px;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/workflow/businessForm/index.vue b/ruoyi-ui/src/views/workflow/businessForm/index.vue
deleted file mode 100644
index 40931705..00000000
--- a/ruoyi-ui/src/views/workflow/businessForm/index.vue
+++ /dev/null
@@ -1,419 +0,0 @@
-<template>
-  <div class="app-container">
-    <div v-if="dataViewVisible">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="表单key" prop="formKey">
-            <el-input
-            v-model="queryParams.formKey"
-            placeholder="请输入表单key"
-            clearable
-            @keyup.enter.native="handleQuery"
-            />
-        </el-form-item>
-        <el-form-item label="表单名称" prop="formName">
-            <el-input
-            v-model="queryParams.formName"
-            placeholder="请输入表单名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-            />
-        </el-form-item>
-        <el-form-item label="单号" prop="applyCode">
-            <el-input
-            v-model="queryParams.applyCode"
-            placeholder="请输入单号"
-            clearable
-            @keyup.enter.native="handleQuery"
-            />
-        </el-form-item>
-        <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-            <el-button
-            type="warning"
-            plain
-            icon="el-icon-download"
-            size="mini"
-            @click="handleExport"
-            v-hasPermi="['workflow:businessForm:export']"
-            >导出</el-button>
-        </el-col>
-        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="businessFormList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="单号" align="center" prop="applyCode" />
-        <el-table-column label="表单key" align="center" prop="formKey" />
-        <el-table-column label="表单名称" align="center" prop="formName" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-            <el-button
-                v-if="scope.row.actBusinessStatus.status==='draft'||scope.row.actBusinessStatus.status==='back'||scope.row.actBusinessStatus.status==='cancel'"
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['workflow:businessForm:edit']"
-            >修改</el-button>
-            <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-view"
-                @click="handleView(scope.row)"
-            >查看</el-button>
-            <el-button
-                v-if="scope.row.actBusinessStatus.status==='draft'||scope.row.actBusinessStatus.status==='back'||scope.row.actBusinessStatus.status==='cancel'"
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                v-hasPermi="['workflow:businessForm:remove']"
-            >删除</el-button>
-            <el-button
-                v-if="scope.row.actBusinessStatus.status==='waiting'"
-                size="mini"
-                type="text"
-                icon="el-icon-back"
-                @click="cancelProcessApply(scope.row)"
-            >撤销</el-button>
-            </template>
-        </el-table-column>
-        </el-table>
-
-        <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
-        />
-    </div>
-    <div class="form-container" v-if="dynamicFormEditVisible">
-      <div class="form-container-header"><i class="el-dialog__close el-icon el-icon-close" @click="closeDynamicEdit"></i></div>
-      <!-- 动态表单编辑开始 -->
-      <el-tabs type="border-card" class="container-tab">
-        <el-tab-pane label="业务单据">
-          <dynamicFormEdit
-              :buildData="form.formText"
-              v-model="form.formValue"
-              @draftForm="draftProcessForm(arguments)"
-              @submitForm="submitProcessForm(arguments)"
-              ref="dynamicFormEditRef"
-          />
-        </el-tab-pane>
-        <el-tab-pane label="审批意见" v-if="processInstanceId">
-            <el-table :data="historyList" border stripe style="width: 100%" max-height="570">
-              <el-table-column label="流程审批历史记录" align="center">
-                <el-table-column type="index" label="序号" align="center" width="50"></el-table-column>
-                <el-table-column prop="name" label="任务名称" align="center" ></el-table-column>
-                <el-table-column prop="nickName" label="办理人" align="center" ></el-table-column>
-                <el-table-column prop="status" label="状态" align="center" ></el-table-column>
-                <el-table-column prop="comment" label="审批意见" align="center" ></el-table-column>
-                <el-table-column prop="startTime" label="开始时间" align="center" ></el-table-column>
-                <el-table-column prop="endTime" label="结束时间" align="center" ></el-table-column>
-              </el-table-column>
-            </el-table>
-        </el-tab-pane>
-        <el-tab-pane label="流程进度" v-if="processInstanceId">
-           <el-image :src="url" style="font-size: 20px; margin: 50px;">
-              <div slot="placeholder"><i class="el-icon-loading"></i> 流程审批历史图加载中……</div>
-           </el-image>
-        </el-tab-pane>
-      </el-tabs>
-      <!-- 动态表单编辑结束 -->
-    </div>
-    <div class="form-container" v-if="dynamicFormViewVisible" >
-      <div class="form-container-header"><i class="el-dialog__close el-icon el-icon-close" @click="closeDynamicView"></i></div>
-      <!-- 动态表单查看开始 -->
-      <el-tabs type="border-card" class="container-tab">
-        <el-tab-pane label="业务单据">
-          <dynamicFormView :buildData="form.formText" v-model="form.formValue"/>
-        </el-tab-pane>
-        <el-tab-pane label="审批意见" v-if="processInstanceId">
-            <el-table :data="historyList" border stripe style="width: 100%" max-height="570">
-              <el-table-column label="流程审批历史记录" align="center">
-                <el-table-column type="index" label="序号" align="center" width="50"></el-table-column>
-                <el-table-column prop="name" label="任务名称" align="center" ></el-table-column>
-                <el-table-column prop="nickName" label="办理人" align="center" ></el-table-column>
-                <el-table-column prop="status" label="状态" align="center" ></el-table-column>
-                <el-table-column prop="comment" label="审批意见" align="center" ></el-table-column>
-                <el-table-column prop="startTime" label="开始时间" align="center" ></el-table-column>
-                <el-table-column prop="endTime" label="结束时间" align="center" ></el-table-column>
-              </el-table-column>
-            </el-table>
-        </el-tab-pane>
-        <el-tab-pane label="流程进度" v-if="processInstanceId">
-           <el-image :src="url" style="font-size: 20px; margin: 50px;">
-              <div slot="placeholder"><i class="el-icon-loading"></i> 流程审批历史图加载中……</div>
-           </el-image>
-        </el-tab-pane>
-      </el-tabs>
-      <!-- 动态表单查看结束-->
-    </div>
-    <!-- 工作流 -->
-    <verify ref="verifyRef" @submitCallback="submitCallback" :taskId="taskId" :taskVariables="taskVariables" :sendMessage="sendMessage"/>
-  </div>
-</template>
-
-<script>
-import { listBusinessForm, getBusinessForm, delBusinessForm, updateBusinessForm } from "@/api/workflow/businessForm";
-import dynamicFormEdit from './dynamicFormEdit'
-import dynamicFormView from './dynamicFormView'
-import verify from "@/components/Process/Verify";
-import processApi from "@/api/workflow/processInst";
-export default {
-  name: "BusinessForm",
-  components:{
-    dynamicFormEdit,
-    dynamicFormView,
-    verify
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 业务表单表格数据
-      businessFormList: [],
-      // 弹出层标题
-      title: "",
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        formKey: undefined,
-        formName: undefined,
-        applyCode: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-      },
-      //页面列表展示
-      dataViewVisible: true,
-      //动态表单编辑
-      dynamicFormEditVisible: false,
-      //动态表单查看
-      dynamicFormViewVisible: false,
-      // 任务id
-      taskId: undefined,
-      // 流程变量
-      taskVariables: {},
-      // 站内信
-      sendMessage: {},
-      // 审批记录
-      historyList: [],
-      // 流程实例id
-      processInstanceId: undefined
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询业务表单列表 */
-    getList() {
-      this.loading = true;
-      listBusinessForm(this.queryParams).then(response => {
-        this.businessFormList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 查询审批历史记录
-    async getHistoryInfoList() {
-        const { data } = await processApi.getHistoryInfoList(this.processInstanceId)
-        this.historyList = data
-    },
-    // 通过流程实例id获取历史流程图
-    getHistoryImage(){
-      this.url = process.env.VUE_APP_BASE_API+'/workflow/processInstance/getHistoryProcessImage?processInstanceId='+this.processInstanceId
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      const id = row.id || this.ids
-      getBusinessForm(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.processInstanceId = response.data.actBusinessStatus.processInstanceId
-        if(this.processInstanceId){
-          this.getHistoryInfoList()
-          this.getHistoryImage()
-        }
-        this.dynamicFormEditVisible = true;
-        this.dataViewVisible = false
-        this.title = response.data.formName;
-      });
-    },
-    /** 查看按钮操作 */
-    handleView(row){
-      this.loading = true;
-      const id = row.id || this.ids
-      getBusinessForm(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.processInstanceId = response.data.actBusinessStatus.processInstanceId
-        if(this.processInstanceId){
-          this.getHistoryInfoList()
-          this.getHistoryImage()
-        }
-        this.dynamicFormViewVisible = true;
-        this.dataViewVisible = false
-        this.title = response.data.formName;
-      });
-    },
-    //关闭编辑
-    closeDynamicEdit(){
-        this.dynamicFormEditVisible = false;
-        this.dataViewVisible = true
-        this.getList()
-    },
-    //关闭查看
-    closeDynamicView(){
-        this.dynamicFormViewVisible = false;
-        this.dataViewVisible = true
-        this.getList()
-    },
-    //暂存
-    draftProcessForm(args){
-      this.form.formText = args[0]
-      this.form.formValue = args[1]
-      this.form.status = 'draft'
-      if (this.form.id != null) {
-        updateBusinessForm(this.form).then(response => {
-          this.$modal.msgSuccess("修改成功");
-          this.dynamicFormEditVisible = false
-          this.dataViewVisible = true
-          this.getList();
-        })
-      }
-    },
-    /** 提交按钮 */
-    submitProcessForm(args) {
-      this.sendMessage = {
-        title: this.form.formName,
-        messageContent:'单据【'+this.form.applyCode+"】申请"
-      }
-      this.form.formText = args[0]
-      this.form.formValue = args[1]
-      this.form.status = 'waiting'
-      if (this.form.id != null) {
-        updateBusinessForm(this.form).then(response => {
-          this.submitFormApply(response.data)
-        })
-      }
-    },
-     //提交流程
-     submitFormApply(entity){
-        //流程变量
-        this.taskVariables = {
-            entity: entity.variableMap
-        }
-        const data = {
-            processKey: entity.actProcessDefSetting.processDefinitionKey, // key
-            businessKey: entity.id, // 业务id
-            variables: this.taskVariables,
-            classFullName: entity.formKey
-        }
-        // 启动流程
-        processApi.startProcessApply(data).then(response => {
-            this.taskId = response.data.taskId;
-            this.$refs.verifyRef.visible = true
-            this.$refs.verifyRef.reset()
-        })
-    },
-    // 提交成功回调
-    submitCallback(){
-      this.dynamicFormEditVisible = false;
-      this.dataViewVisible = true
-      this.getList();
-    },
-    //撤回
-    cancelProcessApply(row){
-         this.$modal.confirm('是否撤销申请').then(() => {
-            this.loading = true;
-            return processApi.cancelProcessApply(row.actBusinessStatus.processInstanceId);
-         }).then(() => {
-            this.getList();
-            this.$modal.msgSuccess("撤回成功");
-         }).finally(() => {
-            this.loading = false;
-         });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除业务表单编号为"' + ids + '"的数据项？').then(() => {
-        this.loading = true;
-        return delBusinessForm(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('workflow/businessForm/export', {
-        ...this.queryParams
-      }, `businessForm_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
-<style scoped>
-    .form-container-header{
-        height: 30px;
-        padding-bottom: 10px;
-    }
-    .el-icon-close{
-        float: right;
-        cursor: pointer;
-    }
-    .container-tab{
-        height: calc(100vh - 155px);
-        overflow-y: auto;
-    }
-    /* 修改滚动条样式 */
-    .container-tab::-webkit-scrollbar {
-      width: 4px;
-    }
-    .container-tab::-webkit-scrollbar-thumb {
-      border-radius: 10px;
-    }
-</style>
diff --git a/ruoyi-ui/src/views/workflow/businessRule/index.vue b/ruoyi-ui/src/views/workflow/businessRule/index.vue
deleted file mode 100644
index 41e2d867..00000000
--- a/ruoyi-ui/src/views/workflow/businessRule/index.vue
+++ /dev/null
@@ -1,370 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
-      <el-form-item label="bean名称" prop="beanName">
-        <el-input
-          v-model="queryParams.businessRule"
-          placeholder="请输入bean名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="方法名" prop="method">
-        <el-input
-          v-model="queryParams.method"
-          placeholder="请输入方法名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['workflow:businessRule:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['workflow:businessRule:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['workflow:businessRule:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['workflow:businessRule:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="businessRuleList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="id" align="center" prop="id" v-if="false"/>
-      <el-table-column label="bean名称" align="center" prop="beanName" />
-      <el-table-column label="方法名" align="center" prop="method" width="180"/>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="120">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updateTime" width="120">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createBy" width="120"/>
-      <el-table-column label="更新人" align="center" prop="updateBy" width="120"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['workflow:businessRule:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['workflow:businessRule:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改业务规则对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-form-item label="bean名称" prop="beanName">
-          <el-input v-model="form.beanName" placeholder="请输入bean名称" />
-        </el-form-item>
-        <el-form-item label="方法名" prop="method">
-          <el-input v-model="form.method" placeholder="请输入方法名" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <el-button type="primary" size="mini" @click="addParam">添加</el-button>
-      <el-table :data="businessRuleParams">
-        <el-table-column label="参数类型" align="center" prop="paramType" >
-             <template slot-scope="scope">
-                <el-input v-model="scope.row.paramType"/>
-            </template>
-        </el-table-column>
-        <el-table-column label="参数" align="center" prop="param" >
-             <template slot-scope="scope">
-                <el-input v-model="scope.row.param"/>
-            </template>
-        </el-table-column>
-        <el-table-column label="排序" align="center" prop="orderNo" >
-             <template slot-scope="scope">
-                <el-input type="number" :min="0" @blur="checkOrder(scope.row)" v-model="scope.row.orderNo"/>
-            </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" >
-             <template slot-scope="scope">
-                <el-input v-model="scope.row.remark"/>
-            </template>
-        </el-table-column>
-        <el-table-column label="操作">
-            <template slot-scope="scope">
-                <el-button @click="deleteParam(scope.$index)" type="danger" size="small">删除</el-button>
-            </template>
-        </el-table-column>
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listBusinessRule, getBusinessRule, delBusinessRule, addbusinessRule, updateBusinessRule } from "@/api/workflow/businessRule";
-
-export default {
-  name: "businessRule",
-  data() {
-    return {
-      // 按钮loading
-      buttonLoading: false,
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 业务规则表格数据
-      businessRuleList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        businessRule: undefined,
-        method: undefined,
-      },
-      // 表单参数
-      form: {},
-      businessRuleParams: [],
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "id不能为空", trigger: "blur" }
-        ],
-        beanName: [
-          { required: true, message: "bean名称不能为空", trigger: "blur" }
-        ],
-        method: [
-          { required: true, message: "方法名不能为空", trigger: "blur" }
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
-        ],
-        updateTime: [
-          { required: true, message: "更新时间不能为空", trigger: "blur" }
-        ],
-        createBy: [
-          { required: true, message: "创建人不能为空", trigger: "blur" }
-        ],
-        updateBy: [
-          { required: true, message: "更新人不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询业务规则列表 */
-    getList() {
-      this.loading = true;
-      listBusinessRule(this.queryParams).then(response => {
-        this.businessRuleList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        beanName: undefined,
-        method: undefined,
-        remark: undefined,
-        createTime: undefined,
-        updateTime: undefined,
-        createBy: undefined,
-        updateBy: undefined
-      };
-      this.businessRuleParams = []
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加业务规则";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getBusinessRule(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.businessRuleParams = response.data.businessRuleParams;
-        this.open = true;
-        this.title = "修改业务规则";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.form.businessRuleParams = this.businessRuleParams
-          this.buttonLoading = true;
-          if (this.form.id != null) {
-            updateBusinessRule(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addbusinessRule(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除业务规则编号为"' + ids + '"的数据项？').then(() => {
-        this.loading = true;
-        return delBusinessRule(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('workflow/businessRule/export', {
-        ...this.queryParams
-      }, `businessRule_${new Date().getTime()}.xlsx`)
-    },
-    // 添加参数
-    addParam(){
-        if(this.businessRuleParams === undefined || this.businessRuleParams === null) {
-          this.businessRuleParams = []
-        }
-        let param = {
-            paramType:'',
-            type:'',
-            remark:''
-        }
-        this.businessRuleParams.push(param);
-    },
-    // 删除参数
-    deleteParam(index){
-       this.businessRuleParams.splice(index,1)
-    },
-    // 不可小于0
-    checkOrder(row){
-       if(row.orderNo<0){
-          row.orderNo = 0
-       }
-    }
-  }
-};
-</script>
diff --git a/ruoyi-ui/src/views/workflow/definition/components/processDeploy.vue b/ruoyi-ui/src/views/workflow/definition/components/processDeploy.vue
deleted file mode 100644
index bd10c36b..00000000
--- a/ruoyi-ui/src/views/workflow/definition/components/processDeploy.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-  <el-dialog title="部署流程文件" :visible.sync="visible" width="400px">
-      <el-upload  accept="application/zip,application/xml,.bpmn"
-          :http-request="deployProcessFile" drag action="" :show-file-list="false">
-            <i class="el-icon-upload"></i>
-            <div class="el-upload__text"><em>点击上传，选择BPMN流程文件</em></div>
-            <div class="el-upload__text">仅支持 .zip、.bpmn20.xml、bpmn 格式文件</div>
-      </el-upload>
-  </el-dialog>
-</template>
-<script>
-import {deployProcessFile} from "@/api/workflow/definition";
-export default {
-    data() {
-        return {
-            visible: false, // 弹出窗口，true弹出
-            loading: false,
-        }
-    },
-    methods: {
-        // 部署流程文件
-        async deployProcessFile(file) {
-            // 封装上传文件的表单对象
-          const data = new FormData()
-          data.append('file', file.file)
-          await deployProcessFile(data)
-          this.$modal.msgSuccess("部署成功");
-          this.$parent.getList()
-          this.visible = false
-
-        }
-    }
-}
-</script>
diff --git a/ruoyi-ui/src/views/workflow/definition/components/processFormList.vue b/ruoyi-ui/src/views/workflow/definition/components/processFormList.vue
deleted file mode 100644
index 8324abdd..00000000
--- a/ruoyi-ui/src/views/workflow/definition/components/processFormList.vue
+++ /dev/null
@@ -1,249 +0,0 @@
-<template>
-  <el-dialog title="表单" :visible.sync="visible" v-if="visible" width="60%" :close-on-click-modal="false" append-to-body>
-    <el-form label-width="110px" :model="formData" :rules="rulesFrom" ref="formDataRef">
-      <el-row>
-        <el-col class="line" :span="12">
-          <el-form-item label="流程定义Key" prop="processDefinitionKey">
-            <el-input v-model="formData.processDefinitionKey" disabled></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col class="line" :span="12">
-          <el-form-item label="流程定义名称" prop="processDefinitionName">
-            <el-input v-model="formData.processDefinitionName" disabled></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col class="line" :span="24">
-          <el-form-item label="表单类型" prop="businessType">
-            <el-radio-group @change="change($event)" v-model="formData.businessType">
-              <el-radio :label="0" border>动态表单</el-radio>
-              <el-radio :label="1" border>业务表单</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-if="formData.businessType === 0">
-        <el-col class="line" :span="12">
-          <el-form-item label="表单Key" prop="formKey">
-            <el-input v-model="formData.formKey" placeholder="请选择表单" disabled>
-             <el-button slot="append" @click="handerOpenForm" icon="el-icon-search"></el-button>
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col class="line" :span="12">
-          <el-form-item label="表单名称" prop="formName">
-            <el-input v-model="formData.formName" disabled></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-if="formData.businessType === 0">
-        <el-col class="line" :span="24">
-          <el-form-item label="表单参数">
-            <el-input type="textarea" placeholder="请输入表单参数,动态表单中参数id,多个用英文逗号隔开" v-model="formData.formVariable" @input="change($event)"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row v-if="formData.businessType === 1">
-        <el-col class="line" :span="12">
-          <el-form-item label="组件名称" prop="componentName">
-            <el-input placeholder="请输入组件名称" v-model="formData.componentName"/>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <el-dialog title="表单" :visible.sync="formVisible" v-if="visible" width="70%" :close-on-click-modal="false" append-to-body>
-      <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="表单key" prop="formKey">
-            <el-input
-              v-model="queryParams.formKey"
-              placeholder="请输入表单key"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="表单名称" prop="formName">
-            <el-input
-              v-model="queryParams.formName"
-              placeholder="请输入表单名称"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :highlight-current-row="true" :data="dynamicFormList" @row-click="handleChange">
-          <el-table-column label="主键" align="center" prop="id" v-if="false"/>
-          <el-table-column label="表单key" align="center" prop="formKey" />
-          <el-table-column label="表单名称" align="center" prop="formName" />
-          <el-table-column label="表单备注" align="center" prop="formRemark" />
-        </el-table>
-
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
-      </div>
-    </el-dialog>
-     <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取 消</el-button>
-      <el-button type="primary" @click="submitForm('formDataRef')">确 定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { listDynamicFormEnable } from "@/api/workflow/dynamicForm";
-import { addProcessDefSetting,checkProcessDefSetting } from "@/api/workflow/processDefSetting";
-export default {
-  props:{
-    formData: {
-      type: Object,
-      default:()=>{}
-    }
-  },
-  name: "DynamicFormList",
-  data() {
-    return {
-      // 显示隐藏
-      visible: false,
-      formVisible: false,
-      // 按钮loading
-      buttonLoading: false,
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 流程单表格数据
-      dynamicFormList: [],
-      // 弹出层标题
-      title: "",
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        formKey: undefined,
-        formName: undefined,
-      },
-      // 表单校验
-      rulesFrom: {
-        processDefinitionKey: [
-          { required: true, message: '流程定义Key不能为空', trigger: 'blur' }
-        ],
-        processDefinitionName: [
-          { required: true, message: '流程定义名称不能为空', trigger: 'blur' }
-        ],
-        formKey: [
-          { required: true, message: '表单Key不能为空', trigger: 'blur' }
-        ],
-        formName: [
-          { required: true, message: '表单名称不能为空', trigger: 'blur' }
-        ],
-        businessType: [
-          { required: true, message: '业务类型不能为空', trigger: 'blur' }
-        ],
-        componentName: [
-          { required: true, message: '组件名称不能为空', trigger: 'blur' }
-        ]
-      }
-    };
-  },
-  created() {
-  },
-  methods: {
-    change(e){
-        this.$forceUpdate(e)
-        this.$refs["formDataRef"].clearValidate()
-    },
-    /** 查询流程单列表 */
-    getList() {
-      this.loading = true;
-      listDynamicFormEnable(this.queryParams).then(response => {
-        this.dynamicFormList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 选中数据
-    handleChange(row) {
-      this.$set(this.formData,'formId',row.id)
-      this.$set(this.formData,'formKey',row.formKey)
-      this.$set(this.formData,'formName',row.formName)
-      this.formVisible = false;
-    },
-    // 打开表单
-    handerOpenForm(){
-      this.getList();
-      this.formVisible = true
-    },
-    // 确认
-    submitForm(formName){
-      this.loading = true;
-      this.$refs[formName].validate((valid) => {
-      if (valid) {
-        let param = ''
-        if(this.formData.businessType === 0){
-          param = this.formData.formId
-        }else{
-          param = this.formData.componentName
-        }
-        checkProcessDefSetting(this.formData.processDefinitionId,param,this.formData.businessType).then(response => {
-          if(response.data){
-            this.$confirm(response.msg, '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).then(() => {
-              this.formData.ids = response.data
-              addProcessDefSetting(this.formData).then(response => {
-                this.$modal.msgSuccess("保存成功");
-                this.loading = false;
-                this.visible = false;
-                this.$emit("callbackFn")
-              });
-            })
-          }else{
-              addProcessDefSetting(this.formData).then(response => {
-                this.$modal.msgSuccess("保存成功");
-                this.loading = false;
-                this.visible = false;
-                this.$emit("callbackFn")
-              });
-          }
-        })
-      }
-    })
-    }
-  }
-};
-</script>
-<style scoped>
-.line{
-  padding-bottom: 20px;
-}
-</style>
diff --git a/ruoyi-ui/src/views/workflow/definition/components/processHisList.vue b/ruoyi-ui/src/views/workflow/definition/components/processHisList.vue
deleted file mode 100644
index 4ea4a8a8..00000000
--- a/ruoyi-ui/src/views/workflow/definition/components/processHisList.vue
+++ /dev/null
@@ -1,276 +0,0 @@
-<template>
-    <el-dialog title="历史版本" :visible.sync="visible" width="90%" :close-on-click-modal="false" append-to-body>
-        <div class="app-container">
-            <!-- 表格数据 -->
-            <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
-                <!-- <el-table-column type="selection" width="55" align="center" /> -->
-                <el-table-column align="center" type="index" label="序号" width="50"></el-table-column>
-                <el-table-column align="center" prop="name" label="模型名称"  min-width="160"></el-table-column>
-                <el-table-column align="center" prop="key" label="标识Key"  min-width="120"></el-table-column>
-                <el-table-column align="center" prop="version" label="版本号" width="80" >
-                <template slot-scope="{row}"> v{{row.version}}.0</template>
-                </el-table-column>
-                <el-table-column align="center" prop="resourceName" label="流程XML" min-width="150">
-                <template slot-scope="{row}">
-                <!-- 注意组件上使用原生事件，要加 .active -->
-                <el-link type="primary" @click.native="clickExportXML(row.id)">{{ row.resourceName }}</el-link>
-                </template>
-                </el-table-column>
-                <el-table-column align="center" prop="diagramResourceName" label="流程图片" min-width="150">
-                <template slot-scope="{row}">
-                <el-link type="primary" @click="clickPreviewImg(row.id)">{{ row.diagramResourceName }}</el-link>
-                </template>
-                </el-table-column>
-                <el-table-column align="center" prop="suspensionState" label="状态"  min-width="50">
-                <template slot-scope="scope">
-                    <el-tag type="success" v-if="scope.row.suspensionState==1">激活</el-tag>
-                    <el-tag type="danger" v-else>挂起</el-tag>
-                </template>
-                </el-table-column>
-                <el-table-column align="center" prop="deploymentTime" label="部署时间" width="150"></el-table-column>
-                <el-table-column  align="center" prop="description" :show-overflow-tooltip="true" label="挂起或激活原因" width="150"></el-table-column>
-                <el-table-column label="操作" align="center" width="220" class-name="small-padding fixed-width">
-                  <template slot-scope="scope">
-                    <el-row :gutter="20" class="mb8">
-                      <el-col :span="1.5">
-                        <el-button
-                          v-if="scope.row.suspensionState == 1"
-                          @click="openDialog(scope.row)"
-                          type="text"
-                          size="mini"
-                          icon="el-icon-lock"
-                        >挂起</el-button>
-                        <el-button
-                          v-else type="text"
-                          @click="openDialog(scope.row)"
-                          size="mini"
-                          icon="el-icon-unlock"
-                        >激活</el-button>
-                      </el-col>
-                      <el-col :span="1.5">
-                        <el-button
-                          type="text"
-                          @click="convertToModel(scope.row)"
-                          size="mini"
-                          icon="el-icon-sort"
-                        >转换模型</el-button>
-                      </el-col>
-                      <el-col :span="1.5">
-                        <el-button
-                          size="mini"
-                          type="text"
-                          icon="el-icon-delete"
-                          @click="handleDelete(scope.row)"
-                        >删除</el-button>
-                      </el-col>
-                    </el-row>
-                    <el-row :gutter="20" class="mb8">
-                      <el-col :span="1.5">
-                        <el-button
-                          size="mini"
-                          type="text"
-                          icon="el-icon-setting"
-                          @click="handleSetting(scope.row)"
-                        >设置</el-button>
-                      </el-col>
-                      <el-col :span="1.5">
-                        <el-button
-                          size="mini"
-                          type="text"
-                          icon="el-icon-copy-document"
-                          @click="copySetting(scope.row)"
-                        >复制流程</el-button>
-                      </el-col>
-                    </el-row>
-                  </template>
-                </el-table-column>
-            </el-table>
-
-            <el-dialog
-              title="挂起或激活流程"
-              append-to-body
-              :close-on-click-modal="false"
-              :visible.sync="dialogVisible"
-              v-if="dialogVisible"
-              v-loading="loading"
-              width="60%">
-              <el-input  type="textarea" v-model="description" maxlength="300" placeholder="请输入原因"
-              :autosize="{ minRows: 4 }" show-word-limit ></el-input>
-              <span slot="footer" class="dialog-footer">
-                <el-button size="small" @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" size="small" @click="clickUpdateProcDefState">确 定</el-button>
-              </span>
-            </el-dialog>
-
-            <!-- 预览图片 -->
-            <process-preview ref="previewRef" :url="url" :type="type"/>
-            <!-- 流程设置 -->
-            <process-setting ref="settingRef"/>
-        </div>
-    </el-dialog>
-</template>
-<script>
-import {hisList,del,updateProcDefState} from "@/api/workflow/definition";
-import {copy} from "@/api/workflow/actNodeAssginee";
-import processDeploy from './processDeploy'
-import processPreview from './processPreview'
-import processSetting from './processSetting'
-import {convertToModel} from "@/api/workflow/model";
-
-export default {
-    components: { processDeploy, processPreview, processSetting},
-    props:{
-      propKey: {
-        type: String
-      },
-      definitionId: {
-        type:String
-      }
-    },
-    data() {
-        return {
-            // 弹窗
-            dialogVisible: false,
-            // 原因
-            description: '',
-            // 弹出层
-            visible: false,
-            // 流程图
-            url: [],
-            // 按钮loading
-            buttonLoading: false,
-            // 遮罩层
-            loading: true,
-            // 导出遮罩层
-            exportLoading: false,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 是否显示弹出层
-            open: false,
-            // 表格数据
-            list: [],
-            type: '',//png,xml
-            // 流程定义对象
-            procedefData: {},
-        }
-    },
-    methods: {
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      //查询列表
-      getList(data){
-          this.loading = true;
-          hisList(data).then(response => {
-            this.list = response.data;
-            this.loading = false;
-          })
-      },
-      // 将流程定义转换为模型
-      convertToModel(row){
-          this.loading = true;
-          convertToModel(row.id).then(response => {
-            if(response.code === 200){
-             this.$modal.msgSuccess("转换成功");
-             this.propKey = row.key
-             this.definitionId = row.id
-             this.$refs.hisListRef.visible = true
-             let data = {id:this.definitionId,key:this.propKey}
-             this.getList(data);
-             this.loading = false;
-            }
-          }).finally(() => {
-             this.loading = false;
-          });
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-         const deploymentId = row.deploymentId;
-         this.$modal.confirm('是否确认删除标识key为"' + row.key + '"的数据项？').then(() => {
-           this.loading = true;
-           return del(deploymentId,row.id);
-         }).then(() => {
-           this.loading = false;
-           let data = {id:this.definitionId,key:this.propKey}
-           this.getList(data);
-           this.$modal.msgSuccess("删除成功");
-         }).finally(() => {
-           this.loading = false;
-         });
-      },
-      // 导出xml流程文件
-      clickExportXML(id) {
-         window.open(process.env.VUE_APP_BASE_API+'/workflow/definition/export/xml/'+id)
-      },
-
-      // 预览图片 downFile
-      clickPreviewImg(id) {
-        this.type = 'png'
-        this.url.push(process.env.VUE_APP_BASE_API+'/workflow/definition/export/png/'+id)
-        this.$refs.previewRef.visible = true
-      },
-      //打开弹窗
-      openDialog(row){
-        this.procedefData = row
-        this.description = row.description
-        this.dialogVisible = true
-      },
-      //激活或挂起流程
-      clickUpdateProcDefState(row){
-        let msg='';
-        if(this.procedefData.suspensionState===1){
-          msg=`暂停后，此流程下的所有任务都不允许往后流转，您确定挂起【${this.procedefData.name || this.procedefData.key}】吗？`
-        }else{
-          msg=`启动后，此流程下的所有任务都允许往后流转，您确定激活【${this.procedefData.name || this.procedefData.key}】吗？`
-        }
-        let params = {
-          definitionId: this.procedefData.id,
-          description: this.description
-        }
-        this.$modal.confirm(msg).then(() => {
-           this.loading = true;
-           return updateProcDefState(params);
-         }).then(() => {
-           this.loading = false;
-           let data = {id:this.definitionId,key:this.propKey}
-           this.getList(data);
-           this.$modal.msgSuccess("操作成功");
-           this.dialogVisible = false
-         }).finally(() => {
-           this.loading = false;
-         });
-      },
-      //打开设置
-      handleSetting(row){
-        this.$nextTick(() => {
-          this.$refs.settingRef.visible = true
-          this.$refs.settingRef.init(row.id)
-        })
-      },
-      copySetting(row){
-        this.$modal.confirm('是否确认将此设置复制为最新？').then(() => {
-           this.loading = true;
-           copy(row.id,row.key).then(response => {
-              if(response.code === 200){
-                this.$modal.msgSuccess("操作成功");
-              }else{
-                this.$modal.msgError(response.msg);
-              }
-            })
-         }).finally(() => {
-           this.loading = false;
-         });
-      }
-    }
-}
-</script>
-
diff --git a/ruoyi-ui/src/views/workflow/definition/components/processPreview.vue b/ruoyi-ui/src/views/workflow/definition/components/processPreview.vue
deleted file mode 100644
index 059f7f0e..00000000
--- a/ruoyi-ui/src/views/workflow/definition/components/processPreview.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-  <el-dialog title="预览" :visible.sync="visible" width="70%" append-to-body>
-     <div v-if="type==='png'" style="align:center">
-        <el-image :src="url[0]" v-if="type==='png'">
-          <div slot="placeholder">流程图加载中 <i class="el-icon-loading"></i></div>
-        </el-image>
-      </div>
-      <div class="xml-data" v-if="type==='xml'">
-        <div v-for="(xml,index) in url" :key="index">
-          <pre class="font">{{xml}}</pre>
-       </div>
-      </div>
-      <span slot="footer" v-if="type==='xml'" class="dialog-footer">
-        <el-button class="copyText" :data-clipboard-text="copyText" type="primary" size="mini" @click="copy">复制</el-button>
-      </span>
-  </el-dialog>
-</template>
-
-<script>
-import ClipboardJS from 'clipboard'
-export default {
-    props: {
-      url: {
-        type: Array,
-        default:()=>[]
-      },
-      type: String,
-    },
-    data() {
-      return {
-        visible: false,
-        previewType: 'xml',
-        width: '450px',
-        height: '300px',
-        copyText: ''
-      }
-    },
-    methods: {
-      copy(){
-          const clipboard = new ClipboardJS('.copyText');
-          this.copyText =  this.url.join("")
-          clipboard.on('success', e => {
-            this.$message.success('复制成功');
-            clipboard.destroy();
-          });
-          clipboard.on('error', e => {
-            this.$message.error('复制失败');
-            clipboard.destroy();
-          });
-      }
-    }
-}
-</script>
-<style>
-.xml-data {
-  background-color: #2B2B2B;
-  border-radius: 5px;
-  color: #C6C6C6;
-  word-break:break-all;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  box-sizing: border-box;
-  padding: 8px 0px;
-  height: 500px;
-  width: inherit;
-  line-height: 1px;
-}
-.font{
-  font-family:'幼圆';
-  font-weight:500;
-}
-/* 修改滚动条样式 */
-.xml-data::-webkit-scrollbar {
-	width: 4px;
-}
-.xml-data::-webkit-scrollbar-thumb {
-	border-radius: 10px;
-}
-</style>
diff --git a/ruoyi-ui/src/views/workflow/definition/components/processRule.vue b/ruoyi-ui/src/views/workflow/definition/components/processRule.vue
deleted file mode 100644
index 67fa8bd8..00000000
--- a/ruoyi-ui/src/views/workflow/definition/components/processRule.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<template>
-<el-dialog title="业务规则" :visible.sync="visible" v-if="visible" width="60%" append-to-body v-dialogDrag :close-on-click-modal="false">
-
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="bean名称" prop="beanName">
-        <el-input
-          v-model="queryParams.businessRule"
-          placeholder="请输入bean名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="方法名" prop="method">
-        <el-input
-          v-model="queryParams.method"
-          placeholder="请输入方法名"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="businessRuleList" :highlight-current-row="true"
-     @row-click = "onRowClick">
-      <el-table-column label="id" align="center" prop="id" v-if="false"/>
-      <el-table-column label="bean名称" :show-overflow-tooltip="true" align="center" prop="beanName" />
-      <el-table-column label="方法名" :show-overflow-tooltip="true" align="center" prop="method" />
-      <el-table-column label="备注" :show-overflow-tooltip="true" align="center" prop="remark" />
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </div>
-  <div slot="footer" class="dialog-footer">
-        <el-button size="small" type="primary" @click="primary">确认</el-button>
-        <el-button size="small" @click="cancel">取 消</el-button>
-  </div>
-</el-dialog>
-</template>
-
-<script>
-import { listBusinessRule } from "@/api/workflow/businessRule";
-
-export default {
-  props: {
-
-  },
-  name: "processRule",
-  data() {
-    return {
-      visible: false,
-      // 按钮loading
-      buttonLoading: false,
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 业务规则表格数据
-      businessRuleList: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        beanName: undefined,
-        method: undefined,
-      },
-      businessRuleParam: [],
-      // 选中行数据
-      row: {}
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询业务规则列表 */
-    getList() {
-      this.loading = true;
-      listBusinessRule(this.queryParams).then(response => {
-        this.businessRuleList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.visible = false;
-      this.resetForm("queryForm");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-      this.resetForm("queryForm");
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    onRowClick (row, event, column) {
-      this.row = row
-    },
-    // 确认
-    primary(){
-      this.$emit("primary",this.row)
-    }
-  }
-};
-</script>
diff --git a/ruoyi-ui/src/views/workflow/definition/components/processSetting.vue b/ruoyi-ui/src/views/workflow/definition/components/processSetting.vue
deleted file mode 100644
index 57e3e244..00000000
--- a/ruoyi-ui/src/views/workflow/definition/components/processSetting.vue
+++ /dev/null
@@ -1,412 +0,0 @@
-<template>
-  <el-dialog title="设置" :visible.sync="visible" v-if="visible" width="70%" :close-on-click-modal="false" append-to-body>
-    <div class="container" v-loading="loading">
-       <el-tabs :tab-position="tabPosition" class="tabs" v-model="activeName" @tab-click="changeSteps">
-        <el-tab-pane v-for="(node, index) in nodeList" :key="index" :name="node.id" :label="node.nodeName">
-          <el-form style="height:inherit" ref="form" size="small" label-position="left" :model="form">
-            <el-form-item label="环节名称">
-              <el-tag v-if="nodeName">{{nodeName}}</el-tag><el-tag v-else>无</el-tag>
-            </el-form-item>
-            <el-row>
-              <el-form-item>
-                  <el-col :span="24" style="line-height: 20px">
-                    <el-alert title="每个节点设置，如有修改都请保存一次，跳转节点后数据不会自动保存！" type="warning" show-icon :closable="false"/>
-                  </el-col>
-              </el-form-item>
-            </el-row>
-            <el-form-item v-if="node.index === 1" prop="chooseWay" label="选人方式">
-              <el-radio-group @change="clearSelect(form.chooseWay)" v-model="form.chooseWay">
-                <el-radio border label="person">选择人员</el-radio>
-                <el-radio border label="role">选择角色</el-radio>
-                <el-radio border label="dept">选择部门</el-radio>
-                <el-radio border label="rule">业务规则</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-row v-if="node.index === 1">
-              <el-col class="line" :span="8">
-                <el-form-item label="是否弹窗选人" prop="isShow">
-                  <el-switch v-model="form.isShow"></el-switch>
-                </el-form-item>
-              </el-col>
-              <el-col class="line" :span="8">
-                <el-form-item label="是否能会签" prop="multiple">
-                  <el-switch disabled v-model="form.multiple"></el-switch>
-                </el-form-item>
-              </el-col>
-              <el-col class="line" :span="8">
-                  <el-form-item label="是否能退回" prop="isBack">
-                    <el-switch v-model="form.isBack"></el-switch>
-                  </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col class="line" :span="8">
-                <el-form-item label="是否可以委托" prop="isDelegate">
-                  <el-switch v-model="form.isDelegate"></el-switch>
-                </el-form-item>
-              </el-col>
-              <el-col class="line" :span="8">
-                <el-form-item label="是否能转办" prop="isTransmit">
-                  <el-switch v-model="form.isTransmit"></el-switch>
-                </el-form-item>
-              </el-col>
-              <el-col class="line" :span="8">
-                  <el-form-item label="是否能抄送" prop="isCopy">
-                    <el-switch v-model="form.isCopy"></el-switch>
-                  </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row v-if="node.index === 1">
-              <el-col class="line" :span="8">
-                <el-form-item label="是否自动审批" prop="autoComplete">
-                  <el-switch v-model="form.autoComplete"></el-switch>
-                  <el-tooltip class="item" effect="dark" content="当前节点与上一节点审批人相同自动审批，下一节点如果为弹窗选人则默认下一节点全部人员为候选人" placement="top-start">
-                    <i class="el-icon-info" style="cursor: pointer;font-size: 15px;line-height: 15px;vertical-align: middle;padding-left: 10px;"></i>
-                  </el-tooltip>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row v-if="form.multiple">
-              <el-col class="line" :span="8">
-                <el-form-item label-width="100px" label="会签集合" prop="multipleColumn">
-                  <el-tag>{{form.multipleColumn}}</el-tag>
-                </el-form-item>
-              </el-col>
-              <el-col class="line" :span="8">
-                <el-form-item label="是否能加签" prop="addMultiInstance">
-                  <el-switch v-model="form.addMultiInstance"></el-switch>
-                </el-form-item>
-              </el-col>
-              <el-col class="line" :span="8">
-                  <el-form-item label="是否能减签" prop="deleteMultiInstance">
-                    <el-switch v-model="form.deleteMultiInstance"></el-switch>
-                  </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-col :span="20">
-                <el-form-item label-width="100px" label="节点任务" prop="task">
-                  <el-popover
-                    placement="right"
-                    width="500"
-                    trigger="click">
-                    <el-button type="primary" size="mini" @click="addListener">添加</el-button>
-                    <el-link style="padding-left:15px" type="info" :underline="false">说明：当前任务节点完成前或完成后执行</el-link>
-                    <el-table :data="form.taskListenerList">
-                      <el-table-column label="事件类型" width="150" align="center" prop="paramType" >
-                          <template slot-scope="scope">
-                              <el-select v-model="scope.row.eventType" placeholder="请选择">
-                              <el-option
-                                v-for="item in options"
-                                :key="item.value"
-                                :label="item.label"
-                                :value="item.value">
-                              </el-option>
-                            </el-select>
-                          </template>
-                      </el-table-column>
-                      <el-table-column label="bean名称" align="center" prop="paramType" >
-                          <template slot-scope="scope">
-                              <el-input v-model="scope.row.beanName"/>
-                          </template>
-                      </el-table-column>
-                      <el-table-column label="操作" width="80">
-                          <template slot-scope="scope">
-                              <el-button @click="deleteListener(scope.$index)" type="danger" size="small">删除</el-button>
-                          </template>
-                      </el-table-column>
-                    </el-table>
-                    <el-badge :value="form.taskListenerList.length" slot="reference" class="item">
-                      <el-button type="primary" icon="el-icon-circle-plus-outline">节点任务</el-button>
-                    </el-badge>
-                  </el-popover>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row v-if="node.index === 1">
-              <el-col :span="20">
-                <el-form-item label-width="100px" label="审批人员" prop="assignee">
-                  <el-input readonly v-model="form.assignee" placeholder="审批人员">
-                    <el-button type="primary" slot="append" @click="openSelect" v-text="btnText"></el-button>
-                    <el-button type="success" slot="append" @click="clearSelect">清空</el-button>
-                  </el-input>
-                  <el-input v-model="form.assigneeId" v-show="false" placeholder="审批人员ID"/>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </el-tab-pane>
-      </el-tabs>
-      <div style="float:right;position:relative;bottom:20px;">
-        <el-button type="primary" size="small" @click="onSubmit">保存</el-button>
-        <el-button type="danger" size="small" v-if="index === 1" @click="del">重置</el-button>
-      </div>
-    </div>
-    <!-- 选择人员 -->
-    <sys-dept-user ref="userRef" @confirmUser="clickUser" :propUserList = 'propUserList'/>
-    <!-- 选择角色 -->
-    <sys-role ref="roleRef" @confirmUser="clickRole" :propRoleList = 'propRoleList'/>
-    <!-- 选择部门 -->
-    <sys-dept ref="deptRef" @confirmUser="clickDept" :propDeptList = 'propDeptList'/>
-    <!-- 选择业务规则 -->
-    <process-Rule ref="processRuleRef" @primary="clickRule" :propDeptList = 'propDeptList'/>
-  </el-dialog>
-</template>
-
-<script>
-import  SysDeptUser from "@/views/components/user/sys-dept-user";
-import  SysRole from "@/views/components/role/sys-role";
-import  SysDept from "@/views/components/dept/sys-dept";
-import  ProcessRule from "@/views/workflow/definition/components/processRule";
-import {setting} from "@/api/workflow/definition";
-import {getInfoSetting,add,del} from "@/api/workflow/actNodeAssginee";
-
-export default {
-    components: {
-       SysDeptUser,
-       SysRole,
-       SysDept,
-       ProcessRule
-    },
-    data() {
-      return {
-        tabPosition: 'left',
-        activeName:'',
-        loading: false,
-        nodeList: [],
-        visible: false,
-        active: null,
-        form: {
-          isShow: true,
-          isBack: false,
-          multiple: false,
-          chooseWay: undefined,
-          isDelegate: false,
-          isTransmit: false,
-          isCopy: false,
-          autoComplete: false,
-          addMultiInstance: false,
-          deleteMultiInstance: false,
-          taskListenerList:[]
-        },
-        // 按钮值
-        btnText:"选择人员",
-        // 流程定义id
-        definitionId: null,
-        // 环节名称
-        nodeName: null,
-        // 下标
-        index: 0,
-        // 人员选择
-        propUserList: [],
-        // 角色选择
-        propRoleList: [],
-        // 部门选择
-        propDeptList: [],
-        options: [{
-          value: 'before',
-          label: '完成前'
-        }, {
-          value: 'after',
-          label: '完成后'
-        }]
-      }
-    },
-    methods: {
-        // 查询流程节点
-        async init(definitionId) {
-           this.loading = true
-           this.definitionId = definitionId
-           this.form.chooseWay = 'person'
-           const data = await setting(definitionId)
-           this.nodeList = data.data
-           this.activeName = '0'
-           this.changeSteps()
-        },
-        //切换节点
-        changeSteps() {
-          this.nodeList[this.activeName]
-          this.form.assignee = undefined
-          this.form.multipleColumn = undefined
-          this.form.multiple = false
-          this.loading = true
-          this.nodeName = this.nodeList[this.activeName].nodeName
-          this.index = this.nodeList[this.activeName].index
-          getInfoSetting(this.definitionId,this.nodeList[this.activeName].nodeId).then(response => {
-            if(response.code === 200){
-              this.form = response.data
-              this.form.nodeName = response.data.nodeName
-              this.loading = false
-              if(this.form.id === undefined){
-                this.form.isBack = false
-              }
-              if(this.form.chooseWay === "person"){
-                this.btnText = "选择人员"
-              }else if(this.form.chooseWay === "role"){
-                this.btnText = "选择角色"
-              }else if(this.form.chooseWay === "dept"){
-                this.btnText = "选择部门"
-              }else if(this.form.chooseWay === "rule"){
-                this.btnText = "选择规则"
-              }
-              this.$forceUpdate()
-            }
-          })
-        },
-        //保存设置
-        onSubmit(){
-          if(this.nodeName){
-            this.form.nodeName = this.nodeName
-            this.form.index = this.index
-            add(this.form).then(response => {
-              this.form = response.data
-              this.$modal.msgSuccess("保存成功")
-            })
-          }else{
-            this.$modal.msgError("请选择节点")
-          }
-        },
-        // 删除
-        del(){
-          if(this.form.id){
-             del(this.form.id).then(response => {
-              if(response.code === 200){
-                this.$modal.msgSuccess("重置成功")
-                this.reset()
-              }
-             })
-          }else{
-              this.$modal.msgSuccess("重置成功")
-              this.reset()
-          }
-        },
-        // 重置
-        reset(){
-          this.form.assigneeId =undefined
-          this.form.assignee = undefined
-          this.form.chooseWay = 'person'
-          this.form.processDefinitionId = this.definitionId
-        },
-        // 添加参数
-        addListener(){
-            let param = {
-                eventType:'',
-                beanName:''
-            }
-            this.form.taskListenerList.push(param);
-        },
-        // 删除参数
-        deleteListener(index){
-          this.form.taskListenerList.splice(index,1)
-        },
-        //清空选择的人员
-        clearSelect(chooseWay){
-          this.form.assigneeId = ""
-          this.form.assignee = ""
-          if(chooseWay === "person"){
-            this.btnText = "选择人员"
-          }else if(chooseWay === "role"){
-            this.btnText = "选择角色"
-          }else if(chooseWay === "dept"){
-            this.btnText = "选择部门"
-          }else if(chooseWay === "rule"){
-            this.btnText = "选择规则"
-          }
-        },
-        //选择弹出层
-        async openSelect(){
-          if(this.form.chooseWay === 'person'){
-            this.propUserList = [];
-            if(this.form.assigneeId){
-              let userIds = this.form.assigneeId.split( ',' )
-              if(userIds.length>0){
-                this.propUserList = userIds
-              }
-            }
-            this.$refs.userRef.visible = true
-          }else if(this.form.chooseWay === 'role'){
-           this.propRoleList = [];
-            if(this.form.assigneeId){
-              let roleIds = this.form.assigneeId.split( ',' )
-              if(roleIds.length>0){
-                this.propRoleList = roleIds
-              }
-            }
-            this.$refs.roleRef.visible = true
-          }else if(this.form.chooseWay === 'dept'){
-            this.propDeptList = [];
-            if(this.form.assigneeId){
-              let deptIds = this.form.assigneeId.split( ',' )
-              if(deptIds.length>0){
-                this.propDeptList = deptIds
-              }
-            }
-            this.$refs.deptRef.visible = true
-          }else if(this.form.chooseWay === 'rule'){
-            this.$refs.processRuleRef.visible = true
-          }
-        },
-        //选择人员
-        clickUser(userList){
-          let arrAssignee= userList.map(item => {
-            return item.nickName
-          })
-          let arrAssigneeId= userList.map(item => {
-            return item.userId
-          })
-          let resultAssignee = arrAssignee.join(",")
-          let resultAssigneeId = arrAssigneeId.join(",")
-          this.$set(this.form,'assignee',resultAssignee)
-          this.$set(this.form,'assigneeId',resultAssigneeId)
-          this.$refs.userRef.visible = false
-          this.$forceUpdate()
-        },
-        //选择角色
-        clickRole(roleList){
-          let arrAssignee= roleList.map(item => {
-            return item.roleName
-          })
-          let arrAssigneeId= roleList.map(item => {
-            return item.roleId
-          })
-          let resultAssignee = arrAssignee.join(",")
-          let resultAssigneeId = arrAssigneeId.join(",")
-          this.$set(this.form,'assignee',resultAssignee)
-          this.$set(this.form,'assigneeId',resultAssigneeId)
-          this.$refs.roleRef.visible = false
-        },
-        //选择部门
-        clickDept(deptList){
-          let arrAssignee= deptList.map(item => {
-            return item.deptName
-          })
-          let arrAssigneeId= deptList.map(item => {
-            return item.deptId
-          })
-          let resultAssignee = arrAssignee.join(",")
-          let resultAssigneeId = arrAssigneeId.join(",")
-          this.$set(this.form,'assignee',resultAssignee)
-          this.$set(this.form,'assigneeId',resultAssigneeId)
-          this.$refs.deptRef.visible = false
-        },
-        //业务规则
-        clickRule(rule){
-          this.$set(this.form,'assignee',rule.beanName+"."+rule.method)
-          this.$set(this.form,'assigneeId',rule.beanName+"."+rule.method)
-          this.$set(this.form,'businessRuleId',rule.id)
-          this.$refs.processRuleRef.visible = false
-        }
-    }
-}
-</script>
-<style scoped>
-    .container {
-        height: 550px;
-    }
-    .tabs{
-        height: 550px;
-    }
-</style>
-
-
-
diff --git a/ruoyi-ui/src/views/workflow/definition/index.vue b/ruoyi-ui/src/views/workflow/definition/index.vue
deleted file mode 100644
index 6c48822c..00000000
--- a/ruoyi-ui/src/views/workflow/definition/index.vue
+++ /dev/null
@@ -1,382 +0,0 @@
-<template>
-  <div class="app-container">
-    <!-- 检索 -->
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="模型名称" prop="name">
-          <el-input
-            v-model="queryParams.name"
-            placeholder="请输入模型名称"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="标识Key" prop="key">
-          <el-input
-            v-model="queryParams.key"
-            placeholder="请输入标识Key"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
-    </el-form>
-    <el-row :gutter="10" class="mb8">
-      <el-button icon="el-icon-upload" size="small" type="primary" @click="clickDeploy">部署流程文件</el-button>
-      <el-alert style="margin:10px 0" title="说明：当有多个相同标识Key的流程时，只显示其最新版本流程。" type="info" show-icon :closable="false" />
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-    <!-- 表格数据 -->
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column fixed align="center" type="index" label="序号" width="50"></el-table-column>
-        <el-table-column fixed align="center" prop="name" label="模型名称" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column  align="center" prop="key" label="标识Key"  min-width="120"></el-table-column>
-        <el-table-column align="center" prop="version" label="版本号" width="90" >
-          <template slot-scope="{row}"> v{{row.version}}.0</template>
-        </el-table-column>
-        <el-table-column align="center" prop="resourceName" label="流程XML" min-width="100" show-overflow-tooltip>
-        <template slot-scope="{row}">
-          <!-- 注意组件上使用原生事件，要加 .active -->
-          <el-link type="primary" @click.native="clickExportXML(row.id)">{{ row.resourceName }}</el-link>
-        </template>
-        </el-table-column>
-        <el-table-column align="center" prop="diagramResourceName" label="流程图片" min-width="100" show-overflow-tooltip>
-        <template slot-scope="{row}">
-          <el-link type="primary" @click="clickPreviewImg(row.id)">{{ row.diagramResourceName }}</el-link>
-        </template>
-        </el-table-column>
-        <el-table-column  align="center" prop="suspensionState" label="状态"  min-width="50">
-          <template slot-scope="scope">
-            <el-tag type="success" v-if="scope.row.suspensionState==1">激活</el-tag>
-            <el-tag type="danger" v-else>挂起</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column  align="center" prop="deploymentTime" label="部署时间" :show-overflow-tooltip="true" width="100"></el-table-column>
-        <el-table-column  align="center" prop="actProcessDefSettingVo.businessType" label="表单Key" width="80">
-          <template slot-scope="scope">
-            <el-tag type="success" v-if="scope.row.actProcessDefSettingVo && scope.row.actProcessDefSettingVo.businessType===0">动态表单</el-tag>
-            <el-tag type="primary" v-else-if="scope.row.actProcessDefSettingVo && scope.row.actProcessDefSettingVo.businessType===1">业务表单</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column  align="center" label="表单Key/组件名称" width="150">
-          <template slot-scope="scope">
-            <span v-if="scope.row.actProcessDefSettingVo && scope.row.actProcessDefSettingVo.businessType===0">{{scope.row.actProcessDefSettingVo.formKey}}</span>
-            <span v-if="scope.row.actProcessDefSettingVo && scope.row.actProcessDefSettingVo.businessType===1">{{scope.row.actProcessDefSettingVo.componentName}}</span>
-          </template>
-        </el-table-column>
-        
-        <el-table-column  align="center" prop="description" :show-overflow-tooltip="true" label="挂起或激活原因" width="150"></el-table-column>
-        <el-table-column label="操作" align="center" width="210" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-row :gutter="20" class="mb8">
-            <el-col :span="1.5">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-sort"
-                @click="convertToModel
-                (scope.row)"
-              >转换模型</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                v-if="scope.row.suspensionState == 1"
-                @click="openDialog(scope.row)"
-                type="text"
-                size="mini"
-                icon="el-icon-lock"
-              >挂起</el-button>
-              <el-button
-                v-else type="text"
-                @click="openDialog(scope.row)"
-                size="mini"
-                icon="el-icon-unlock"
-              >激活</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-                >删除</el-button>
-            </el-col>
-          </el-row>
-          <el-row :gutter="20" class="mb8">
-            <el-col :span="1.5">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-tickets"
-                @click="clickHisList
-                (scope.row)"
-              >历史版本</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-setting"
-                @click="handleSetting(scope.row)"
-                >设置</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-postcard"
-                @click="handleForm(scope.row)"
-                >表单</el-button>
-            </el-col>
-          </el-row>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
-    <el-dialog
-      title="挂起或激活流程"
-      :close-on-click-modal="false"
-      :visible.sync="dialogVisible"
-      v-if="dialogVisible"
-      width="60%">
-      <el-input  type="textarea" v-model="description" maxlength="300" placeholder="请输入原因"
-      :autosize="{ minRows: 4 }" show-word-limit ></el-input>
-      <span slot="footer" class="dialog-footer">
-        <el-button type="primary" size="small" v-loading = "buttonLoading" @click="clickUpdateProcDefState">确 定</el-button>
-        <el-button size="small" @click="dialogVisible = false">取 消</el-button>
-      </span>
-    </el-dialog>
-    <!-- 部署流程文件 -->
-    <process-deploy ref="deployProcess" />
-
-    <!-- 预览图片或xml -->
-    <process-preview ref="previewRef" :url="url" :type="type"/>
-
-    <!-- 历史版本 -->
-    <process-his-list ref="hisListRef" :propKey="propKey" :definitionId="definitionId" />
-
-    <!-- 流程设置 -->
-    <process-setting ref="settingRef"/>
-
-    <!-- 表单设置 -->
-    <process-form-list ref="formRef" @callbackFn="getList" :formData="formData"/>
-
-
-  </div>
-</template>
-<script>
-import {list,del,updateProcDefState,getXml} from "@/api/workflow/definition";
-import { getProcessDefSettingByDefId } from "@/api/workflow/processDefSetting";
-import {convertToModel} from "@/api/workflow/model";
-import processDeploy from './components/processDeploy'
-import processPreview from './components/processPreview'
-import processHisList from './components/processHisList'
-import processSetting from './components/processSetting'
-import processFormList from './components/processFormList'
-
-export default {
-    name: 'Definition', // 和对应路由表中配置的name值一致
-    components: { processDeploy, processPreview,processHisList,processSetting,processFormList },
-    data() {
-        return {
-            // 弹窗
-            dialogVisible: false,
-            // 原因
-            description: '',
-            // 流程图
-            url: [],
-            // 流程key
-            propKey: null,
-            // 流程定义id
-            definitionId: null,
-            // 按钮loading
-            buttonLoading: false,
-            // 遮罩层
-            loading: true,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 是否显示弹出层
-            open: false,
-            // 表格数据
-            dataList: [],
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                name: undefined,
-                key : undefined
-            },
-            // 设置弹窗
-            settingVisible: false,
-            // 流程定义对象
-            procedefData: {},
-            type: '',//png,xml
-            // 表单数据
-            formData: {}
-        }
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.daterangeCreateTime = [];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      // 将流程定义转换为模型
-      convertToModel(row){
-         this.$modal.confirm('是否转换模型？').then(() => {
-            this.loading = true;
-            return convertToModel(row.id)
-         }).then(() => {
-           this.loading = false;
-           this.getList();
-           this.$modal.msgSuccess("转换成功");
-         }).finally(() => {
-           this.loading = false;
-         });
-      },
-      // 分页
-      getList(){
-          this.loading = true;
-          list(this.queryParams).then(response => {
-            this.dataList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          })
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-         const deploymentId = row.deploymentId;
-         this.$modal.confirm('是否确认删除标识key为"' + row.key + '"的数据项？').then(() => {
-           this.loading = true;
-           return del(deploymentId,row.id);
-         }).then(() => {
-           this.loading = false;
-           this.getList();
-           this.$modal.msgSuccess("删除成功");
-         }).finally(() => {
-           this.loading = false;
-         });
-      },
-      // 弹出部署流程文件窗口
-      clickDeploy() {
-        this.$refs.deployProcess.visible = true
-      },
-      // 导出xml流程文件
-      clickExportXML(id) {
-        this.type = 'xml'
-        getXml(id).then(response => {
-          this.url = []
-          this.url = response.data
-          this.$refs.previewRef.visible = true
-        })
-      },
-
-      // 预览图片 downFile
-      clickPreviewImg(id) {
-        this.type = 'png'
-        this.url = []
-        this.url.push(process.env.VUE_APP_BASE_API+'/workflow/definition/export/png/'+id)
-        this.$refs.previewRef.visible = true
-      },
-      //打开弹窗
-      openDialog(row){
-        this.procedefData = row
-        if(row.description === null){
-          this.description = ''
-        }else{
-          this.description = row.description
-        }
-        this.dialogVisible = true
-      },
-      //激活或挂起流程
-      clickUpdateProcDefState(){
-        let msg='';
-        if(this.procedefData.suspensionState===1){
-          msg=`暂停后，此流程下的所有任务都不允许往后流转，您确定挂起【${this.procedefData.name || this.procedefData.key}】吗？`
-        }else{
-          msg=`启动后，此流程下的所有任务都允许往后流转，您确定激活【${this.procedefData.name || this.procedefData.key}】吗？`
-        }
-        let params = {
-          definitionId: this.procedefData.id,
-          description: this.description
-        }
-        this.$modal.confirm(msg).then(() => {
-           this.buttonLoading = true;
-           return updateProcDefState(params);
-         }).then(() => {
-           this.buttonLoading = false;
-           this.getList();
-           this.$modal.msgSuccess("操作成功");
-           this.dialogVisible = false
-         }).finally(() => {
-           this.buttonLoading = false;
-         });
-      },
-      //历史版本
-      clickHisList(row) {
-          this.propKey = row.key
-          this.definitionId = row.id
-          this.$refs.hisListRef.visible = true
-          let data = {id:this.definitionId,key:this.propKey}
-          this.$refs.hisListRef.getList(data)
-      },
-      //打开设置
-      handleSetting(row){
-        this.$nextTick(() => {
-          this.$refs.settingRef.visible = true
-          this.$refs.settingRef.init(row.id)
-        })
-      },
-      //打开表单
-      handleForm(row){
-        this.loading = true
-        getProcessDefSettingByDefId(row.id).then(response => {
-          this.formData = {}
-          if(response.data){
-            this.formData = response.data
-          }else{
-            this.formData.businessType = 0
-          }
-          this.formData.processDefinitionId = row.id
-          this.formData.processDefinitionKey = row.key
-          this.formData.processDefinitionName = row.name         
-          this.loading = false
-          this.$refs.formRef.visible = true
-        })
-      }
-    }
-}
-</script>
-
diff --git a/ruoyi-ui/src/views/workflow/dynamicForm/dynamicFormDesigner.vue b/ruoyi-ui/src/views/workflow/dynamicForm/dynamicFormDesigner.vue
deleted file mode 100644
index be870c0e..00000000
--- a/ruoyi-ui/src/views/workflow/dynamicForm/dynamicFormDesigner.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<template>
-  <div>
-    <form-designer ref="formDesigner" v-model="designerForm"/>
-  </div>
-</template>
-
-<script>
-import { getDynamicForm } from "@/api/workflow/dynamicForm";
-export default {
-  name: "dynamicFormDesigner",
-  data() {
-    return {
-      designerForm: ''
-     }
-  },
-  mounted() {
-    getDynamicForm(this.$route.params.id).then(response => {
-      this.designerForm = response.data.formDesignerText;
-    });
-  },
-  methods: {
-  }
-}
-</script>
-
-<style>
-
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/workflow/dynamicForm/dynamicFormEnableList.vue b/ruoyi-ui/src/views/workflow/dynamicForm/dynamicFormEnableList.vue
deleted file mode 100644
index e55e5712..00000000
--- a/ruoyi-ui/src/views/workflow/dynamicForm/dynamicFormEnableList.vue
+++ /dev/null
@@ -1,262 +0,0 @@
-<template>
-  <div class="app-container">
-    <div v-if="dataViewVisible">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-form-item label="表单key" prop="formKey">
-            <el-input
-            v-model="queryParams.formKey"
-            placeholder="请输入表单key"
-            clearable
-            @keyup.enter.native="handleQuery"
-            />
-        </el-form-item>
-        <el-form-item label="表单名称" prop="formName">
-            <el-input
-            v-model="queryParams.formName"
-            placeholder="请输入表单名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-            />
-        </el-form-item>
-        <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-        <div class="container-box" v-loading="loading" v-if="dynamicFormList && dynamicFormList.length>0">
-            <div v-for="(item,index) in dynamicFormList" :key="index" class="container-card">
-                <el-card shadow="hover" class="card-item">
-                    <div slot="header" class="clearfix">
-                    <el-tooltip class="item" effect="dark" :content="'表单KEY:'+item.formKey" placement="top-start">
-                        <span>{{item.formName}}</span>
-                    </el-tooltip>
-                    <span style="float: right;" @click="handleApply(item)"><el-link type="primary">提交申请</el-link></span>
-                    </div>
-                    <div>
-                    {{item.formRemark}}
-                    </div>
-                </el-card>
-            </div>
-        </div>
-        <el-empty class="el-empty-icon" v-else description="暂无数据"></el-empty>
-        <div class="pagination-box" v-show="total>0">
-            <pagination
-            v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList"
-            />
-        </div>
-    </div>
-    <!-- 动态表单编辑 -->
-    <div v-if="dynamicFormEditVisible">
-       <div class="container-header"><i class="el-dialog__close el-icon el-icon-close" @click="closeDynamicEdit"></i></div>
-       <el-tabs type="border-card" class="container-tab">
-        <el-tab-pane label="业务单据">
-          <dynamicFormEdit
-            :buildData="formData.formDesignerText"
-            @draftForm="draftProcessForm(arguments)"
-            @submitForm="submitProcessForm(arguments)"
-            ref="dynamicFormEditRef"
-          />
-        </el-tab-pane>
-      </el-tabs>
-       <!-- 工作流 -->
-       <verify ref="verifyRef" @submitCallback="submitCallback" :taskId="taskId" :taskVariables="taskVariables" :sendMessage="sendMessage"/>
-    </div>
-  </div>
-</template>
-
-<script>
-import { listDynamicFormEnable } from "@/api/workflow/dynamicForm";
-import dynamicFormEdit from '@/views/workflow/businessForm/dynamicFormEdit'
-import { addBusinessForm} from "@/api/workflow/businessForm";
-import verify from "@/components/Process/Verify";
-import processApi from "@/api/workflow/processInst";
-export default {
-  name: "ProcessForm",
-  components:{
-    dynamicFormEdit,
-    verify
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 流程单表格数据
-      dynamicFormList: [],
-      // 弹出层标题
-      title: "",
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 15,
-        formKey: undefined,
-        formName: undefined,
-      },
-      //页面列表展示
-      dataViewVisible: true,
-      // 表单显示隐藏
-      dynamicFormEditVisible: false,
-      // 表单数据
-      formData: {},
-      // 任务id
-      taskId: '',
-      // 流程变量
-      taskVariables: {},
-      // 站内信
-      sendMessage: {}
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-
-    /** 查询流程单列表 */
-    getList() {
-      this.loading = true;
-      listDynamicFormEnable(this.queryParams).then(response => {
-        this.dynamicFormList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    //打开表单
-    handleApply(row){
-       this.formData = row
-       this.dynamicFormEditVisible = true
-       this.dataViewVisible = false
-    },
-    //关闭编辑
-    closeDynamicEdit(){
-        this.dynamicFormEditVisible = false;
-        this.dataViewVisible = true
-        this.getList()
-    },
-    //暂存
-    draftProcessForm(args){
-      let data = {
-        formId: this.formData.id,
-        formKey: this.formData.formKey,
-        formName: this.formData.formName,
-        formText: args[0],
-        formValue: args[1],
-        status: 'draft'
-      }
-      addBusinessForm(data).then(response => {
-        this.$modal.msgSuccess("保存成功");
-        this.$router.push('/workflow/from/businessForm')
-        this.dynamicFormEditVisible = false
-        this.getList();
-      })
-    },
-    //提交
-    submitProcessForm(args){
-      let data = {
-        formId: this.formData.id,
-        formKey: this.formData.formKey,
-        formName: this.formData.formName,
-        formText: args[0],
-        formValue: args[1],
-        status: 'waiting'
-      }
-      addBusinessForm(data).then(response => {
-        this.sendMessage = {
-          title: response.data.formName,
-          messageContent:'单据【'+response.data.applyCode+"】申请"
-        }
-        this.submitFormApply(response.data)
-      })
-    },
-    //提交流程
-    submitFormApply(entity){
-        //流程变量
-        this.taskVariables = {
-            entity: entity.variableMap
-        }
-        const data = {
-            processKey: entity.actProcessDefSetting.processDefinitionKey, // key
-            businessKey: entity.id, // 业务id
-            variables: this.taskVariables,
-            classFullName: entity.formKey
-        }
-        // 启动流程
-        processApi.startProcessApply(data).then(response => {
-            this.taskId = response.data.taskId;
-            this.$refs.verifyRef.visible = true
-            this.$refs.verifyRef.reset()
-        })
-    },
-    // 提交成功回调
-    submitCallback(){
-      this.dynamicFormEditVisible = false;
-      this.dataViewVisible = true
-      this.getList();
-      this.$router.push('/workflow/from/businessForm')
-    },
-  }
-};
-</script>
-<style scoped>
-  .card-item{
-    cursor: pointer;
-    height: 160px !important;
-  }
-  .clearfix{
-    font-size: 14px;
-    font-family: '幼圆' !important;
-  }
-  .container-box{
-    height: calc(100vh - 263px);
-    overflow-y: auto;
-    display: flex;
-    flex-wrap: wrap;
-  }
-  .container-card{
-    width: 280px;
-    padding: 0px 10px 0px 10px;
-  }
-  .container-header{
-    height: 30px;
-    padding-bottom: 10px;
-  }
-  .el-icon-close{
-    float: right;
-    cursor: pointer;
-  }
-  .container-tab{
-    height: calc(100vh - 155px);
-    overflow-y: auto;
-  }
-  /* 修改滚动条样式 */
-  .container-tab::-webkit-scrollbar {
-    width: 4px;
-  }
-  .container-tab::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-  }
-</style>
diff --git a/ruoyi-ui/src/views/workflow/dynamicForm/index.vue b/ruoyi-ui/src/views/workflow/dynamicForm/index.vue
deleted file mode 100644
index b04a6e60..00000000
--- a/ruoyi-ui/src/views/workflow/dynamicForm/index.vue
+++ /dev/null
@@ -1,303 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="表单key" prop="formKey">
-        <el-input
-          v-model="queryParams.formKey"
-          placeholder="请输入表单key"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="表单名称" prop="formName">
-        <el-input
-          v-model="queryParams.formName"
-          placeholder="请输入表单名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['workflow:dynamicForm:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['workflow:dynamicForm:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['workflow:dynamicForm:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['workflow:dynamicForm:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="dynamicFormList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" v-if="false"/>
-      <el-table-column label="表单key" align="center" prop="formKey" />
-      <el-table-column label="表单名称" align="center" prop="formName" />
-      <el-table-column label="表单备注" align="center" prop="formRemark" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['workflow:dynamicForm:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-thumb"
-            @click="handleFormDesigner(scope.row)"
-            v-hasPermi="['workflow:dynamicForm:edit']"
-          >表单设计</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['workflow:dynamicForm:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改流程单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="表单key" prop="formKey">
-          <el-input v-model="form.formKey" placeholder="请输入表单key" />
-        </el-form-item>
-        <el-form-item label="表单名称" prop="formName">
-          <el-input v-model="form.formName" placeholder="请输入表单名称" />
-        </el-form-item>
-        <el-form-item label="排序" prop="orderNo">
-          <el-input-number v-model="form.orderNo" placeholder="排序" />
-        </el-form-item>
-        <el-form-item label="表单备注" prop="formRemark">
-          <el-input v-model="form.formRemark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listDynamicForm, getDynamicForm, delDynamicForm, addDynamicForm, updateDynamicForm } from "@/api/workflow/dynamicForm";
-
-export default {
-  name: "DynamicForm",
-  data() {
-    return {
-      // 按钮loading
-      buttonLoading: false,
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 流程单表格数据
-      dynamicFormList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        formKey: undefined,
-        formName: undefined,
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        formKey: [
-          { required: true, message: "表单key不能为空", trigger: "blur" }
-        ],
-        formName: [
-          { required: true, message: "表单名称不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    handleFormDesigner(row){
-        this.$router.push('/workflow/dynamicFormDesigner/'+row.id)
-    },
-    /** 查询流程单列表 */
-    getList() {
-      this.loading = true;
-      listDynamicForm(this.queryParams).then(response => {
-        this.dynamicFormList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        formKey: undefined,
-        formName: undefined,
-        formDesignerText: undefined,
-        createTime: undefined,
-        updateTime: undefined,
-        createBy: undefined,
-        updateBy: undefined,
-        formRemark: undefined,
-        status: true,
-        orderNo: 0
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加流程单";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getDynamicForm(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改流程单";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.id != null) {
-            updateDynamicForm(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addDynamicForm(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除流程单编号为"' + ids + '"的数据项？').then(() => {
-        this.loading = true;
-        return delDynamicForm(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('workflow/dynamicForm/export', {
-        ...this.queryParams
-      }, `dynamicForm_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
diff --git a/ruoyi-ui/src/views/workflow/instance/finish.vue b/ruoyi-ui/src/views/workflow/instance/finish.vue
deleted file mode 100644
index 3cde7ba8..00000000
--- a/ruoyi-ui/src/views/workflow/instance/finish.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-<template>
-    <div class="app-container">
-         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-          <el-form-item label="流程名称" prop="name">
-            <el-input
-              v-model="queryParams.name"
-              placeholder="请输入流程名称"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="任务发起人" prop="key">
-            <el-input
-              v-model="queryParams.startUserId"
-              placeholder="请输入任务发起人"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-         <el-row :gutter="10" class="mb8">
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column fixed align="center" type="index" label="序号" width="50"></el-table-column>
-            <el-table-column fixed align="center" prop="name" label="流程定义名称"></el-table-column>
-            <el-table-column  align="center" prop="processDefinitionKey" label="流程定义KEY" width="150"></el-table-column>
-            <el-table-column align="center" prop="processDefinitionVersion" label="版本号" width="100" >
-              <template slot-scope="{row}"> v{{row.processDefinitionVersion}}.0</template>
-            </el-table-column>
-            <el-table-column  align="center" prop="startUserNickName" label="流程发起人" width="180"></el-table-column>
-            <el-table-column  align="center" prop="businessKey" :show-overflow-tooltip="true" label="流程关联业务ID"></el-table-column>
-            <el-table-column  align="center" prop="startTime" label="流程启动时间" width="150"></el-table-column>
-            <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-                <el-button size="mini" type="text"  icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
-    </div>
-</template>
-
-<script>
-  import api from '@/api/workflow/processInst'
-
-  export default {
-    data () {
-      return {
-        //按钮loading
-        buttonLoading: false,
-        // 遮罩层
-        loading: true,
-        // 导出遮罩层
-        exportLoading: false,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 是否显示弹出层
-        open: false,
-        // 表格数据
-        dataList: [],
-        // 查询参数
-        queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-            name: undefined,
-            key : undefined
-        }
-      }
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.daterangeCreateTime = [];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      //分页
-      getList(){
-          this.loading = true;
-          api.getProcessInstFinishByPage(this.queryParams).then(response => {
-            this.dataList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          })
-      },
-      handleDelete(row){
-        this.$modal.confirm('是否确认删除流程实例ID为"' + row.processInstanceId + '"的数据项？').then(() => {
-           this.loading = true;
-           return api.deleteFinishProcessAndHisInst(row.processInstanceId);
-         }).then(() => {
-           this.loading = false;
-           this.getList();
-           this.$modal.msgSuccess("删除成功");
-         }).finally(() => {
-           this.loading = false;
-         });
-      },
-    }
-  }
-</script>
diff --git a/ruoyi-ui/src/views/workflow/instance/running.vue b/ruoyi-ui/src/views/workflow/instance/running.vue
deleted file mode 100644
index 1d824038..00000000
--- a/ruoyi-ui/src/views/workflow/instance/running.vue
+++ /dev/null
@@ -1,233 +0,0 @@
-<template>
-    <div class="app-container">
-         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-          <el-form-item label="流程名称" prop="name">
-            <el-input
-              v-model="queryParams.name"
-              placeholder="请输入流程名称"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="任务发起人" prop="key">
-            <el-input
-              v-model="queryParams.startUserId"
-              placeholder="请输入任务发起人"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-         <el-row :gutter="10" class="mb8">
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column fixed align="center" type="index" label="序号" width="50"></el-table-column>
-            <el-table-column fixed align="center" prop="name" label="流程定义名称" width="150"></el-table-column>
-            <el-table-column  align="center" prop="processDefinitionKey" label="流程定义KEY" width="120"></el-table-column>
-            <el-table-column align="center" prop="processDefinitionVersion" label="版本号" width="90" >
-              <template slot-scope="{row}"> v{{row.processDefinitionVersion}}.0</template>
-            </el-table-column>
-            <el-table-column  align="center" prop="startUserNickName" label="流程发起人" width="120"></el-table-column>
-            <el-table-column  align="center" prop="isSuspended" label="流程状态" width="75">
-              <template slot-scope="scope">
-                <el-tag type="success" v-if="scope.row.isSuspended=='激活'">激活</el-tag>
-                <el-tag type="danger" v-else>挂起</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column  align="center" prop="currTaskInfo" :show-overflow-tooltip="true" label="当前办理人"></el-table-column>
-            <el-table-column  align="center" prop="businessKey" :show-overflow-tooltip="true" label="流程关联业务ID" width="150"></el-table-column>
-            <el-table-column  align="center" prop="startTime" :show-overflow-tooltip="true" label="流程启动时间" width="150"></el-table-column>
-            <el-table-column  align="center" prop="actBusinessStatus.suspendedReason" :show-overflow-tooltip="true" label="挂起或激活原因" width="180"></el-table-column>
-            <el-table-column label="操作" align="center" width="120" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-row :gutter="10" class="mb8">
-                <el-col :span="1.5">
-                  <el-button
-                  v-if="scope.row.isSuspended == '激活'"
-                  @click="openDialog(scope.row)"
-                  type="text"
-                  size="mini"
-                  icon="el-icon-lock"
-                >挂起</el-button>
-                <el-button
-                  v-else type="text"
-                  @click="openDialog(scope.row)"
-                  size="mini"
-                  icon="el-icon-unlock"
-                >激活</el-button>
-                </el-col>
-                <el-col :span="1.5">
-                  <el-button size="mini" type="text"  icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
-                </el-col>
-              </el-row>
-              <el-row :gutter="10" class="mb8">
-                <el-col :span="1.5">
-                  <el-button size="mini" type="text"  icon="el-icon-circle-close" @click="invalidRuntimeProcessInst(scope.row)">作废</el-button>
-                </el-col>
-              </el-row>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
-        <el-dialog
-          title="挂起或激活流程"
-          :close-on-click-modal="false"
-          :visible.sync="dialogVisible"
-          v-if="dialogVisible"
-          width="60%">
-          <el-input  type="textarea" v-model="reason" maxlength="300" placeholder="请输入原因"
-          :autosize="{ minRows: 4 }" show-word-limit ></el-input>
-          <span slot="footer" class="dialog-footer">
-            <el-button type="primary" size="small" v-loading = "buttonLoading" @click="clickUpdateProcDefState">确 定</el-button>
-            <el-button size="small" @click="dialogVisible = false">取 消</el-button>
-          </span>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-  import api from '@/api/workflow/processInst'
-
-  export default {
-    data () {
-      return {
-        // 弹窗
-        dialogVisible: false,
-        // 原因
-        reason: '',
-        //按钮loading
-        buttonLoading: false,
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 是否显示弹出层
-        open: false,
-        // 表格数据
-        dataList: [],
-        // 查询参数
-        queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-            name: undefined,
-            key : undefined
-        },
-        // 流程实例对象
-        processInstanceData: {}
-      }
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.daterangeCreateTime = [];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      //分页
-      getList(){
-          this.loading = true;
-          api.getProcessInstRunningByPage(this.queryParams).then(response => {
-            this.dataList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          })
-      },
-      handleDelete(row){
-        this.$modal.confirm('是否确认删除流程实例ID为"' + row.processInstanceId + '"的数据项？').then(() => {
-           this.loading = true;
-           return api.deleteRuntimeProcessAndHisInst(row.processInstanceId);
-         }).then(() => {
-           this.loading = false;
-           this.getList();
-           this.$modal.msgSuccess("删除成功");
-         }).finally(() => {
-           this.loading = false;
-         });
-      },
-      invalidRuntimeProcessInst(row){
-        this.$modal.confirm('是否确认作废流程实例ID为"' + row.processInstanceId + '"的数据项？').then(() => {
-           this.loading = true;
-           return api.deleteRuntimeProcessInst(row.processInstanceId);
-         }).then(() => {
-           this.loading = false;
-           this.getList();
-           this.$modal.msgSuccess("作废成功");
-         }).finally(() => {
-           this.loading = false;
-         });
-      },
-      //打开弹窗
-      openDialog(row){
-        this.processInstanceData = row
-        if(row.actBusinessStatus.suspendedReason === null){
-          this.reason = ''
-        }else{
-          this.reason = row.actBusinessStatus.suspendedReason
-        }
-        this.dialogVisible = true
-      },
-      // 激活或挂起流程
-      clickUpdateProcDefState(){
-        let msg='';
-        if(this.processInstanceData.isSuspended==='激活'){
-          msg=`暂停后，此任务不允许往后流转，您确定挂起【${this.processInstanceData.name || this.processInstanceData.processDefinitionKey}】吗？`
-        }else{
-          msg=`启动后，此任务允许往后流转，您确定激活【${this.processInstanceData.name || this.processInstanceData.processDefinitionKey}】吗？`
-        }
-        let params = {
-          processInstId: this.processInstanceData.processInstanceId,
-          reason: this.reason
-        }
-        this.$modal.confirm(msg).then(() => {
-           this.buttonLoading = true;
-           return api.state(params);
-         }).then(() => {
-           this.buttonLoading = false;
-           this.getList();
-           this.$modal.msgSuccess("操作成功");
-           this.dialogVisible = false
-         }).finally(() => {
-           this.buttonLoading = false;
-         });
-
-      }
-    }
-  }
-</script>
diff --git a/ruoyi-ui/src/views/workflow/message/index.vue b/ruoyi-ui/src/views/workflow/message/index.vue
deleted file mode 100644
index 538dde00..00000000
--- a/ruoyi-ui/src/views/workflow/message/index.vue
+++ /dev/null
@@ -1,392 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="消息类型" prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择消息类型" clearable>
-          <el-option
-            v-for="dict in dict.type.sys_message"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="阅读状态" prop="status">
-        <el-select v-model="queryParams.status" placeholder="请选择阅读状态" clearable>
-          <el-option
-            v-for="dict in dict.type.read_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="阅读时间">
-        <el-date-picker
-          v-model="daterangeReadTime"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['workflow:message:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['workflow:message:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['workflow:message:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['workflow:message:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="messageList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" v-if="true"/>
-      <el-table-column label="消息发送者" align="center" prop="sendName" />
-      <el-table-column label="消息接收者" align="center" prop="recordName" />
-      <el-table-column label="标题" align="center" prop="title" />
-      <el-table-column label="消息类型" align="center" prop="type">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_message" :value="scope.row.type"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="阅读状态" align="center" prop="status">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.read_status" :key="scope.row.status" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="消息内容" :show-overflow-tooltip="true" align="center" prop="messageContent" />
-      <el-table-column label="阅读时间" align="center" prop="readTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.readTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['workflow:message:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['workflow:message:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改消息通知对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="消息发送者id" prop="sendId">
-          <el-input v-model="form.sendId" placeholder="请输入消息发送者id" />
-        </el-form-item>
-        <el-form-item label="消息接收者id" prop="recordId">
-          <el-input v-model="form.recordId" placeholder="请输入消息接收者id" />
-        </el-form-item>
-        <el-form-item label="标题" prop="title">
-          <el-input v-model="form.title" placeholder="请输入标题" />
-        </el-form-item>
-        <el-form-item label="消息类型" prop="type">
-          <el-select v-model="form.type" placeholder="请选择消息类型">
-            <el-option
-              v-for="dict in dict.type.sys_message"
-              :key="dict.value"
-              :label="dict.label"
-:value="parseInt(dict.value)"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="阅读状态">
-          <el-radio-group v-model="form.status">
-            <el-radio
-              v-for="dict in dict.type.read_status"
-              :key="dict.value"
-:label="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="消息内容">
-          <el-input type="textarea" :rows="4" v-model="form.messageContent"/>
-        </el-form-item>
-        <el-form-item label="阅读时间" prop="readTime">
-          <el-date-picker clearable
-            v-model="form.readTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="请选择阅读时间">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listMessage, getMessage, delMessage, addMessage, updateMessage } from "@/api/workflow/message";
-
-export default {
-  name: "Message",
-  dicts: ['read_status', 'sys_message'],
-  data() {
-    return {
-      // 按钮loading
-      buttonLoading: false,
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 消息通知表格数据
-      messageList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-      // 阅读时间时间范围
-      daterangeReadTime: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        sendId: undefined,
-        recordId: undefined,
-        type: undefined,
-        status: undefined,
-        messageContent: undefined,
-        readTime: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "主键不能为空", trigger: "blur" }
-        ],
-        sendId: [
-          { required: true, message: "消息发送者id不能为空", trigger: "blur" }
-        ],
-        recordId: [
-          { required: true, message: "消息接收者id不能为空", trigger: "blur" }
-        ],
-        title: [
-          { required: true, message: "标题不能为空", trigger: "blur" }
-        ],
-        type: [
-          { required: true, message: "消息类型不能为空", trigger: "change" }
-        ],
-        status: [
-          { required: true, message: "阅读状态不能为空", trigger: "blur" }
-        ],
-        messageContent: [
-          { required: true, message: "消息内容不能为空", trigger: "blur" }
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" }
-        ],
-        updateTime: [
-          { required: true, message: "修改时间不能为空", trigger: "blur" }
-        ],
-        createBy: [
-          { required: true, message: "创建人不能为空", trigger: "blur" }
-        ],
-        updateBy: [
-          { required: true, message: "更新人不能为空", trigger: "blur" }
-        ]
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询消息通知列表 */
-    getList() {
-      this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeReadTime && '' != this.daterangeReadTime) {
-        this.queryParams.params["beginReadTime"] = this.daterangeReadTime[0];
-        this.queryParams.params["endReadTime"] = this.daterangeReadTime[1];
-      }
-      listMessage(this.queryParams).then(response => {
-        this.messageList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: undefined,
-        sendId: undefined,
-        recordId: undefined,
-        type: undefined,
-        status: false,
-        title: undefined,
-        messageContent: undefined,
-        createTime: undefined,
-        updateTime: undefined,
-        createBy: undefined,
-        updateBy: undefined,
-        readTime: undefined
-      };
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.daterangeReadTime = [];
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加消息通知";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.loading = true;
-      this.reset();
-      const id = row.id || this.ids
-      getMessage(id).then(response => {
-        this.loading = false;
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改消息通知";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.buttonLoading = true;
-          if (this.form.id != null) {
-            updateMessage(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          } else {
-            addMessage(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            }).finally(() => {
-              this.buttonLoading = false;
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除消息通知编号为"' + ids + '"的数据项？').then(() => {
-        this.loading = true;
-        return delMessage(ids);
-      }).then(() => {
-        this.loading = false;
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('workflow/message/export', {
-        ...this.queryParams
-      }, `message_${new Date().getTime()}.xlsx`)
-    }
-  }
-};
-</script>
diff --git a/ruoyi-ui/src/views/workflow/model/bpmnJs.vue b/ruoyi-ui/src/views/workflow/model/bpmnJs.vue
deleted file mode 100644
index e2c4215c..00000000
--- a/ruoyi-ui/src/views/workflow/model/bpmnJs.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-  <div id="app">
-    <bpmn-modeler
-      ref="refNode"
-      :xml="xml"
-      :users="users"
-      :groups="groups"
-      :categorys="categorys"
-      :is-view="false"
-      @save="saveModeler"
-    />
-  </div>
-</template>
-
-<script>
-import bpmnModeler from '@/components/Bpmn/package/index'
-import {getEditorXml,saveModelXml,add} from "@/api/workflow/model";
-export default {
-  dicts: ['act_category'],
-  components: {
-    bpmnModeler
-  },
-  props: {
-      modelId: String,
-      categorysBpmn: Array
-  },
-  data() {
-    return {
-      xml: '', // 后端查询到的xml
-      categorys: [],
-      isView: false,
-      users: [
-        // { name: '${assignee}', id: '${assignee}' },
-        // { name: '李四', id: 'lisi' },
-        // { name: '王五', id: 'wangwu' }
-      ],
-      groups: [
-        { name: 'web组', id: 'web' },
-        { name: 'java组', id: 'java' },
-        { name: 'python组', id: 'python' }
-      ]
-    }
-  },
-  mounted() {
-    this.getModelDetail()
-  },
-  methods: {
-    getModelDetail() {
-      this.categorysBpmn.forEach(element => {
-        let param = {
-          id:element.value,
-          name:element.label
-        }
-        this.categorys.push(param)
-      });
-      if(this.modelId!=='new'){
-        getEditorXml(this.modelId).then(response => {
-           this.xml = response.data.xml
-        })
-      }
-    },
-    saveModeler(data){
-      this.$modal.confirm('是否确认保存模型？').then(() => {
-           if(this.modelId === 'new'){
-              let params = {xml: data.xml,svg: data.svg,process:data.process}
-              add(params).then(response=>{
-                if(response.code === 200){
-                  this.$modal.msgSuccess("保存成功")
-                  this.$emit("close-bpmn")
-                }
-              })
-            }else{
-              let params = {modelId: this.modelId,xml: data.xml,svg: data.svg,process:data.process}
-              saveModelXml(params).then(response=>{
-                if(response.code === 200){
-                  this.$modal.msgSuccess("保存成功")
-                  this.$emit("close-bpmn")
-                }
-              })
-            }
-         })
-    },
-  }
-}
-</script>
-
-<style lang="scss">
-html, body, #app {
-  // height: 650px;
-  margin: 0;
-}
-</style>
diff --git a/ruoyi-ui/src/views/workflow/model/design.vue b/ruoyi-ui/src/views/workflow/model/design.vue
deleted file mode 100644
index 8bd1c046..00000000
--- a/ruoyi-ui/src/views/workflow/model/design.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-
-<template>
-  <el-dialog title="Activiti工作流在线流程设计器" :visible.sync="visible" :before-close="handleClose" fullscreen >
-    <div class="modeler">
-        <iframe class="iframe" :src="src"></iframe>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-export default {
-    props: {
-      modelId: String,
-    },
-
-    data() {
-      return {
-        visible: false,
-      }
-    },
-
-    computed:{
-        src(){
-          return "/modeler.html?modelId="+this.modelId
-        },
-        apiUrl(){
-          return  process.env.VUE_APP_BASE_API // "/dev-api";//后台部署的api服务
-        }
-    },
-
-    mounted(){
-      //全局存入当前vue实例，供activiti调用
-      window.getMyVue = this;
-    },
-
-    methods:{
-      goto(){
-        this.$message.success("保存模型成功");
-        this.$router.push({name:"/workflow/model"})
-      },
-
-      handleClose(done) {
-        this.$confirm('请记得点击左上角保存按钮，确定关闭设计窗口?', '确认关闭',{
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-            // 关闭
-            done();
-            // 刷新数据
-            this.$parent.getList()
-        }).catch(() => {})
-      }
-    }
-  }
-</script>
-<style scoped>
-.iframe {
-  width: 100%;
-  height: calc(100vh - 120px);
-  border: 0px;
-}
-</style>
diff --git a/ruoyi-ui/src/views/workflow/model/index.vue b/ruoyi-ui/src/views/workflow/model/index.vue
deleted file mode 100644
index a6bf1779..00000000
--- a/ruoyi-ui/src/views/workflow/model/index.vue
+++ /dev/null
@@ -1,266 +0,0 @@
-<template>
-    <div class="app-container">
-         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="模型名称" prop="name">
-            <el-input
-              v-model="queryParams.name"
-              placeholder="请输入模型名称"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="标识Key" prop="key">
-            <el-input
-              v-model="queryParams.key"
-              placeholder="请输入标识Key"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-         <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                v-hasPermi="['demo:demo:add']"
-              >新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="danger"
-                plain
-                icon="el-icon-delete"
-                size="mini"
-                :disabled="multiple"
-                @click="handleDelete"
-                v-hasPermi="['demo:demo:remove']"
-              >删除</el-button>
-            </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="modelList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column fixed align="center" type="index" label="序号" width="50"></el-table-column>
-            <el-table-column fixed align="center" prop="name" label="模型名称"></el-table-column>
-            <el-table-column  align="center" prop="key" label="标识Key" ></el-table-column>
-            <el-table-column align="center" prop="version" label="版本号" width="90" >
-              <template slot-scope="{row}"> v{{row.version}}.0</template>
-            </el-table-column>
-            <el-table-column  align="center" prop="metaInfo" label="备注说明"  min-width="130"></el-table-column>
-            <el-table-column  align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
-            <el-table-column  align="center" prop="lastUpdateTime" label="更新时间" width="160"></el-table-column>
-            <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-               <el-row :gutter="10" class="mb8">
-                <el-col :span="1.5">
-                  <el-button type="text" size="small" icon="el-icon-thumb" @click="clickDesign(scope.row.id)">设计流程</el-button>
-                </el-col>
-                <el-col :span="1.5">
-                  <el-button type="text" size="small" icon="el-icon-download" @click="clickExportZip(scope.row)">导出</el-button>
-                </el-col>
-               </el-row>
-              <el-row :gutter="10" class="mb8">
-                <el-col :span="1.5">
-                  <el-button type="text" size="small" icon="el-icon-c-scale-to-original" @click="clickDeploy(scope.row.id,scope.row.key)">流程部署</el-button>
-                </el-col>
-                <el-col :span="1.5">
-                  <el-button size="mini" type="text"  icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
-                </el-col>
-              </el-row>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
-           <!-- 添加模型对话框 -->
-        <el-dialog title="新增模型" :visible.sync="open" width="650px" append-to-body>
-          <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-             <el-form-item label="模型名称：" prop="name"  >
-                <el-input v-model="form.name"  maxlength="20" show-word-limit/>
-            </el-form-item>
-            <el-form-item label="标识Key：" prop="key">
-                <el-input v-model="form.key" maxlength="20" show-word-limit/>
-            </el-form-item>
-            <el-form-item label="备注：" prop="description">
-                <el-input type="textarea" v-model="form.description" maxlength="30" show-word-limit></el-input>
-            </el-form-item>
-          </el-form>
-          <div slot="footer" class="dialog-footer">
-            <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-            <el-button @click="cancel">取 消</el-button>
-          </div>
-        </el-dialog>
-        <!-- 设计流程 -->
-        <design ref="designModel" :modelId="modelId"/>
-    </div>
-</template>
-
-<script>
-import {list,newModel,del,deploy} from "@/api/workflow/model";
-import Design from './design'
-export default {
-    name: 'Model', // 和对应路由表中配置的name值一致
-    components: {Design},
-    data() {
-        return {
-            //按钮loading
-            buttonLoading: false,
-            // 遮罩层
-            loading: true,
-            // 导出遮罩层
-            exportLoading: false,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 是否显示弹出层
-            open: false,
-            // 模型定义表格数据
-            modelList: [],
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                name: undefined,
-                key : undefined
-            },
-            // 表单参数
-            form: {},
-            // 表单校验
-            rules: {
-              name: [
-                { required: true, message: "模型名称不能为空", trigger: "blur" }
-              ],
-              key: [
-                { required: true, message: "标识key不能为空", trigger: "blur" }
-              ],
-            },
-            modelId: null, // 模型id
-        }
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.daterangeCreateTime = [];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      //分页
-      getList(){
-          this.loading = true;
-          list(this.queryParams).then(response => {
-            this.modelList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          })
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-         const ids = row.id || this.ids;
-         this.$modal.confirm('是否确认删除模型id为"' + ids + '"的数据项？').then(() => {
-           this.loading = true;
-           return del(ids);
-         }).then(() => {
-           this.loading = false;
-           this.getList();
-           this.$modal.msgSuccess("删除成功");
-         }).finally(() => {
-           this.loading = false;
-         });
-      },
-      // 流程部署
-      clickDeploy(id,key){
-        this.$modal.confirm('是否部署模型key为【'+key+'】流程？').then(() => {
-           this.loading = true;
-           return deploy(id);
-         }).then(() => {
-           this.loading = false;
-           this.getList();
-           this.$modal.msgSuccess("部署成功");
-         }).finally(() => {
-           this.loading = false;
-         });
-      },
-      handleAdd(){
-        this.reset();
-        this.open = true;
-        this.title = "添加测试单表";
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          name: undefined,
-          key: undefined,
-          description: undefined,
-        };
-        this.resetForm("form");
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.reset();
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-              this.buttonLoading = true;
-              newModel(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              }).finally(() => {
-                this.buttonLoading = false;
-              });
-            }
-        });
-      },
-      // 设计流程
-      clickDesign(id) {
-          this.modelId = id
-          this.$refs.designModel.visible = true
-      },
-      // 导出流程模型
-      clickExportZip(data){
-          this.$download.zip('/workflow/model/export/zip/'+data.id,data.name+"-"+data.key);
-      }
-    }
-
-}
-</script>
diff --git a/ruoyi-ui/src/views/workflow/model/index2.vue b/ruoyi-ui/src/views/workflow/model/index2.vue
deleted file mode 100644
index f41ce97c..00000000
--- a/ruoyi-ui/src/views/workflow/model/index2.vue
+++ /dev/null
@@ -1,255 +0,0 @@
-<template>
-    <div class="app-container">
-         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="模型名称" prop="name">
-            <el-input
-              v-model="queryParams.name"
-              placeholder="请输入模型名称"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="标识Key" prop="key">
-            <el-input
-              v-model="queryParams.key"
-              placeholder="请输入标识Key"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-         <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                v-hasPermi="['demo:demo:add']"
-              >新增</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="danger"
-                plain
-                icon="el-icon-delete"
-                size="mini"
-                :disabled="multiple"
-                @click="handleDelete"
-                v-hasPermi="['demo:demo:remove']"
-              >删除</el-button>
-            </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="modelList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column fixed align="center" type="index" label="序号" width="50"></el-table-column>
-            <el-table-column fixed align="center" prop="name" label="模型名称"></el-table-column>
-            <el-table-column  align="center" prop="key" label="标识Key" ></el-table-column>
-            <el-table-column align="center" prop="version" label="版本号" width="90" >
-              <template slot-scope="{row}"> v{{row.version}}.0</template>
-            </el-table-column>
-            <el-table-column  align="center" prop="metaInfo" label="备注说明"  min-width="130"></el-table-column>
-            <el-table-column  align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
-            <el-table-column  align="center" prop="lastUpdateTime" label="更新时间" width="160"></el-table-column>
-            <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-               <el-row :gutter="10" class="mb8">
-                <el-col :span="1.5">
-                  <el-button type="text" size="small" icon="el-icon-thumb" @click="clickDesign(scope.row.id)">设计流程</el-button>
-                </el-col>
-                <el-col :span="1.5">
-                  <el-button type="text" size="small" icon="el-icon-download" @click="clickExportZip(scope.row)">导出</el-button>
-                </el-col>
-               </el-row>
-              <el-row :gutter="10" class="mb8">
-                <el-col :span="1.5">
-                  <el-button type="text" size="small" icon="el-icon-c-scale-to-original" @click="clickDeploy(scope.row.id,scope.row.key)">流程部署</el-button>
-                </el-col>
-                <el-col :span="1.5">
-                  <el-button size="mini" type="text"  icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
-                </el-col>
-              </el-row>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
-        <!-- 设计流程 -->
-        <el-dialog title="设计模型" :before-close="handleClose" :visible.sync="bpmnJsModelVisible"
-        v-if="bpmnJsModelVisible" fullscreen :modal-append-to-body='false'>
-            <bpmnJs ref="bpmnJsModel" @close-bpmn="closeBpmn" :categorysBpmn="categorysBpmn" :modelId="modelId"/>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import {list,add,del,deploy} from "@/api/workflow/model";
-import BpmnJs from './bpmnJs'
-export default {
-    dicts: ['act_category'],
-    name: 'Model', // 和对应路由表中配置的name值一致
-    components: {BpmnJs},
-    data() {
-        return {
-            //按钮loading
-            buttonLoading: false,
-            // 遮罩层
-            loading: true,
-            // 导出遮罩层
-            exportLoading: false,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 是否显示弹出层
-            bpmnJsModelVisible: false,
-            // 模型定义表格数据
-            modelList: [],
-            // 查询参数
-            queryParams: {
-                pageNum: 1,
-                pageSize: 10,
-                name: undefined,
-                key : undefined
-            },
-            // 表单参数
-            form: {},
-            // 表单校验
-            rules: {
-              name: [
-                { required: true, message: "模型名称不能为空", trigger: "blur" }
-              ],
-              key: [
-                { required: true, message: "标识key不能为空", trigger: "blur" }
-              ],
-            },
-            modelId: null, // 模型id
-            categorys:[]
-        }
-    },
-    created() {
-      this.categorysBpmn = this.dict.type.act_category
-      this.getList();
-    },
-    methods: {
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.daterangeCreateTime = [];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      //分页
-      getList(){
-        this.loading = true;
-        list(this.queryParams).then(response => {
-          this.modelList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        })
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-         const ids = row.id || this.ids;
-         this.$modal.confirm('是否确认删除模型id为"' + ids + '"的数据项？').then(() => {
-           this.loading = true;
-           return del(ids);
-         }).then(() => {
-           this.loading = false;
-           this.getList();
-           this.$modal.msgSuccess("删除成功");
-         }).finally(() => {
-           this.loading = false;
-         });
-      },
-      // 流程部署
-      clickDeploy(id,key){
-        this.$modal.confirm('是否部署模型key为【'+key+'】流程？').then(() => {
-           this.loading = true;
-           return deploy(id);
-         }).then(() => {
-           this.loading = false;
-           this.getList();
-           this.$modal.msgSuccess("部署成功");
-         }).finally(() => {
-           this.loading = false;
-         });
-      },
-      handleAdd(){
-        this.modelId = "new"
-        this.bpmnJsModelVisible = true
-      },
-      /** 提交按钮 */
-      submitForm() {
-        this.$refs["form"].validate(valid => {
-          if (valid) {
-              this.buttonLoading = true;
-              add(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.open = false;
-                this.getList();
-              }).finally(() => {
-                this.buttonLoading = false;
-              });
-            }
-        });
-      },
-      // 打开设计流程
-      clickDesign(id) {
-        this.modelId = id
-        this.bpmnJsModelVisible = true
-      },
-      // 关闭设计流程
-      closeBpmn(){
-        this.getList()
-        this.bpmnJsModelVisible = false
-      },
-      handleClose() {
-        this.$confirm('请记得点击保存按钮，确定关闭设计窗口?', '确认关闭',{
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.bpmnJsModelVisible = false
-          // 刷新数据
-          this.getList()
-        }).catch(() => {})
-      },
-      // 导出流程模型
-      clickExportZip(data){
-          this.$download.zip('/workflow/model/export/zip/'+data.id,data.name+"-"+data.key);
-      }
-    }
-
-}
-</script>
diff --git a/ruoyi-ui/src/views/workflow/task/finish.vue b/ruoyi-ui/src/views/workflow/task/finish.vue
deleted file mode 100644
index bf7a89db..00000000
--- a/ruoyi-ui/src/views/workflow/task/finish.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-    <div class="app-container">
-         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-          <el-form-item label="流程名称" prop="name">
-            <el-input
-              v-model="queryParams.name"
-              placeholder="请输入流程名称"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-         <el-row :gutter="10" class="mb8">
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column fixed align="center" type="index" label="序号" width="50"/>
-            <el-table-column fixed align="center" prop="name" label="任务名称"/>
-            <el-table-column  align="center" prop="processDefinitionName" label="流程定义名称"/>
-            <el-table-column  align="center" prop="processDefinitionKey" label="流程定义Key"/>
-            <el-table-column align="center" prop="version" label="版本号" width="90" >
-              <template slot-scope="{row}"> v{{row.version}}.0</template>
-            </el-table-column>
-            <el-table-column  align="center" prop="assignee" label="流程办理人"  min-width="130"/>
-            <el-table-column  align="center" prop="startTime" label="启动时间" width="160"/>
-            <el-table-column  align="center" prop="endTime" label="结束时间" width="160"/>
-        </el-table>
-
-        <pagination v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
-    </div>
-</template>
-
-<script>
-  import api from '@/api/workflow/task'
-
-  export default {
-    data () {
-      return {
-        //按钮loading
-        buttonLoading: false,
-        // 遮罩层
-        loading: true,
-        // 导出遮罩层
-        exportLoading: false,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 是否显示弹出层
-        open: false,
-        // 表格数据
-        dataList: [],
-        // 查询参数
-        queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-            name: undefined
-        }
-      }
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.daterangeCreateTime = [];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      //分页
-      getList(){
-          this.loading = true;
-          api.getAllTaskFinishByPage(this.queryParams).then(response => {
-            this.dataList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          })
-      }
-    }
-  }
-</script>
diff --git a/ruoyi-ui/src/views/workflow/task/personalFinish.vue b/ruoyi-ui/src/views/workflow/task/personalFinish.vue
deleted file mode 100644
index 05e9945a..00000000
--- a/ruoyi-ui/src/views/workflow/task/personalFinish.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
-    <div class="app-container">
-         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-          <el-form-item label="流程名称" prop="name">
-            <el-input
-              v-model="queryParams.name"
-              placeholder="请输入流程名称"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-         <el-row :gutter="10" class="mb8">
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column fixed align="center" type="index" label="序号" width="50"/>
-            <el-table-column fixed align="center" prop="name" label="任务名称"/>
-            <el-table-column  align="center" prop="processDefinitionName" label="流程定义名称"/>
-            <el-table-column  align="center" prop="processDefinitionKey" label="流程定义Key"/>
-            <el-table-column align="center" prop="version" label="版本号" width="90" >
-              <template slot-scope="{row}"> v{{row.version}}.0</template>
-            </el-table-column>
-            <el-table-column  align="center" prop="assignee" label="流程办理人"  min-width="130"/>
-            <el-table-column  align="center" prop="startTime" label="启动时间" width="160"/>
-            <el-table-column  align="center" prop="endTime" label="结束时间" width="160"/>
-        </el-table>
-
-        <pagination v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
-    </div>
-</template>
-
-<script>
-  import api from '@/api/workflow/task'
-
-  export default {
-    data () {
-      return {
-        //按钮loading
-        buttonLoading: false,
-        // 遮罩层
-        loading: true,
-        // 导出遮罩层
-        exportLoading: false,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 是否显示弹出层
-        open: false,
-        // 表格数据
-        dataList: [],
-        // 查询参数
-        queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-            name: undefined
-        }
-      }
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.daterangeCreateTime = [];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      //分页
-      getList(){
-          this.loading = true;
-          api.getTaskFinishByPage(this.queryParams).then(response => {
-            this.dataList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          })
-      }
-    }
-  }
-</script>
diff --git a/ruoyi-ui/src/views/workflow/task/personalWaiting.vue b/ruoyi-ui/src/views/workflow/task/personalWaiting.vue
deleted file mode 100644
index b994341f..00000000
--- a/ruoyi-ui/src/views/workflow/task/personalWaiting.vue
+++ /dev/null
@@ -1,222 +0,0 @@
-<template>
-    <div class="app-container">
-        <div v-if="dataViewVisible">
-            <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-                <el-form-item label="流程名称" prop="name">
-                    <el-input
-                    v-model="queryParams.name"
-                    placeholder="请输入流程名称"
-                    clearable
-                    size="small"
-                    @keyup.enter.native="handleQuery"
-                    />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-                    <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-                </el-form-item>
-            </el-form>
-
-            <el-row :gutter="10" class="mb8">
-                <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-            </el-row>
-
-            <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-                <el-table-column type="selection" width="55" align="center" />
-                <el-table-column fixed align="center" type="index" label="序号" width="50"/>
-                <el-table-column fixed align="center" prop="name" label="任务名称"/>
-                <el-table-column  align="center" prop="processDefinitionName" label="流程定义名称" />
-                <el-table-column align="center" prop="processDefinitionVersion" label="版本号" width="90" >
-                <template slot-scope="{row}"> v{{row.processDefinitionVersion}}.0</template>
-                </el-table-column>
-                <el-table-column  align="center" prop="startUserNickName" label="流程发起人"  min-width="130"/>
-                <el-table-column  align="center" prop="assignee" label="当前流程办理人"  min-width="130"/>
-                <el-table-column  align="center" prop="isSuspended" label="流程状态" width="160">
-                <template slot-scope="scope">
-                    <el-tag type="success" v-if="scope.row.processStatus=='激活'">激活</el-tag>
-                    <el-tag type="danger" v-else>挂起</el-tag>
-                </template>
-                </el-table-column>
-                <el-table-column  align="center" prop="businessKey" :show-overflow-tooltip="true" label="流程关联业务ID" width="160"/>
-                <el-table-column  align="center" prop="createTime" label="创建时间" width="160"/>
-                <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
-                  <template slot-scope="scope">
-                    <el-button size="mini" icon="el-icon-sort" v-if="scope.row.isClaim===false" type="text"
-                    @click="clickClaim(scope.row)">签收 &nbsp;</el-button>
-                    <el-button size="mini" icon="el-icon-sort" v-if="scope.row.isClaim===true" type="text"
-                    @click="returnTask(scope.row)">归还 &nbsp;</el-button>
-                    <el-button
-                        v-if="scope.row.isClaim===null||scope.row.isClaim===true"
-                        type="text"
-                        @click="clickTaskPop(scope.row)"
-                        size="mini"
-                        icon="el-icon-s-check"
-                    >办理</el-button>
-                  </template>
-                </el-table-column>
-            </el-table>
-
-            <pagination v-show="total>0"
-            :total="total"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            @pagination="getList" />
-        </div>
-        <!-- 单据信息开始 -->
-        <div class="form-container" v-if="dynamicFormEditVisible">
-            <div class="form-container-header form-container-header"><i class="el-dialog__close el-icon el-icon-close" @click="closeDynamicEdit"></i></div>
-            <approvalForm ref="approvalForm" :businessKey = 'businessKey' :taskId = 'taskId' :parentTaskId = 'parentTaskId'
-            @closeForm = 'closeDynamicEdit' :currProcessForm = 'currProcessForm' :processInstanceId = 'processInstanceId' :dynamicFormData = 'dynamicFormData'/>
-        </div>
-        <!-- 单据信息结束 -->
-    </div>
-</template>
-
-<script>
-  import api from '@/api/workflow/task'
-  import history from "@/components/Process/History";
-  import approvalForm from "@/views/components/approvalForm";
-  import { getBusinessForm } from "@/api/workflow/businessForm";
-  export default {
-    components: {
-      history,
-      approvalForm
-    },
-    data () {
-      return {
-        //按钮loading
-        buttonLoading: false,
-        // 遮罩层
-        loading: true,
-        dataViewVisible: true,
-        dynamicFormEditVisible: false,
-        // 导出遮罩层
-        exportLoading: false,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 是否显示弹出层
-        open: false,
-        // 表格数据
-        dataList: [],
-        // 查询参数
-        queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-            name: undefined
-        },
-        // 任务id
-        taskId:undefined,
-        taskVariables: undefined,
-        processInstanceId: undefined,
-        parentTaskId: undefined,
-        businessKey: undefined, // 业务唯一标识
-        currProcessForm: '', //表单组件名称
-        dynamicFormData: '' //表单组件名称
-      }
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.daterangeCreateTime = [];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      //分页
-      getList(){
-        this.loading = true;
-        api.getTaskWaitByPage(this.queryParams).then(response => {
-          this.dataList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        })
-      },
-      //刷新
-      refresh(){
-        this.getList()
-      },
-      //办理任务弹出层
-      clickTaskPop(row){
-          this.businessKey = row.businessKey
-          this.processInstanceId = row.processInstanceId
-          this.taskId = row.id
-          this.parentTaskId = row.parentTaskId
-          if(row.actProcessDefSetting && row.actProcessDefSetting.businessType === 0){
-            getBusinessForm(this.businessKey).then(response => {
-                this.dynamicFormData = response.data;
-                this.dynamicFormEditVisible = true;
-                this.dataViewVisible = false
-                this.currProcessForm = 'dynamicFormEdit'
-            });
-          }else{
-            this.currProcessForm = row.actProcessDefSetting.componentName
-            this.dynamicFormEditVisible = true    
-            this.dataViewVisible = false  
-          }
-      },
-      //关闭办理弹出层
-      closeDynamicEdit(){
-         this.dynamicFormEditVisible = false;
-         this.dataViewVisible = true
-         this.getList()
-       },
-      //签收
-      clickClaim(row){
-         this.$modal.confirm('是否确认签收此任务？').then(() => {
-           this.loading = true;
-           return api.claim(row.id)
-         }).then(() => {
-           this.loading = false;
-           this.getList();
-           this.$modal.msgSuccess("签收成功");
-         }).finally(() => {
-           this.loading = false;
-         });
-      },
-      //归还任务
-      returnTask(row){
-         this.$modal.confirm('是否确认归还此任务？').then(() => {
-           this.loading = true;
-           return api.returnTask(row.id)
-         }).then(() => {
-           this.loading = false;
-           this.getList();
-           this.$modal.msgSuccess("归还成功");
-         }).finally(() => {
-           this.loading = false;
-         });
-      }
-    }
-  }
-</script>
-<style scoped>
-.form-container-header{
-    height: 30px;
-    padding-bottom: 10px;
-}
-.el-icon-close{
-    float: right;
-    cursor: pointer;
-}
-</style>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/workflow/task/waiting.vue b/ruoyi-ui/src/views/workflow/task/waiting.vue
deleted file mode 100644
index a25f89e3..00000000
--- a/ruoyi-ui/src/views/workflow/task/waiting.vue
+++ /dev/null
@@ -1,385 +0,0 @@
-<template>
-    <div class="app-container">
-         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
-          <el-form-item label="流程名称" prop="name">
-            <el-input
-              v-model="queryParams.name"
-              placeholder="请输入流程名称"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-         <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-              <el-button
-                type="success"
-                plain
-                icon="el-icon-edit"
-                size="mini"
-                :disabled="multiple"
-                @click="openAssignee"
-              >修改办理人</el-button>
-            </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
-
-        <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column align="center" type="index" label="序号" width="50"/>
-            <el-table-column align="center" prop="name" label="任务名称"/>
-            <el-table-column align="center" prop="processDefinitionName" label="流程定义名称" />
-            <el-table-column align="center" prop="processDefinitionVersion" label="版本号" width="90" >
-              <template slot-scope="{row}"> v{{row.processDefinitionVersion}}.0</template>
-            </el-table-column>
-            <el-table-column  align="center" prop="startUserNickName" label="流程发起人" min-width="80"/>
-            <el-table-column  align="center" prop="assignee" label="当前流程办理人" min-width="80"/>
-            <el-table-column  align="center" prop="isSuspended" label="流程状态" width="80">
-              <template slot-scope="scope">
-                <el-tag type="success" v-if="scope.row.processStatus=='激活'">激活</el-tag>
-                <el-tag type="danger" v-else>挂起</el-tag>
-              </template>
-            </el-table-column>
-            <el-table-column  align="center" prop="businessKey" :show-overflow-tooltip="true" label="流程关联业务ID" width="160"/>
-            <el-table-column  align="center" prop="createTime" label="创建时间" width="160"/>
-            <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
-              <template slot-scope="scope">
-                <el-row :gutter="20" class="mb8">
-                    <el-col :span="1.5">
-                      <el-button
-                          type="text"
-                          @click="clickHistPop(scope.row)"
-                          size="mini"
-                          icon="el-icon-tickets"
-                      >审批记录</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                      <el-button
-                          v-if="scope.row.multiInstance && scope.row.parentTaskId===null"
-                          type="text"
-                          @click="addMultiPeople(scope.row)"
-                          size="mini"
-                          icon="el-icon-tickets"
-                      >加签</el-button>
-                    </el-col>
-                  </el-row>
-                  <el-row :gutter="20" class="mb8">
-                    <el-col :span="1.5">
-                      <el-button
-                          type="text"
-                          v-if="scope.row.parentTaskId===null"
-                          @click="getInstVariable(scope.row)"
-                          size="mini"
-                          icon="el-icon-tickets"
-                      >流程变量</el-button>
-                    </el-col>
-                    <el-col :span="1.5">
-                      <el-button
-                          v-if="scope.row.taskVoList && scope.row.taskVoList.length>0 && scope.row.parentTaskId===null"
-                          type="text"
-                          @click="deleteMultiClick(scope.row)"
-                          size="mini"
-                          icon="el-icon-tickets"
-                      >减签</el-button>
-                    </el-col>
-                  </el-row>
-                </template>
-            </el-table-column>
-        </el-table>
-        <pagination v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList" />
-        <!-- 驳回 -->
-        <el-dialog title="审批记录" :visible.sync="visible" v-if="visible" width="60%" :close-on-click-modal="false">
-          <history :processInstanceId="processInstanceId" :editMessage="true"></history>
-        </el-dialog>
-
-        <!-- 选择人员 -->
-        <sys-dept-user ref="userRef" @confirmUser="clickUser" :multiple="false"/>
-
-        <!-- 加签开始 -->
-        <div v-if="addMultiVisible"><multi-user :taskId="taskId" ref="addMultiUserRef" @multiClose="multiClose" @confirmUser="confirmAddMultiUser"/></div>
-        <!-- 加签结束 -->
-
-        <!-- 减签开始 -->
-        <el-dialog :close-on-click-modal="false" title="减签" :visible.sync="deleteMultiVisible" width="700px"  append-to-body>
-          <el-table border @selection-change="handleSelectionMultiList" :data="multiList" style="width: 100%">
-            <el-table-column type="selection" width="55"/>
-            <el-table-column prop="name" label="任务名称" width="200"/>
-            <el-table-column prop="assignee" label="办理人" width="200"/>
-            <el-table-column prop="assigneeId" v-show="false" label="办理人ID" width="200"/>
-          </el-table>
-          <span slot="footer" class="dialog-footer">
-            <el-button size="small" type="primary" @click="deleteMultiSubmit()">确定</el-button>
-            <el-button size="small" @click="deleteMultiVisible = false">取消</el-button>
-          </span>
-        </el-dialog>
-        <!-- 减签结束 -->
-
-        <!-- 流程变量 -->
-        <el-dialog title="流程变量" :visible.sync="variableVisible" v-if="variableVisible" width="60%" :close-on-click-modal="false">
-          <el-card class="box-card">
-            <div slot="header" class="clearfix">
-              <span>流程定义名称：{{processDefinitionName}}</span>
-            </div>
-            <div v-for="(v,index) in variableList" :key="index">
-            <el-form :label-position="'right'" label-width="200px">
-              <el-form-item :label="v.key+'：'">
-                {{v.value}}
-              </el-form-item>
-            </el-form>
-            </div>
-          </el-card>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-  import api from '@/api/workflow/task'
-  import History from "@/components/Process/History";
-  import Back from "@/components/Process/Back";
-  import SysDeptUser from "@/views/components/user/sys-dept-user";
-  import MultiUser from "@/views/components/user/multi-user";
-  export default {
-    components: {
-      Back,
-      History,
-      SysDeptUser,
-      MultiUser
-    },
-    data () {
-      return {
-        //按钮loading
-        buttonLoading: false,
-        // 遮罩层
-        loading: true,
-        // 导出遮罩层
-        exportLoading: false,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 是否显示弹出层
-        open: false,
-        // 表格数据
-        dataList: [],
-        // 查询参数
-        queryParams: {
-            pageNum: 1,
-            pageSize: 10,
-            name: undefined
-        },
-        // 任务id
-        taskId:undefined,
-        // 点击的行数据
-        task: {},
-        taskVariables: undefined,
-        variableVisible: false,
-        processInstanceId: undefined,
-        businessKey: undefined, // 业务唯一标识
-        visible: false,
-        updateAssignee:{
-            taskIdList:[],
-            userId: undefined
-        },
-        //是否为会签
-        isMultiInstance: false,
-        //加签
-        addMultiForm: {},
-        //减签
-        deleteMultiForm: {},
-        //可以减签的集合
-        multiList: [],
-        addMultiVisible: false,
-        deleteMultiVisible: false,
-        //流程定义名称
-        processDefinitionName: undefined,
-        //流程变量
-        variableList:[]
-      }
-    },
-    created() {
-      this.getList();
-    },
-    methods: {
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.daterangeCreateTime = [];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      //分页
-      getList(){
-          this.loading = true;
-          api.getAllTaskWaitByPage(this.queryParams).then(response => {
-            this.dataList = response.rows;
-            this.total = response.total;
-            this.loading = false;
-          })
-      },
-      //审批记录
-      clickHistPop(row){
-         this.processInstanceId = row.processInstanceId
-         this.visible = true
-      },
-      //修改办理人
-      openAssignee(){
-         this.$refs.userRef.visible = true
-      },
-      //选择人员
-      clickUser(userList){
-        this.$modal.confirm('是否确认修改？').then(() => {
-            let userId= userList.map(item => { return item.userId })
-            this.loading = true;
-            this.updateAssignee.taskIdList = this.ids
-            this.updateAssignee.userId = userId.toString()
-            this.$refs.userRef.visible = false
-            api.updateAssignee(this.updateAssignee).then(()=>{
-                this.$modal.msgSuccess("修改成功");
-                this.getList();
-            })
-        })
-      },
-      //查询流程变量
-      getInstVariable(row){
-        this.variableVisible = true
-        this.processDefinitionName = row.processDefinitionName
-        api.getProcessInstVariable(row.id).then(response=>{
-          this.variableList = response.data
-        })
-      },
-      //关闭加签人员组件
-      multiClose(){
-        this.addMultiVisible = false
-      },
-      //打开加签人员组件
-      addMultiPeople(row){
-        this.addMultiForm = {}
-        this.addMultiVisible = true
-        this.taskId = row.id
-        this.$nextTick(()=>{
-          this.$refs.addMultiUserRef.visible = true
-        })
-      },
-      //确认加签人员
-      confirmAddMultiUser(data){
-        let assignees = data.map((item) => {
-          return item.userId;
-        });
-        let assigneeNames = data.map((item) => {
-          return item.nickName;
-        });
-        this.addMultiForm = {
-          taskId: this.taskId,
-          assignees: assignees,
-          assigneeNames: assigneeNames,
-          nickNames: assigneeNames.join(",")
-        }
-        this.$forceUpdate()
-        this.$modal.confirm('是否确认加签？').then(() => {
-        api.addMultiInstanceExecution(this.addMultiForm).then(response => {
-            if(response.code === 200){
-                // 刷新数据
-                  this.$message.success("办理成功");
-                  // 将表单清空
-                  this.addMultiForm = {}
-                  // 关闭窗口
-                  this.visible = false;
-                  this.addMultiVisible = false;
-                  // 刷新
-                  this.getList()
-              }
-            })
-            this.$refs.addMultiUserRef.visible = false
-        })
-      },
-      //打开减签窗口
-      deleteMultiClick(row){
-        this.multiList = row.taskVoList
-        this.deleteMultiVisible = true
-      },
-      //减签复选框
-      handleSelectionMultiList(val){
-        let executionIds = val.map((item) => {
-          return item.executionId;
-        });
-        let taskIds = val.map((item) => {
-          return item.id;
-        });
-        let assigneeIds = val.map((item) => {
-          return item.assigneeId;
-        });
-        let assigneeNames = val.map((item) => {
-          return item.assignee;
-        });
-        this.deleteMultiForm = {
-          taskId: this.taskId,
-          taskIds: taskIds,
-          executionIds: executionIds,
-          assigneeIds: assigneeIds,
-          assigneeNames: assigneeNames
-        }
-      },
-      //减签
-      deleteMultiSubmit(){
-        this.$modal.confirm('是否确认减签？').then(() => {
-          api.deleteMultiInstanceExecution(this.deleteMultiForm).then(response => {
-            if(response.code === 200){
-              // 刷新数据
-                this.$message.success("办理成功");
-                // 关闭窗口
-                this.visible = false;
-                this.deleteMultiVisible = false;
-                // 刷新
-                this.getList()
-            }
-          })
-        })
-      }
-    }
-  }
-</script>
-<style scoped>
-.box-card {
-  word-break:break-all;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  box-sizing: border-box;
-  padding: 8px 0px;
-  height: 630px;
-  width: inherit;
-  line-height: 8px;
-}
-/* 修改滚动条样式 */
-.box-card::-webkit-scrollbar {
-	width: 4px;
-}
-.box-card::-webkit-scrollbar-thumb {
-	border-radius: 10px;
-}
-</style>
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index b39246a0..3b1bbe12 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://14.10.8.153:9999`,
+        target: `http://localhost:9998`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''