Browse Source

各节点查看工作流表单功能扩展

chenc 3 years ago
parent
commit
a47b3803e0

+ 4 - 2
src/views/activiti/ProcessModelList.vue

@@ -274,7 +274,7 @@
         <a-col :md="4" :sm="4" style="border-right: 1px solid #999">
           <!--          选择流程节点-->
           <a-steps direction="vertical" :current="current" size="small">
-            <template v-for="item,i in nodeList">
+            <template v-for="item,i in nodeList" >
               <a-step
                 style="cursor: pointer;"
                 :title="item.title"
@@ -699,7 +699,9 @@ export default {
             if (_this.nodeList.length > 0) {
               _this.editNode = _this.nodeList[0]
               _this.showProcessNodeEdit = true
-              this.spry.tbTableInfoId=_this.nodeList[0].tbTableInfoId;
+              if(_this.nodeList[0].tbTableInfoId){
+                this.spry.tbTableInfoId=_this.nodeList[0].tbTableInfoId;
+              }
             }
           } else {
             _this.$message.error(res.message)

+ 2 - 1
src/views/activiti/form/demoForm2.vue

@@ -98,7 +98,8 @@ export default {
       // this.$refs.KFB.getData().then(res => {
       //   console.log('aaa',res)
       // })
-      if(res.result.isSave){
+      //后台检测到流程节点有关联表单且前台处于我的待办界面打开表单详情
+      if(res.result.isSave&&this.processData.isSuspended!=undefined){
         this.disabled=false;
         this.btndisabled=false;
       }

+ 1 - 1
src/views/activiti/processInsManage.vue

@@ -275,7 +275,7 @@ export default {
           alert("调用其他项目页面")
       }else if(r.routeName.indexOf("自定义")!=-1){//自定义的表单流程
         this.lcModa.disabled = true;
-        this.lcModa.title = '查看流程业务信息:'+r.processName;
+        this.lcModa.title = '查看流程业务信息:'+r.name;
         let com={component:() => import(`@/views/activiti/form/demoForm2`)}
         this.lcModa.formComponent = com.component;
         this.lcModa.isNew = false;