From 3da21d7b6644e42dd3a4df38592e626187af47ef Mon Sep 17 00:00:00 2001
From: wangqing <250543222@qq.com>
Date: Wed, 9 Jun 2021 23:08:36 +0800
Subject: [PATCH] fix

---
 src/views/form/statistics/filter.vue | 13 +++++++++++--
 src/views/form/statistics/list.vue   | 12 ++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/views/form/statistics/filter.vue b/src/views/form/statistics/filter.vue
index 71f646d..1dbaf92 100644
--- a/src/views/form/statistics/filter.vue
+++ b/src/views/form/statistics/filter.vue
@@ -45,7 +45,9 @@
         </el-row>
         <span slot="footer" class="dialog-footer">
             <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button :disabled="selectedFields.length==0" type="primary" @click="submitFilterHandle">确 定</el-button>
+            <el-button :disabled="selectedFields.length==0&&filterParams!={}" type="primary"
+                       @click="submitFilterHandle"
+            >确 定</el-button>
         </span>
     </el-dialog>
 </template>
@@ -63,6 +65,8 @@ export default {
         return {
             dialogVisible: true,
             selectedFields: [],
+            // 参数比较类型
+            filterParamsComparison: {},
             filterParams: {}
         }
     },
@@ -76,7 +80,7 @@ export default {
             this.$set(this.fields, item.leftIndex, item)
         },
         submitFilterHandle() {
-            this.$emit('filter', this.filterParams)
+            this.$emit('filter', this.filterParams, this.filterParamsComparison)
             this.dialogVisible = false
         },
         selectedFieldHandle(index, item) {
@@ -86,6 +90,11 @@ export default {
             item.selected = true
             this.$set(this.fields, index, item)
             item.leftIndex = index
+            if (['SELECT', 'RADIO', 'CHECKBOX', 'IMAGE_SELECT'].includes(item.type)) {
+                this.filterParamsComparison[`filed${item.formItemId}`] = 'EQ'
+            } else {
+                this.filterParamsComparison[`filed${item.formItemId}`] = 'LIKE'
+            }
             this.selectedFields.push(item)
         }
     }
diff --git a/src/views/form/statistics/list.vue b/src/views/form/statistics/list.vue
index 6a9322a..3ce52ea 100644
--- a/src/views/form/statistics/list.vue
+++ b/src/views/form/statistics/list.vue
@@ -129,9 +129,7 @@
                 </span>
             </el-dialog>
         </div>
-        <data-filter ref="dataFilter" :fields="projectItemList" @filter="(params)=>
-        {this.queryConditions.extParams=params;this.queryProjectResult()}"
-        />
+        <data-filter ref="dataFilter" :fields="projectItemList" @filter="dataFilterHandle" />
     </div>
 </template>
 
@@ -178,7 +176,8 @@ export default {
                 projectKey: '',
                 beginDateTime: '',
                 endDateTime: '',
-                extParams: {}
+                extParams: null,
+                extComparisons: null
             }
         }
     },
@@ -207,6 +206,11 @@ export default {
         conditionFilterHandle() {
             this.$refs.dataFilter.showDialogHandle()
         },
+        dataFilterHandle(params, comparisons) {
+            this.queryConditions.extParams = params
+            this.queryConditions.extComparisons = comparisons
+            this.queryProjectResult()
+        },
         queryProjectResult() {
             this.$api.get('/user/project/result/page', {params: this.queryConditions}).then(res => {
                 let {records, total, size} = res.data