sasp-flow-render 1.0.20 → 1.0.21

package/package.json

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

package/src/components/flowInst/flowInstList.vue

@@ -62,7 +62,7 @@
                     </el-button>
                 </el-header>
                 <el-main style="height: 100%;padding: 0;" class="main-box">
-                    <el-table :data="crud.dataStore.records" :ref="crud.tableRef"
+                    <el-table :data="crud.dataStore.records" :ref="crud.tableRef" @sort-change="flowSortChange"
                               v-if="showModel=='list'" stripe border height="100%" style="width: 100%;">
                         <el-table-column type="selection" width="40" align="center"
                                          v-if="isShow('draft')"></el-table-column>
@@ -73,7 +73,8 @@
                                 {{userMap[scope.row.startUserId]}}
                             </template>
                         </el-table-column>
-                        <el-table-column :label="tabType=='draft'?'创建时间':'启动时间'" prop="saspStartTime" width="180" align="center"></el-table-column>
+                        <el-table-column :label="tabType=='draft'?'创建时间':'启动时间'"
+                                         prop="saspStartTime" width="180" align="center"></el-table-column>
                         <el-table-column label="办结时间" prop="finishedTime" width="180" align="center"
                                          v-if="isShow('finished')"></el-table-column>
                         <el-table-column label="撤销时间" prop="revokedTime" width="180" align="center"
@@ -252,8 +253,8 @@
         <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>
+            <vue-form-edit :form-id="formId" :define-key="formDefineKey"
+                           v-if="formSettingVisible" @cancel="formSettingVisible = false;"></vue-form-edit>
         </el-dialog>
     </el-container>
 </template>
@@ -473,6 +474,7 @@
                 formDefineKey: "",
                 title: "",
                 formSettingVisible:false,
+                flowSortOrder:""
             }
         },
         created() {
@@ -491,32 +493,32 @@
         },
         methods: {
             initWorkStageTurnOn(){
-              this.workTurnOn = WORK_GLOBAL.getTurnOn(this.switchOnline,this.listViewId);
+                this.workTurnOn = WORK_GLOBAL.getTurnOn(this.switchOnline,this.listViewId);
             },
             switchOnline(val){
-              this.workTurnOn = 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");
-                }
-              });
+                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");
+                    }
+                });
             },
             /**
              * 根据类型加载不需要清楚的
@@ -718,6 +720,9 @@
                 if (timeArr.length > 0 && timeArr[1]) {
                     this.crud.searchForm.startTimeEnd = timeArr[1] + " 23:59:59";
                 }
+                if (this.flowSortOrder) {
+                    this.crud.searchForm.flowSortOrder = this.flowSortOrder;
+                }
                 this.$emit("initTabNum");
                 if (type == "noMessage") {
                     this.crud.search();
@@ -856,6 +861,19 @@
                 })
                 return arr.join(",");
             },
+            //点击列排序是的函数
+            flowSortChange({column, prop, order}){
+                if(column.order){
+                    if(column.order == "ascending"){ // asc
+                        this.flowSortOrder = column.property + " ASC";
+                    }else{
+                        this.flowSortOrder = column.property + " DESC";
+                    }
+                }else{
+                    this.flowSortOrder = "";
+                }
+                this.doSearch();
+            },
         }
     }
 </script>