sasp-flow-render 1.1.2 → 1.1.5

package/src/components/flowInst/flowInstTab.vue

@@ -32,14 +32,17 @@
                                 :open-add-flow-form="openAddFlowForm"
                                 :open-update-flow-form="openUpdateFlowForm"
                                 :open-batch-update-flow-form="openBatchUpdateFlowForm"
+                                :formImpMethod="formImpMethod"
+                                :flowImpParamObj="flowImpParamObj"
+                                :downloadTemplate="downloadTemplate"
                 >
                 </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"
@@ -55,11 +58,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>
@@ -217,7 +222,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"
@@ -227,6 +232,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>
 
@@ -266,8 +279,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"
+            >
+            </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 ? (' -> ' + nextNodeName) : '')"
+        <!--流程下一步处理人选择弹窗-->
+        <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">
             <el-form label-width="100px" size="small" v-if="nextNode.nodeType != 'EndEvent'">
@@ -290,7 +318,7 @@
                         </div>
                     </el-form-item>
                 </fieldset>
-                <el-form-item label="下一步执行人" v-if="nextNode.nextType != 'inclusiveGateway'">
+                <el-form-item label="下一步执行人" v-if="nextNode.nextType != 'inclusiveGateway' && isProceedNext">
                     <el-select v-model="chooseNextUserId" v-if="nextSteptUserType != 'all' && nextSteptUserDialog"
                                :multiple="mulitiChooseUser" filterable style="width:100%">
                         <el-option v-for="item in nextSteptUserArr" :key="item.id" :value="item.id"
@@ -310,9 +338,12 @@
                         <el-input type="textarea" :rows="5" v-model="description"></el-input>
                     </el-form-item>
                 </fieldset>
-                <el-form-item label="附加说明" v-if="nextNode.nextType != 'inclusiveGateway'">
+                <el-form-item label="附加说明" v-if="nextNode.nextType != 'inclusiveGateway' && isProceedNext">
                     <el-input type="textarea" :rows="5" v-model="description"></el-input>
                 </el-form-item>
+                <el-form-item v-if="nextNode.nextType != 'inclusiveGateway' && !isProceedNext" label-width="0">
+                  <div>请等待其他人员处理完成。</div>
+                </el-form-item>
             </el-form>
             <div v-if="nextNode.nodeType == 'EndEvent'">流程即将结束，是否继续？</div>
             <div slot="footer" class="dialog-footer">
@@ -341,7 +372,7 @@
         </el-dialog>
 
         <el-dialog :close-on-click-modal=false title="选择加签人" top="5vh" width="80%" height="80%"
-                   :visible.sync="completeSignDialog" append-to-body>
+                   :visible.sync="completeSignDialog" append-to-body @closed="disableSign = false">
             <!--            <sys-org-pos-user-select ref="completeSignRef"-->
             <!--                                     :filterUserParam="{'commonUserType':'common','filterLoginUser':'Y'}"-->
             <!--                                     :ognEnable="false"-->
@@ -354,13 +385,13 @@
                          v-if="completeSignDialog">
             </user-select>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" size="small" @click="sureCompleteSign()">确定</el-button>
+                <el-button type="primary" size="small" @click="sureCompleteSign()" :disabled="disableSign">确定</el-button>
                 <el-button size="small" @click="completeSignDialog = false">取消</el-button>
             </div>
         </el-dialog>
 
         <el-dialog :close-on-click-modal=false title="选择转签人" top="5vh" width="80%" height="80%"
-                   :visible.sync="turnSignDialog" append-to-body>
+                   :visible.sync="turnSignDialog" append-to-body @closed="disableSign = false">
             <!--            <sys-org-pos-user-select ref="turnSignRef"-->
             <!--                                     :filterUserParam="{'commonUserType':'common' }"-->
             <!--                                     :ognEnable="false"-->
@@ -374,7 +405,7 @@
                          v-if="turnSignDialog">
             </user-select>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" size="small" @click="sureTurnSign()">确定</el-button>
