diff --git a/src/api/maintenance/task.js b/src/api/maintenance/task.js new file mode 100644 index 0000000..a7bda9c --- /dev/null +++ b/src/api/maintenance/task.js @@ -0,0 +1,34 @@ +import request from '@/router/axios'; +const prefix = '/api/blade-workflow/taskInfo' +// 查询 +export const getList = () => { + return request({ + url: `${prefix}/list`, + method: 'get' + }) +} +export const add = (row) => { + return request({ + url: `${prefix}/save`, + method: 'post', + data: row + }) +} +export const update = (row) => { + return request({ + url: `${prefix}/update`, + method: 'post', + data: row + }) +} +export const remove = (ids) => { + return request({ + url: `${prefix}/remove`, + method: 'post', + params: { + ids, + } + }) +} + + diff --git a/src/const/maintenance/task.js b/src/const/maintenance/task.js new file mode 100644 index 0000000..266edb6 --- /dev/null +++ b/src/const/maintenance/task.js @@ -0,0 +1,84 @@ +export const tableOption = { + index: true, + indexLabel: "序号", + indexWidth:120, + labelPosition: "top", + selection: true, + border: false, + headerAlign: "left", + align: "left", + menuAlign:'left', + menuHeaderAlign:'left', + menuBtn: true, + editBtn: false, + delBtn: false, + addBtn: false, + tip: false, + searchMenuSpan: 3, //控制搜索按钮 + columnBtn: false, + refreshBtn: false, + header: false, + menuWidth:220, + dialogCustomClass:"custom", + column: [ + { + type: "select", + label: "任务父类", + prop: "taskParentId", + align: "left", + overHidden: true, + dicUrl:'/api/blade-system/dict-biz/dictionary?code=task_parent', + props: { + label: "dictValue", + value: "id", + }, + rules: [{ required: true, message: "请选择任务父类" }], + span:8 + + }, + { + type: "input", + label: "任务种类", + prop: "taskTypeName", + align: "left", + overHidden: true, + rules: [{ required: true, message: "请输入任务种类" }], + span:8 + }, + + { + type: "select", + label: "任务等级", + prop: "taskLevel", + align: "left", + overHidden: true, + dicUrl:'/api/blade-system/dict-biz/dictionary?code=task_level', + props: { + label: "dictValue", + value: "id", + }, + rules: [{ required: true, message: "请选择任务等级" }], + span:8 + }, + { + type: "input", + label: "创建人", + prop: "createUser", + align: "left", + overHidden: true, + addDisplay:false, + editDisplay: false + }, + + { + label: "创建时间", + type: "datetime", + overHidden: true, + prop: "createTime", + format: "yyyy-MM-dd HH:mm", + valueFormat: "yyyy-MM-dd HH:mm:ss", + addDisplay:false, + editDisplay: false + }, + ], +} diff --git a/src/const/workflow/workorder.js b/src/const/workflow/workorder.js new file mode 100644 index 0000000..591921c --- /dev/null +++ b/src/const/workflow/workorder.js @@ -0,0 +1,80 @@ +export const tableOption = { + selection: true, + 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: "year", + align: "left", + overHidden: true, + }, + { + type: "input", + label: "当前责任人", + prop: "userStatusAnalysis", + align: "left", + overHidden: true, + }, + { + type: "input", + label: "公司名称", + prop: "count", + align: "left", + overHidden: true, + }, + { + type: "input", + label: "发起人", + prop: "count", + align: "left", + overHidden: true, + }, + { + type: "input", + label: "状态", + prop: "status", + align: "left", + overHidden: true, + }, + { + label: "创建时间", + type: "datetime", + overHidden: true, + prop: "startTime", + format: "yyyy-MM-dd HH:mm", + valueFormat: "yyyy-MM-dd HH:mm:ss", + }, + { + label: "结束时间", + type: "datetime", + overHidden: true, + prop: "startTime", + format: "yyyy-MM-dd HH:mm", + valueFormat: "yyyy-MM-dd HH:mm:ss", + }, + { + type: "input", + label: "处理状态", + prop: "status", + align: "left", + overHidden: true, + }, + ], +} diff --git a/src/lang/zh.js b/src/lang/zh.js index 306ed2c..9325f37 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -1,5 +1,5 @@ export default { - title: 'Saber企业管理平台', + title: '工单系统', logoutTip: '退出系统, 是否继续?', submitText: '确定', cancelText: '取消', diff --git a/src/styles/custom/custom.scss b/src/styles/custom/custom.scss index 08b04cf..6de1de3 100644 --- a/src/styles/custom/custom.scss +++ b/src/styles/custom/custom.scss @@ -1,8 +1,6 @@ // // input输入框 // .el-input--small .el-input__inner { -// width: 420px; -// height: 50px; -// line-height: 50px; + // border-radius: 3px 3px 3px 3px; // color: #333; // position: relative; @@ -14,6 +12,7 @@ // color: #273240; // padding: 0!important; // } + // 包裹容器 .cus-container { margin: 0 38px; @@ -21,3 +20,86 @@ height: 100%; width: calc(100% - 76px); } +#avue-id { + // .el-table { + // height: 776px; + // min-height: 776px; + // } + .el-table thead { + background: #fff; + height: 80px; + font-size: 16px; + } + .el-table th { + background: #fff; + font-weight: 600; + } + .el-table tr { + height: 80px; + color: #374454; + } +} +// 分页 +.avue-crud__pagination { + text-align: left; + background: #F0F2F5; +} +// 自定义弹框样式,只有父类包含 custom类才可使用 +.custom { + width: 920px !important; + // 表单输入框 + .avue-crud .el-input--small input, + .avue-form .el-input--small input { + height: 40px; + line-height: 40px; + border-radius: 0px; + padding-left: 16px; + border-color: #e4e7ec; + } + .el-input--small { + width: 240px!important; + } + .avue-form .el-date-editor.el-input { + width: 240px!important; + } + + .avue-form, + .avue-form__group .el-col { + position: relative; + padding: 0 !important; + margin: 0; + } + + // 下拉 + .avue-select { + width: 240px !important; + } + // label + .el-form--label-top .el-form-item__label { + padding: 0; + margin-bottom: 5px; + } + + // 时间选择器 + .avue-crud .el-range-editor--small, + .avue-form .el-range-editor--small { + height: 40px; + line-height: 40px; + border-radius: 0px; + } + + // 上下距离 + .el-form-item--mini.el-form-item, + .el-form-item--small.el-form-item { + margin-bottom: 21px; + } + .el-col-8 { + width: 240px; + } + .el-col-8:nth-child(3n-1) { + margin: 0 45px; + } + .el-col-8:nth-child(3n+1) { + margin-left: 35px; + } +} \ No newline at end of file diff --git a/src/views/maintenance/task.vue b/src/views/maintenance/task.vue new file mode 100644 index 0000000..c1de919 --- /dev/null +++ b/src/views/maintenance/task.vue @@ -0,0 +1,247 @@ + + + diff --git a/src/views/plugin/workflow/process/components/examForm.vue b/src/views/plugin/workflow/process/components/examForm.vue index e7dd3eb..1c4e3c1 100644 --- a/src/views/plugin/workflow/process/components/examForm.vue +++ b/src/views/plugin/workflow/process/components/examForm.vue @@ -64,20 +64,22 @@ export default { action: '/api/blade-resource/oss/endpoint/put-file', span: 24, display: true - }, { - label: '抄送人', - prop: '$copyUser', - placeholder: '请选择 抄送人', - readonly: true, - append: '+', - span: 24, - event: { - click: () => { - this.$emit('user-select', { type: 'copy', checkType: 'checkbox' }) - } - }, - display: true - }, { + }, + // { + // label: '抄送人', + // prop: '$copyUser', + // placeholder: '请选择 抄送人', + // readonly: true, + // append: '+', + // span: 24, + // event: { + // click: () => { + // this.$emit('user-select', { type: 'copy', checkType: 'checkbox' }) + // } + // }, + // display: true + // }, + { label: '指定审批人', prop: '$assignee', placeholder: '指定下一级审批人,如不选择则使用默认处理人,驳回时无效。多选时若下一节点为多实例并行则会进行动态加减签,若不是则只有第一个生效。', diff --git a/src/views/plugin/workflow/process/components/form.vue b/src/views/plugin/workflow/process/components/form.vue index ee44b71..c988bfb 100644 --- a/src/views/plugin/workflow/process/components/form.vue +++ b/src/views/plugin/workflow/process/components/form.vue @@ -1,81 +1,124 @@ \ No newline at end of file +.aaa { +// .avue-crud .el-input--small input, .avue-form .el-input--small input { +// width: 420px; +// height: 50px; +// line-height: 50px; +// } +} + diff --git a/src/views/plugin/workflow/process/start.vue b/src/views/plugin/workflow/process/start.vue index 9fd7f53..27876a0 100644 --- a/src/views/plugin/workflow/process/start.vue +++ b/src/views/plugin/workflow/process/start.vue @@ -22,10 +22,6 @@ @refresh-change="onLoad(page, query)"> diff --git a/src/views/system/user.vue b/src/views/system/user.vue index 80ff0ef..cfbd2f3 100644 --- a/src/views/system/user.vue +++ b/src/views/system/user.vue @@ -308,12 +308,12 @@ slot: true, display: false }, - { - label: "用户平台", - prop: "userTypeName", - slot: true, - display: false - }, + // { + // label: "用户平台", + // prop: "userTypeName", + // slot: true, + // display: false + // }, { label: "用户平台", type: "select",