sasp-flow-render 1.1.6 → 1.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasp-flow-render",
-  "version": "1.1.6",
+  "version": "1.1.8",
   "description": "业务应用支撑平台-智慧流程渲染组件",
   "scripts": {
     "build": "vue-cli-service build"

package/src/assets/js/api/apiFlow.js

@@ -238,6 +238,8 @@ let objResult = {
     },
     flowEngine: {
         saveDataFlowDrafts: "/flowEngine/saveDataFlowDrafts",
+        startFlow: "/flowEngine/startFlow",
+        completeTask: "/flowEngine/completeTask",
     }
 };
 

package/src/components/flowInst/flowInstTab.vue

@@ -797,7 +797,7 @@
                 nodeFormButtonObj: {},
                 optColumnWidth: 336,
                 showModel: "list",//默认风格  list：列表card：卡片
-                showInfo: "",//展示信息 flow：流程信息 form：表单信息
+                showInfo: "flow",//展示信息 flow：流程信息 form：表单信息
                 operateType: {},
                 resourceTabOpts: ['draft','pending','processed','rescinded','finished','discontinue','flowQuery'],
                 tabTypeObj: {},//标签页对象
@@ -1128,6 +1128,7 @@
                     this.flowDefine = this.flowDefineByFlowId[row.flowId];
                     this.startNodeKeyObj = this.startNodeKeyObjByFlowId[row.flowId];
                     this.flowVersionNodeObj = this.flowVersionNodeObjByFlowId[row.flowId];
+                    this.initFlowObj();
                     // Object.assign(this.formInfo, this.formInfoByFlowId[row.flowId]);
                 }
 
