sasp-flow-render 1.1.8 → 1.1.9

package/package.json

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

package/src/components/flowInst/flowInstList.vue

@@ -93,6 +93,7 @@
                                          v-if="isShow('draft')"></el-table-column>
                         <el-table-column type="index" label="序号" align="center" width="60"></el-table-column>
                         <el-table-column label="事项概述" prop="flowSummary" show-overflow-tooltip :formatter="formatterFlowSummary"></el-table-column>
+                        <el-table-column label="流程名称" prop="flowId" width="200" align="center" :formatter="formatterFlowName" v-if="flowIds.includes(',')"></el-table-column>
                         <el-table-column label="启动人" prop="startUserId" v-if="isNotShow('draft')" width="100" align="center">
                             <template slot-scope="scope">
                                 {{userMap[scope.row.startUserId]}}
@@ -107,7 +108,7 @@
                         <el-table-column label="中止时间" prop="discontinueTime" width="180" align="center"
                                          v-if="isShow('discontinue')"></el-table-column>
                         <el-table-column label="当前任务" prop="currentNodeName" width="150" align="center"
-                                         v-if="!isShow('draft')" show-overflow-tooltip :sortable="tabType == 'pending' ? 'custom' : false">
+                                         v-if="!isShow('draft')" show-overflow-tooltip :sortable="tabType === 'pending' ? 'custom' : false">
                             <template slot-scope="scope">
                                 {{formatterCurrentNodeName(scope.row)}}
                                 <span v-if="scope.row.operateStatus == '0' && scope.row.agentType == '0'">(正常)</span>
@@ -397,6 +398,7 @@
             flowImpParamObj: {type: Object, default: () => ({})},
             downloadTemplate: {type: Function, default: null},
             getFormDataByDataIds: {type: Function, default: null},
+            flowDefineByFlowId: {type: Object, default: () => ({})},
         },
         data() {
 
@@ -921,6 +923,11 @@
                 })
                 return arr.join(",");
             },
