sasp-flow-render 1.1.2 → 1.1.3

package/src/components/flowInst/flowInstTab.vue

@@ -32,6 +32,9 @@
                                 :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>
@@ -267,7 +270,7 @@
         </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 +293,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 +313,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 +347,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 +360,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 +380,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>
@@ -466,7 +472,10 @@
             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},
         },
         data() {
             let vm = this;
@@ -587,7 +596,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 +621,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 +643,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 +663,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 +794,8 @@
 
                 nextNodeName:"", // 下一个节点名称
                 nextNode: {},//下一个节点信息
+                nowNode: {},//本节点信息
+                isProceedNext:true,
                 description: "",//附加说明
 
                 // 处理、修改、查看流程信息弹窗
@@ -853,6 +864,7 @@
                 currNodeName: "", //当前节点名称
                 nextUserInfo:{}, // 下一步处理人的信息
                 dataId:"", // 表单数据id
+                disableSign:false, // 禁用加签转签按钮
             }
         },
         watch:{
@@ -1265,7 +1277,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 +1302,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 +1358,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 +1382,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 +1435,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 +1457,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 +1716,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 +1756,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 +1805,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 +1834,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 +1848,7 @@
                     } else {
                         this.$message({type: "error", message: "加签失败！"});
                     }
+                    this.disableSign = false;
                 });
             },
 
@@ -1837,7 +1862,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 +1876,7 @@
                     } else {
                         this.$message({type: "error", message: "转签失败！"});
                     }
+                    this.disableSign = false;
                 });
 
             },