@@ -1156,6 +1157,11 @@
             openUpdateFlowForm(row,executePosition) {
                 this.currentRowData = row;
                 this.currNodeName = 'noEnd';
+                let currentNodeObj1 = this.flowNodeIdToInfo[row.currentNode] ||{};
+                let result = this.exeNewFlowEvent("editBefore",currentNodeObj1.nodeLinkId ||'');//新事件规则
+                if(result === false && typeof result == "boolean"){
+                    return;
+                }
                 this.flowInstDataDialog = true;
                 this.initUpdateFlowForm(row).then(() =>{
                     this.$nextTick(() => {
@@ -1347,7 +1353,6 @@
 
             saveNewBatchDealFormData() {
                 this.saveFormInfo().then(result => {
-                    // console.log('保存方法1', result);
                     if (result) {
                         let flowNewBatchDealVm = this.$refs.flowNewBatchDealRef;
                         // 数据保存成功，更改行数据
@@ -1376,7 +1381,6 @@
                             });
                         }
                         this.$set(flowObj, "isEdited", true);
-                        // console.log('flowObj', flowObj, flowNewBatchDealVm);
                         this.flowInstDataDialog = false;
                         // 刷新下一步处理人
                         if (flowNewBatchDealVm) {
@@ -1387,7 +1391,6 @@
             },
 
             newBatchDealSubmit(selectionArr, submitType) {
-                // console.log('提交',selectionArr);
                 if (selectionArr.length === 0) {
                     return this.$message.warning('请先勾选要提交的数据！');
                 }
@@ -1420,7 +1423,7 @@
                             nextStepSelectionArr.push(selectionObj);
                         }
                     });
-                    // console.log(this.flowDefine, this.allNodeInfo, '提交', selectionArr, nextStepSelectionArr);
+
                     if (params.length > 0) {
                         this.saveBatchDealFormData(this.formInfo.formId, JSON.stringify(params)).then(resData => {
                             if (resData.operateSuccess) {
@@ -1476,7 +1479,7 @@
                         selectArr.push(item);
                     }
                 });
-                // console.log('全部提交', selectArr);
+
                 if (selectArr.length === 0) {
                     return this.$message.warning("暂无提交内容！");
                 }
@@ -1649,7 +1652,6 @@
              * @param row 流程行数据
              */
             openFlowRecord(row) {
-                console.log('流转记录',row);
                 let arr = ["2", "3", "4"]; // 旧版本的已办结已撤销以及已中止数据通过旧版接口查询流转记录
                 if (arr.indexOf(row.flowStatus) > -1 && row.isOldData === "1") {
                     this.flowRecordObj = {instId: row.flowInstId || "", oldDialogVisible: true};
@@ -1881,14 +1883,14 @@
                 let currentNodeObj = this.flowNodeIdToInfo[this.currentInst.currentNode || this.draftNodeId] ||{};
                 afterClickResult=this.exeFlowEvent("nextStep","afterClick", this.currentInst.currentNode || this.draftNodeId);
                 //
-                if(currentNodeObj.openEvent == '1'){
+                if(currentNodeObj.openEvent === '1'){
                     afterClickResult = this.exeNewFlowEvent("nextClick",currentNodeObj.nodeLinkId);
                 }
 
                 // let afterValidateResult;
                 // let currentNodeObj = this.flowNodeIdToInfo[this.currentInst.currentNode || this.draftNodeId] ||{};
                 this.exeFlowEvent("nextStep","afterValidate", this.currentInst.currentNode || this.draftNodeId);
-                if(currentNodeObj.openEvent == '1'){
+                if(currentNodeObj.openEvent === '1'){
                     this.exeNewFlowEvent("nextCheck",currentNodeObj.nodeLinkId);
                 }
 
@@ -2248,7 +2250,9 @@
                 Object.assign(params,this.flowParams || {},obj);
                 this.saspFlowAxios.post(this.api.plFlowInst.executeNextStep,params).then(res => {
                     if (res && res.data && res.data.operateSuccess) {
-                        this.initTabNum();
+                        if (!this.flowId.includes(",")) {
+                            this.initTabNum();
+                        }
                         this.$message({type: "success", message: "提交成功！"});
                         if (this.flowBatchPendingDialog) {
                             this.batchTabRemove(this.currentInst.dataId);
@@ -2308,7 +2312,7 @@
              */
             sureCompleteSign() {
                 let checkedUserArr = this.$refs.completeSignRef.chooseUsers || [];
-                if (checkedUserArr.length == 0) {
+                if (checkedUserArr.length === 0) {
                     this.$message({type: "error", message: "请选择加签人！"});
                     return;
                 }
@@ -2324,7 +2328,9 @@
                     if (res && res.data && res.data.operateSuccess) {
                         this.completeSignDialog = false;
                         this.flowInstDataDialog = false;
-                        this.initTabNum();
+                        if (!this.flowId.includes(",")) {
+                            this.initTabNum();
+                        }
                         this.$message({type: "success", message: "加签成功！"});
                         this.tabCrudSearch();
                     } else {
@@ -2339,7 +2345,7 @@
              */
             sureTurnSign() {
                 let checkedUserArr = this.$refs.turnSignRef.chooseUsers || [];
-                if (checkedUserArr.length == 0) {
+                if (checkedUserArr.length === 0) {
                     this.$message({type: "error", message: "请选择转签人！"});
                     return;
                 }
@@ -2352,7 +2358,9 @@
                     if (res && res.data && res.data.operateSuccess) {
                         this.turnSignDialog = false;
                         this.flowInstDataDialog = false;
-                        this.initTabNum();
+                        if (!this.flowId.includes(",")) {
+                            this.initTabNum();
+                        }
                         this.$message({type: "success", message: "转签成功！"});
                         this.tabCrudSearch();
                     } else {
@@ -2386,7 +2394,9 @@
                         }).then(res => {
                         if (res && res.data && res.data.operateSuccess) {
                             this.$message({type: "success", message: "退回成功！"});
-                            this.initTabNum();
+                            if (!this.flowId.includes(",")) {
+                                this.initTabNum();
+                            }
                             if (this.flowBatchPendingDialog) {
                                 this.batchTabRemove(this.currentInst.dataId);
                             } else {
@@ -2425,7 +2435,9 @@
                         }).then(res => {
                         if (res && res.data && res.data.operateSuccess) {
                             this.$message({type: "success", message: "取回成功！"});
-                            this.initTabNum();
+                            if (!this.flowId.includes(",")) {
+                                this.initTabNum();
+                            }
                             if (this.flowBatchPendingDialog) {
                                 this.batchTabRemove(this.currentInst.dataId);
                             } else {
@@ -2699,7 +2711,9 @@
                             } else {
                                 this.tabCrudSearch();
                             }
-                            this.initTabNum();
+                            if (!this.flowId.includes(",")) {
+                                this.initTabNum();
+                            }
                         } else {
                             this.$message({type: "error", message: res.data.operateMessage});
                         }
@@ -3235,7 +3249,7 @@
                 // let CTX = window.JAVA_URL;
                 let CTX = "";
                 let paramValues = [this,this.saspFlowAxios,CTX,formData,this.loginUser,AjaxUtil,this.nextNode]; // 入参
-                if(executeType == "addAfter" || executeType == "editAfter"){ //新增或者修改后
+                if(executeType == "addAfter"){ //新增或后
                     (this.newScriptObj[executeType] || []).forEach(event => {
                         event && event(...paramValues); // 执行事件
                     });
@@ -3275,7 +3289,7 @@
                         }
                     });
                 }catch (e) {
-                    console.log(e);
+                    // console.log(e);
                     result=false;
                 }
 
@@ -3339,10 +3353,12 @@
             },
 
             tabClick(tab) {
-                if (this.showInfo == "flow" && this.$refs[tab.name + "Ref"] && this.$refs[tab.name + "Ref"].crud) {
+                if (this.showInfo === "flow" && this.$refs[tab.name + "Ref"] && this.$refs[tab.name + "Ref"].crud) {
                     this.$refs[tab.name + "Ref"].crud.search();
-                    this.initTabNum();
-                } else if (this.showInfo == "form" && this.$refs[tab.name + "Ref"] && this.$refs[tab.name + "Ref"].getDataRows) {
+                    if (!this.flowId.includes(",")) {
+                        this.initTabNum();
+                    }
+                } else if (this.showInfo === "form" && this.$refs[tab.name + "Ref"] && this.$refs[tab.name + "Ref"].getDataRows) {
                     this.$refs[tab.name + "Ref"].getDataRows();
                     this.initTabNum();
                 }
@@ -3357,6 +3373,7 @@
             },
 
             initFlowObj() {//处理流程定义对象
+                this.isRefreshGetNextUsers = [];
                 let gatewayFields = this.flowDefine.gatewayFields || "";
                 this.isRefreshGetNextUsers = gatewayFields.split(",");
                 Object.keys(this.allNodeInfo).forEach(key => {
@@ -3370,22 +3387,24 @@
                         }
                     }
                 });
-                let tabSetting = JSON.parse(this.flowDefine.tabSetting);
-                tabSetting.forEach(data => {
-                    this.$set(this.tabTypeObj, data.type, data);
-                });
-                Object.keys(this.tabTypeObj).forEach(key => {
-                    let objTemp = this.tabTypeObj[key];
-                    objTemp.tabName = objTemp["showName"] || objTemp["name"];
-                });
-                let tabTitleType = this.flowDefine.tabTitleType;
-                if (tabTitleType == "1") {
-                    this.tabTypeObj["showtTabText"] = true;
-                    this.tabTypeObj["showTabIcon"] = true;
-                } else if (tabTitleType == "2") {
-                    this.tabTypeObj["showtTabText"] = true;
-                } else if (tabTitleType == "3") {
-                    this.tabTypeObj["showTabIcon"] = true;
+                if (!this.flowId.includes(",")) {
+                    let tabSetting = JSON.parse(this.flowDefine.tabSetting);
+                    tabSetting.forEach(data => {
+                        this.$set(this.tabTypeObj, data.type, data);
+                    });
+                    Object.keys(this.tabTypeObj).forEach(key => {
+                        let objTemp = this.tabTypeObj[key];
+                        objTemp.tabName = objTemp["showName"] || objTemp["name"];
+                    });
+                    let tabTitleType = this.flowDefine.tabTitleType;
+                    if (tabTitleType === "1") {
+                        this.tabTypeObj["showtTabText"] = true;
+                        this.tabTypeObj["showTabIcon"] = true;
+                    } else if (tabTitleType === "2") {
+                        this.tabTypeObj["showtTabText"] = true;
+                    } else if (tabTitleType === "3") {
+                        this.tabTypeObj["showTabIcon"] = true;
+                    }
                 }
             },