+
+            formatterFlowName(row, column, cellValue) {
+                let flowDefineObj = this.flowDefineByFlowId[cellValue] || {};
+                return flowDefineObj.flowName || "";
+            },
             //点击列排序是的函数
             flowSortChange({column, prop, order}){
                 if(column.order){

package/src/components/flowInst/flowInstTab.vue

@@ -30,6 +30,7 @@
                             :open-batch-update-flow-form="openBatchUpdateFlowForm"
                             :openNewBatchUpdateFlowForm="openNewBatchUpdateFlowForm"
                             @setDataValue="setDataValue"
+                            :flowDefineByFlowId="flowDefineByFlowId"
             >
             </flow-inst-list>
         </div>
@@ -324,7 +325,7 @@
         </el-dialog>
 
         <!--流程下一步处理人选择弹窗-->
-        <el-dialog :close-on-click-modal=false :title="'下一步' + (nextNodeName ? (isProceedNext?' -> ' + nextNodeName:'->等待他人处理') : '')"
+        <el-dialog :close-on-click-modal=false style="font-family: '微软雅黑'" :title="'下一步' + (nextNodeName ? (isProceedNext?' -> ' + nextNodeName:'->等待他人处理') : '')"
                    :top="nextNode.nextType != 'inclusiveGateway' ? '20vh': '10vh'" append-to-body
                    width="500px" :visible.sync="nextSteptUserDialog" @closed="closeNextSteptUserDialog">
             <el-form label-width="100px" size="small" v-if="nextNode.nodeType != 'EndEvent'">
@@ -1129,6 +1130,8 @@
                     this.startNodeKeyObj = this.startNodeKeyObjByFlowId[row.flowId];
                     this.flowVersionNodeObj = this.flowVersionNodeObjByFlowId[row.flowId];
                     this.initFlowObj();
+                    // 加载工作流脚本与工作流事件规则
+                    this.initFlowScript();
                     // Object.assign(this.formInfo, this.formInfoByFlowId[row.flowId]);
                 }
 
@@ -2250,9 +2253,7 @@
                 Object.assign(params,this.flowParams || {},obj);
                 this.saspFlowAxios.post(this.api.plFlowInst.executeNextStep,params).then(res => {
                     if (res && res.data && res.data.operateSuccess) {
-                        if (!this.flowId.includes(",")) {
-                            this.initTabNum();
-                        }
+                        this.initTabNum();
                         this.$message({type: "success", message: "提交成功！"});
                         if (this.flowBatchPendingDialog) {
                             this.batchTabRemove(this.currentInst.dataId);
@@ -2328,9 +2329,7 @@
                     if (res && res.data && res.data.operateSuccess) {
                         this.completeSignDialog = false;
                         this.flowInstDataDialog = false;
-                        if (!this.flowId.includes(",")) {
-                            this.initTabNum();
-                        }
+                        this.initTabNum();
                         this.$message({type: "success", message: "加签成功！"});
                         this.tabCrudSearch();
                     } else {
@@ -2358,9 +2357,7 @@
                     if (res && res.data && res.data.operateSuccess) {
                         this.turnSignDialog = false;
                         this.flowInstDataDialog = false;
-                        if (!this.flowId.includes(",")) {
-                            this.initTabNum();
-                        }
+                        this.initTabNum();
                         this.$message({type: "success", message: "转签成功！"});
                         this.tabCrudSearch();
                     } else {
@@ -2394,9 +2391,7 @@
                         }).then(res => {
                         if (res && res.data && res.data.operateSuccess) {
                             this.$message({type: "success", message: "退回成功！"});
-                            if (!this.flowId.includes(",")) {
-                                this.initTabNum();
-                            }
+                            this.initTabNum();
                             if (this.flowBatchPendingDialog) {
                                 this.batchTabRemove(this.currentInst.dataId);
                             } else {
@@ -2435,9 +2430,7 @@
                         }).then(res => {
                         if (res && res.data && res.data.operateSuccess) {
                             this.$message({type: "success", message: "取回成功！"});
-                            if (!this.flowId.includes(",")) {
-                                this.initTabNum();
-                            }
+                            this.initTabNum();
                             if (this.flowBatchPendingDialog) {
                                 this.batchTabRemove(this.currentInst.dataId);
                             } else {
@@ -2711,9 +2704,7 @@
                             } else {
                                 this.tabCrudSearch();
                             }
-                            if (!this.flowId.includes(",")) {
-                                this.initTabNum();
-                            }
+                            this.initTabNum();
                         } else {
                             this.$message({type: "error", message: res.data.operateMessage});
                         }
@@ -2732,6 +2723,9 @@
 
             initTabNum() {
                 this.initMessageFunc && this.initMessageFunc();
+                if (this.flowId.includes(",")) {
+                    return;
+                }
                 this.saspFlowAxios.all([
                     this.saspFlowAxios.post(this.api.plFlowInst.getTabsNum,
                         {flowId: this.flowData.flowId, type: "1"}),
@@ -2860,7 +2854,7 @@
                                 this.$forceUpdate();
                             }
                             // 加载工作流脚本与工作流事件规则
-                            this.initFlowScript(this.flowData.flowId).then(() => {
+                            this.initFlowScript().then(() => {
                                 resolve(true);
                             })
                         });
@@ -2933,12 +2927,12 @@
                             let flowId = allFlowNode[0].flowId;
                             this.$set(this.startNodeKeyObjByFlowId, flowId, this.startNodeKeyObj);
                             this.$set(this.flowVersionNodeObjByFlowId, flowId, this.flowVersionNodeObj);
-                            // 加载工作流脚本与工作流事件规则
                             this.flowDefine = this.flowDefineByFlowId[flowId];
-                            this.initFlowScript(flowId).then(() => {
-                                resolve(true);
-                            });
+                            // this.initFlowScript().then(() => {
+                            //     resolve(true);
+                            // });
                         }
+                        resolve(true);
                     });
                 });
             },
@@ -2946,11 +2940,11 @@
             /**
              *  加载工作流脚本与工作流事件规则
              */
-            initFlowScript(flowId){
+            initFlowScript(){
                 return new Promise(resolve => {
                     this.saspFlowAxios.all([
-                        this.saspFlowAxios.post(this.api.plFlowScript.find,{"flowId": flowId}),
-                        this.saspFlowAxios.post(this.api.plFlowEventDetail.findByFlowAndLeadFunc,{"flowId": flowId,"version":this.flowDefine.flowVersion || "1.0"})
+                        this.saspFlowAxios.post(this.api.plFlowScript.find,{"flowId": this.flowDefine.id}),
+                        this.saspFlowAxios.post(this.api.plFlowEventDetail.findByFlowAndLeadFunc,{"flowId": this.flowDefine.id,"version":this.flowDefine.flowVersion || "1.0"})
                     ]).then(this.saspFlowAxios.spread((resScript, resEvent) => {
                         // 流程脚本
                         if(resScript){
@@ -3355,9 +3349,7 @@
             tabClick(tab) {
                 if (this.showInfo === "flow" && this.$refs[tab.name + "Ref"] && this.$refs[tab.name + "Ref"].crud) {
                     this.$refs[tab.name + "Ref"].crud.search();
-                    if (!this.flowId.includes(",")) {
-                        this.initTabNum();
-                    }
+                    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();