diff --git a/src/api/plugin/workflow/workorder.js b/src/api/plugin/workflow/workorder.js new file mode 100644 index 0000000..bca675a --- /dev/null +++ b/src/api/plugin/workflow/workorder.js @@ -0,0 +1,11 @@ +import request from '@/router/axios'; +const prefix = '/api/blade-workflow/workOrder' +// 查询 +export const getList = (query) => { + return request({ + url: `${prefix}/myToDo`, + method: 'get', + params:query + }) +} +// historyWorkOrder \ No newline at end of file diff --git a/src/const/workflow/workorder.js b/src/const/workflow/workorder.js index 7779d26..743b217 100644 --- a/src/const/workflow/workorder.js +++ b/src/const/workflow/workorder.js @@ -23,49 +23,49 @@ export const tableOption = { { type: "input", label: "任务种类", - prop: "year", + prop: "renwuzhonglei", align: "left", overHidden: true, }, { type: "input", label: "任务父类", - prop: "year", + prop: "$renwufulei", align: "left", overHidden: true, }, { type: "input", label: "操作模块", - prop: "year", + prop: "$xitongmingchengshujuku", align: "left", overHidden: true, }, { type: "input", label: "当前责任人", - prop: "userStatusAnalysis", + prop: "currentResponsiblePerson", align: "left", overHidden: true, }, { type: "input", label: "分管部门", - prop: "count", + prop: "$guanlibumen", align: "left", overHidden: true, }, { type: "input", label: "运维公司", - prop: "count", + prop: "$yunweigongsi", align: "left", overHidden: true, }, { type: "input", label: "发起人", - prop: "count", + prop: "startUserId", align: "left", overHidden: true, }, @@ -88,7 +88,7 @@ export const tableOption = { label: "结束时间", type: "datetime", overHidden: true, - prop: "startTime", + prop: "endTime", format: "yyyy-MM-dd HH:mm", valueFormat: "yyyy-MM-dd HH:mm:ss", }, @@ -96,7 +96,7 @@ export const tableOption = { label: "期望完成时间", type: "datetime", overHidden: true, - prop: "startTime", + prop: "qiwangwanchengshijian", format: "yyyy-MM-dd HH:mm", valueFormat: "yyyy-MM-dd HH:mm:ss", }, diff --git a/src/option/user/info.js b/src/option/user/info.js index d2fcbe0..2cb690a 100644 --- a/src/option/user/info.js +++ b/src/option/user/info.js @@ -11,13 +11,14 @@ export default { listType: 'picture-img', propsHttp: { res: 'data', - url: 'link', + url: 'path', + name: 'name' }, canvasOption: { text: ' ', ratio: 0.1 }, - action: '/api/blade-resource/oss/endpoint/put-file', + action: '/api/blade-workflow/database/upload', tip: '只能上传jpg/png用户头像，且不超过500kb', span: 12, row: true, diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index 358b526..0e9dfb6 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -1,23 +1,41 @@ diff --git a/src/page/index/top/top-notice.vue b/src/page/index/top/top-notice.vue index 5953924..81afb9f 100644 --- a/src/page/index/top/top-notice.vue +++ b/src/page/index/top/top-notice.vue @@ -1,87 +1,90 @@ diff --git a/src/styles/top.scss b/src/styles/top.scss index 0f8baad..aef01f9 100644 --- a/src/styles/top.scss +++ b/src/styles/top.scss @@ -78,8 +78,8 @@ $height: 64px; display: inline-block !important; } .el-badge__content.is-fixed { - top: 12px; - right: 5px; + top: 2px; + right: 6px; } } diff --git a/src/views/plugin/workflow/process/components/detail.vue b/src/views/plugin/workflow/process/components/detail.vue index a22bc9c..be54ae4 100644 --- a/src/views/plugin/workflow/process/components/detail.vue +++ b/src/views/plugin/workflow/process/components/detail.vue @@ -75,12 +75,15 @@ - +
+ +
+ @@ -145,7 +150,7 @@ import WfExamineForm from "./examForm.vue"; import WfButton from "./button.vue"; import WfFlow from "./flow.vue"; import userSelect from "./user-select"; -import {mapGetters} from "vuex"; +import { mapGetters } from "vuex"; import exForm from "../../mixins/ex-form"; import theme from "../../mixins/theme"; @@ -176,8 +181,16 @@ export default { }; }, computed: { - ...mapGetters(["userInfo"]), + ...mapGetters(["userInfo"]), + // 隐藏下方操作 + yibanTask() { + if (["运维公司收到任务"].includes(this.process.taskName)) { + return false; + } else { + return true; + } }, + }, methods: { // 下载 async download(row) { @@ -283,7 +296,7 @@ export default { ); renwuzhonglei.dicData = res.data.data; }); - getTaskAndDataBase({id:yunweigongsi}).then((res) => { + getTaskAndDataBase({ id: yunweigongsi }).then((res) => { const datasql = this.findObject( this.option.column, "xitongmingchengshujuku" diff --git a/src/views/plugin/workflow/process/components/examForm.vue b/src/views/plugin/workflow/process/components/examForm.vue index d67f797..a91363c 100644 --- a/src/views/plugin/workflow/process/components/examForm.vue +++ b/src/views/plugin/workflow/process/components/examForm.vue @@ -24,11 +24,12 @@ export default { process: { handler(val) { if (!val) return - const { hideComment, hideAttachment, hideCopy, hideExamine, copyUser, copyUserName } = val + const { hideComment, hideAttachment, hideCopy, hideExamine, copyUser, copyUserName,taskName } = val + console.log(['运维公司执行任务'].includes(taskName)) if (hideComment) this.findObject(this.examineOption.column, 'comment').display = false // 隐藏评论 if (hideComment || hideAttachment) this.findObject(this.examineOption.column, 'attachment').display = false // 隐藏评论附件 if (hideCopy) this.findObject(this.examineOption.column, '$copyUser').display = false // 隐藏抄送人 - if (hideExamine) this.findObject(this.examineOption.column, '$assignee').display = false // 隐藏指定下一步审核人 + if (hideExamine ) this.findObject(this.examineOption.column, '$assignee').display = false // 隐藏指定下一步审核人 if (copyUser) this.$set(this.examineForm, 'copyUser', val.copyUser) // 默认抄送人 if (copyUserName) this.$set(this.examineForm, '$copyUser', val.copyUserName) // 默认抄送人 }, @@ -37,23 +38,18 @@ export default { }, renwudengji: { handler(val) { + console.log("val",val) // 1625035000825049090 日常 // 1624973130579636225 一般 - if(this.userInfo.role_name === "运维公司" && val === "1625035000825049090") { + if((this.userInfo.role_name === "运维公司" && val === "1625035000825049090") || (this.userInfo.role_name === "技术员" && val === "1624973130579636225")||(['运维公司执行任务','领导审批'].includes(this.process.taskName))) { this.findObject(this.examineOption.column, '$assignee').display = false + console.log("val",val) }else { this.findObject(this.examineOption.column, '$assignee').display = true - - } - if(this.userInfo.role_name === "技术员" && val === "1624973130579636225") { - this.findObject(this.examineOption.column, '$assignee').display = false - }else { - this.findObject(this.examineOption.column, '$assignee').display = true - } }, + immediate: true, deep: true, - immediate: true } }, data() { @@ -81,7 +77,7 @@ export default { dragFile: true, }, { - label: '审批意见', + label: '意见', prop: 'comment', type: 'textarea', span: 24, @@ -119,8 +115,8 @@ export default { this.$emit('user-select', { type: 'assignee', checkType: 'checkbox' }) } }, - display: true - }] + } + ] }, } }, diff --git a/src/views/plugin/workflow/process/components/form.vue b/src/views/plugin/workflow/process/components/form.vue index 494d7ed..8f6d731 100644 --- a/src/views/plugin/workflow/process/components/form.vue +++ b/src/views/plugin/workflow/process/components/form.vue @@ -103,8 +103,8 @@ - -