@@ -1870,7 +1897,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 +1937,7 @@
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                 }).then(() => {
-                    this.axios.post(this.api.plFlowInst.getBackRewrite,
+                    this.saspFlowAxios.post(this.api.plFlowInst.getBackRewrite,
                         {
                             flowInstId: currentInst.flowInstId,
                         }).then(res => {
@@ -2107,7 +2134,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 +2143,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 +2155,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 +2166,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 +2203,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 +2236,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 +2382,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 +2640,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 +2682,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 +2695,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 +2718,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 +2733,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);
                 // }
 
 
@@ -2803,7 +2830,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 +2888,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 +2926,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){

package/src/components/flowRoamRecords.vue

@@ -275,7 +275,7 @@
             init() {
                 this.flowInstNodeArr = [];
                 this.loading = true;
-                this.axios.post(this.api.plFlowInst.getHistoryActInst,{"flowInstId":this.instId}).then(res => {
+                this.saspFlowAxios.post(this.api.plFlowInst.getHistoryActInst,{"flowInstId":this.instId}).then(res => {
                     if(!res.data.operateSuccess){
                         this.$message.error(res.data.operateMessage);
                         return;

package/src/components/roamRecord.vue

@@ -209,7 +209,7 @@
                     return;
                 }
                 this.loading = true;
-                this.axios.post(this.api.plFlowInstNodeResult.listNoPageByResult, {
+                this.saspFlowAxios.post(this.api.plFlowInstNodeResult.listNoPageByResult, {
                     "flowInstId": this.flowInstId
                 }).then(res => {
                     this.flowInstNodeArr = this.sortFlowInstNode(res.data);
@@ -564,4 +564,4 @@
             }
         }
     }
-</style>
+</style>

package/src/components/userSelect.vue

@@ -113,7 +113,7 @@
             init(){
                 this.loading = true;
                 // 先载入系统接口数据
-                this.axios.post(this.api.plFlowInterface.find,{interStatus:'1',interType:'sys'}).then(res => {
+                this.saspFlowAxios.post(this.api.plFlowInterface.find,{interStatus:'1',interType:'sys'}).then(res => {
                     (res.data || []).forEach(item => {
                         this.sysInterfaceObj[item.sysInterName] = item;
                     })
@@ -130,7 +130,7 @@
              */
             loadUserData(){
                 let dataInter = this.sysInterfaceObj['userData'];
-                this.axios.post(this.api.plFlowDomain.findRealUrl,{status:'1'}).then(res => {
+                this.saspFlowAxios.post(this.api.plFlowDomain.findRealUrl,{status:'1'}).then(res => {
                     (res.data || []).forEach(item => {
                         this.doMainDatasObj[item.id] = item.domainUrl;
                     })
@@ -380,7 +380,7 @@
                         obj[item.key] = item.value || ""; // 注意这里要replace ${userCode}
                     })
                     if(dataInter.requestType === 'post'){
-                        this.axios.post(url,obj).then(res => {
+                        this.saspFlowAxios.post(url,obj).then(res => {
                             this.INTER_CACHE.setCacheInfo(dataInter.sysInterName,res.data);
                             resolve(res.data || []);
                         })
@@ -398,7 +398,7 @@
                                 url += "?" + params;
                             }
                         }
-                        this.axios(url).then(res => {
+                        this.saspFlowAxios(url).then(res => {
                             this.INTER_CACHE.setCacheInfo(dataInter.sysInterName,res.data);
                             resolve(res.data || []);
                         })

package/src/views/flowInstView.vue

@@ -2,7 +2,8 @@
     <flow-inst-tab :flow-id="useFlowId" :userArr="userArr" :userMap="userMap"
                    :operateRootArr="operateArr" :dataPermis="dataPermis"
                    :initFormInfo="initFormInfo" :saveFormInfo="saveFormInfo" :class='flowViewMainClass'
-                   :flow-next-operation="flowNextOperation" :getFormInfo="getFormInfo">
+                   :flow-next-operation="flowNextOperation" :getFormInfo="getFormInfo" :formImpMethod="formImpMethod"
+                   :flowImpParamObj="flowImpParamObj" :downloadTemplate="downloadTemplate">
         <template slot="formInfo">
             <slot name="formInfo"></slot>
         </template>
@@ -22,7 +23,10 @@
             initFormInfo:{type: Function,default:null}, // 添加修改打开表单时执行的事件
             saveFormInfo:{type: Function,default:null}, // 保存表单时执行的事件
             getFormInfo:{type: Function,default:null}, // 获取表单内容，以方便进行表单信息修改
-            flowNextOperation:{type: Function,default:null} // 流程下一步时的参数回调事件
+            flowNextOperation:{type: Function,default:null}, // 流程下一步时的参数回调事件
+            formImpMethod:{type: Function,default:null},
+            flowImpParamObj: {type: Object,default: () => ({})},
+            downloadTemplate: {type: Function, default: null},
         },
         data(){
             return {
@@ -41,7 +45,7 @@
         },
         methods:{
             loadSkin() {
-                this.axios.post(this.api.plFlowCss.find, {
+                this.saspFlowAxios.post(this.api.plFlowCss.find, {
                     'useable': '1',
                     'order': 'PRIORITY ASC,UPDATE_TIME ASC',
                     "applyType":"0"
@@ -96,7 +100,7 @@
                     this.userMap = this.INTER_CACHE.getUserMap();
                     this.userArr = userArr;
                 }else{
-                    this.axios.post(this.api.plFlowInterface.find,{sysInterName:'userData',interType:'sys',interStatus:'1'}).then(res => {
+                    this.saspFlowAxios.post(this.api.plFlowInterface.find,{sysInterName:'userData',interType:'sys',interStatus:'1'}).then(res => {
                         if((res.data || []).length == 0){
                             return;
                         }
@@ -106,7 +110,7 @@
                 }
             },
             loadUserData(dataInter){
-                this.axios.post(this.api.plFlowDomain.findRealUrl,{status:'1'}).then(res => {
+                this.saspFlowAxios.post(this.api.plFlowDomain.findRealUrl,{status:'1'}).then(res => {
                     (res.data || []).forEach(item => {
                         this.doMainDatasObj[item.id] = item.domainUrl;
                     })
@@ -150,7 +154,7 @@
                         obj[item.key] = item.value || ""; // 注意这里要replace ${userCode}
                     })
                     if(dataInter.requestType === 'post'){
-                        this.axios.post(url,obj).then(res => {
+                        this.saspFlowAxios.post(url,obj).then(res => {
                             this.INTER_CACHE.setCacheInfo(dataInter.sysInterName,res.data);
                             resolve(res.data || []);
                         })
@@ -168,7 +172,7 @@
                                 url += "?" + params;
                             }
                         }
-                        this.axios(url).then(res => {
+                        this.saspFlowAxios(url).then(res => {
                             this.INTER_CACHE.setCacheInfo(dataInter.sysInterName,res.data);
                             resolve(res.data || []);
                         })

package/src/views/menuRouter/flowMenuRouter.vue

@@ -94,7 +94,7 @@
                     menuObj = window.menuIdToMenuObj[this.menuId];
                 }else{
                     //新窗口打开时查询菜单信息
-                    this.axios.post(this.api.menu.getById,{id:this.menuId}).then(function (res) {
+                    this.saspFlowAxios.post(this.api.menu.getById,{id:this.menuId}).then(function (res) {
                         if(res && res.data){
                             menuObj = res.data;
                         }
@@ -225,7 +225,7 @@
             //  * 获取资源池对象
             //  */
             // async getResources(){
-            //     let res = await this.axios.post(this.api.resources.findResources,{id:this.resourceId,rType:"page"}); //查询自定义表单中资源池数据
+            //     let res = await this.saspFlowAxios.post(this.api.resources.findResources,{id:this.resourceId,rType:"page"}); //查询自定义表单中资源池数据
             //     if(res.data && res.data.operateObj){
             //         this.resourceObj = res.data.operateObj[0]; //当前资源池
             //     }
@@ -242,7 +242,7 @@
 
             },
             async initReousrceObj(){
-                let res =  await  vm.axios.post(this.api.resources.findResources,{'rSource':rSource,'rStatus':'1','rKey':this.rKey}); //获取绑定资源数据
+                let res =  await  this.saspFlowAxios.post(this.api.resources.findResources,{'rSource':rSource,'rStatus':'1','rKey':this.rKey}); //获取绑定资源数据
                 if(res.data && res.data.operateObj){
                     res.data.operateObj.forEach(item =>{
                         this.sourcesObj[item.rkey] = item;

package/src/views/menuRouter/flowResRouter.vue

@@ -66,7 +66,7 @@
                 let resourceObj = this.resourceObj;
                 this.flowId = resourceObj.rkey || '';
                 if(this.flowId){
-                     /*await this.axios.post(this.api.plFlowDefine.getById, {"id":this.flowId}).then(res=>{
+                     /*await this.saspFlowAxios.post(this.api.plFlowDefine.getById, {"id":this.flowId}).then(res=>{
                          if(res.data){
                             this.flowObj=res.data;
                          }
@@ -113,7 +113,7 @@
 
                     this.isShow = true;
                 }else{ //根据 resourceId查询当前用户是否存在  资源权限  resourceId 如果存在获取数据权限和操作权限
-                    this.axios.post(this.api.auth.getOwnMenuOpt,{userId:loginUser.id,userType:loginUser.userType,optType:'source'}).then(res =>{
+                    this.saspFlowAxios.post(this.api.auth.getOwnMenuOpt,{userId:loginUser.id,userType:loginUser.userType,optType:'source'}).then(res =>{
                         if(res && res.data){
                             let roleOptArr = [];
                             (res.data || []).forEach(item =>{
@@ -190,7 +190,7 @@
             //  * 获取资源池对象
             //  */
             // async getResources(){
-            //     let res = await this.axios.post(this.api.resources.findResources,{id:this.resourceId,rType:"page"}); //查询自定义表单中资源池数据
+            //     let res = await this.saspFlowAxios.post(this.api.resources.findResources,{id:this.resourceId,rType:"page"}); //查询自定义表单中资源池数据
             //     if(res.data && res.data.operateObj){
             //         this.resourceObj = res.data.operateObj[0]; //当前资源池
             //     }
@@ -207,7 +207,7 @@
 
             },
             async initReousrceObj(){
-                let res =  await  vm.axios.post(this.api.resources.findResources,{'rSource':rSource,'rStatus':'1','rKey':this.rKey}); //获取绑定资源数据
+                let res =  await  this.saspFlowAxios.post(this.api.resources.findResources,{'rSource':rSource,'rStatus':'1','rKey':this.rKey}); //获取绑定资源数据
                 if(res.data && res.data.operateObj){
                     res.data.operateObj.forEach(item =>{
                         this.sourcesObj[item.rkey] = item;

package/src/views/popup/event/js/loadFlowEventPlugin.js

@@ -166,8 +166,8 @@ let eventObj = {}; //事件对象
 
 export default {
     name: "loadEventPlugin",
-    installAll(Vue){
-        axios.post(apiFlow.apis.eventRule.findByVersion,{"eventTypes":"flow"}).then(res =>{ //查询流程相关事件规则
+    installAll(Vue,opts){
+        opts.saspFlowAxios.post(apiFlow.apis.eventRule.findByVersion,{"eventTypes":"flow"}).then(res =>{ //查询流程相关事件规则
             let eventPlugin = Vue.prototype.EVENT_PLUGIN || {};
             if(res){
                 Object.keys(diyEventObjs).forEach(key =>{
@@ -279,4 +279,4 @@ export default {
         });
 
     }
-}
+}