sasp-flow-render 1.1.5 → 1.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasp-flow-render",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "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/flowInstList.vue

@@ -1,6 +1,6 @@
 <template>
     <el-container style="height: 100%;">
-        <el-header style="height: auto;">
+        <el-header style="height: auto;" :class="[{'multiInstListHeader': flowIds.includes(',')}]">
             <div class="search-form-parent el-card">
                 <el-form :inline="true" :model="crud.searchForm" size="small" class="demo-form-inline"
                          @keyup.enter.native="doSearch()" onSubmit="return false;">
@@ -82,7 +82,7 @@
                     <el-button type="primary" icon="el-icon-document-copy" size="small" round v-if="isShow('pending')"
                                @click="openFlowBatchPendingDialog">批量处理
                     </el-button>
-                    <el-button type="warning" icon="el-icon-document-copy" size="small" round v-if="isShow('pending')"
+                    <el-button type="warning" icon="el-icon-document-copy" size="small" round v-if="isShow('pending') && getFormDataByDataIds"
                                @click="openFlowBatchPendingDialogNew">快捷处理
                     </el-button>
                 </el-header>
@@ -296,6 +296,7 @@
                 }
             },//工作流配置信息
             formId: {type: String, default: ""},
+            flowIds: {type: String, default: ""},
             startNodeKey: {type: String, default: ""},//开始节点key
             flowNodeIdToInfo: {
                 type: Object, default: () => {
@@ -564,22 +565,22 @@
             },
 
             init() {
-                this.crud.searchForm["flowId"] = this.flowDefine.id;
+                this.crud.searchForm["flowId"] = this.flowIds || this.flowDefine.id;
                 this.$set(this.crud.searchForm,"currentNode","");
                 let flowStatus = this.flowStatusObj[this.tabType];
-                if(!flowStatus && flowStatus != 0){
+                if(!flowStatus && flowStatus !== 0){
                     flowStatus = "";
                 }
                 this.crud.searchForm["nodeType"] = this.tabType;
-                if (this.tabType == "draft") {
+                if (this.tabType === "draft") {
                     this.crud.searchForm["created"] = this.loginUser.id;
                 }
-                if (this.tabType == "pending" || this.tabType == "processed" || this.tabType == "finished"
-                    || this.tabType == "rescinded" || this.tabType == "discontinue") {
+                if (this.tabType === "pending" || this.tabType === "processed" || this.tabType === "finished"
+                    || this.tabType === "rescinded" || this.tabType === "discontinue") {
                     this.crud.searchForm["dealUserId"] = this.loginUser.id;
                     flowStatus = this.flowStatusObj[this.tabType] || "1";
                 }
-                if(this.tabType == "flowQuery"){
+                if(this.tabType === "flowQuery"){
                     this.crud.searchForm["instQueryPower"] = this.instQueryPower;
                     this.crud.searchForm["created"] = this.loginUser.id;
                     this.crud.searchForm["queryOrderSetting"] = this.flowDefine.queryOrderSetting;
@@ -849,15 +850,20 @@
              * 按钮操作事件
              */
             listButtonOpt(buttonType, row, type) {
-                if (buttonType == "update") {//修改
-                    this.openUpdateFlowForm(row,'update');
-                } else if (buttonType == "deal") {//处理
-                    this.openUpdateFlowForm(row,'handle');
-                } else if (buttonType == "view") {//查看
+                if (buttonType === "update") {
+                    //修改
+                    this.openUpdateFlowForm(row, 'update');
+                } else if (buttonType === "deal") {
+                    //处理
+                    this.openUpdateFlowForm(row, 'handle');
+                } else if (buttonType === "view") {
+                    //查看
                     this.openViewFlowForm(row);
-                } else if (buttonType == "flowChart") {
+                } else if (buttonType === "flowChart") {
+                    //流程图
                     this.openFlowChart(row);
-                } else if (buttonType == "flowRecord") {
+                } else if (buttonType === "flowRecord") {
+                    // 流转记录
                     this.openFlowRecord(row);
                 }
             },
@@ -1034,6 +1040,9 @@
 
 <style scoped lang="scss">
     @import "css/flowInstList";
+    .multiInstListHeader {
+        margin-top: 10px;
+    }
 </style>
 <style lang="scss">
     .el-tooltip__popper{

package/src/components/flowInst/flowInstTab.vue

@@ -1,12 +1,39 @@
 <template>
     <div class="flow-inst" style="height: 100%;background-color: white;">
-        <div class="flow-chart" style="z-index:100;position:absolute;top:9px;right:0;text-align: right;">
+        <div class="flow-chart" style="z-index:100;position:absolute;top:9px;right:0;text-align: right;" v-if="!flowId.includes(',')">
             <el-button size="mini" style="margin-right: 12px;"
                        type="warning" round icon="saspiconfont pl-icon-gongzuoliuchengtu"
                        @click="openFlowChart()">流程图
             </el-button>
         </div>
 
+        <div style="height: 100%" v-if="flowId.includes(',')">
+            <flow-inst-list ref="pendingRef"
+                            v-if="initSuccess"
+                            tab-type="pending"
+                            :flow-define="flowDefine"
+                            :flow-ids="flowId"
+                            :userArr="userArr"
+                            :userMap="userMap"
+                            :form-id="formInfo.formId"
+                            :flow-node-id-to-info="flowNodeIdToInfo"
+                            :flow-node-name-obj="flowNodeNameObj"
+                            :node-list-button-obj="nodeListButtonObj"
+                            :opt-column-width="optColumnWidth"
+                            :show-model="showModel"
+                            :start-node-key-obj="startNodeKeyObj"
+                            :flow-version-node-obj="flowVersionNodeObj"
+                            @initTabNum="initTabNum"
+                            :open-flow-chart="openFlowChart"
+                            :open-flow-record="openFlowRecord"
+                            :open-update-flow-form="openUpdateFlowForm"
+                            :open-batch-update-flow-form="openBatchUpdateFlowForm"
+                            :openNewBatchUpdateFlowForm="openNewBatchUpdateFlowForm"
+                            @setDataValue="setDataValue"
+            >
+            </flow-inst-list>
+        </div>
+        <div style="height: 100%" v-else>
         <el-tabs v-model="tabActive" v-if="initSuccess" type="border-card" @tab-click="tabClick"
                  style="width: 100%;height: 100%;">
             <el-tab-pane name="draft" v-if="tabShow('draft')" style="height: 100%;" :lazy="true">
@@ -120,7 +147,7 @@
                 </flow-inst-list>
             </el-tab-pane>
             <el-tab-pane name="rescinded" v-if="tabShow('rescinded')" :lazy="true">
-               <span slot="label">
+                <span slot="label">
                     <i v-if="tabTypeObj['showTabIcon']" :class="tabTypeObj['rescinded'].iconShow"></i>
                     {{tabTypeObj['showtTabText']? tabTypeObj['rescinded'].tabName : ''}}
                    <span style="color: red">({{numberObj['rescinded']}})</span>
@@ -145,7 +172,7 @@
                 </flow-inst-list>
             </el-tab-pane>
             <el-tab-pane name="discontinue" v-if="tabShow('discontinue')" :lazy="true">
-               <span slot="label">
+                <span slot="label">
                     <i v-if="tabTypeObj['showTabIcon']" :class="tabTypeObj['discontinue'].iconShow"></i>
                     {{tabTypeObj['showtTabText']? tabTypeObj['discontinue'].tabName : ''}}
                    <span style="color: red">({{numberObj['discontinue']}})</span>
@@ -170,7 +197,7 @@
                 </flow-inst-list>
             </el-tab-pane>
             <el-tab-pane name="flowQuery" v-if="tabShow('flowQuery')" :lazy="true">
-               <span slot="label">
+                <span slot="label">
                     <i v-if="tabTypeObj['showTabIcon']" :class="tabTypeObj['flowQuery'].iconShow"></i>
                     {{tabTypeObj['showtTabText']? tabTypeObj['flowQuery'].tabName : ''}}
                 </span>
@@ -195,6 +222,7 @@
                 </flow-inst-list>
             </el-tab-pane>
         </el-tabs>
+        </div>
 
         <!--处理、修改、查看流程信息弹窗-->
         <el-dialog :close-on-click-modal=false top="5vh" width="90%" height="90%" :visible.sync="flowInstDataDialog" append-to-body
@@ -280,16 +308,17 @@
         </el-dialog>
 
         <!--新版批量处理信息弹窗-->
-        <el-dialog title="批量处理" :close-on-click-modal=false top="5vh" width="90%" height="90%" :visible.sync="flowBatchSelectPendingDialog"
+        <el-dialog title="快捷处理" :close-on-click-modal=false top="5vh" width="90%" height="90%" :visible.sync="flowBatchSelectPendingDialog"
                    @close="newBatchDealClose" class="batchSelectDialog" append-to-body>
             <flow-new-batch-deal v-if="flowBatchSelectPendingDialog" :formSearchObj="formSearchObj" ref="flowNewBatchDealRef"
                                  :formDataObj="formDataObj" :allNodeInfo="allNodeInfo" :newBatchDealSubmit="newBatchDealSubmit"
                                  @openCurrUpdateFlowForm="openCurrUpdateFlowForm" :isRefreshGetNextUsers="isRefreshGetNextUsers"
                                  :userMap="userMap" :fieldSysDataObj="fieldSysDataObj" :sysDataObj="sysDataObj" :formFieldObj="formFieldObj"
+                                 :currentPage="currentPage" :total="total" :pages="pages" @changePage="changePage"
             >
             </flow-new-batch-deal>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" size="small" @click="newBatchDealAllSubmit">全部提交</el-button>
+                <el-button type="primary" size="small" @click="newBatchDealAllSubmit">快速提交</el-button>
                 <el-button size="small" @click="flowBatchSelectPendingDialog = false">取消</el-button>
             </div>
         </el-dialog>
@@ -415,7 +444,7 @@
                    :visible.sync="flowChartObj.dialogVisible"
                    width="90%" height="90%"
                    top="5vh">
-            <flow-chart :flow-id="flowId + ''" :inst-id="flowChartObj.instId + ''"
+            <flow-chart :flow-id="flowChartObj.flowId + ''" :inst-id="flowChartObj.instId + ''"
                         :link-proc-id="flowChartObj.linkProcId + ''"
                         :is-release="flowChartObj.isRelease"
                         v-if="flowChartObj.dialogVisible"></flow-chart>
@@ -519,6 +548,7 @@
                 loginUser: {},//当前登录用户
                 userDept: {},//当前登录用户所在部门信息
                 flowDefine: {},
+                flowDefineByFlowId: {},
                 flowNodeIdToInfo: {},//key为id
                 flowNodeNameObj:{}, //节点名称对应节点id分组
                 draftNodeId:"", // 草稿节点id
@@ -880,8 +910,10 @@
                 isShowAgentSet:false,//是否显示流程设置
                 loadAgentSuccess:false,//是否显示流程设置
 
-                startNodeKeyObj:{}, //当前开始节点 key 和对应版本号
-                flowVersionNodeObj:{}, //版本号对应的节点对象
+                startNodeKeyObj: {}, //当前开始节点 key 和对应版本号
+                startNodeKeyObjByFlowId: {},
+                flowVersionNodeObj: {}, //版本号对应的节点对象
+                flowVersionNodeObjByFlowId: {},
                 parentListViewId:"",
                 parentTableViewId:"",
                 scriptObj:{},
@@ -899,7 +931,8 @@
                     taskNode: "",
                     flowNewBatchDealArr: [],
                     isNewSelectBatchDeal: false,
-                    loading: true
+                    loading: true,
+                    isInit: false
                 },
                 formDataObj: {},
                 formNewBtnArr: [],
@@ -930,6 +963,10 @@
                 isRefreshGetNextUsers: [], // 是否要刷新下一步处理人的字段，网关字段，表单，变量
                 fieldSysDataObj: {},
                 flowNewBatchDealDataIds: "",
+                currentPage: 1, //当前页
+                pages: 1, //总页数
+                total: 0, //总条数
+                pageSize: 50, //每页多少条
             }
         },
         watch:{
@@ -956,21 +993,28 @@
             this.isShowAgentSet = false;
             this.loginUser = this.FLOW_CACHE_GLOBAL.getLoginUser();
             this.userDept = this.FLOW_CACHE_GLOBAL.getLoginDept();
-            this.initTabOpts(); // 初始化外部选项卡权限
-
-            this.getFlowInfo().then(res => {
-                this.initSuccess = true;
-                this.initFlowObj();
-                this.getFlowAgent(); //加载流程代理
-                // this.initFieldSysData();
-            });
-            this.initTabNum();
-            // this.initWorkStageTurnOn();
+
+            if (this.flowId.includes(",")) {
+                this.getMultiFlowInfo().then(() => {
+                    this.initSuccess = true;
+                    this.getFlowAgent();
+                });
+            }else {
+                this.initTabOpts(); // 初始化外部选项卡权限
+                this.getFlowInfo().then(res => {
+                    this.initSuccess = true;
+                    this.initFlowObj();
+                    this.getFlowAgent(); //加载流程代理
+                    // this.initFieldSysData();
+                });
+                this.initTabNum();
+            }
         },
         methods: {
             // 新批量处理关闭弹框时数据重做的回调
             newBatchDealClose() {
-                Object.assign(this.formSearchObj, {isNewSelectBatchDeal: false});
+                Object.assign(this.formSearchObj, {isNewSelectBatchDeal: false, taskNode: ""});
+                this.currentPage = 1;
                 // let flowInstListVm = this.$refs["pendingRef"];
                 // if (flowInstListVm) {
                 //     flowInstListVm.initFormDataByDataIds();
@@ -1080,6 +1124,12 @@
             initUpdateFlowForm(row) {
                 this.currentRowData = row;
                 this.currNodeName = 'noEnd';
+                if (this.flowId.includes(',')) {
+                    this.flowDefine = this.flowDefineByFlowId[row.flowId];
+                    this.startNodeKeyObj = this.startNodeKeyObjByFlowId[row.flowId];
+                    this.flowVersionNodeObj = this.flowVersionNodeObjByFlowId[row.flowId];
+                    // Object.assign(this.formInfo, this.formInfoByFlowId[row.flowId]);
+                }
 
                 return new Promise(resolve => {
                     let startNodeKey =  this.startNodeKeyObj[row.version];
@@ -1106,12 +1156,17 @@
             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(() => {
                         this.exeFlowEvent(executePosition,"afterClick",row.currentNode);
                         let currentNodeObj = this.flowNodeIdToInfo[row.currentNode] ||{};
-                        if(currentNodeObj.openEvent== '1'){ //开启事件
+                        if(currentNodeObj.openEvent === '1'){ //开启事件
                             this.exeNewFlowEvent("editAfter",currentNodeObj.nodeLinkId ||'');//新事件规则
                         }
                     })
@@ -1179,7 +1234,8 @@
                 Object.assign(this.formSearchObj, {
                     flowNewBatchDealArr: [],
                     isNewSelectBatchDeal: false,
-                    loading:true
+                    loading: true,
+                    isInit: false
                 });
                 this.initFieldSysData();
                 // 处理按钮渲染
@@ -1190,6 +1246,9 @@
                 });
                 this.formNewBtnArr = btnArr;
                 this.initNewBatchDeal().then(arr => {
+                    Object.assign(this.formSearchObj, {
+                        isInit: true,
+                    });
                     this.getFormDataByDataIds(this.formInfo.formId, this.flowNewBatchDealDataIds).then(res => {
                         this.formDataObj = res || {};
                         arr.forEach(flowInst => {
@@ -1234,7 +1293,7 @@
                         Object.assign(this.formSearchObj, {
                             flowNewBatchDealArr: arr,
                             isNewSelectBatchDeal: true,
-                            loading:false
+                            loading: false
                         });
                     });
                 });
@@ -1246,12 +1305,17 @@
                 return new Promise(resolve => {
                     this.saspFlowAxios.post(this.api.plFlowInst.findInstPending, {
                         flowId: this.flowDefine.id,
-                        currentNode: "",
+                        currentNode: this.formSearchObj.taskNode,
                         nodeType: "pending",
                         dealUserId: this.loginUser.id,
                         flowStatus: "1",
-                        flowVar: "1"
+                        flowVar: "1",
+                        rows: this.pageSize,
+                        page: this.currentPage
                     }).then(res => {
+                        // console.log('initNewBatchDeal', res);
+                        this.total = res.data.total;
+                        this.pages = res.data.pages;
                         let flowNewBatchDeal = [];
                         this.flowNewBatchDealDataIds = "";
                         if (res.data && res.data.records.length > 0) {
@@ -1275,6 +1339,11 @@
                 });
             },
 
+            changePage(currPage) {
+                this.currentPage = currPage;
+                this.openNewBatchUpdateFlowForm();
+            },
+
             // 新批量处理当前行点击编辑按钮打开弹框回调事件
             openCurrUpdateFlowForm(row) {
                 this.openUpdateFlowForm(row, "update");
@@ -1327,9 +1396,10 @@
                 if (selectionArr.length === 0) {
                     return this.$message.warning('请先勾选要提交的数据！');
                 }
+                // 判断是否选择了下一步处理人
                 let str = "即将提交" + selectionArr.length + "条数据";
                 if(submitType === "all"){
-                    str = "即将全部提交（不包括正在loading加载的数据）";
+                    str = "即将提交当前显示内容（不包括正在加载的数据）";
                 }
                 this.$confirm(`${str}, 确认是否继续?`, '提示', {
                     confirmButtonText: '确定',
@@ -1338,42 +1408,33 @@
                 }).then(() => {
                     let params = [];
                     let instIds = "";
+                    let nextStepSelectionArr = [];
                     selectionArr.forEach(selectionObj => {
                         let paramsObj = {dataId: selectionObj.dataId};
                         let updateParams = {};
                         (selectionObj.settingInfo || []).forEach(item => {
                             updateParams[item.field] = item.defaultValue;
                         });
-                        paramsObj["updateParams"] = updateParams;
-                        params.push(paramsObj);
-                        if (selectionObj.flowInstId) {
-                            instIds += `,${selectionObj.flowInstId}`;
+                        if (Object.keys(updateParams).length > 0) {
+                            paramsObj["updateParams"] = updateParams;
+                            params.push(paramsObj);
                         }
-                    });
-                    // console.log(this.flowDefine, this.allNodeInfo, '提交', selectionArr);
-                    this.saveBatchDealFormData(this.formInfo.formId, JSON.stringify(params)).then(resData => {
-                        if (resData.operateSuccess) {
-                            // 更新工作流状态
-                            this.saspFlowAxios.post(this.api.plFlowInst.batchUpdateFlowStatus, {
-                                instIds: instIds.slice(1)
-                            }).then(updateFlowStatusRes => {
-                                let type = "error";
-                                let message = updateFlowStatusRes.data.operateMessage;
-                                if (updateFlowStatusRes && updateFlowStatusRes.data.operateSuccess) {
-                                    type = "success";
-                                    // 执行工作流下一步
-                                    this.newBatchExecuteNextStep(selectionArr);
-                                    let pendingRefVm = this.$refs["pendingRef"];
-                                    pendingRefVm && pendingRefVm.init();
-                                    this.flowBatchSelectPendingDialog = false;
-                                }
-                                this.$message({
-                                    type,
-                                    message
-                                });
-                            });
+                        let flag = selectionObj.flowInstId;
+                        if (flag || selectionObj.isEndNode) {
+                            instIds += `,${selectionObj.flowInstId}`;
+                            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) {
+                                this.batchUpdateFlow(instIds, nextStepSelectionArr);
+                            }
+                        });
+                    }else {
+                        this.batchUpdateFlow(instIds, nextStepSelectionArr);
+                    }
                 }).catch(() => {
                     this.$message({
                         type: 'info',
@@ -1382,6 +1443,35 @@
                 });
             },
 
+            batchUpdateFlow(instIds, nextStepSelectionArr) {
+                if (!instIds) {
+                    return this.$message.warning("instIds不能为空！");
+                }
+                // 更新工作流状态
+                this.saspFlowAxios.post(this.api.plFlowInst.batchUpdateFlowStatus, {
+                    instIds: instIds.slice(1)
+                }).then(updateFlowStatusRes => {
+                    let type = "error";
+                    let message = updateFlowStatusRes.data.operateMessage;
+                    if (updateFlowStatusRes && updateFlowStatusRes.data.operateSuccess) {
+                        type = "success";
+                        // 执行工作流下一步
+                        this.newBatchExecuteNextStep(nextStepSelectionArr);
+                        // 提交完之后刷新页面，不关闭弹窗
+                        this.currentPage = 1;
+                        this.openNewBatchUpdateFlowForm();
+
+                        let pendingRefVm = this.$refs["pendingRef"];
+                        pendingRefVm && pendingRefVm.init();
+                        // this.flowBatchSelectPendingDialog = false;
+                    }
+                    this.$message({
+                        type,
+                        message
+                    });
+                });
+            },
+
             // 流程批量审批，全部提交
             newBatchDealAllSubmit() {
                 let flowNewBatchDealVm = this.$refs.flowNewBatchDealRef;
@@ -1392,6 +1482,9 @@
                     }
                 });
                 // console.log('全部提交', selectArr);
+                if (selectArr.length === 0) {
+                    return this.$message.warning("暂无提交内容！");
+                }
                 this.newBatchDealSubmit(selectArr, "all");
             },
 
@@ -1400,24 +1493,38 @@
                 arr.forEach(items => {
                     let nextNodeObj = this.allNodeInfo[items.nextDealUsers.nextNodeId];
                     let dealers = items.chooseNextUserId;
+                    if (Array.isArray(items.chooseNextUserId)) {
+                        dealers = items.chooseNextUserId.join(",");
+                    }
                     let dealersObj = {};
-                    dealersObj[nextNodeObj["nodeLinkId"]] = dealers;
-
+                    dealersObj[(nextNodeObj || {})["nodeLinkId"]] = dealers;
                     let nextStepBaseObj = {
+                        flowSaveSuccess: true,
+                        flowDataId: items.dataId,
+                        flowInstId: items.flowInstId,
                         instId: items.flowInstId,
                         dealers: dealers,
                         // dealerNames: dealerNames,
                         dealersObj: JSON.stringify(dealersObj),
-                        nextNodeType: nextNodeObj.nodeType,
-                        nextNodeId: nextNodeObj.id,
-                        nextNodeKey: nextNodeObj.nodeLinkId,
                         taskId: items.taskId,
                     }
+                    let nextNode = {};
+                    if (nextNodeObj) {
+                        nextNode = {
+                            nextNodeType: nextNodeObj.nodeType,
+                            nextNodeId: nextNodeObj.id,
+                            nextNodeKey: nextNodeObj.nodeLinkId,
+                        }
+                    }
+                    let nowNodeObj = this.allNodeInfo[items.currentNode];
+                    if (nowNodeObj && nowNodeObj.dealType === 'multi') {
+                        this.$set(nextStepBaseObj, 'passCondition', nowNodeObj.passCondition);
+                    }
                     // if(this.flowNextOperation) {
                     //     this.flowNextOperation(obj.instId, obj.dealers, obj.dealerNames, obj.taskId);
                     // }
                     let paramsSourceObj = {"SASP_FLOW_USE_VARIABLES": "yes"};
-                    Object.assign(paramsSourceObj, {}, nextStepBaseObj);
+                    Object.assign(paramsSourceObj, nextStepBaseObj, nextNode);
                     params.push(paramsSourceObj);
                 });
                 // console.log('params',params);
@@ -1526,18 +1633,20 @@
 
             /**
              * 打开流程图窗口
-             * @param instId 流程实例ID
+             * @param row 流程实例ID
              */
             openFlowChart(row) {
+                let flowId = "";
                 let instId = "";
                 let linkProcId = "";
                 let isRelease = "";
-                if(row){
+                if (row) {
+                    flowId = row.flowId;
                     instId = row.flowInstId;
                     linkProcId = row.linkProcId;
                     isRelease = row.isRelease;
                 }
-                this.flowChartObj = {instId: instId,linkProcId:linkProcId,isRelease:isRelease, dialogVisible: true};
+                this.flowChartObj = {flowId: flowId,instId: instId,linkProcId:linkProcId,isRelease:isRelease, dialogVisible: true};
             },
 
             /**
@@ -1545,10 +1654,11 @@
              * @param row 流程行数据
              */
             openFlowRecord(row) {
-                let arr = ["2","3","4"]; // 旧版本的已办结已撤销以及已中止数据通过旧版接口查询流转记录
-                if(arr.indexOf(row.flowStatus) > -1 && row.isOldData == "1"){
+                console.log('流转记录',row);
+                let arr = ["2", "3", "4"]; // 旧版本的已办结已撤销以及已中止数据通过旧版接口查询流转记录
+                if (arr.indexOf(row.flowStatus) > -1 && row.isOldData === "1") {
                     this.flowRecordObj = {instId: row.flowInstId || "", oldDialogVisible: true};
-                }else{
+                } else {
                     this.flowRecordObj = {instId: row.flowInstId || "", dialogVisible: true};
                 }
             },
@@ -1804,7 +1914,20 @@
                         this.$set(obj,'passCondition',this.nowNode.passCondition)
                     }
                     let params = {"SASP_FLOW_USE_VARIABLES":"yes"};
-                    Object.assign(params,flowParams || {},obj);
+                    // Object.assign(params,flowParams || {},obj);
+                    Object.assign(params,obj);
+                    let allParamKeys = Object.keys(flowParams || {});
+                    allParamKeys.forEach(templateKey => {
+                        if(this.isRefreshGetNextUsers.indexOf(templateKey) > -1){
+                            params[templateKey] = flowParams[templateKey];
+                            if(allParamKeys.indexOf(templateKey + "_SASP_SYS_DATA") > -1){
+                                params[templateKey + "_SASP_SYS_DATA"] = flowParams[templateKey + "_SASP_SYS_DATA"];
+                            }
+                            if(allParamKeys.indexOf(templateKey + "_SASP_SYS_DATA_ID") > -1){
+                                params[templateKey + "_SASP_SYS_DATA_ID"] = flowParams[templateKey + "_SASP_SYS_DATA_ID"];
+                            }
+                        }
+                    })
                     this.saspFlowAxios.post(this.api.plFlowInst.getNextUsers, params).then(res => {
                         if(!res.data.operateSuccess){
                             this.isDisabled['nextStep'] = true;
@@ -1923,6 +2046,9 @@
                                 this.chooseNextUserId = userInfo.id;
                                 this.chooseNextUserName = userInfo.userName;
                             }
+                            if(this.nextNode.dealType === "multi" && this.nextSteptUserArr.length === 1){
+                                this.chooseNextUserId = [userInfo.id];
+                            }
                         }
                     });
                 });
@@ -2725,7 +2851,7 @@
                                 this.$forceUpdate();
                             }
                             // 加载工作流脚本与工作流事件规则
-                            this.initFlowScript().then(() => {
+                            this.initFlowScript(this.flowData.flowId).then(() => {
                                 resolve(true);
                             })
                         });
@@ -2738,14 +2864,84 @@
                 });
             },
 
+            getMultiFlowInfo() {
+                return new Promise(resolve => {
+                    let flowIdArr = this.flowId.split(",").filter(item => item);
+                    flowIdArr.forEach(flowId => {
+                        this.FLOW_GLOBAL.getFlowDefineById(flowId).then(flowDefine => {
+                            this.flowDefineByFlowId[flowId] = flowDefine;
+                        });
+                    });
+
+                    const initFlowNodeFunc = flowIdArr.map(flowId => (() => this.FLOW_GLOBAL.getFlowNodesByFlowId(flowId)));
+                    Promise.all(initFlowNodeFunc.map(func => func())).then(allFlowNodeArr => {
+                        //工作流节点
+                        this.startNodeKey = "Activity_draft";
+                        for (const allFlowNode of allFlowNodeArr) {
+                            this.startNodeKeyObj = {};
+                            this.flowVersionNodeObj = {};
+                            (allFlowNode || []).forEach(item => {
+                                if (item.nodeLinkId.indexOf("Activity_draft") > -1) {
+                                    this.startNodeKey = item.nodeLinkId;
+                                    this.startNodeKeyObj[item.version] = item.nodeLinkId; //开始节点对应版本号
+                                }
+                                if (!this.flowVersionNodeObj[item.version]) {
+                                    this.$set(this.flowVersionNodeObj, item.version, {});
+                                }
+                                this.$set(this.flowVersionNodeObj[item.version], item.nodeLinkId, item); //版本节点对象
+
+                                this.allNodeInfo[item.id] = item;
+                                this.flowNodeIdToInfo[item.id] = item;
+                                let nodeArr = ['StartEvent', 'ParallelGateway', 'SequenceFlow', 'ExclusiveGateway', 'InclusiveGateway'];
+                                if (item.nodeType && nodeArr.indexOf(item.nodeType) === -1) {
+                                    if (!this.flowNodeNameObj[item.nodeLinkId]) {
+                                        this.$set(this.flowNodeNameObj, item.nodeLinkId, item.nodeName);
+                                    } else {
+                                        if (this.flowNodeNameObj[item.nodeLinkId] !== item.nodeName) {
+                                            this.flowNodeNameObj[item.nodeLinkId] = this.flowNodeNameObj[item.nodeLinkId] + "," + item.nodeName;
+                                        }
+                                    }
+                                }
+                                if (item.nodeType === "UserTask" && (item.nodeLinkId || "").indexOf("Activity_draft") > -1) {
+                                    this.draftNodeId = item.id; // 草稿节点id
+                                }
+                                // 行按钮
+                                let listButton = JSON.parse(item.listButton || "[]") || [];
+                                listButton.forEach(button => {
+                                    button.showName = button.showName ? button.showName : this.listButtonObj[button.type];
+                                });
+                                this.nodeListButtonObj[item.id] = listButton;
+
+                                // 表单按钮
+                                let formButton = JSON.parse(item.formButton || "[]") || [];
+                                formButton.forEach(button => {
+                                    button.showName = button.showName ? button.showName : this.formButtonObj[button.type];
+                                });
+
+                                this.nodeFormButtonObj[item.id] = this.sortButtonArr(formButton);
+                                this.nodeFormBtnObj[item.id] = this.formatterFormButton(formButton);
+                            });
+                            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);
+                            });
+                        }
+                    });
+                });
+            },
+
             /**
              *  加载工作流脚本与工作流事件规则
              */
-            initFlowScript(){
+            initFlowScript(flowId){
                 return new Promise(resolve => {
                     this.saspFlowAxios.all([
-                        this.saspFlowAxios.post(this.api.plFlowScript.find,{"flowId":this.flowData.flowId}),
-                        this.saspFlowAxios.post(this.api.plFlowEventDetail.findByFlowAndLeadFunc,{"flowId":this.flowData.flowId,"version":this.flowDefine.flowVersion||"1.0"})
+                        this.saspFlowAxios.post(this.api.plFlowScript.find,{"flowId": flowId}),
+                        this.saspFlowAxios.post(this.api.plFlowEventDetail.findByFlowAndLeadFunc,{"flowId": flowId,"version":this.flowDefine.flowVersion || "1.0"})
                     ]).then(this.saspFlowAxios.spread((resScript, resEvent) => {
                         // 流程脚本
                         if(resScript){
@@ -3044,7 +3240,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); // 执行事件
                     });
@@ -3084,7 +3280,7 @@
                         }
                     });
                 }catch (e) {
-                    console.log(e);
+                    // console.log(e);
                     result=false;
                 }
 

package/src/components/flowNewBatchDeal.vue

@@ -1,23 +1,27 @@
 <template>
     <el-container style="height: 100%">
         <el-header style="height: auto">
-            <el-form inline size="small" class="search-form-parent el-card" style="flex-shrink: 0">
+            <el-form inline size="small" class="search-form-parent el-card">
                 <el-form-item label="任务节点筛选">
                     <el-select v-model="formSearchObj.taskNode" style="width: 97%;"
                                clearable filterable @change="taskNodeChange">
                         <el-option v-for="item in taskNodeArr" :key="item.currentNode"
                                    :label="item.currentNodeName"
-                                   :value="item.currentNode">
+                                   :value="item.nodeKey">
                         </el-option>
                     </el-select>
                 </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" @click="doSearch()">查询</el-button>
+                    <el-button icon="el-icon-close" @click="clearSearch()">清空</el-button>
+                </el-form-item>
             </el-form>
         </el-header>
         <el-main style="padding-top: 10px;padding-bottom: 0">
             <div style="margin-bottom: 10px;">
                 <el-button type="primary" size="small" @click="partSubmit">提交</el-button>
             </div>
-            <el-form size="small" style="height: calc(100% - 42px)">
+            <el-form size="small" style="height: calc(100% - 42px);position: relative">
                 <el-table
                     v-loading="formSearchObj.loading"
                     element-loading-text="正在加载，请稍等..."
@@ -196,6 +200,15 @@
                 </el-table>
             </el-form>
         </el-main>
+        <el-footer style="height: auto;text-align: right;padding-top: 15px;margin-bottom: -7px" v-show="isShowPage">
+            <el-button-group>
+                <el-button size="small" icon="el-icon-arrow-left" :disabled="prevDisabled" @click="prevClick">上一页</el-button>
+                <el-button size="small" :disabled="nextDisabled" @click="nextClick">下一页<i class="el-icon-arrow-right el-icon--right"></i></el-button>
+            </el-button-group>
+            <div style="display: inline-block;vertical-align: middle">
+                <span style="padding-left: 10px">第{{ currentPage }}页，</span><span>共{{ total }}条</span>
+            </div>
+        </el-footer>
     </el-container>
 </template>
 
@@ -212,6 +225,9 @@ export default {
         fieldSysDataObj: {type: Object, default: () => ({})},
         sysDataObj: {type: Object, default: () => ({})},
         formFieldObj: {type: Object, default: () => ({})},
+        currentPage: {type: Number, default: 1},
+        pages: {type: Number, default: 1},
+        total: {type: Number, default: 0},
     },
     data() {
         return {
@@ -220,6 +236,9 @@ export default {
             shLabelWidth: "100px",
             taskNodeArr: [],
             taskNodeClickNum: 0,
+            prevDisabled: true,
+            nextDisabled: true,
+            isShowPage: false,
             // dateTypeObj: {
             //     "yyyy-MM-dd HH:mm:ss": {category: "date",type: "datetime", value: "yyyy-MM-dd HH:mm:ss", label: "年-月-日 时:分:秒"},
             //     "yyyy-MM-dd": {category: "date",type: "date", value: "yyyy-MM-dd", label: "年-月-日"},
@@ -240,11 +259,31 @@ export default {
             if(!this.formSearchObj.loading){ // 等到列表数据加载完毕后，即loading消失后初始化数据
                 let flowNewBatchDealArr = JSON.parse(JSON.stringify(this.formSearchObj.flowNewBatchDealArr));
                 flowNewBatchDealArr.forEach(item => {
-                    let obj = {currentNode: item.currentNode, currentNodeName: item.currentNodeName};
+                    let obj = {currentNode: item.currentNode, currentNodeName: item.currentNodeName, nodeKey: item.nodeKey};
                     !this.taskNodeArr.some(taskNodeObj => taskNodeObj.currentNode === obj.currentNode) && this.taskNodeArr.push(obj);
                 });
                 this.initFlowBatchDeal(this.formSearchObj.flowNewBatchDealArr);
             }
+        },
+        'formSearchObj.isInit'() {
+            if (this.formSearchObj.isInit) {
+                // console.log(this.currentPage,this.pages);
+                // 判断是否要分页
+                if (this.pages <= 1) {
+                    this.isShowPage = false;
+                    return;
+                }
+                this.isShowPage = true;
+
+                this.prevDisabled = false;
+                this.nextDisabled = false;
+                if (this.currentPage === 1) {
+                    this.prevDisabled = true;
+                }
+                if (this.currentPage >= this.pages) {
+                    this.nextDisabled = true;
+                }
+            }
         }
     },
     methods: {
@@ -299,11 +338,16 @@ export default {
                 this.saspFlowAxios.post(this.api.plFlowInst.getNextUsers, paramsMap).then(res => {
                     // console.log('getNextUsers-request' + index, res);
                     if (res.data.operateSuccess) {
+                        let operateObj = res.data.operateObj || {nextNodeName: "", userArr: []};
+
                         let operateMap = JSON.parse(JSON.stringify(res.data.operateMap));
-                        if (operateMap && operateMap.isPassCondition === 0) {
+                        if (operateMap && operateMap.isPassCondition === 0 && !operateObj.nextNodeName) {
                             Object.assign(operateMap, {nextNodeName: "会签中...等待其他人处理完毕"});
+                        }else {
+                            if (operateMap && operateMap.hasOwnProperty('isPassCondition')) {
+                                delete operateMap.isPassCondition;
+                            }
                         }
-                        let operateObj = res.data.operateObj || {nextNodeName: "", userArr: []};
                         //获取下一个节点信息
                         let nextNodeObj = this.allNodeInfo[operateObj.nextNodeId] || {};
                         operateObj["multiChooseUser"] = nextNodeObj.dealType === "multi";
@@ -317,6 +361,7 @@ export default {
                             }
                         } else if (nextNodeObj.nodeType === "EndEvent") {
                             isEndNode = true;
+                            operateObj.nextNodeName = nextNodeObj.nodeName || "结束";
                         }
                         let userArr = operateObj.userArr || [];
                         if (userArr.length > 0) {
@@ -344,6 +389,15 @@ export default {
             });
         },
 
+        doSearch() {
+            this.$emit("changePage", 1);
+        },
+
+        clearSearch() {
+            this.$set(this.formSearchObj, "taskNode", "");
+            this.$emit("changePage", 1);
+        },
+
         // 选择提交
         partSubmit() {
             this.newBatchDealSubmit(this.multipleSelection);
@@ -395,46 +449,62 @@ export default {
             // console.log('是否禁用勾选', row, index);
             let flag = true;
             flag = (row.nextDealUsers.userArr || []).length > 0;
-            return !row.isLoading && flag;
+            return !row.isLoading;
+            // return (!row.isLoading && flag) || row.isEndNode;
         },
 
         taskNodeChange(val) {
-            if (!this.taskNodeClickNum) {
-                this.backNewBatchDealArr = JSON.parse(JSON.stringify(this.formSearchObj.flowNewBatchDealArr));
-                this.taskNodeClickNum++;
-            }
-            let arr = [];
-            if (val) {
-                arr = this.backNewBatchDealArr.filter(item => item.currentNode === val);
-            }else {
-                arr = this.backNewBatchDealArr;
-            }
-            this.$set(this.formSearchObj, "flowNewBatchDealArr", arr);
+            // if (!this.taskNodeClickNum) {
+            //     this.backNewBatchDealArr = JSON.parse(JSON.stringify(this.formSearchObj.flowNewBatchDealArr));
+            //     this.taskNodeClickNum++;
+            // }
+            // let arr = [];
+            // if (val) {
+            //     arr = this.backNewBatchDealArr.filter(item => item.currentNode === val);
+            // }else {
+            //     arr = this.backNewBatchDealArr;
+            // }
+            // this.$set(this.formSearchObj, "flowNewBatchDealArr", arr);
+        },
+
+        // 上一页事件
+        prevClick() {
+            this.$emit("changePage", this.currentPage - 1);
+        },
+
+        nextClick() {
+            this.$emit("changePage", this.currentPage + 1);
         },
     }
 }
 </script>
 
 <style scoped>
-.el-form .el-form-item {
+.el-form > .el-table .el-form-item {
     margin-bottom: 0;
 }
 
 .el-table::v-deep {
     tr > td.checkInfo .cell {
-        display: flex;
+        //display: flex;
+        position: relative;
 
         .sh-left-box {
             //width: 255px;
-            flex-grow: 1;
+            //flex-grow: 1;
+            padding-left: 16px;
+            padding-right: 16px;
         }
 
         .sh-right-box {
-            flex-shrink: 0;
-            width: 80px;
+            position: absolute;
+            top: 0;
+            right: 0;
+            //flex-shrink: 0;
+            //width: 80px;
             font-size: 26px;
             text-align: right;
-            margin-left: 20px;
+            //margin-left: 20px;
 
             .icon-edit {
                 color: #cccccc;
@@ -478,7 +548,8 @@ export default {
         user-select: none;
 
         &.isEndNode {
-            color: #FABDBD;
+            //color: #FABDBD;
+            color: #ffafaf;
         }
     }
 }