sasp-flow-render 1.1.3 → 1.1.6

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">
@@ -39,10 +66,10 @@
                 </flow-inst-list>
             </el-tab-pane>
             <el-tab-pane name="pending" v-if="tabShow('pending')" style="height: 100%;">
-               <span slot="label">
-                   <i v-if="tabTypeObj['showTabIcon']" :class="tabTypeObj['pending'].iconShow"></i>
-                    {{tabTypeObj['showtTabText']? tabTypeObj['pending'].tabName : ''}}
-                   <span style="color: red">({{numberObj['pending']}})</span>
+                <span slot="label">
+                    <i v-if="tabTypeObj['showTabIcon']" :class="tabTypeObj['pending'].iconShow"></i>
+                    {{ tabTypeObj['showtTabText'] ? tabTypeObj['pending'].tabName : '' }}
+                    <span style="color: red">({{ numberObj['pending'] }})</span>
                 </span>
                 <flow-inst-list ref="pendingRef"
                                 tab-type="pending"
@@ -58,11 +85,13 @@
                                 :start-node-key-obj="startNodeKeyObj"
                                 :flow-version-node-obj="flowVersionNodeObj"
                                 @initTabNum="initTabNum"
-
+                                :getFormDataByDataIds="getFormDataByDataIds"
                                 :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>
             </el-tab-pane>
@@ -118,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>
@@ -143,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>
@@ -168,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>
@@ -193,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
@@ -220,7 +250,7 @@
             <!--            </table-form-render>-->
 
             <div slot="footer" style="height:31px;" class="dialog-footer">
-                <div>
+                <div v-if="!formSearchObj.isNewSelectBatchDeal">
                     <el-button v-for="btn in formBtnArr" @click="btn.method" :disabled="isDisabled[btn.btnType]?false:true"
                                v-show="btn.show && ((formInfo.opt != 'view') || (formInfo.opt=='view' && btn.isView))"
                                :key="btn.btnType"
@@ -230,6 +260,14 @@
                         {{btn.text}}
                     </el-button>
                 </div>
+                <div v-else>
+                    <el-button v-for="btn in formNewBtnArr" @click="btn.method"
+                               :key="btn.btnType"
+                               :type="btn.type"
+                               :icon="btn.icon"
+                               size="small">{{btn.text}}
+                    </el-button>
+                </div>
             </div>
         </el-dialog>
 
@@ -269,7 +307,23 @@
             </div>
         </el-dialog>
 
+        <!--新版批量处理信息弹窗-->
+        <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 size="small" @click="flowBatchSelectPendingDialog = false">取消</el-button>
+            </div>
+        </el-dialog>
 
+        <!--流程下一步处理人选择弹窗-->
         <el-dialog :close-on-click-modal=false :title="'下一步' + (nextNodeName ? (isProceedNext?' -> ' + nextNodeName:'->等待他人处理') : '')"
                    :top="nextNode.nextType != 'inclusiveGateway' ? '20vh': '10vh'" append-to-body
                    width="500px" :visible.sync="nextSteptUserDialog" @closed="closeNextSteptUserDialog">
@@ -390,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>
@@ -446,18 +500,17 @@
     import FlowInstList from "./flowInstList";
     import FlowChart from "../flowChart";
     import FlowRoamRecord from "../flowRoamRecords";
-    import {AjaxUtil} from 'sasp-base';
-
-    // import {Replace} from "sasp-base";
+    import {AjaxUtil, Replace} from 'sasp-base';
     import RoamRecord from "../roamRecord";
     import UserSelect from "../userSelect";
