sasp-flow-render 1.1.27-decoupling → 1.1.29-decoupling

package/index.js

@@ -125,7 +125,8 @@ let initAxios = (Vue, props) => {
 let loadFlowDialog = (Vue,opts) => {
     // 创建 Dialog 实例并挂载到 body
     const DialogConstructor = Vue.extend(flowDialog);
-    const instance = new DialogConstructor().$mount();
+    let router = opts.router;
+    const instance = new DialogConstructor({router}).$mount();
     document.body.appendChild(instance.$el);
 
     // 将实例挂载到 Vue 原型，方便全局调用

package/package.json

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

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

@@ -251,6 +251,7 @@ let objResult = {
         saveDataFlowDrafts: "/flowEngine/saveDataFlowDrafts",
         startFlow: "/flowEngine/startFlow",
         completeTask: "/flowEngine/completeTask",
+        saveFlowDraft: "/flowEngine/saveFlowDraft",
     }
 };
 

package/src/components/flowInst/js/workflow.js

@@ -23,6 +23,12 @@ class WorkflowEngine {
         this.currentInst = {};
         this.installListObj = this.$this.EVENT_PLUGIN['installEventObj']||{}; //已经安装的流程事件
         this.loginUser = this.$this.FLOW_CACHE_GLOBAL.getLoginUser();
+        if(!this.loginUser.id){ // 判断是否是表单独立登录
+            if(this.$this.FORM_USER_GLOBAL){
+                this.loginUser = this.$this.FORM_USER_GLOBAL.getLoginUser();
+            }
+        }
+
         this.skipAutoInit = false;
         if(flowAttrs.skipAutoInit){
             this.skipAutoInit = flowAttrs.skipAutoInit;
@@ -50,7 +56,8 @@ class WorkflowEngine {
         this.getFormInfo = methods["getFormInfo"];
         this.flowNextOperation = methods["flowNextOperation"];
         this.forceUpdateComponent = methods["forceUpdateComponent"];
-        this.nextStepAfterSave = methods["nextStepAfterSave"];
+        this.nextStepAfterSave = methods["nextStepAfterSave"]; // 流程下一步保存表单数据后的回调
+        this.afterNextStepSuccess = methods["afterNextStepSuccess"]; // 流程下一步成功后，即关闭对话框后的回调
         this.setParams = methods["setParams"];
 
         if(!this.initFormInfo){
@@ -159,7 +166,7 @@ class WorkflowEngine {
                     type: "success",
                     icon: "el-icon-check",
                     disabled: false,
-                    show: true,
+                    show: false,
                     method: () => {
                     this.saveDraft();
                 }
@@ -170,7 +177,7 @@ class WorkflowEngine {
                     type: "primary",
                     icon: "el-icon-d-arrow-right",
                     disabled: false,
-                    show: true,
+                    show: false,
                     method: () => {
                     this.nextStep();
                     // this.isDisabled1 = true;
@@ -342,7 +349,7 @@ class WorkflowEngine {
                     type: "warning",
                     icon: "saspiconfont pl-icon-liuchengtu",
                     disabled: false,
-                    show: true,
+                    show: false,
                     isView: true,
                     method: () => {
                     this.openFlowRecord(this.currentInst);
@@ -353,7 +360,7 @@ class WorkflowEngine {
                     type: "",
                     icon: "el-icon-close",
                     disabled: false,
-                    show: true,
+                    show: false,
                     isView: true,
                     method: () => {
                     this.flowInstDataDialog = false;
@@ -1843,6 +1850,13 @@ class WorkflowEngine {
         })
     }
 
+    syncFlowDialogPrams(params){
+        Object.keys(params).forEach(key => {
+            this[key] = params[key];
+        });
+        this.setParams && this.setParams(params);
+    }
+
     /**
      * 恢复方法
      */
@@ -1876,14 +1890,14 @@ class WorkflowEngine {
      */
     openFlowRecord(row) {
         let arr = ["2", "3", "4"]; // 旧版本的已办结已撤销以及已中止数据通过旧版接口查询流转记录
+        this.$flowDialog.fillFlowDialogParams({
+            flowRecordObj: this.flowRecordObj
+        });
         if (arr.indexOf(row.flowStatus) > -1 && row.isOldData === "1") {
             this.flowRecordObj = {instId: row.flowInstId || "", oldDialogVisible: true};
         } else {
             this.flowRecordObj = {instId: row.flowInstId || "", dialogVisible: true};
         }
-        this.$flowDialog.fillFlowDialogParams({
-            flowRecordObj: this.flowRecordObj
-        });
     }
 
     openFlowChart(row) {
@@ -2206,7 +2220,14 @@ class WorkflowEngine {
         })
     }
 
-    open(dataId,type,callback){
+    /**
+     *
+     * @param dataId 数据ID
+     * @param type 操作类型，view-查看、update-编辑
+     * @param forceOpen 是否强制打开，默认false，为true时可以将非工作流列表数据自动插入草稿数据并打开
+     * @param callback 回调函数
+     */
+    open(dataId,type,forceOpen,callback){
         if(!this.tableviewId){
             this.$this.$message.error("请先设置tableviewId");
             return;
@@ -2220,12 +2241,11 @@ class WorkflowEngine {
                 formInfo: this.formInfo
             });
             if(dataId){
-                this.$this.saspFlowAxios.post(this.$this.api.plFlowInst.getFlowInstByFlowDataId,{flowId:this.flowId,dataId:dataId}).then(res => {
-                    if(!res.data){
+                this.getDataByDataId(dataId,forceOpen).then(rowData => {
+                    if(!rowData){
                         this.$this.$message.error("未获取到此流程数据！");
                         return;
                     }
-                    let rowData = res.data || {};
                     if(type !== "view" && rowData.operateAuth === "0"){
                         console.log("当前登录用户无此流程数据操作权限，已自动切换为查看！");
                         type = "view";
@@ -2260,6 +2280,53 @@ class WorkflowEngine {
         })
     }
 
+    /**
+     * 根据数据ID获取流程数据
+     * @param dataId
+     * @returns {Promise<unknown>}
+     */
+    getDataByDataId(dataId,forceOpen){
+        return new Promise(resolve => {
+            this.getFlowInstByDataId(dataId).then(rowData => {
+                if(!rowData) {
+                    if (forceOpen) {
+                        this.$this.axios.post(this.$this.api.flowEngine.saveFlowDraft, {
+                            flowId: this.flowId,
+                            dataId: dataId,
+                            userCode: this.loginUser.id
+                        }).then(flowDraftRes => {
+                            let flowDraftData = flowDraftRes.data || {};
+                            if (flowDraftData.requestStatus === "1") {
+                                this.getFlowInstByDataId(dataId).then(rowData => {
+                                    resolve(rowData);
+                                });
+                            }else{
+                                resolve(false);
+                            }
+                        });
+                    }else{
+                        resolve(false);
+                    }
+                }else{
+                    resolve(rowData);
+                }
+            })
+        })
+    }
+
+    getFlowInstByDataId(dataId){
+        return new Promise(resolve => {
+            this.$this.saspFlowAxios.post(this.$this.api.plFlowInst.getFlowInstByFlowDataId,{flowId:this.flowId,dataId:dataId}).then(res => {
+                if(!res.data){
+                    resolve(false);
+                    return;
+                }
+                let rowData = res.data || {};
+                resolve(rowData);
+            });
+        })
+    }
+
     openFlowDialog(args){
         this.$flowDialog.openFlowDialog(args);
     }

package/src/components/flowInst/popup/flowDialog.vue

@@ -645,6 +645,11 @@ export default {
         if(this.flowNextOperation) {
           this.flowNextOperation(obj.instId, obj.dealers, obj.dealerNames, obj.taskId);
         }
+        this.workFlowUtil.syncFlowDialogPrams({
+            chooseNextUserId: this.chooseNextUserId,
+            chooseNextUserName: this.chooseNextUserName,
+            chooseNextUserIdObj: this.chooseNextUserIdObj
+        });
         let params = {"SASP_FLOW_USE_VARIABLES":"yes"};
         Object.assign(params,this.flowParams || {},obj);
         this.saspFlowAxios.post(this.api.plFlowInst.executeNextStep,params).then(res => {
@@ -663,19 +668,11 @@ export default {
             let type = this.flowBatchPendingDialog ? "batch" : "";
             let currentNodeObj = this.flowNodeIdToInfo[this.currentInst.currentNode || this.draftNodeId] ||{};
             let submitSuccessRusult;
-            if (type == 'batch') {
-              // 批量处理
-              let ref = "batchTableForm"+this.batchUpdateFormInfo.activeName+"Ref";
-              submitSuccessRusult=this.workFlowUtil.exeFlowEvent("nextStep","submitSuccess", this.currentInst.currentNode || this.draftNodeId,ref);
-              if(currentNodeObj.openEvent == '1'){
-                submitSuccessRusult = this.workFlowUtil.exeNewFlowEvent("nextSubmit",currentNodeObj.nodeLinkId||'',ref)
-              }
-            } else {
-              submitSuccessRusult=this.workFlowUtil.exeFlowEvent("nextStep","submitSuccess", this.currentInst.currentNode || this.draftNodeId);
-              if(currentNodeObj.openEvent == '1'){
-                submitSuccessRusult =this.workFlowUtil.exeNewFlowEvent("nextSubmit",currentNodeObj.nodeLinkId||'')
-              }
+            submitSuccessRusult=this.workFlowUtil.exeFlowEvent("nextStep","submitSuccess", this.currentInst.currentNode || this.draftNodeId);
+            if(currentNodeObj.openEvent == '1'){
+              submitSuccessRusult =this.workFlowUtil.exeNewFlowEvent("nextSubmit",currentNodeObj.nodeLinkId||'')
             }
+            this.workFlowUtil.afterNextStepSuccess && this.workFlowUtil.afterNextStepSuccess(this.workFlowUtil.$this,this.workFlowUtil);
             if(submitSuccessRusult){
               //办结提醒
               if(this.nextNode.nodeType == "EndEvent"){

package/src/views/popup/event/compoment/system/flowEditContentConfig.vue

@@ -138,10 +138,11 @@
                         "label":"用户名称",
                     },
                 ], //用户信息
+                loginUser:{}
             }
         },
         created(){
-
+            this.loginUser = this.FLOW_CACHE_GLOBAL.getLoginUser() || {};
         },
         methods:{
             /**