Explorar o código

fix(流程模型): 解决检索条件正常查询

qihao %!s(int64=2) %!d(string=hai) anos
pai
achega
4cfb9fff14

+ 5 - 5
src/views/bpm/model/components/modelSearch.vue

@@ -3,7 +3,7 @@
   <el-form
     label-width="100px"
     class="ele-form-search"
-    @keyup.enter.native="search"
+    @keyup.enter.native="search(true)"
     @submit.native.prevent
   >
     <el-row :gutter="15">
@@ -29,7 +29,7 @@
             type="primary"
             icon="el-icon-search"
             class="ele-btn-icon"
-            @click="search"
+            @click="search(true)"
           >
             查询
           </el-button>
@@ -61,15 +61,15 @@
     },
     methods: {
       /* 搜索 */
-      search () {
-        this.$emit('search', {
+      search (reset) {
+        this.$emit('search', {reset: reset,
           ...this.queryParams
         });
       },
       /*  重置 */
       reset () {
         this.queryParams = { ...this.defaultParams };
-        this.search();
+        this.search(true);
       }
     }
   };

+ 5 - 2
src/views/bpm/model/index.vue

@@ -233,7 +233,11 @@
       },
       /* 刷新表格 */
       reload (params) {
-        this.$refs.table.reload({ where: params });
+        if(params.reset){
+          this.$refs.table.reload({ page: 1, where: params });
+        } else {
+          this.$refs.table.reload({ where: params });
+        }
       },
 
       /** 取消按钮 */
@@ -241,7 +245,6 @@
         this.open = false;
       },
 
-
       // 表单重置
       reset() {
         this.form = {