+    import flowNewBatchDeal from "../../components/flowNewBatchDeal.vue";
     export default {
         name: "flow-inst-tab",
         components: {
             UserSelect,
             RoamRecord,
             FlowRoamRecord,
-            FlowChart, FlowInstList
+            FlowChart, FlowInstList, flowNewBatchDeal
         },
         props: {
             flowId: {type: String, default: ''},
@@ -476,6 +529,10 @@
             formImpMethod:{type: Function,default: null},
             flowImpParamObj: {type: Object,default: () => ({})},
             downloadTemplate: {type: Function, default: null},
+            getFormDataByDataIds: {type: Function, default: null},
+            saveBatchDealFormData: {type: Function, default: null},
+            formAboutInfoObj: {type: Object, default: () => ({})},
+            sysDataObj: {type: Object, default: () => ({})},
         },
         data() {
             let vm = this;
@@ -491,6 +548,7 @@
                 loginUser: {},//当前登录用户
                 userDept: {},//当前登录用户所在部门信息
                 flowDefine: {},
+                flowDefineByFlowId: {},
                 flowNodeIdToInfo: {},//key为id
                 flowNodeNameObj:{}, //节点名称对应节点id分组
                 draftNodeId:"", // 草稿节点id
@@ -517,6 +575,8 @@
 
                 // 批量处理
                 flowBatchPendingDialog: false,
+                // 选择性的批量多条一次性处理
+                flowBatchSelectPendingDialog: false,
                 batchUpdateFormInfo: {
                     formShow: false,
                     dataRows: [],
@@ -850,8 +910,10 @@
                 isShowAgentSet:false,//是否显示流程设置
                 loadAgentSuccess:false,//是否显示流程设置
 
-                startNodeKeyObj:{}, //当前开始节点 key 和对应版本号
-                flowVersionNodeObj:{}, //版本号对应的节点对象
+                startNodeKeyObj: {}, //当前开始节点 key 和对应版本号
+                startNodeKeyObjByFlowId: {},
+                flowVersionNodeObj: {}, //版本号对应的节点对象
+                flowVersionNodeObjByFlowId: {},
                 parentListViewId:"",
                 parentTableViewId:"",
                 scriptObj:{},
@@ -862,9 +924,49 @@
                 workListViews:{},
                 workTableViews:{},
                 currNodeName: "", //当前节点名称
-                nextUserInfo:{}, // 下一步处理人的信息
-                dataId:"", // 表单数据id
-                disableSign:false, // 禁用加签转签按钮
+                nextUserInfo: {}, // 下一步处理人的信息
+                dataId: "", // 表单数据id
+                disableSign: false, // 禁用加签转签按钮
+                formSearchObj: {
+                    taskNode: "",
+                    flowNewBatchDealArr: [],
+                    isNewSelectBatchDeal: false,
+                    loading: true,
+                    isInit: false
+                },
+                formDataObj: {},
+                formNewBtnArr: [],
+                newBatchDealBtnObj: {
+                    close: {
+                        text: "关闭",
+                        type: "",
+                        icon: "el-icon-close",
+                        show: true,
+                        isView: true,
+                        method: () => {
+                            this.flowInstDataDialog = false;
+                            this.flowBatchPendingDialog = false;
+                        }
+                    },
+                    newBatchDealSave: {
+                        text: "保存",
+                        type: "primary",
+                        icon: "el-icon-check",
+                        show: true,
+                        isView: true,
+                        method: () => {
+                            this.saveNewBatchDealFormData();
+                        }
+                    }
+                },
+                newBatchDealCurrDataId: "", // 新批量处理当前点击行dataId
+                isRefreshGetNextUsers: [], // 是否要刷新下一步处理人的字段，网关字段，表单，变量
+                fieldSysDataObj: {},
+                flowNewBatchDealDataIds: "",
+                currentPage: 1, //当前页
+                pages: 1, //总页数
+                total: 0, //总条数
+                pageSize: 50, //每页多少条
             }
         },
         watch:{
@@ -891,17 +993,56 @@
             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.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, taskNode: ""});
