sasp-flow-render 1.0.18 → 1.0.20

package/package.json

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

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

@@ -109,6 +109,7 @@ let objResult = {
         getAllFlowInst:"/plFlowInstController/getAllFlowInst", // 获取所有流程实例
         suspendOrRecover:"/plFlowInstController/suspendOrRecover", // 挂起或恢复选中流程实例
         getListInfoByResource:"/plFlowInstController/getListInfoByResource", // 根据资源id获取列表视图数据
+        getPageInfoByFlowId:"/plFlowInstController/getPageInfoByFlowId", // 根据资源id获取页面配置数据
         findInstPending:"/plFlowInstController/findInstPending",
         findInstProcessed:"/plFlowInstController/findInstProcessed",
         findInstFinished:"/plFlowInstController/findInstFinished",

package/src/components/flowInst/flowInstList.vue

@@ -41,6 +41,8 @@
                         <el-button icon="el-icon-close" @click="resetSearch()">清空</el-button>
                     </el-form-item>
                 </el-form>
+                <el-button type="primary" style="position: absolute;right:20px;top:20px;z-index:999"
+                           @click="showFormSetting" v-if="workTurnOn">智能建表配置</el-button>
             </div>
         </el-header>
         <el-main style="height: 100%;padding:0 10px">
@@ -246,11 +248,18 @@
                     layout="total, sizes, prev, pager, next, jumper">
             </el-pagination>
         </el-footer>
+        <!-- 请求前后加载组件end -->
+        <el-dialog :title="title" append-to-body
+                   :close-on-click-modal="false"
+                   :visible.sync="formSettingVisible" width="99%" height="98%" top="1vh">
+          <vue-form-edit :form-id="formId" :define-key="formDefineKey"
+                         v-if="formSettingVisible" @cancel="formSettingVisible = false;"></vue-form-edit>
+        </el-dialog>
     </el-container>
 </template>
 
 <script>
-    import {Replace} from "sasp-base";
+    import {Replace,WORK_GLOBAL} from "sasp-base";
     import FlowChart from "../flowChart";
     import FlowRoamRecord from "../flowRoamRecords";
 
@@ -459,11 +468,17 @@
                 currentOptColumnWidth: this.optColumnWidth,
                 screenWidth:"",
                 screenHeight:"",
+                workTurnOn:false,
+                flowFormId: "",
+                formDefineKey: "",
+                title: "",
+                formSettingVisible:false,
             }
         },
         created() {
             this.init();
             this.getListButton();
+            this.initWorkStageTurnOn();
             if (this.showModel == "card") {
                 this.checkScreenWidth();
                 window.addEventListener('resize', () => { //监听浏览器窗口大小改变
@@ -475,7 +490,34 @@
         mounted() {
         },
         methods: {
-
+            initWorkStageTurnOn(){
+              this.workTurnOn = WORK_GLOBAL.getTurnOn(this.switchOnline,this.listViewId);
+            },
+            switchOnline(val){
+              this.workTurnOn = val;
+            },
+            /**
+             * 打开相关的智能建表
+             */
+            showFormSetting(){
+              this.axios.post(this.api.plPageInfo.find,{ flowId: this.flowDefine.id }).then(res => {
+                let pageInfo = (res.data || [])[0] || {};
+                this.pageName = pageInfo.pageName || "";
+                this.flowFormId = pageInfo.formId;
+                this.formDefineKey = pageInfo.formDefineKey;
+                this.title = "智能建表配置("+ (this.pageName) +")";
+                if (this.SASP_FORM_CONFIG_PACK) {
+                  this.formSettingVisible = true;
+                } else {
+                  let href = window.FORM_RENDER_URL + "/formPath/index.html#/vueFormEditRedirect" +
+                      "?formId=" + this.flowFormId + "&defineKey=" + this.formDefineKey + "&title=" + this.title;
+                  window.open(href,"_blank");
+                  // let href = window.FORM_RENDER_URL + "/formPath/index.html#/vueFormEditRedirect" +
+                  //     "?flowId=" + this.flowDefine.id + "&type=flow";
+                  // window.open(href,"_blank");
+                }
+              });
+            },
             /**
              * 根据类型加载不需要清楚的
              */

package/src/components/flowInst/flowInstTab.vue

@@ -249,7 +249,7 @@
                         :key="item.dataId"
                         :label="userMap[item.startUserId]"
                         :name="item.dataId" :closable="batchUpdateFormInfo.dataRows.length > 1" :lazy="true">
-                    <template>
+                    <template v-if="batchUpdateFormInfo.formShow">
                         <slot name="formInfo"></slot>
                     </template>
                 </el-tab-pane>
@@ -1044,7 +1044,7 @@
                     arrRows.push(Object.assign({}, data));
                 });
                 Object.assign(this.batchUpdateFormInfo, {
-                    formShow: false,
+                    formShow: true,
                     dataRows: arrRows,
                     pendingNums: arrRows.length,
                     activeName: arrRows[0].dataId,
@@ -1053,7 +1053,7 @@
 
                 this.flowBatchPendingDialog = true;
                 this.initUpdateFlowForm(arrRows[0]).then(()=>{
-                    this.batchUpdateFormInfo.formShow = true;
+                    // this.batchUpdateFormInfo.formShow = true;
                     let ref='batchTableForm'+arrRows[0].dataId+'Ref'
 
                     this.$nextTick(()=>{
@@ -1595,13 +1595,17 @@
                 if (nextTab) {
                     this.batchUpdateFormInfo.activeName = nextTab.dataId;
                     this.batchUpdateFormInfo.batchDataId =nextTab.dataId;
-                    this.initUpdateFlowForm(nextTab).then(()=>{
-                        this.$nextTick(()=>{
-                            let ref='batchTableForm'+nextTab.dataId+'Ref';
-                            // this.$refs[ref][0].loadData().then(() => {
-                            this.exeFlowEvent("handle","afterClick",nextTab.currentNode,ref);
-                            // })
-                        })
+                    this.batchUpdateFormInfo.formShow = false;
+                    this.$nextTick(() => {
+                        this.batchUpdateFormInfo.formShow = true;
+                        this.initUpdateFlowForm(nextTab).then(()=>{
+                            this.$nextTick(()=>{
+                                let ref='batchTableForm'+nextTab.dataId+'Ref';
+                                // this.$refs[ref][0].loadData().then(() => {
+                                this.exeFlowEvent("handle","afterClick",nextTab.currentNode,ref);
+                                // })
+                            })
+                        });
                     });
                 }
 
@@ -1861,13 +1865,15 @@
                     background: 'rgba(0, 0, 0, 0.7)'
                 })
                 let currentInst = this.currentInst;
-                this.$confirm('确定要退回至上一个节点吗?', '警告', {
+                this.$prompt('退回备注', '确定要退回至上一个节点吗?', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
-                }).then(() => {
+                    inputType: 'textarea',
+                }).then(({ value }) => {
                     this.axios.post(this.api.plFlowInst.backRewrite,
                         {
-                            taskId:currentInst.taskId
+                            taskId:currentInst.taskId,
+                            remarks: value
                         }).then(res => {
                         if (res && res.data && res.data.operateSuccess) {
                             this.$message({type: "success", message: "退回成功！"});

package/src/components/flowRoamRecords.vue

@@ -286,6 +286,7 @@
                     let variables = res.data.resultObject.variables;
                     let userIdsMap = res.data.resultObject.userIdsMap;
                     let externalTak = res.data.resultObject.externalTak;
+                    let plNodeInstMap = res.data.resultObject.plNodeInstMap;
                     // 初始化多人处理数据
                     let multiInstanceBodyObj = {};
                     let multiInstanceArr = [];
@@ -466,6 +467,7 @@
                         }else if(variables["back_" + item.taskId]){ // 退回
                             item.nodeInstStatus = "3";
                             item.actorUserName += "(由用户‘"+ userIdsMap[variables["back_" + item.taskId]] + "’退回)";
+                            item.nodeMask = plNodeInstMap[item.taskId] === undefined ? "" : plNodeInstMap[item.taskId].backMsg;
                         }else if(Object.keys(variables).indexOf("autoEnd_" + item.taskId) > -1){ // 自动处理
                             item.actorUserName += "(系统自动处理)";
                         }else if(variables["assignTask_" + item.taskId]){ // 退回

package/src/views/popup/event/compoment/system/flowEditContentConfig.vue

@@ -257,14 +257,14 @@
                                 }
                             }else if(affect.valType == 'sysData'){ //数据字典
                                 if(affect.value){
-                                    let maxIndex =  affect.value.length - 1;
+                                    let maxIndex = affect.value.length - 1;
                                     paramsObj[field] = affect.value[maxIndex] || '';
                                 }
-                            }else if(affect.valType == 'user'){
-                                if(affect.value.indexOf("LOGINUSER") > -1){
+                            }else if(affect.valType == 'user' && affect.value.indexOf("LOGINUSER") > -1){
+                                // if(affect.value.indexOf("LOGINUSER") > -1){
                                     let value = Replace.def(vm.loginUser,affect.value) || "";
                                     paramsObj[field] = value;
-                                }
+                                // }
                             }
                         }
                     });
@@ -289,11 +289,11 @@
                                     let maxIndex =  affect.value.length - 1;
                                     vm.$set(formData,field,affect.value[maxIndex] || '');
                                 }
-                            }else if(affect.valType == 'user'){
-                                if(affect.value.indexOf("LOGINUSER") > -1){
+                            }else if(affect.valType == 'user' && affect.value.indexOf("LOGINUSER") > -1){
+                                // if(affect.value.indexOf("LOGINUSER") > -1){
                                     let value = Replace.def(vm.loginUser,affect.value) || "";
                                     vm.$set(formData,field,value)
-                                }
+                                // }
                             }
                         }
                     });