diff --git a/src/components/tool-selector/index.vue b/src/components/tool-selector/index.vue new file mode 100644 index 0000000..65b9c9a --- /dev/null +++ b/src/components/tool-selector/index.vue @@ -0,0 +1,180 @@ + + + diff --git a/src/views/tool/toolDetail.vue b/src/views/tool/toolDetail.vue index 0a7b881..a246f14 100644 --- a/src/views/tool/toolDetail.vue +++ b/src/views/tool/toolDetail.vue @@ -18,6 +18,11 @@ {{toolDetail.applyCondition}} {{toolDetail.operateExplain}} {{toolDetail.remark}} + + + {{tag.toolName}} + + diff --git a/src/views/workflowList/addWorkflow/tool_release.vue b/src/views/workflowList/addWorkflow/tool_release.vue index 636e104..a880b09 100644 --- a/src/views/workflowList/addWorkflow/tool_release.vue +++ b/src/views/workflowList/addWorkflow/tool_release.vue @@ -128,6 +128,29 @@ + + + + + + + + + +
@@ -235,7 +258,7 @@ v-if="monitorDrawerVisible" ref="monitorDrawer" > - +
@@ -254,10 +277,12 @@ import Treeselect from '@riophae/vue-treeselect' import { deptTreeSelect } from "@/api/system/user"; import { addTool, checkToolExist, getInfoByBpmcId, updateTool } from '@/api/tool/tool' import blUserSelector from '@/components/user-selector/src/user-selector.vue' +import ToolSelector from '@/components/tool-selector/index.vue' // PDF本地文件预览 export default { dicts: ['sys_normal_disable','tool_type'], components: { + ToolSelector, blUserSelector, Treeselect, AddDoc, WorkflowLogs, @@ -420,6 +445,7 @@ export default { getInfoByBpmcId(procInstId).then(async (res) => { let formData = res.data; formData.type = _this.form.type + formData.association = JSON.parse(res.data.association) _this.form = formData _this.getDocumentList(res.data.toolId) }).finally(()=>{ @@ -519,6 +545,7 @@ export default { let formData = JSON.parse(JSON.stringify(_this.form)) formData.recordStatus = "draft"; formData.editStatus = _this.editStatus + formData.association = JSON.stringify(_this.form.association) if (formData.toolId) { updateTool(formData).then((res) => { if (res.code===200) { @@ -632,6 +659,7 @@ export default { handleWorkflowSubmit() { let _this = this let formData = JSON.parse(JSON.stringify(_this.form)) + formData.association = JSON.stringify(_this.form.association) let wf_receivers = []; if (_this.$refs.prochild.receiveUserList.length < 1 &&_this.$refs.prochild.nextData.actDefType!=='endEvent') { _this.$message.warning("请选择人员!"); @@ -747,8 +775,21 @@ export default { handleSelectNode(node){ this.$set(this.form,'toolRespDeptName',node.label) }, - handleFileAdd(fileList){ - console.log(fileList) + toolSelect(){ + this.$refs.selectHeadTool.blur(); + this.$nextTick(()=>{ + this.$refs.toolSelect.init(null,null,true) + }) + }, + selectHandle(source,index,data){ + let list = this.form.association + if (!list) { + list = [] + } + data.forEach(itme=>{ + list.push({toolId:itme.toolId,toolName:itme.toolName}) + }) + this.form.association = list } }, };