+                <el-button type="primary" size="small" @click="sureTurnSign()" :disabled="disableSign">确定</el-button>
                 <el-button size="small" @click="turnSignDialog = false">取消</el-button>
             </div>
         </el-dialog>
@@ -440,18 +471,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: ''},
@@ -466,7 +496,14 @@
             saveFormInfo:{type: Function,default:null}, // 保存表单时执行的事件
             getFormInfo:{type: Function,default:null}, // 获取表单内容，以方便进行表单信息修改
             dataPermis:{type:String,default:''},
-            flowNextOperation:{type: Function,default:null} // 流程下一步时的参数回调事件
+            flowNextOperation:{type: Function,default:null}, // 流程下一步时的参数回调事件
+            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;
@@ -508,6 +545,8 @@
 
                 // 批量处理
                 flowBatchPendingDialog: false,
+                // 选择性的批量多条一次性处理
+                flowBatchSelectPendingDialog: false,
                 batchUpdateFormInfo: {
                     formShow: false,
                     dataRows: [],
@@ -587,7 +626,7 @@
                         icon: "saspiconfont pl-icon-yizhongzhi",
                         show: false,
                         method: () => {
-                            this.axios.post(this.api.plFlowInst.stopFlow, {
+                            this.saspFlowAxios.post(this.api.plFlowInst.stopFlow, {
                                 instId: this.currentInst.flowInstId, type: "0",
                                 procInstId: this.currentInst.linkProcId,
                                 taskId: this.currentInst.taskId
@@ -612,7 +651,7 @@
                                             dataId:this.formInfo.dataId,
                                             instType:"stopped"
                                         };
-                                        this.axios.post(this.api.plFlowInst.saveRemind,remindParam);
+                                        this.saspFlowAxios.post(this.api.plFlowInst.saveRemind,remindParam);
 
                                         //执行事件规则
                                         let currentNodeObj = this.flowNodeIdToInfo[this.currentInst.currentNode] ||{};
@@ -634,7 +673,7 @@
                         show: false,
                         isView: true,
                         method: () => {
-                            this.axios.post(this.api.plFlowInst.revokeFlow, {
+                            this.saspFlowAxios.post(this.api.plFlowInst.revokeFlow, {
                                 instId: this.currentInst.flowInstId,
                                 taskId: this.currentInst.taskId
                             }).then(res => {
@@ -654,7 +693,7 @@
                                             dataId:this.formInfo.dataId,
                                             instType:"cancel"
                                         };
-                                        this.axios.post(this.api.plFlowInst.saveRemind,remindParam);
+                                        this.saspFlowAxios.post(this.api.plFlowInst.saveRemind,remindParam);
 
 
                                     } else {
@@ -785,6 +824,8 @@
 
                 nextNodeName:"", // 下一个节点名称
                 nextNode: {},//下一个节点信息
+                nowNode: {},//本节点信息
+                isProceedNext:true,
                 description: "",//附加说明
 
                 // 处理、修改、查看流程信息弹窗
@@ -851,8 +892,44 @@
                 workListViews:{},
                 workTableViews:{},
                 currNodeName: "", //当前节点名称
-                nextUserInfo:{}, // 下一步处理人的信息
-                dataId:"", // 表单数据id
+                nextUserInfo: {}, // 下一步处理人的信息
+                dataId: "", // 表单数据id
+                disableSign: false, // 禁用加签转签按钮
+                formSearchObj: {
+                    taskNode: "",
+                    flowNewBatchDealArr: [],
+                    isNewSelectBatchDeal: false,
+                    loading: true
+                },
+                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: "",
             }
         },
         watch:{
@@ -883,13 +960,45 @@
 
             this.getFlowInfo().then(res => {
                 this.initSuccess = true;
-                this.initflowObj();
+                this.initFlowObj();
                 this.getFlowAgent(); //加载流程代理
+                // this.initFieldSysData();
             });
             this.initTabNum();
             // this.initWorkStageTurnOn();
         },
         methods: {
+            // 新批量处理关闭弹框时数据重做的回调
+            newBatchDealClose() {
+                Object.assign(this.formSearchObj, {isNewSelectBatchDeal: false});
+                // 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;
+                        }
+                    }
+                });
+            },
 
             /**
              * 打开[添加]窗口
@@ -1064,6 +1173,270 @@
                 });
             },
 
+            // 新批量处理弹框回调事件
+            openNewBatchUpdateFlowForm() {
+                // console.log('this.sysDataObj', this.sysDataObj, this.loginUser);
+                Object.assign(this.formSearchObj, {
+                    flowNewBatchDealArr: [],
+                    isNewSelectBatchDeal: false,
+                    loading:true
+                });
+                this.initFieldSysData();
+                // 处理按钮渲染
+                let btnTypeArr = ["newBatchDealSave", "close"];
+                let btnArr = [];
+                btnTypeArr.forEach(item => {
+                    btnArr.push(this.newBatchDealBtnObj[item]);
+                });
+                this.formNewBtnArr = btnArr;
+                this.initNewBatchDeal().then(arr => {
+                    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: "",
+                        nodeType: "pending",
+                        dealUserId: this.loginUser.id,
+                        flowStatus: "1",
+                        flowVar: "1"
+                    }).then(res => {
+                        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);
+                    });
+                });
+            },
+
+            // 新批量处理当前行点击编辑按钮打开弹框回调事件
+            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 = "即将全部提交（不包括正在loading加载的数据）";
+                }
+                this.$confirm(`${str}, 确认是否继续?`, '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning'
+                }).then(() => {
+                    let params = [];
+                    let instIds = "";
+                    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}`;
+                        }
+                    });
+                    // 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
+                                });
+                            });
+                        }
+                    });
+                }).catch(() => {
+                    this.$message({
+                        type: 'info',
+                        message: '已取消提交'
+                    });
+                });
+            },
+
+            // 流程批量审批，全部提交
+            newBatchDealAllSubmit() {
+                let flowNewBatchDealVm = this.$refs.flowNewBatchDealRef;
+                let selectArr = [];
+                this.formSearchObj.flowNewBatchDealArr.forEach(item => {
+                    if (flowNewBatchDealVm.newBatchDealSelectable(item)) {
+                        selectArr.push(item);
+                    }
+                });
+                // console.log('全部提交', selectArr);
+                this.newBatchDealSubmit(selectArr, "all");
+            },
+
+            newBatchExecuteNextStep(arr) {
+                let params = [];
+                arr.forEach(items => {
+                    let nextNodeObj = this.allNodeInfo[items.nextDealUsers.nextNodeId];
+                    let dealers = items.chooseNextUserId;
+                    let dealersObj = {};
+                    dealersObj[nextNodeObj["nodeLinkId"]] = dealers;
+
+                    let nextStepBaseObj = {
+                        instId: items.flowInstId,
+                        dealers: dealers,
+                        // dealerNames: dealerNames,
+                        dealersObj: JSON.stringify(dealersObj),
+                        nextNodeType: nextNodeObj.nodeType,
+                        nextNodeId: nextNodeObj.id,
+                        nextNodeKey: nextNodeObj.nodeLinkId,
+                        taskId: items.taskId,
+                    }
+                    // if(this.flowNextOperation) {
+                    //     this.flowNextOperation(obj.instId, obj.dealers, obj.dealerNames, obj.taskId);
+                    // }
+                    let paramsSourceObj = {"SASP_FLOW_USE_VARIABLES": "yes"};
+                    Object.assign(paramsSourceObj, {}, nextStepBaseObj);
+                    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,
+                        });
+                    }
+                });
+            },
+
             /**
              * 获取[添加、修改和处理]的操作按钮
              */
@@ -1265,7 +1638,7 @@
                         if(this.formInfo.opt == 'add' || this.tabActive == 'draft'){  //版本号也要随之更新
                             flowInst = Object.assign(flowInst,{"version":this.flowDefine.releaseVersion,"isRelease":this.flowDefine.isRelease})
                         }
-                        this.axios.post(this.api.plFlowInst.url + "/" + this.formInfo.opt, flowInst).then(instRes => {
+                        this.saspFlowAxios.post(this.api.plFlowInst.url + "/" + this.formInfo.opt, flowInst).then(instRes => {
                             this.runFlowEvt();
                             resolve(instRes.data.operateObj);
                         });
@@ -1290,7 +1663,7 @@
                                 updated: this.loginUser.id,
                             };
                         }
-                        this.axios.post(this.api.plFlowInst.url + "/" + this.formInfo.opt, flowInst).then(instRes => {
+                        this.saspFlowAxios.post(this.api.plFlowInst.url + "/" + this.formInfo.opt, flowInst).then(instRes => {
                             this.runFlowEvt();
                             resolve(instRes.data.operateObj);
                             this.currentInst=instRes.data.operateObj;
@@ -1346,7 +1719,7 @@
                     //             if(this.formInfo.opt == 'add' || this.tabActive == 'draft'){  //版本号也要随之更新
                     //                 flowInst = Object.assign(flowInst,{"version":this.flowDefine.releaseVersion,"isRelease":this.flowDefine.isRelease})
                     //             }
-                    //             this.axios.post(this.api.plFlowInst.url + "/" + this.formInfo.opt, flowInst).then(instRes => {
+                    //             this.saspFlowAxios.post(this.api.plFlowInst.url + "/" + this.formInfo.opt, flowInst).then(instRes => {
                     //                 resolve(instRes.data);
                     //             });
                     //         }else{
@@ -1370,7 +1743,7 @@
                     //                     updated: this.loginUser.id,
                     //                 };
                     //             }
-                    //             this.axios.post(this.api.plFlowInst.url + "/" + this.formInfo.opt, flowInst).then(instRes => {
+                    //             this.saspFlowAxios.post(this.api.plFlowInst.url + "/" + this.formInfo.opt, flowInst).then(instRes => {
                     //                 resolve(instRes.data);
                     //                 this.currentInst=instRes.data;
                     //             });
@@ -1423,11 +1796,16 @@
                     this.currentInst.id = instId;
                     this.description = "";
                     this.saveInstId = instId;
+                    this.nowNode =  this.allNodeInfo[currentNodeObj.id] || {};
+                    this.isProceedNext = true;
                     //获取处理人
-                    let obj = {instId: instId, taskId: this.currentInst.taskId};
+                    let obj = {instId: instId, taskId: this.currentInst.taskId,};
+                    if(this.nowNode && this.nowNode.dealType && this.nowNode.dealType == 'multi'){
+                        this.$set(obj,'passCondition',this.nowNode.passCondition)
+                    }
                     let params = {"SASP_FLOW_USE_VARIABLES":"yes"};
                     Object.assign(params,flowParams || {},obj);
-                    this.axios.post(this.api.plFlowInst.getNextUsers, params).then(res => {
+                    this.saspFlowAxios.post(this.api.plFlowInst.getNextUsers, params).then(res => {
                         if(!res.data.operateSuccess){
                             this.isDisabled['nextStep'] = true;
                             if(res.data.resultObject === 'requestException'){
@@ -1440,6 +1818,9 @@
                         let obj = {};
                         if (res && res.data) {
                             obj = res.data.operateObj || {};
+                            if(res.data.operateMap  && res.data.operateMap.isPassCondition == 0){
+                                this.isProceedNext = false;
+                            }
                         }
                         this.nextNodeName = "";
                         this.choosePosUserIds = "";
@@ -1696,7 +2077,7 @@
                         dealerNames = this.chooseNextUserName;
                     }
                     if (this.nextNode.nodeType != 'EndEvent') {
-                        if (!this.chooseNextUserId || this.chooseNextUserId.length == 0) {
+                        if ((!this.chooseNextUserId || this.chooseNextUserId.length == 0) && this.isProceedNext) {
                             this.$message({type: "error", message: "请选择处理人！"});
                             this.isDisabled1 = true;
                             return;
@@ -1736,12 +2117,15 @@
                     nextNodeId: this.nextNode.id,
                     nextNodeKey: this.nextNode.nodeLinkId,
                 }
+                if(this.nowNode && this.nowNode.dealType && this.nowNode.dealType == 'multi'){
+                    this.$set(obj,'passCondition',this.nowNode.passCondition)
+                }
                 if(this.flowNextOperation) {
                     this.flowNextOperation(obj.instId, obj.dealers, obj.dealerNames, obj.taskId);
                 }
                 let params = {"SASP_FLOW_USE_VARIABLES":"yes"};
                 Object.assign(params,this.flowParams || {},obj);
-                this.axios.post(this.api.plFlowInst.executeNextStep,params).then(res => {
+                this.saspFlowAxios.post(this.api.plFlowInst.executeNextStep,params).then(res => {
                     if (res && res.data && res.data.operateSuccess) {
                         this.initTabNum();
                         this.$message({type: "success", message: "提交成功！"});
@@ -1782,7 +2166,7 @@
                                     dataId:this.formInfo.dataId,
                                     instType:"end"
                                 };
-                                this.axios.post(this.api.plFlowInst.saveRemind,remindParam);
+                                this.saspFlowAxios.post(this.api.plFlowInst.saveRemind,remindParam);
                             }
                         }else{
                             console.log("脚本异常")
@@ -1811,7 +2195,8 @@
                 checkedUserArr.forEach(item => {
                     userIds += "," + item.dataKey;
                 });
-                this.axios.post(this.api.plFlowInst.completeSign, {
+                this.disableSign = true;
+                this.saspFlowAxios.post(this.api.plFlowInst.completeSign, {
                     taskId: this.currentInst.taskId,
                     dealers: userIds.substring(1)
                 }).then(res => {
@@ -1824,6 +2209,7 @@
                     } else {
                         this.$message({type: "error", message: "加签失败！"});
                     }
+                    this.disableSign = false;
                 });
             },
 
@@ -1837,7 +2223,8 @@
                     return;
                 }
                 let userId = checkedUserArr[0].dataKey;
-                this.axios.post(this.api.plFlowInst.turnSign, {
+                this.disableSign = true;
+                this.saspFlowAxios.post(this.api.plFlowInst.turnSign, {
                     taskId: this.currentInst.taskId,
                     dealers: userId
                 }).then(res => {
@@ -1850,6 +2237,7 @@
                     } else {
                         this.$message({type: "error", message: "转签失败！"});
                     }
+                    this.disableSign = false;
                 });
 
             },
@@ -1870,7 +2258,7 @@
                     cancelButtonText: '取消',
                     inputType: 'textarea',
                 }).then(({ value }) => {
-                    this.axios.post(this.api.plFlowInst.backRewrite,
+                    this.saspFlowAxios.post(this.api.plFlowInst.backRewrite,
                         {
                             taskId:currentInst.taskId,
                             remarks: value
@@ -1910,7 +2298,7 @@
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                 }).then(() => {
-                    this.axios.post(this.api.plFlowInst.getBackRewrite,
+                    this.saspFlowAxios.post(this.api.plFlowInst.getBackRewrite,
                         {
                             flowInstId: currentInst.flowInstId,
                         }).then(res => {
@@ -1943,10 +2331,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 {
@@ -2107,7 +2495,7 @@
 
             // getDefaultUser(orgChargeField,supervisorField,levels,resolve){
             //     if(orgChargeField.length > 0 && supervisorField.length > 0){
-            //         this.axios.post(this.api.sysOrgPosUser.getDeptSupervisorByUserId,
+            //         this.saspFlowAxios.post(this.api.sysOrgPosUser.getDeptSupervisorByUserId,
             //             {userId:this.loginUser.id}).then(res => {
             //             if(res && res.data){
             //                 let userId = (res.data[0] || {}).id;
@@ -2116,7 +2504,7 @@
             //                 });
             //             }
             //
-            //             this.axios.post(this.api.sysOrgPosUser.getSupervisorByLevels,
+            //             this.saspFlowAxios.post(this.api.sysOrgPosUser.getSupervisorByLevels,
             //                 {userId:this.loginUser.id,levels:levels.substring(1)}).then(res => {
             //                 if(res && res.data){
             //                     let userIdMap = res.data || {};
@@ -2128,7 +2516,7 @@
             //             });
             //         });
             //     }else if(orgChargeField.length > 0){
-            //         this.axios.post(this.api.sysOrgPosUser.getDeptSupervisorByUserId,
+            //         this.saspFlowAxios.post(this.api.sysOrgPosUser.getDeptSupervisorByUserId,
             //             {userId:this.loginUser.id}).then(res => {
             //             if (res && res.data) {
             //                 let userId = (res.data[0] || {}).id;
@@ -2139,7 +2527,7 @@
             //             }
             //         });
             //     }else if(supervisorField.length > 0){
-            //         this.axios.post(this.api.sysOrgPosUser.getSupervisorByLevels,
+            //         this.saspFlowAxios.post(this.api.sysOrgPosUser.getSupervisorByLevels,
             //             {userId:this.loginUser.id,levels:levels.substring(1)}).then(res => {
             //             if(res && res.data){
             //                 let userIdMap = res.data || {};
@@ -2176,7 +2564,7 @@
              * 恢复方法
              */
             restoreFlow() {
-                this.axios.post(this.api.plFlowInst.stopFlow, {
+                this.saspFlowAxios.post(this.api.plFlowInst.stopFlow, {
                     instId: this.currentInst.flowInstId, type: "1",
                     procInstId: this.currentInst.linkProcId,
                     taskId: this.currentInst.taskId
@@ -2209,12 +2597,12 @@
 
             initTabNum() {
                 this.initMessageFunc && this.initMessageFunc();
-                this.axios.all([
-                    this.axios.post(this.api.plFlowInst.getTabsNum,
+                this.saspFlowAxios.all([
+                    this.saspFlowAxios.post(this.api.plFlowInst.getTabsNum,
                         {flowId: this.flowData.flowId, type: "1"}),
-                    this.axios.post(this.api.plFlowInst.getTabsNum,
+                    this.saspFlowAxios.post(this.api.plFlowInst.getTabsNum,
                         {flowId: this.flowData.flowId, type: "2"}),
-                ]).then(this.axios.spread((res1, res2) => {
+                ]).then(this.saspFlowAxios.spread((res1, res2) => {
                     Object.assign(this.numberObj, res1.data, res2.data);
                 }));
             },
@@ -2355,10 +2743,10 @@
              */
             initFlowScript(){
                 return new Promise(resolve => {
-                    this.axios.all([
-                        this.axios.post(this.api.plFlowScript.find,{"flowId":this.flowData.flowId}),
-                        this.axios.post(this.api.plFlowEventDetail.findByFlowAndLeadFunc,{"flowId":this.flowData.flowId,"version":this.flowDefine.flowVersion||"1.0"})
-                    ]).then(this.axios.spread((resScript, resEvent) => {
+                    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"})
+                    ]).then(this.saspFlowAxios.spread((resScript, resEvent) => {
                         // 流程脚本
                         if(resScript){
                             let scriptDatas = resScript.data || [];
@@ -2613,7 +3001,7 @@
                 // }
                 // let CTX = window.JAVA_URL;
                 let CTX = "";
-                let paramValues = [this,this.axios,CTX,formData,this.loginUser,AjaxUtil,this.nextNode,null]; // 入参
+                let paramValues = [this,this.saspFlowAxios,CTX,formData,this.loginUser,AjaxUtil,this.nextNode,null]; // 入参
                 if(executePosition == "add" || executePosition == "update"){
                     ((this.scriptObj[executePosition] || {})[executeTime] || []).forEach(event => {
                         event && event(...paramValues); // 执行事件
@@ -2655,7 +3043,7 @@
                 //执行自定义脚本
                 // let CTX = window.JAVA_URL;
                 let CTX = "";
-                let paramValues = [this,this.axios,CTX,formData,this.loginUser,AjaxUtil,this.nextNode]; // 入参
+                let paramValues = [this,this.saspFlowAxios,CTX,formData,this.loginUser,AjaxUtil,this.nextNode]; // 入参
                 if(executeType == "addAfter" || executeType == "editAfter"){ //新增或者修改后
                     (this.newScriptObj[executeType] || []).forEach(event => {
                         event && event(...paramValues); // 执行事件
@@ -2668,7 +3056,7 @@
                             && this.installListObj[eventKey]["config"].methods.renderFlowConfig){
                             let affectContentArr = this.newEventObj[executeType][eventKey] || [];
                             affectContentArr.forEach(affectContent =>{
-                                this.installListObj[eventKey]["config"].methods.renderFlowConfig(this,this.CTX,this.axios,this.nextNode,formData,affectContent);
+                                this.installListObj[eventKey]["config"].methods.renderFlowConfig(this,this.CTX,this.saspFlowAxios,this.nextNode,formData,affectContent);
                             });
                         }
                     });
@@ -2691,7 +3079,7 @@
                             && this.installListObj[eventKey]["config"].methods.renderFlowConfig){
                             let affectContentArr = eventObj[eventKey] || [];
                             affectContentArr.forEach(affectContent =>{
-                                this.installListObj[eventKey]["config"].methods.renderFlowConfig(this,this.CTX,this.axios,this.nextNode,formData,affectContent,executeType);
+                                this.installListObj[eventKey]["config"].methods.renderFlowConfig(this,this.CTX,this.saspFlowAxios,this.nextNode,formData,affectContent,executeType);
                             });
                         }
                     });
@@ -2706,7 +3094,7 @@
                 //     && this.installListObj[affect.eventKey]["config"].methods.renderTableViewConfig){
                 //     //调用渲染方法
                 //     this.$set(affect,"field",field);//当前响应控件
-                //     this.installListObj[affect.eventKey]["config"].methods.renderTableViewConfig(this,this.CTX,this.axios,this.dataAllObj,affect);
+                //     this.installListObj[affect.eventKey]["config"].methods.renderTableViewConfig(this,this.CTX,this.saspFlowAxios,this.dataAllObj,affect);
                 // }
 
 
@@ -2777,7 +3165,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);
@@ -2803,7 +3204,7 @@
             async getFlowAgent() {
                 this.agentTitle = "\"" + this.flowDefine.flowName + "\"" + " 流程设置";
                 this.agentFormObj.userId = this.loginUser.id;
-                let flowAgentRes = await this.axios.post(this.api.plFlowSetting.getByUserFlowId, {
+                let flowAgentRes = await this.saspFlowAxios.post(this.api.plFlowSetting.getByUserFlowId, {
                     flowId: this.flowData.flowId,
                     userId: this.loginUser.id
                 });
@@ -2861,7 +3262,7 @@
              */
             retSpecified(currentInst){
                 let flowInstId = currentInst.flowInstId;
-                this.axios.post(this.api.plFlowInst.getBackData,{"flowInstId":flowInstId}).then(res => {
+                this.saspFlowAxios.post(this.api.plFlowInst.getBackData,{"flowInstId":flowInstId}).then(res => {
                     this.backNodeArr = [];
                     if(res.data.operateSuccess){
                         let result = res.data.resultObject || [];
@@ -2899,7 +3300,7 @@
                     return;
                 }
                 this.isDisabled2 = false;
-                this.axios.post(this.api.plFlowInst.skipToNode,
+                this.saspFlowAxios.post(this.api.plFlowInst.skipToNode,
                     {"instId":this.currentInst.flowInstId,"skipNode":this.backNodeId,
                         "backMsg":this.backMsg,"skipStatus":"skip"}).then(res => {
                     if(res.data.operateSuccess){