From c63545c5e3f297a5b9545f0cb2afeaa843ce52cb Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 12 十二月 2022 09:29:13 +0800
Subject: [PATCH] Initial commit

---
 src/views/specialCheck/components/wholesaleForm.vue |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/views/specialCheck/components/wholesaleForm.vue b/src/views/specialCheck/components/wholesaleForm.vue
index 28990ee..1ac8d77 100644
--- a/src/views/specialCheck/components/wholesaleForm.vue
+++ b/src/views/specialCheck/components/wholesaleForm.vue
@@ -13,7 +13,7 @@
                 <div v-show="enterpriseType == 2">
                     零售企业共计<span class="point-data" @click="resetSearch()">{{enterpriseCount}}</span>家,其中:已自查<span class="point-data" @click="toSelfEnterprise(1)">{{ selfCheckEnterpriseCount }}</span>家,未自查<span @click="toSelfEnterprise(0)" class="undone point-data">{{ noSelfCheckEnterpriseCount }}</span>家;本级已经抽查<span class="point-data" @click="toLevelEnterprise(1)">{{ thislevelAlreadyCheckCount }}</span>家,未检查<span @click="toLevelEnterprise(0)" class="undone point-data">{{ thislevelNoCheckCount }}</span>家,检查覆盖要求<span class="undone">{{ thislevelCompletionRateRequire }}{{thislevelCompletionRateRequireUnit ==1?'家':'%'}}</span>,完成率<span>{{ thislevelCompletionRate == null?'--':thislevelCompletionRate + '%' }}</span>。
                 </div>
-                <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search" @click="showFilter = !showFilter">{{showFilter?'关闭查询':'自定义查询'}}</el-button>
+                <el-button class="filter-item" style="margin-left: 10px;" type="primary" icon="el-icon-search" @click="openSearch()">{{showFilter?'关闭查询':'自定义查询'}}</el-button>
             </div>
             <transition name="el-zoom-in-top">
                 <el-row v-show="showFilter" :gutter="20">
@@ -136,10 +136,10 @@
             listLoading: false,
             showFilter: false,
             search:{
-                name: '',
-                province: '',
-                city: '',
-                area: '',
+                name: null,
+                province: null,
+                city: null,
+                area: null,
                 isRisky: null
             },
             tableKey: 0,
@@ -200,6 +200,7 @@
         async getEnterpriseCompleteInfoList(){
             const t = this
             t.listLoading = true
+            if(t.search.name == ''){t.search.name = null}
             let data = {pageIndex: t.currentPage,pageSize: t.pageSize,taskId: t.taskId,enterpriseType: t.enterpriseType,selfcheckStatus:t.selfcheckStatus,thislevelCheckStatus: t.thislevelCheckStatus,enterpriseName: t.search.name, enterpriseProvince: t.search.province, enterpriseCity: t.search.city, enterpriseArea: t.search.area, hiddendangerStatus: t.search.isRisky}
             let res = await getEnterpriseCompleteInfoList(data)
             if(res.data.code === "200"){
@@ -222,6 +223,14 @@
             t.listLoading = false
         },
 
+        openSearch(){
+            const t = this
+            t.showFilter = !t.showFilter
+            if(t.showFilter == false){
+                t.resetSearch()
+            }
+        },
+
         handleSizeChange: function (val) {
             this.pageSize = val
             this.currentPage = 1
@@ -236,8 +245,8 @@
             t.selfcheckStatus = null
             t.thislevelCheckStatus = null
             t.search.province = value[0]
-            t.search.city = value[1] ? value[1] : ''
-            t.search.area = value[2] ? value[2] : ''
+            t.search.city = value[1] ? value[1] : null
+            t.search.area = value[2] ? value[2] : null
             t.getEnterpriseCompleteInfoList()
         },
 
@@ -257,10 +266,10 @@
             t.selfcheckStatus = null
             t.thislevelCheckStatus = null
             t.search = {
-                name: '',
-                province: '',
-                city: '',
-                area: '',
+                name: null,
+                province: null,
+                city: null,
+                area: null,
                 isRisky: null
             }
             t.selectedOptions = []
@@ -295,7 +304,6 @@
             t.$refs.feedback.unitType = t.unitType
             t.$refs.feedback.enterpriseType = t.enterpriseType
             t.$refs.feedback.getSpotCheckReportInfo()
-            console.log(t.$refs.feedback.unitType,t.$refs.feedback.checkData,'data')
             t.$refs.feedback.dialogVisible = true
         }
     }

--
Gitblit v1.9.2