+                this.currentPage = 1;
+                // let flowInstListVm = this.$refs["pendingRef"];
+                // if (flowInstListVm) {
+                //     flowInstListVm.initFormDataByDataIds();
+                //     // flowInstListVm.initNewBatchDealFunc();
+                // }
+            },
+
+            setDataValue(key, value) {
+                if (key && typeof key === "string") {
+                    this[key] = value;
+                }
+            },
+
+            initFieldSysData() {
+                this.formFieldObj = this.formAboutInfoObj["formFieldObj"] || {};
+                let configInfoArr = this.formAboutInfoObj["formControlConfigArr"] || [];
+                let controlTypeArr = ["radio", "checkbox", "select"];
+                configInfoArr.forEach(item => {
+                    if (controlTypeArr.includes(item.controlType) && typeof item.specialSet === "string") {
+                        let specialSet = JSON.parse(item.specialSet);
+                        // console.log('specialSet', specialSet);
+                        let paramsKey = item.controlType + "Type";
+                        if (specialSet[paramsKey] === "sysData") {
+                            this.fieldSysDataObj[item.fieldId] = true;
+                        }
+                    }
+                });
+            },
 
             /**
              * 打开[添加]窗口
@@ -983,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];
@@ -1014,7 +1161,7 @@
                     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 ||'');//新事件规则
                         }
                     })
@@ -1076,6 +1223,322 @@
                 });
             },
 
+            // 新批量处理弹框回调事件
+            openNewBatchUpdateFlowForm() {
+                // console.log('this.sysDataObj', this.sysDataObj, this.loginUser);
+                Object.assign(this.formSearchObj, {
+                    flowNewBatchDealArr: [],
+                    isNewSelectBatchDeal: false,
+                    loading: true,
+                    isInit: false
+                });
+                this.initFieldSysData();
+                // 处理按钮渲染
+                let btnTypeArr = ["newBatchDealSave", "close"];
+                let btnArr = [];
+                btnTypeArr.forEach(item => {
+                    btnArr.push(this.newBatchDealBtnObj[item]);
+                });
+                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 => {
+                            let formData = this.formDataObj[flowInst.dataId] || {};
+                            // 解析自定义流程概要
+                            this.currentStartUser = this.userMap[flowInst.startUserId] || "";
+                            this.currentStartTime = flowInst.startTime;
+                            flowInst["outlineResult"] = this.getFlowSummary(formData, flowInst.outlineResult);
+                            if ((flowInst.settingInfo || []).length > 0) {
+                                flowInst.settingInfo.forEach(setInfo => {
+                                    let defaultVal;
+                                    let anyVariable = "";
+                                    if (setInfo.fieldType === "checkbox") {
+                                        anyVariable = [];
+                                        if (formData[setInfo.field] && typeof formData[setInfo.field] === "string") {
+                                            formData[setInfo.field] = JSON.parse(formData[setInfo.field]);
+                                        }
+                                    }
+                                    if (setInfo.defaultValue) {
+                                        if (setInfo.defaultValueType === "formInfo") {
+                                            setInfo.defaultValue = formData[setInfo.defaultValue];
+                                        }
+                                        if (setInfo.defaultValueType === "loginInfo") {
+                                            let userInfo = Object.assign({}, this.loginUser, {"userId": this.loginUser.id});
+                                            setInfo.defaultValue = userInfo[setInfo.defaultValue];
+                                        }
+                                    }
+                                    if (setInfo.defaultValueType === "sysDate") {
+                                        anyVariable = this.DATE_UTIL.formaterDateOrTime(new Date(), setInfo.fieldFormat);
+                                    }
+                                    let defaultValue = formData[setInfo.field] || setInfo.defaultValue;
+                                    defaultVal = defaultValue || anyVariable;
+                                    // if (setInfo.defaultValueType === "sysDate") {
+                                    //     defaultVal = this.DATE_UTIL.formaterDateOrTime(new Date(), setInfo.fieldFormat);
+                                    // }
+                                    // 给列表审核信息赋默认值
+                                    setInfo.defaultValue = defaultVal;
+                                    formData[setInfo.field] = defaultVal;
+                                });
+                            }
+                        });
+                        Object.assign(this.formSearchObj, {
+                            flowNewBatchDealArr: arr,
+                            isNewSelectBatchDeal: true,
+                            loading: false
+                        });
+                    });
+                });
+                this.flowBatchSelectPendingDialog = true;
+            },
+
+            // 获取批量流程数据
+            initNewBatchDeal() {
+                return new Promise(resolve => {
+                    this.saspFlowAxios.post(this.api.plFlowInst.findInstPending, {
+                        flowId: this.flowDefine.id,
+                        currentNode: this.formSearchObj.taskNode,
+                        nodeType: "pending",
+                        dealUserId: this.loginUser.id,
+                        flowStatus: "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) {
+                            res.data.records.forEach((item, index) => {
+                                if (item.openBatch === "1") {
+                                    item.settingInfo = JSON.parse(item.settingInfo);
+                                }
+                                item['isEdited'] = false;
+                                // item['isLoading'] = true;
+                                item['nextDealUsers'] = {};
+                                if (!index) {
+                                    this.flowNewBatchDealDataIds += item.dataId;
+                                }else {
+                                    this.flowNewBatchDealDataIds += "," + item.dataId;
+                                }
+                                flowNewBatchDeal.push(item);
+                            });
+                        }
+                        resolve(flowNewBatchDeal);
+                    });
+                });
+            },
+
+            changePage(currPage) {
+                this.currentPage = currPage;
+                this.openNewBatchUpdateFlowForm();
+            },
+
+            // 新批量处理当前行点击编辑按钮打开弹框回调事件
+            openCurrUpdateFlowForm(row) {
+                this.openUpdateFlowForm(row, "update");
+                // this.openBatchUpdateFlowForm(arr);
+            },
+
+            saveNewBatchDealFormData() {
+                this.saveFormInfo().then(result => {
+                    // console.log('保存方法1', result);
+                    if (result) {
+                        let flowNewBatchDealVm = this.$refs.flowNewBatchDealRef;
+                        // 数据保存成功，更改行数据
+                        let formData = this.formDataObj[result.ID] || {};
+                        let flowObj = this.formSearchObj.flowNewBatchDealArr.filter(item => item.dataId === result.ID)[0];
+                        // 刷新行数据
+                        let keysArr = Object.keys(result);
+                        Object.keys(formData).forEach(key => {
+                            if(keysArr.indexOf(key) > -1){
+                                if(keysArr.indexOf(key + "_SASP_SYS_DATA_ID") > -1){
+                                    formData[key] = result[key + "_SASP_SYS_DATA_ID"];
+                                }else{
+                                    formData[key] = result[key];
+                                }
+                            }
+                        })
+                        // 刷新配置信息
+                        if (flowObj.settingInfo && flowObj.settingInfo.length > 0) {
+                            flowObj.settingInfo.forEach(settingObj => {
+                                let defaultValue = result[settingObj.field] || settingObj.defaultValue;
+                                let defaultVal = defaultValue || (settingObj.options[0] || {}).value;
+                                // 给列表审核信息赋默认值
+                                // this.$set(settingObj, "defaultValue", defaultVal || "");
+                                settingObj.defaultValue = defaultVal || "";
+                                formData[settingObj.field] = defaultVal || "";
+                            });
+                        }
+                        this.$set(flowObj, "isEdited", true);
+                        // console.log('flowObj', flowObj, flowNewBatchDealVm);
+                        this.flowInstDataDialog = false;
+                        // 刷新下一步处理人
+                        if (flowNewBatchDealVm) {
+                            flowNewBatchDealVm.initFlowBatchDeal([flowObj]);
+                        }
+                    }
+                });
+            },
+
+            newBatchDealSubmit(selectionArr, submitType) {
+                // console.log('提交',selectionArr);
+                if (selectionArr.length === 0) {
+                    return this.$message.warning('请先勾选要提交的数据！');
+                }
+                // 判断是否选择了下一步处理人
+                let str = "即将提交" + selectionArr.length + "条数据";
+                if(submitType === "all"){
+                    str = "即将提交当前显示内容（不包括正在加载的数据）";
+                }
+                this.$confirm(`${str}, 确认是否继续?`, '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).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;
+                        });
+                        if (Object.keys(updateParams).length > 0) {
+                            paramsObj["updateParams"] = updateParams;
+                            params.push(paramsObj);
+                        }
+                        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',
+                        message: '已取消提交'
+                    });
+                });
+            },
+
+            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;
+                let selectArr = [];
+                this.formSearchObj.flowNewBatchDealArr.forEach(item => {
+                    if (flowNewBatchDealVm.newBatchDealSelectable(item)) {
+                        selectArr.push(item);
+                    }
+                });
+                // console.log('全部提交', selectArr);
+                if (selectArr.length === 0) {
+                    return this.$message.warning("暂无提交内容！");
+                }
+                this.newBatchDealSubmit(selectArr, "all");
+            },
+
+            newBatchExecuteNextStep(arr) {
+                let params = [];
+                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;
+                    let nextStepBaseObj = {
+                        flowSaveSuccess: true,
+                        flowDataId: items.dataId,
+                        flowInstId: items.flowInstId,
+                        instId: items.flowInstId,
+                        dealers: dealers,
+                        // dealerNames: dealerNames,
+                        dealersObj: JSON.stringify(dealersObj),
+                        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, nextNode);
+                    params.push(paramsSourceObj);
+                });
+                // console.log('params',params);
+                this.saspFlowAxios.post(this.api.plFlowInst.batchExecuteNextStep, {
+                    params: JSON.stringify(params)
+                }).then(res => {
+                    if (res.data.operateSuccess) {
+                        let message = res.data.operateMessage;
+                        this.$notify({
+                            title: '提示',
+                            message: `${message}`,
+                            type: 'info',
+                            position: 'bottom-right',
+                            duration: 10000,
+                        });
+                    }
+                });
+            },
+
             /**
              * 获取[添加、修改和处理]的操作按钮
              */
