src/components/MonitorDrawer/index.vue

@@ -33,6 +33,7 @@
               let protocol = window.location.protocol
               let hostname = window.location.hostname;
               let workflowManageUrl = protocol + '//' + hostname + ':9080' + process.env.VUE_APP_WORKFLOW_MANAGE_URL
+              workflowManageUrl = 'http://124.223.108.21:9080/ebpm-process-manage'
               this.src = workflowManageUrl + '/workflow/trace/traceProcess.do?processInstanceId=' + procInstId
             }
         }

src/views/tool/index.vue

@@ -501,9 +501,14 @@ export default {
       // this.multiple = !selection.length;
     },
     handleDetail(row){
+      if(row.recordStatus === 'done'){
         this.detailDrawerOpen = true
         this.detailOpen = true
         this.toolDetail = row
+      } else {
+        let status = row.recordStatus === 'draft' ? '1' : '0'
+        this.handleOpen({type:'tool_release', procInstId:row.procInstId, status:status})
+      }
     },
     handleFileDownload(row){
       this.fileDetailDrawerOpen = true

src/views/workflowList/addWorkflow/tool_release.vue

@@ -2,17 +2,14 @@
   <div  v-loading="loading||detailLoading">
     <div class="drawer-head">
       <div class="cell-title">
-        <div v-if="pListData && pListData.procInstId">
+          <p class="title">工具发布</p>
-          <p class="title">审核工具</p>
-        </div>
-        <div v-else>新增工具</div>
       </div>
       <div class="cell-btn">
-        <el-button type="primary" v-if="pListData && pListData.procInstId" @click="handleMonitor">流程监控</el-button>
+        <el-button type="primary" v-if="pListData && pListData.procInstId" @click="handleMonitor" icon="el-icon-data-line">流程监控</el-button>
-        <el-button v-if="editStatus && pListData.procInstId" type="danger" @click="deleteForm">删除</el-button>
+        <el-button v-if="(editStatus || workflowStatus)" type="primary" @click="submitForm" icon="el-icon-finished">提交</el-button>
-        <el-button v-if="(editStatus || workflowStatus)" type="primary" @click="submitForm">提交</el-button>
+        <el-button v-if="editStatus && !pListData.procInstId" type="primary" @click="saveForm" icon="el-icon-check">暂存</el-button>
-        <el-button v-if="editStatus" type="primary" @click="saveForm">保存</el-button>
+        <el-button v-if="editStatus && pListData.procInstId" type="danger" @click="deleteForm" icon="el-icon-close">撤销</el-button>
-        <el-button @click="close">关闭</el-button>
+        <el-button @click="close" icon="el-icon-close">关闭</el-button>
       </div>
     </div>
     <template v-if="attributeModelBool('approve') && workflowStatus">
@@ -306,7 +303,7 @@ import {
 import WorkflowLogs from '@/views/workflowList/workflowLogs/index.vue'
 import AddDoc from '@/views/tool/AddDoc.vue'
 import Treeselect from '@riophae/vue-treeselect'
-import { deptTreeSelect } from "@/api/system/user";
+import { addUser, deptTreeSelect, updateUser } 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'
@@ -576,6 +573,8 @@ export default {
     //不需要验证必填的保存
     saveForm() {
       let _this = this
+      _this.$refs["eForm"].validate(valid => {
+        if (valid) {
           if (!_this.procDefKey) {
             _this.$message.warning("尚未进行流程设置，将无法发起流程！");
             return;
@@ -637,6 +636,8 @@ export default {
               _this.loading = false
             });
           }
+        }
+      });
     },
     deleteForm(){
       let _this = this