diff --git a/src/api/plugin/workflow/workorder.js b/src/api/plugin/workflow/workorder.js index 42e1b47..fff81c7 100644 --- a/src/api/plugin/workflow/workorder.js +++ b/src/api/plugin/workflow/workorder.js @@ -1,85 +1,93 @@ -import request from '@/router/axios'; -const prefix = '/api/blade-workflow/workOrder' -const prefix2 = '/api/blade-workflow/autoProcess' +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`, - method: 'get', - params:query - }) -} + method: "get", + params: query, + }); +}; // 导出 export const exportExcel = (query) => { return request({ url: `${prefix}/exportExcel`, - method: 'get', - params:query, - responseType: 'blob' - }) -} + method: "get", + params: query, + responseType: "blob", + }); +}; // 头部查询 export const conditionalData = (query) => { return request({ url: `${prefix}/conditionalData`, - method: 'get', - params:query - }) -} + method: "get", + params: query, + }); +}; +// 任务种类 +export const taskType = (query) => { + return request({ + url: `/api/blade-workflow/taskInfo/taskTypeData`, + method: "get", + params: query, + }); +}; // 我的待办 export const todoList = (query) => { return request({ url: `${prefix}/myToDo`, - method: 'get', - params:query - }) -} + method: "get", + params: query, + }); +}; // 定时任务 export const taskList = (query) => { return request({ url: `${prefix2}/list`, - method: 'get', - params:query - }) -} + method: "get", + params: query, + }); +}; // 定时任务终止 export const taskRemove = (query) => { return request({ url: `${prefix2}/remove`, - method: 'post', - params:query - }) -} + method: "post", + params: query, + }); +}; // 重复模式 export const repeatMode = () => { return request({ url: "/api/blade-system/dict-biz/dictionary?code=repeat_mode", - method: 'get', - }) -} + method: "get", + }); +}; // 工单记录 export const implementation = (query) => { return request({ url: `${prefix}/workOrderRecord`, - method: 'get', - params:query - }) -} + method: "get", + params: query, + }); +}; // 实施反馈提交 export const add = (obj) => { return request({ url: `${prefix}/submit`, - method: 'post', - data:obj - }) -} + 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 + method: "get", + params: query, + responseType: "blob", + }); +}; diff --git a/src/config/website.js b/src/config/website.js index 7563ced..613db3d 100644 --- a/src/config/website.js +++ b/src/config/website.js @@ -4,17 +4,17 @@ export default { title: "saber", logo: "S", - key: 'saber',//配置主键,目前用于存储 - indexTitle: 'Saber Admin', - clientId: 'saber', // 客户端id - clientSecret: 'saber_secret', // 客户端密钥 + key: "saber", //配置主键,目前用于存储 + indexTitle: "Saber Admin", + clientId: "saber", // 客户端id + clientSecret: "saber_secret", // 客户端密钥 tenantMode: true, // 是否开启租户模式 tenantId: "000000", // 管理组租户编号 captchaMode: true, // 是否开启验证码模式 switchMode: false, // 是否开启部门切换模式 - lockPage: '/lock', + lockPage: "/lock", tokenTime: 3000, - tokenHeader: 'Blade-Auth', + tokenHeader: "Blade-Auth", //http的status默认放行列表 statusWhiteList: [], //配置首页不可关闭 @@ -25,27 +25,30 @@ export default { params: {}, query: {}, meta: { - i18n: 'dashboard' + i18n: "dashboard", }, group: [], - close: false + close: false, }, //配置菜单的属性 menu: { - iconDefault: 'iconfont icon-caidan', + iconDefault: "iconfont icon-caidan", props: { - label: 'name', - path: 'path', - icon: 'source', - children: 'children' - } + label: "name", + path: "path", + icon: "source", + children: "children", + }, }, // 第三方系统授权地址 - authUrl: 'http://localhost/blade-auth/oauth/render', + authUrl: "http://localhost/blade-auth/oauth/render", // 报表设计器地址(cloud端口为8108,boot端口为80) - reportUrl: 'http://localhost:8108/ureport', + reportUrl: "http://localhost:8108/ureport", // 单点登录系统认证(blade-auth服务的地) - ssoUrl: 'http://localhost:8100/oauth/authorize?client_id=saber&response_type=code&redirect_uri=', + ssoUrl: + "http://localhost:8100/oauth/authorize?client_id=saber&response_type=code&redirect_uri=", // 单点登录回调地址(Saber服务的地址) - redirectUri: 'http://localhost:1888', -} + redirectUri: "http://localhost:1888", + operModule: "操作对象", + adminDept: "部门名称", +}; diff --git a/src/const/maintenance/basics.js b/src/const/maintenance/basics.js index 7d51f36..dd1c3f7 100644 --- a/src/const/maintenance/basics.js +++ b/src/const/maintenance/basics.js @@ -1,3 +1,5 @@ +import website from "../../config/website"; + export const tableOption = { index: true, indexLabel: "序号", @@ -23,8 +25,10 @@ export const tableOption = { menu: false, column: [ { + // label: "数据库/系统名称", + type: "select", - label: "数据库/系统名称", + label: "部门系统", prop: "databaseProjectName", align: "left", overHidden: true, @@ -39,11 +43,12 @@ export const tableOption = { allowCreate: true, filterable: true, formslot: true, - rules: [{ required: true, message: "请输入数据库/系统名称" }], + rules: [{ required: true, message: "请输入部门系统" }], }, { type: "input", - label: "数据库/系统别名", + // label: "数据库/系统别名", + label: "部门系统别名", prop: "dataBaseAlias", align: "left", overHidden: true, @@ -121,7 +126,8 @@ export const tableOption = { }, { type: "select", - label: "管理部门", + // label: "管理部门", + label: website.adminDept, prop: "deptId", align: "left", overHidden: true, @@ -133,11 +139,12 @@ export const tableOption = { hide: true, disabled: false, span: 8, - rules: [{ required: true, message: "请选择管理部门" }], + rules: [{ required: true, message: "请选择" + website.adminDept }], }, { type: "input", - label: "管理部门", + // label: "管理部门", + label: website.adminDept, prop: "deptName", align: "left", overHidden: true, diff --git a/src/const/workflow/crontab.js b/src/const/workflow/crontab.js index aa5b251..729f85b 100644 --- a/src/const/workflow/crontab.js +++ b/src/const/workflow/crontab.js @@ -1,14 +1,16 @@ +import website from "../../config/website"; + export const tableOption = { index: true, indexLabel: "序号", - indexWidth:120, + indexWidth: 120, selection: false, border: false, gutter: 60, //设置input的大小 headerAlign: "left", align: "left", - menuAlign:'left', - menuHeaderAlign:'left', + menuAlign: "left", + menuHeaderAlign: "left", menuBtn: true, editBtn: false, delBtn: false, @@ -18,7 +20,7 @@ export const tableOption = { columnBtn: false, refreshBtn: false, header: false, - menuWidth:200, + menuWidth: 200, column: [ { type: "input", @@ -50,7 +52,8 @@ export const tableOption = { }, { type: "input", - label: "管理部门", + // label: "管理部门", + label: website.adminDept, prop: "deptName", align: "left", overHidden: true, @@ -69,7 +72,7 @@ export const tableOption = { align: "left", overHidden: true, }, - + { label: "创建时间", type: "datetime", @@ -94,4 +97,4 @@ export const tableOption = { valueFormat: "yyyy-MM-dd HH:mm:ss", }, ], -} +}; diff --git a/src/const/workflow/implementation.js b/src/const/workflow/implementation.js index 7750edd..5afac16 100644 --- a/src/const/workflow/implementation.js +++ b/src/const/workflow/implementation.js @@ -1,3 +1,5 @@ +import website from "../../config/website"; + export const tableOption = { index: true, indexLabel: "序号", @@ -35,19 +37,26 @@ export const tableOption = { align: "left", overHidden: true, }, + { + type: "input", + // label: "管理部门", + label: website.adminDept, + prop: "managementName", + align: "left", + overHidden: true, + }, { type: "input", // label: "操作模块", - label: "操作对象", + label: website.operModule, prop: "operateSysName", align: "left", overHidden: true, }, - { type: "input", - label: "管理部门", - prop: "managementName", + label: "详情", + prop: "detail", align: "left", overHidden: true, }, diff --git a/src/const/workflow/todo.js b/src/const/workflow/todo.js index 25d8f44..1423f31 100644 --- a/src/const/workflow/todo.js +++ b/src/const/workflow/todo.js @@ -1,3 +1,5 @@ +import website from "../../config/website"; + export const tableOption = { index: true, indexLabel: "序号", @@ -37,7 +39,8 @@ export const tableOption = { }, { type: "input", - label: "操作模块", + label: website.operModule, + // label: "操作模块", prop: "operateSysName", align: "left", overHidden: true, @@ -58,7 +61,8 @@ export const tableOption = { }, { type: "input", - label: "管理部门", + // label: "管理部门", + label: website.adminDept, prop: "managementName", align: "left", overHidden: true, diff --git a/src/const/workflow/workorder.js b/src/const/workflow/workorder.js index 1effd63..28c5ce6 100644 --- a/src/const/workflow/workorder.js +++ b/src/const/workflow/workorder.js @@ -1,3 +1,5 @@ +import website from "../../config/website"; + export const tableOption = { index: true, indexLabel: "序号", @@ -37,7 +39,8 @@ export const tableOption = { }, { type: "input", - label: "操作模块", + label: website.operModule, + // label: "操作模块", prop: "xitongmingchengshujuku", align: "left", overHidden: true, @@ -51,7 +54,8 @@ export const tableOption = { }, { type: "input", - label: "管理部门", + // label: "管理部门", + label: website.adminDept, prop: "$guanlibumen", align: "left", overHidden: true, diff --git a/src/views/maintenance/system.vue b/src/views/maintenance/system.vue index ac42ca5..d336c7a 100644 --- a/src/views/maintenance/system.vue +++ b/src/views/maintenance/system.vue @@ -2,9 +2,10 @@
@@ -126,6 +132,7 @@ import { taskList as getList, conditionalData, taskRemove, + taskType, repeatMode, } from "@/api/plugin/workflow/workorder.js"; import { tableOption } from "@/const/workflow/crontab.js"; @@ -135,7 +142,9 @@ export default { mixins: [exForm], data() { return { - searchForm: {}, + searchForm: { + taskType:'' + }, option: tableOption, page: { currentPage: 1, @@ -165,7 +174,7 @@ export default { const { taskParent, taskInfos, depts, users, taskLevel } = res.data.data; this.taskParent = taskParent; - this.taskInfos = taskInfos; + // this.taskInfos = taskInfos; this.depts = depts; this.users = users; this.taskLevel = taskLevel; @@ -174,6 +183,12 @@ export default { this.repeatModeList = res.data.data; }); }, + changeParent(val){ + this.searchForm.taskType = '' + taskType({parentId:val,isDetail:1}).then(res =>{ + this.taskInfos = res.data.data + }) + }, // 列表 onLoad() { this.loading = true; @@ -208,6 +223,7 @@ export default { // 查询重置 searchHandle(index) { this.page.currentPage = 1; + this.taskInfos = [] if (index === 2) { this.searchForm = { timeArr: null, diff --git a/src/views/plugin/workflow/process/implementation.vue b/src/views/plugin/workflow/process/implementation.vue index d3e541e..b47ce18 100644 --- a/src/views/plugin/workflow/process/implementation.vue +++ b/src/views/plugin/workflow/process/implementation.vue @@ -7,6 +7,7 @@ placeholder="任务父类" class="search-select" clearable + @change="changeParent" > + @@ -94,8 +96,8 @@ class="search-picker" type="datetimerange" range-separator="至" - start-placeholder="创建日期" - end-placeholder="结束日期" + start-placeholder="创建时间开始" + end-placeholder="创建时间结束" >
● {{ scope.row.isFinish === 0 ? "待实施" : "已完成" }} + +
@@ -149,15 +161,19 @@ import { implementation as getList, conditionalData, + taskType, workOrderExcel, } from "@/api/plugin/workflow/workorder.js"; import exForm from "../mixins/ex-form"; +import website from '@/config/website'; import { tableOption } from "@/const/workflow/implementation.js"; export default { mixins: [exForm], data() { return { - searchForm: {}, + searchForm: { + taskType:'' + }, option: tableOption, page: { currentPage: 1, @@ -194,12 +210,18 @@ export default { const { taskParent, taskInfos, depts, users, taskLevel } = res.data.data; this.taskParent = taskParent; - this.taskInfos = taskInfos; + // this.taskInfos = taskInfos; this.depts = depts; this.users = users; this.taskLevel = taskLevel; }); }, + changeParent(val){ + this.searchForm.taskType = '' + taskType({parentId:val,isDetail:1}).then(res =>{ + this.taskInfos = res.data.data + }) + }, // 列表 onLoad() { this.loading = true; @@ -235,6 +257,7 @@ export default { // 查询重置 searchHandle(index) { this.page.currentPage = 1; + this.taskInfos = [] if (index === 2) { this.searchForm = { timeArr: null, diff --git a/src/views/plugin/workflow/process/todo.vue b/src/views/plugin/workflow/process/todo.vue index 36d01cc..f3f1b7d 100644 --- a/src/views/plugin/workflow/process/todo.vue +++ b/src/views/plugin/workflow/process/todo.vue @@ -7,6 +7,7 @@ placeholder="任务父类" class="search-select" clearable + @change="changeParent" >
+ @@ -94,8 +96,8 @@ class="search-picker" type="datetimerange" range-separator="至" - start-placeholder="创建开始日期" - end-placeholder="创建结束日期" + start-placeholder="创建时间开始" + end-placeholder="创建时间结束" >
查询 @@ -137,6 +139,11 @@ >●{{ scope.row.approvalStatus }} +
@@ -145,15 +152,19 @@ import { todoList as getList, conditionalData, + taskType } from "@/api/plugin/workflow/workorder.js"; import { tableOption } from "@/const/workflow/todo.js"; +import website from '@/config/website'; import { mapGetters } from "vuex"; import exForm from "../mixins/ex-form"; export default { mixins: [exForm], data() { return { - searchForm: {}, + searchForm: { + taskTypeName:'' + }, option: tableOption, page: { currentPage: 1, @@ -196,12 +207,21 @@ export default { const { taskParent, taskInfos, depts, users, taskLevel } = res.data.data; this.taskParent = taskParent; - this.taskInfos = taskInfos; + // this.taskInfos = taskInfos; this.depts = depts; this.users = users; this.taskLevel = taskLevel; }); }, + changeParent(val){ + this.searchForm.taskTypeName = '' + let tmp = this.taskParent.find(item => item.dictValue == val) + if(tmp){ + taskType({parentId:tmp.id,isDetail:1}).then(res =>{ + this.taskInfos = res.data.data + }) + } + }, // 列表 onLoad() { this.loading = true; @@ -238,6 +258,7 @@ export default { // 查询重置 searchHandle(index) { this.page.currentPage = 1; + this.taskInfos = [] if (index === 2) { this.searchForm = { timeArr: null, diff --git a/src/views/plugin/workflow/process/workorder.vue b/src/views/plugin/workflow/process/workorder.vue index 8bbefae..03ea26f 100644 --- a/src/views/plugin/workflow/process/workorder.vue +++ b/src/views/plugin/workflow/process/workorder.vue @@ -7,6 +7,7 @@ placeholder="任务父类" class="search-select" clearable + @change="changeParent" >
+ @@ -121,8 +123,8 @@ class="search-picker" type="datetimerange" range-separator="至" - start-placeholder="创建开始日期" - end-placeholder="创建结束日期" + start-placeholder="创建时间开始" + end-placeholder="创建时间结束" >
●{{ scope.row.status }} +
@@ -181,16 +188,20 @@ import { getList, conditionalData, + taskType, exportExcel, repeatMode } from "@/api/plugin/workflow/workorder.js"; import exForm from "../mixins/ex-form"; import { tableOption } from "@/const/workflow/workorder.js"; +import website from '@/config/website'; export default { mixins: [exForm], data() { return { - searchForm: {}, + searchForm: { + taskType:'' + }, option: tableOption, page: { currentPage: 1, @@ -237,12 +248,21 @@ export default { const { taskParent, taskInfos, depts, users, taskLevel } = res.data.data; this.taskParent = taskParent; - this.taskInfos = taskInfos; + // this.taskInfos = taskInfos; this.depts = depts; this.users = users; this.taskLevel = taskLevel; }); }, + changeParent(val){ + this.searchForm.taskType = '' + let tmp = this.taskParent.find(item => item.dictValue == val) + if(tmp){ + taskType({parentId:tmp.id,isDetail:1}).then(res =>{ + this.taskInfos = res.data.data + }) + } + }, getRepeat(){ repeatMode().then(res =>{ console.log(res) @@ -284,6 +304,7 @@ export default { // 查询重置 searchHandle(index) { this.page.currentPage = 1; + this.taskInfos = [] if (index === 2) { this.searchForm = { timeArr: null,