sasp-flow-render 1.1.7 → 1.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasp-flow-render",
-  "version": "1.1.7",
+  "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'">
@@ -797,7 +798,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 +1129,9 @@
                     this.flowDefine = this.flowDefineByFlowId[row.flowId];
                     this.startNodeKeyObj = this.startNodeKeyObjByFlowId[row.flowId];
                     this.flowVersionNodeObj = this.flowVersionNodeObjByFlowId[row.flowId];
+                    this.initFlowObj();
+                    // 加载工作流脚本与工作流事件规则
+                    this.initFlowScript();
                     // Object.assign(this.formInfo, this.formInfoByFlowId[row.flowId]);
                 }
 
@@ -1352,7 +1356,6 @@
 
             saveNewBatchDealFormData() {
                 this.saveFormInfo().then(result => {
-                    // console.log('保存方法1', result);
                     if (result) {
                         let flowNewBatchDealVm = this.$refs.flowNewBatchDealRef;
                         // 数据保存成功，更改行数据
@@ -1381,7 +1384,6 @@
                             });
                         }
                         this.$set(flowObj, "isEdited", true);
-                        // console.log('flowObj', flowObj, flowNewBatchDealVm);
                         this.flowInstDataDialog = false;
                         // 刷新下一步处理人
                         if (flowNewBatchDealVm) {
@@ -1392,7 +1394,6 @@
             },
 
             newBatchDealSubmit(selectionArr, submitType) {
-                // console.log('提交',selectionArr);
                 if (selectionArr.length === 0) {
                     return this.$message.warning('请先勾选要提交的数据！');
                 }
@@ -1425,7 +1426,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) {
@@ -1481,7 +1482,7 @@
                         selectArr.push(item);
                     }
                 });
-                // console.log('全部提交', selectArr);
+
                 if (selectArr.length === 0) {
                     return this.$message.warning("暂无提交内容！");
                 }
@@ -1654,7 +1655,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};
@@ -1886,14 +1886,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);
                 }
 
@@ -2313,7 +2313,7 @@
              */
             sureCompleteSign() {
                 let checkedUserArr = this.$refs.completeSignRef.chooseUsers || [];
-                if (checkedUserArr.length == 0) {
+                if (checkedUserArr.length === 0) {
                     this.$message({type: "error", message: "请选择加签人！"});
                     return;
                 }
@@ -2344,7 +2344,7 @@
              */
             sureTurnSign() {
                 let checkedUserArr = this.$refs.turnSignRef.chooseUsers || [];
-                if (checkedUserArr.length == 0) {
+                if (checkedUserArr.length === 0) {
                     this.$message({type: "error", message: "请选择转签人！"});
                     return;
                 }
@@ -2723,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"}),
@@ -2851,7 +2854,7 @@
                                 this.$forceUpdate();
                             }
                             // 加载工作流脚本与工作流事件规则
-                            this.initFlowScript(this.flowData.flowId).then(() => {
+                            this.initFlowScript().then(() => {
                                 resolve(true);
                             })
                         });
@@ -2924,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);
                     });
                 });
             },
@@ -2937,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){
@@ -3344,10 +3347,10 @@
             },
 
             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) {
+                } else if (this.showInfo === "form" && this.$refs[tab.name + "Ref"] && this.$refs[tab.name + "Ref"].getDataRows) {
                     this.$refs[tab.name + "Ref"].getDataRows();
                     this.initTabNum();
                 }
@@ -3362,6 +3365,7 @@
             },
 
             initFlowObj() {//处理流程定义对象
+                this.isRefreshGetNextUsers = [];
                 let gatewayFields = this.flowDefine.gatewayFields || "";
                 this.isRefreshGetNextUsers = gatewayFields.split(",");
                 Object.keys(this.allNodeInfo).forEach(key => {
@@ -3375,22 +3379,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;
+                    }
                 }
             },