diff --git a/src/api/plugin/workflow/workorder.js b/src/api/plugin/workflow/workorder.js
index e0a4469..42e1b47 100644
--- a/src/api/plugin/workflow/workorder.js
+++ b/src/api/plugin/workflow/workorder.js
@@ -1,7 +1,7 @@
import request from '@/router/axios';
const prefix = '/api/blade-workflow/workOrder'
const prefix2 = '/api/blade-workflow/autoProcess'
-// 工单记录查询
+// 流程中心查询
export const getList = (query) => {
return request({
url: `${prefix}/historyWorkOrder`,
@@ -57,3 +57,29 @@ export const repeatMode = () => {
method: 'get',
})
}
+// 工单记录
+export const implementation = (query) => {
+ return request({
+ url: `${prefix}/workOrderRecord`,
+ method: 'get',
+ params:query
+ })
+}
+// 实施反馈提交
+export const add = (obj) => {
+ return request({
+ url: `${prefix}/submit`,
+ method: 'post',
+ data:obj
+ })
+}
+
+// 导出
+export const workOrderExcel = (query) => {
+ return request({
+ url: `${prefix}/workOrderExcel`,
+ method: 'get',
+ params:query,
+ responseType: 'blob'
+ })
+}
\ No newline at end of file
diff --git a/src/const/maintenance/database.js b/src/const/maintenance/database.js
index c8133a5..1c69818 100644
--- a/src/const/maintenance/database.js
+++ b/src/const/maintenance/database.js
@@ -76,18 +76,21 @@ export const tableOption = {
prop: "companyName",
type: "input",
align: "left",
+ overHidden:true,
},
{
label: "表名",
prop: "dataTableName",
type: "input",
align: "left",
+ overHidden:true,
},
{
label: "中文表别名",
prop: "dataTableAlias",
type: "input",
align: "left",
+ overHidden:true,
},
],
};
diff --git a/src/const/workflow/implementation.js b/src/const/workflow/implementation.js
new file mode 100644
index 0000000..926ef93
--- /dev/null
+++ b/src/const/workflow/implementation.js
@@ -0,0 +1,99 @@
+export const tableOption = {
+ index: true,
+ indexLabel: "序号",
+ indexWidth:120,
+ selection: false,
+ border: false,
+ gutter: 60, //设置input的大小
+ headerAlign: "left",
+ align: "left",
+ menuAlign:'left',
+ menuHeaderAlign:'left',
+ menuBtn: true,
+ editBtn: false,
+ delBtn: false,
+ addBtn: false,
+ tip: false,
+ searchMenuSpan: 3, //控制搜索按钮
+ columnBtn: false,
+ refreshBtn: false,
+ // dialogCustomClass: "custom",
+ header: false,
+ menuWidth:120,
+ column: [
+ {
+ type: "input",
+ label: "任务父类",
+ prop: "taskParentName",
+ align: "left",
+ overHidden: true,
+ },
+ {
+ type: "input",
+ label: "任务种类",
+ prop: "taskTypeName",
+ align: "left",
+ overHidden: true,
+ },
+ {
+ type: "input",
+ label: "操作模块",
+ prop: "operateSysName",
+ align: "left",
+ overHidden: true,
+ },
+
+ {
+ type: "input",
+ label: "管理部门",
+ prop: "managementName",
+ align: "left",
+ overHidden: true,
+ },
+ {
+ type: "input",
+ label: "运维公司",
+ prop: "maintenanceCompanyName",
+ align: "left",
+ overHidden: true,
+ },
+ {
+ type: "input",
+ label: "发起人",
+ prop: "applyUserName",
+ align: "left",
+ overHidden: true,
+ },
+ {
+ type: "input",
+ label: "审批状态",
+ prop: "isFinish",
+ align: "left",
+ overHidden: true,
+ },
+ {
+ label: "创建时间",
+ type: "datetime",
+ overHidden: true,
+ prop: "createTime",
+ format: "yyyy-MM-dd HH:mm",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ },
+ {
+ label: "结束时间",
+ type: "datetime",
+ overHidden: true,
+ prop: "finishTime",
+ format: "yyyy-MM-dd HH:mm",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ },
+ {
+ label: "期望完成时间",
+ type: "datetime",
+ overHidden: true,
+ prop: "expectedCompletionTime",
+ format: "yyyy-MM-dd HH:mm",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ },
+ ],
+}
diff --git a/src/const/workflow/todo.js b/src/const/workflow/todo.js
index 5db7c7d..00f0b0a 100644
--- a/src/const/workflow/todo.js
+++ b/src/const/workflow/todo.js
@@ -24,21 +24,21 @@ export const tableOption = {
{
type: "input",
label: "任务父类",
- prop: "taskParent",
+ prop: "taskParentName",
align: "left",
overHidden: true,
},
{
type: "input",
label: "任务种类",
- prop: "taskType",
+ prop: "taskTypeName",
align: "left",
overHidden: true,
},
{
type: "input",
label: "操作模块",
- prop: "operateSys",
+ prop: "operateSysName",
align: "left",
overHidden: true,
},
@@ -52,21 +52,21 @@ export const tableOption = {
{
type: "input",
label: "管理部门",
- prop: "management",
+ prop: "managementName",
align: "left",
overHidden: true,
},
{
type: "input",
label: "运维公司",
- prop: "currentResponsiblePerson",
+ prop: "maintenanceCompanyName",
align: "left",
overHidden: true,
},
{
type: "input",
label: "发起人",
- prop: "applyUser",
+ prop: "applyUserName",
align: "left",
overHidden: true,
},
diff --git a/src/option/user/info.js b/src/option/user/info.js
index d2fcbe0..65e8fd4 100644
--- a/src/option/user/info.js
+++ b/src/option/user/info.js
@@ -1,71 +1,82 @@
export default {
tabs: true,
tabsActive: 1,
+ column: [{ label: "头像", prop: "avatar",display:false}],
group: [
{
- label: '个人信息',
- prop: 'info',
- column: [{
- label: '头像',
- type: 'upload',
- listType: 'picture-img',
- propsHttp: {
- res: 'data',
- url: 'link',
+ label: "个人信息",
+ prop: "info",
+ column: [
+ {
+ label: "头像",
+ type: "upload",
+ listType: "picture-img",
+ propsHttp: {
+ res: "data",
+ url: "link",
+ },
+ canvasOption: {
+ text: " ",
+ ratio: 0.1,
+ },
+ action: "/api/blade-resource/oss/endpoint/put-file",
+ tip: "只能上传jpg/png用户头像,且不超过500kb",
+ span: 12,
+ row: true,
+ prop: "avatar",
},
- canvasOption: {
- text: ' ',
- ratio: 0.1
+ {
+ label: "姓名",
+ span: 12,
+ row: true,
+ prop: "realName",
},
- action: '/api/blade-resource/oss/endpoint/put-file',
- tip: '只能上传jpg/png用户头像,且不超过500kb',
- span: 12,
- row: true,
- prop: 'avatar'
- }, {
- label: '姓名',
- span: 12,
- row: true,
- prop: 'realName'
- }, {
- label: '用户名',
- span: 12,
- row: true,
- prop: 'name'
- }, {
- label: '手机号',
- span: 12,
- row: true,
- prop: 'phone'
- }, {
- label: '邮箱',
- prop: 'email',
- span: 12,
- row: true,
- }]
+ {
+ label: "用户名",
+ span: 12,
+ row: true,
+ prop: "name",
+ },
+ {
+ label: "手机号",
+ span: 12,
+ row: true,
+ prop: "phone",
+ },
+ {
+ label: "邮箱",
+ prop: "email",
+ span: 12,
+ row: true,
+ },
+ ],
},
{
- label: '修改密码',
- prop: 'password',
- column: [{
- label: '原密码',
- span: 12,
- row: true,
- type: 'password',
- prop: 'oldPassword'
- }, {
- label: '新密码',
- span: 12,
- row: true,
- type: 'password',
- prop: 'newPassword'
- }, {
- label: '确认密码',
- span: 12,
- row: true,
- type: 'password',
- prop: 'newPassword1'
- }]
- }
+ label: "修改密码",
+ prop: "password",
+ column: [
+ {
+ label: "原密码",
+ span: 12,
+ row: true,
+ type: "password",
+ prop: "oldPassword",
+ },
+ {
+ label: "新密码",
+ span: 12,
+ row: true,
+ type: "password",
+ prop: "newPassword",
+ },
+ {
+ label: "确认密码",
+ span: 12,
+ row: true,
+ type: "password",
+ prop: "newPassword1",
+ },
+ ],
+ },
],
-}
+};
diff --git a/src/router/views/index.js b/src/router/views/index.js
index cb10524..6ced693 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -136,6 +136,12 @@ export default [{
name: '流程详情',
component: () =>
import( /* webpackChunkName: "views" */ '@/views/plugin/workflow/process/components/detail'),
+ },
+ {
+ path: 'process/effect',
+ name: '实施',
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/views/plugin/workflow/process/components/effect'),
}
]
}]
diff --git a/src/views/plugin/workflow/mixins/ex-form.js b/src/views/plugin/workflow/mixins/ex-form.js
index 801b11f..bc4b2d8 100644
--- a/src/views/plugin/workflow/mixins/ex-form.js
+++ b/src/views/plugin/workflow/mixins/ex-form.js
@@ -41,7 +41,6 @@ export default {
methods: {
// 动态路由跳转
dynamicRoute(row, type, async = false, parent) {
- console.log(row);
const {
id,
taskId,
diff --git a/src/views/plugin/workflow/process/components/effect.vue b/src/views/plugin/workflow/process/components/effect.vue
new file mode 100644
index 0000000..253ce21
--- /dev/null
+++ b/src/views/plugin/workflow/process/components/effect.vue
@@ -0,0 +1,305 @@
+
+