sasp-flow-render 1.1.3 → 1.1.6

package/index.js

@@ -45,6 +45,12 @@ let components = [
 ];
 
 let createAxiosIfNotExists = (Vue,props) => {
+    if((props || {}).axios){
+        Vue.prototype.saspFlowAxios = props.axios;
+        (props || {}).saspFlowAxios = props.axios;
+        return;
+    }
+
     let newAxios = axios.create({
         baseURL:window.FLOW_RENDER_URL,
         headers: {
@@ -70,13 +76,14 @@ let createAxiosIfNotExists = (Vue,props) => {
  */
 let initAxios = (Vue, props) => {
     let axios = (props || {}).saspFlowAxios;
+
     // 添加请求拦截器
     axios.interceptors.request.use(function (config) {
         // if ((config.headers["Content-Type"] != 'multipart/form-data') && isAxiosFormData((config.url))) {
         if (config.headers["Content-Type"] != 'multipart/form-data') {
             config = Object.assign({}, config);
             config.headers = Object.assign({}, config.headers || {}, {
-                // "Is-Sasp-Qs": true,
+                "Is-Sasp-Qs": true,
                 "Content-Type": "application/x-www-form-urlencoded"
             });
         }
@@ -94,15 +101,20 @@ let initAxios = (Vue, props) => {
     });
     axios.defaults.transformRequest = axios.defaults.transformRequest || [];
     axios.defaults.transformRequest.push(
-        function (data) {
-            if (data && typeof data === "string") { // 本项目的所有请求都通过qs转换实现
-                try {
-                    data = JSON.parse(data);
-                } catch (e) {
-                    console.error(e);
+        function (data,config) {
+            if (config["Is-Sasp-Qs"]) {
+                delete config["Is-Sasp-Qs"];
+                if (data && typeof data === "string") { // 本项目的所有请求都通过qs转换实现
+                    try {
+                        data = JSON.parse(data);
+                    } catch (e) {
+                        console.error(e);
+                    }
                 }
+                return qs.stringify(data);
+            }else{
+                return data;
             }
-            return qs.stringify(data);
         }
     );
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasp-flow-render",
-  "version": "1.1.3",
+  "version": "1.1.6",
   "description": "业务应用支撑平台-智慧流程渲染组件",
   "scripts": {
     "build": "vue-cli-service build"

package/src/assets/js/api/apiFlow.js

@@ -93,6 +93,12 @@ let objResult = {
         listNoPageByResult:"/flowInstNodeResultController/listNoPageByResult",
     },
 
+    //流程节点批量处理配置
+    plFlowNodeExtend: {
+        find: "/plFlowNodeExtendController/find",
+        getById: "/plFlowNodeExtendController/getById",
+    },
+
     plFlowInst:{
         url:"/plFlowInstController",
         queryFormData:"/plFlowInstController/queryFormData",
@@ -146,7 +152,9 @@ let objResult = {
         changeDealer:"/plFlowInstController/changeDealer", // 切换当前任务处理人
         forceEnd:"/plFlowInstController/forceEnd", // 强制办结
         recoverExceptionFlow:"/plFlowInstController/recoverExceptionFlow", // 恢复异常流程
-        reStartFlow:"/plFlowInstController/reStartFlow" //重启办结状态下的流程
+        reStartFlow:"/plFlowInstController/reStartFlow", //重启办结状态下的流程
+        batchUpdateFlowStatus:"/plFlowInstController/batchUpdateFlowStatus", //新版流程批量处理的批量修改流程状态
+        batchExecuteNextStep:"/plFlowInstController/batchExecuteNextStep", //新版流程批量处理的批量执行下一步
     },
 
     plFlowSetting:{
@@ -183,6 +191,10 @@ let objResult = {
         login: "/flowLoginController/login",
         logout: "/flowLoginController/logout",
     },
+    loginInnovateMethod:{
+        login: "/loginController/login",
+        logout: "/loginController/logout",
+    },
     plFlowDomain:{
         url:"/plFlowDomainController",
         find:"/plFlowDomainController/find",

package/src/components/flowInst/flowInstList.vue

@@ -1,6 +1,6 @@
 <template>
     <el-container style="height: 100%;">
-        <el-header style="height: auto;">
+        <el-header style="height: auto;" :class="[{'multiInstListHeader': flowIds.includes(',')}]">
             <div class="search-form-parent el-card">
                 <el-form :inline="true" :model="crud.searchForm" size="small" class="demo-form-inline"
                          @keyup.enter.native="doSearch()" onSubmit="return false;">
@@ -82,6 +82,9 @@
                     <el-button type="primary" icon="el-icon-document-copy" size="small" round v-if="isShow('pending')"
                                @click="openFlowBatchPendingDialog">批量处理
                     </el-button>
+                    <el-button type="warning" icon="el-icon-document-copy" size="small" round v-if="isShow('pending') && getFormDataByDataIds"
+                               @click="openFlowBatchPendingDialogNew">快捷处理
+                    </el-button>
                 </el-header>
                 <el-main style="height: 100%;padding: 0;" class="main-box">
                     <el-table :data="crud.dataStore.records" :ref="crud.tableRef" @sort-change="flowSortChange"
@@ -140,26 +143,22 @@
                                             :key="buttonObj.type" size="small" type="primary"
                                             v-if="judgeListButton(tabType,buttonObj.type)"
                                             @click="listButtonOpt(buttonObj.type,scope.row)"
-                                            :icon="buttonIcon[buttonObj.type]" :type="buttonType[buttonObj.type]">
-                                        {{buttonObj.showName}}
+                                            :icon="buttonIcon[buttonObj.type]" :type="buttonType[buttonObj.type]">{{buttonObj.showName}}
                                     </el-button>
                                 </template>
                                 <template v-else>
                                     <el-button size="small"
                                                @click="listButtonOpt('view',scope.row)"
-                                               icon="el-icon-view" type="primary">
-                                        查看
+                                               icon="el-icon-view" type="primary">查看
                                     </el-button>
                                     <el-button size="small"
                                                @click="listButtonOpt('flowRecord',scope.row)"
-                                               icon="saspiconfont pl-icon-liuchengtu" type="primary">
-                                        流转记录
+                                               icon="saspiconfont pl-icon-liuchengtu" type="primary">流转记录
                                     </el-button>
                                 </template>
                                 <el-button size="small" v-if="scope.row.linkProcId && scope.row.nodeKey == startNodeKeyObj[scope.row.version]"
                                            @click="deleteRowFlow(scope.row)"
-                                           icon="el-icon-delete" type="danger">
-                                    删除
+                                           icon="el-icon-delete" type="danger">删除
                                 </el-button>
                             </template>
                         </el-table-column>
@@ -297,6 +296,7 @@
                 }
             },//工作流配置信息
             formId: {type: String, default: ""},
+            flowIds: {type: String, default: ""},
             startNodeKey: {type: String, default: ""},//开始节点key
             flowNodeIdToInfo: {
                 type: Object, default: () => {
@@ -358,6 +358,13 @@
                 }
             },
 
+            // 打开新的批量修改窗口回调函数
+            openNewBatchUpdateFlowForm: {
+                type: Function, default() {
+
+                }
+            },
+
             // 打开查看窗口回调函数
             openViewFlowForm: {
                 type: Function, default() {
@@ -389,6 +396,7 @@
             formImpMethod: {type: Function, default(){}},
             flowImpParamObj: {type: Object, default: () => ({})},
             downloadTemplate: {type: Function, default: null},
+            getFormDataByDataIds: {type: Function, default: null},
         },
         data() {
 
@@ -500,13 +508,14 @@
                 formSettingVisible: false,
                 flowSortOrder: "",
                 flowAboutFileList: [],
+                flowNewBatchDealDataIds: "",
             }
         },
         created() {
             this.init();
             this.getListButton();
             this.initWorkStageTurnOn();
-            if (this.showModel == "card") {
+            if (this.showModel === "card") {
                 this.checkScreenWidth();
                 window.addEventListener('resize', () => { //监听浏览器窗口大小改变
                     //浏览器变化执行动作
@@ -514,8 +523,7 @@
                 });
             }
         },
-        mounted() {
-        },
+        mounted() {},
         methods: {
             initWorkStageTurnOn(){
                 this.workTurnOn = WORK_GLOBAL.getTurnOn(this.switchOnline,this.listViewId);
@@ -557,31 +565,42 @@
             },
 
             init() {
-                this.crud.searchForm["flowId"] = this.flowDefine.id;
+                this.crud.searchForm["flowId"] = this.flowIds || this.flowDefine.id;
                 this.$set(this.crud.searchForm,"currentNode","");
                 let flowStatus = this.flowStatusObj[this.tabType];
-                if(!flowStatus && flowStatus != 0){
+                if(!flowStatus && flowStatus !== 0){
                     flowStatus = "";
                 }
                 this.crud.searchForm["nodeType"] = this.tabType;
-                if (this.tabType == "draft") {
+                if (this.tabType === "draft") {
                     this.crud.searchForm["created"] = this.loginUser.id;
                 }
-                if (this.tabType == "pending" || this.tabType == "processed" || this.tabType == "finished"
-                    || this.tabType == "rescinded" || this.tabType == "discontinue") {
+                if (this.tabType === "pending" || this.tabType === "processed" || this.tabType === "finished"
+                    || this.tabType === "rescinded" || this.tabType === "discontinue") {
                     this.crud.searchForm["dealUserId"] = this.loginUser.id;
                     flowStatus = this.flowStatusObj[this.tabType] || "1";
                 }
-                if(this.tabType == "flowQuery"){
+                if(this.tabType === "flowQuery"){
                     this.crud.searchForm["instQueryPower"] = this.instQueryPower;
                     this.crud.searchForm["created"] = this.loginUser.id;
                     this.crud.searchForm["queryOrderSetting"] = this.flowDefine.queryOrderSetting;
                 }
                 this.$set(this.crud.searchForm, 'flowStatus', flowStatus);
                 this.crud.search();
-
             },
 
+            // initNewBatchDealFunc() {
+            //     this.initNewBatchDeal().then(() => {
+            //         this.initFormDataByDataIds();
+            //     });
+            // },
+
+            // initFormDataByDataIds() {
+            //     this.getFormDataByDataIds(this.formId, this.flowNewBatchDealDataIds).then(res => {
+            //         this.$emit('setDataValue', "formDataObj", res);
+            //     });
+            // },
+
             /**
              * 列表操作按钮显示
              */
@@ -755,7 +774,7 @@
                     this.crud.searchForm.flowSortOrder = "";
                 }
                 this.$emit("initTabNum");
-                if (type == "noMessage") {
+                if (type === "noMessage") {
                     this.crud.search();
                 } else {
                     this.crud.doSearch();
@@ -831,15 +850,20 @@
              * 按钮操作事件
              */
             listButtonOpt(buttonType, row, type) {
-                if (buttonType == "update") {//修改
-                    this.openUpdateFlowForm(row,'update');
-                } else if (buttonType == "deal") {//处理
-                    this.openUpdateFlowForm(row,'handle');
-                } else if (buttonType == "view") {//查看
+                if (buttonType === "update") {
+                    //修改
+                    this.openUpdateFlowForm(row, 'update');
+                } else if (buttonType === "deal") {
+                    //处理
+                    this.openUpdateFlowForm(row, 'handle');
+                } else if (buttonType === "view") {
+                    //查看
                     this.openViewFlowForm(row);
-                } else if (buttonType == "flowChart") {
+                } else if (buttonType === "flowChart") {
+                    //流程图
                     this.openFlowChart(row);
-                } else if (buttonType == "flowRecord") {
+                } else if (buttonType === "flowRecord") {
+                    // 流转记录
                     this.openFlowRecord(row);
                 }
             },
@@ -848,7 +872,7 @@
              * 打开批量处理页面方法
              */
             async openFlowBatchPendingDialog() {
-                if (this.crud.dataStore.records.length == 0) {
+                if (this.crud.dataStore.records.length === 0) {
                     this.$message({
                         showClose: true,
                         message: '当前没有可处理的流程'
@@ -856,7 +880,12 @@
                 } else {
                     this.openBatchUpdateFlowForm(this.crud.dataStore.records);
                 }
-
+            },
+            /**
+             * 快捷处理
+             */
+            openFlowBatchPendingDialogNew(){
+                this.openNewBatchUpdateFlowForm();
             },
 
             /**
@@ -1011,6 +1040,9 @@
 
 <style scoped lang="scss">
     @import "css/flowInstList";
+    .multiInstListHeader {
+        margin-top: 10px;
+    }
 </style>
 <style lang="scss">
     .el-tooltip__popper{