@@ -1165,18 +1628,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};
             },
 
             /**
@@ -1184,10 +1649,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};
                 }
             },
@@ -1443,7 +1909,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;
@@ -1562,6 +2041,9 @@
                                 this.chooseNextUserId = userInfo.id;
                                 this.chooseNextUserName = userInfo.userName;
                             }
+                            if(this.nextNode.dealType === "multi" && this.nextSteptUserArr.length === 1){
+                                this.chooseNextUserId = [userInfo.id];
+                            }
                         }
                     });
                 });
@@ -1970,10 +2452,10 @@
             /**
              * 获取流程概要
              */
-            getFlowSummary(dataObj) {
+            getFlowSummary(dataObj, summaryTemplate) {
                 let flowSummary = "";
-                let summarySet = this.flowDefine.flowSummary;
-                if (this.tabActive == "draft") {
+                let summarySet = summaryTemplate || this.flowDefine.flowSummary;
+                if (this.tabActive === "draft") {
                     flowSummary = this.platStringUtil.replaceAll(summarySet, "${startUserName*}", this.loginUser.userName);
                     flowSummary = this.platStringUtil.replaceAll(flowSummary, "${createTime*}", this.DATE_UTIL.getCurrentDateTime());
                 } else {
@@ -2364,7 +2846,7 @@
                                 this.$forceUpdate();
                             }
                             // 加载工作流脚本与工作流事件规则
-                            this.initFlowScript().then(() => {
+                            this.initFlowScript(this.flowData.flowId).then(() => {
                                 resolve(true);
                             })
                         });
@@ -2377,14 +2859,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){
@@ -2804,7 +3356,20 @@
                 }
             },
 
-            initflowObj() {//处理流程定义对象
+            initFlowObj() {//处理流程定义对象
+                let gatewayFields = this.flowDefine.gatewayFields || "";
+                this.isRefreshGetNextUsers = gatewayFields.split(",");
+                Object.keys(this.allNodeInfo).forEach(key => {
+                    let obj = this.allNodeInfo[key];
+                    if (obj.nodeType === "UserTask" && (!obj.nodeLinkId || obj.nodeLinkId.indexOf('Activity_draft') === -1)) {
+                        if (obj.dealerType === "form" && obj.formField) {
+                            this.isRefreshGetNextUsers.push(obj.formField);
+                        }
+                        if (obj.dealerType === "variable" && obj.variable) {
+                            this.isRefreshGetNextUsers.push(obj.variable);
+                        }
+                    }
+                });
                 let tabSetting = JSON.parse(this.flowDefine.tabSetting);
                 tabSetting.forEach(data => {
                     this.$set(this.tabTypeObj, data.type, data);