工具发布流程和使用申请流程细节优化

src/views/tool/toolDetail.vue

@@ -18,6 +18,11 @@
                 <el-col :span="12"> <el-form-item label="适用条件">{{toolDetail.applyCondition}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="操作说明">{{toolDetail.operateExplain}}</el-form-item> </el-col>
                 <el-col :span="12"> <el-form-item label="备注">{{toolDetail.remark}}</el-form-item> </el-col>
+                <el-col :span="24">
+                  <el-form-item label="关联工具">
+                     <el-tag :key="tag.toolId" v-for="tag in JSON.parse(toolDetail.association)" type="info" style="margin-right: 5px">{{tag.toolName}}</el-tag>
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-form><!--el-form-->
           </div><!--el-form-border 表单-->

src/views/workflowList/addWorkflow/tool_release.vue

@@ -128,6 +128,29 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="关联工具" prop="association">
+                <el-select
+                  :disabled="!editStatus"
+                  v-model="form.association"
+                  ref="selectHeadTool"
+                  multiple
+                  value-key="toolId"
+                  filterable
+                  remote
+                  placeholder="请选择关联工具"
+                  @focus="toolSelect">
+                  <el-option
+                    v-for="item in form.association"
+                    :key="item.toolId"
+                    :label="item.toolName"
+                    :value="item">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </div>
         <div>
           <div class="box-title">
@@ -235,7 +258,7 @@
       v-if="monitorDrawerVisible"
       ref="monitorDrawer"
     ></monitor-drawer>
-
+    <tool-selector ref="toolSelect" @selectHandle="selectHandle"></tool-selector>
     <bl-user-selector  ref="peopleSelect" :type="'single'" :isCheck="true" :open="toolPrincipalsChoose" @cancel="toolPrincipalsChoose=false"   @submit="submitPeople"></bl-user-selector>
   </div>
 </template>
@@ -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
     }
   },
 };