计划加入查询条件

src/views/enforce/enforcementPlan.vue

@@ -1,4 +1,3 @@
-
 <template>
     <div class="shop app_content">
         <!-- 导航栏 -->
@@ -19,15 +18,24 @@
                 <div @click="onClickButton">搜索</div>
             </template>
         </van-search>
-    <!-- <div class="search-button-list">
+        <div class="search-button-list">
-      <van-button plain hairline class="search-button" @click="searchDateType()" round type="primary" size="mini">全部</van-button>
+            <van-button plain hairline class="search-button" @click="searchDateType()" round type="primary" size="mini">
-      <van-button plain hairline class="search-button" @click="searchDateType(2)" round type="primary" size="mini">本月</van-button>
+                全部
-      <van-button plain hairline class="search-button" @click="searchDateType(3)" round type="primary" size="mini">本季度</van-button>
+            </van-button>
-      <van-button plain hairline class="search-button" @click="searchDateType(1)" round type="primary" size="mini">本年度</van-button>
+            <van-button plain hairline class="search-button" @click="searchDateType(1)" round type="primary"
-      <van-button plain hairline class="search-button" @click="searchComplaint(1)" round type="primary" size="mini">投诉</van-button>
+                        size="mini">本月
-    </div> -->
+            </van-button>
+            <van-button plain hairline class="search-button" @click="searchDateType(2)" round type="primary"
+                        size="mini">本季
+            </van-button>
+            <van-button plain hairline class="search-button" @click="searchDateType(3)" round type="primary"
+                        size="mini">本年
+            </van-button>
+            <van-button plain hairline class="search-button" @click="selectDate" round type="primary" size="mini">筛选
+            </van-button>
+        </div>
         <div class="search-button-date">
-      <span class="date-select" @click="selectDate">{{  data.dateSearch }}</span>
+            <span class="date-select" v-show="data.dateShow" @click="selectDate">{{  data.dateSearch }}</span>
             <div style="border-color: black;" class="van-hairline--bottom"></div>
             <van-button class="search-button" type="primary" size="mini" @click="openPlanAddView">创建</van-button>
             <van-popup v-model:show="data.showDatePicker" position="bottom">
@@ -50,7 +58,8 @@
                               :resetScroll="resetScroll" class="refresh_box">
                     <div class="refresh_content" v-if="data?.dataList.length">
                         <!--						<div class="goods_box" v-for="(item, index) in data?.dataList" :key="index" @click="toPdfView(item.fileObject.fileUrl)">-->
-						<div class="goods_box" v-for="(item, index) in data?.dataList" :key="index" @click="toPdfView(null!=item.fileObject?item.fileObject.fileUrl:null)">
+                        <div class="goods_box" v-for="(item, index) in data?.dataList" :key="index"
+                             @click="toPdfView(null!=item.fileObject?item.fileObject.fileUrl:null)">
                             <van-swipe-cell class="swipe_cell">
                                 <div class="card_box">
                                     <div class="card_box_span">
@@ -66,10 +75,12 @@
                                         <p><span class="card_box_label">执法区域：</span> {{ item.enforcementArea }}</p>
                                     </div>
                                     <div class="card_box_span">
-                    <p><span class="card_box_label">执法部门：</span> {{ item.enforcementDepartment }}</p>
+                                        <p><span class="card_box_label">执法部门：</span> {{ item.enforcementDepartment }}
+                                        </p>
                                     </div>
                                     <div class="card_box_span">
-                    <p><span class="card_box_label">执法计划：</span> <a style="color: green;">{{ null!=item.fileObject?item.fileObject.fileName:"" }}</a></p>
+                                        <p><span class="card_box_label">执法计划：</span> <a style="color: green;">{{
+                                            null!=item.fileObject?item.fileObject.fileName:"" }}</a></p>
                                     </div>
                                     <!-- <div class="card_box_span">
                                       <p><span class="card_box_label">执法计划：</span> {{ item.fileObject.fileName }}</p>
@@ -94,6 +105,7 @@
     import {queryEnforcementInspectionProgramList} from "@/api/enforce";
     import {setGoodsNum} from "@/util/util";
     import {showFailToast} from 'vant';
+
     const {useCommon, useShopCard} = $globalStore;
 
     const router = useRouter();
@@ -119,6 +131,7 @@ const data = reactive({
         minDate: new Date(2020, 0, 1),
         maxDate: new Date(2125, 5, 1),
         columnsType: ['year', 'month'],
+        dateShow: false
     });
 
     // 设置初始值为当前时间
@@ -134,7 +147,6 @@ onMounted(() => {
     });
     const queryList = () => {
         queryEnforcementInspectionProgramList(searchParam, success => {
-    console.log(success)
             data.dataList = success.data;
             freshMap.refreshLoad = false;
             freshMap.listLoading = false;
@@ -211,7 +223,6 @@ const onLoad = () => {
     };
 
 
-
     //获取分类下的商品列表
     const getGoodslist = async (onLoad) => {
         // const res = await useClassify.classifyGoods();
@@ -248,13 +259,10 @@ const selectDate  = () =>{
     }
 
     const onDateConfirm = (value) => {
-      console.log(value);
-      value.selectedValues.forEach((item,index) => {
-        console.log(item);
-      });
         data.dateSearch = value.selectedValues[0] + "/" + value.selectedValues[1]
-      data.showDatePicker = false;
         searchParam.dateSearch = value.selectedValues[0] + "-" + value.selectedValues[1];
+        data.showDatePicker = false;
+        data.dateShow = true;
         queryList();
     }
     const nowDate = (time) => {
@@ -271,8 +279,10 @@ const nowDate = (time) => {
 
 
     const searchDateType = (val) => {
+        searchParam.dateSearch = null;
         searchParam.dateType = val;
         searchParam.isComplaint = null;
+        data.dateShow = false;
         queryList();
     }
     const searchComplaint = (val) => {
@@ -322,11 +332,13 @@ const openPlanAddView = () =>{
                     width: 100%;
                     padding: 10px 0px;
                     flex-direction: column;
+
                     .card_body {
                         background-color: #fff;
                         border-radius: 10px;
                         flex: 1;
                     }
+
                     .card_box_span {
                         display: flex;
                         align-items: center;
@@ -339,6 +351,7 @@ const openPlanAddView = () =>{
                             margin: 0;
                         }
                     }
+
                     .card_box_action {
                         position: absolute;
                         right: 4%;
@@ -350,6 +363,7 @@ const openPlanAddView = () =>{
         .shop_footer_body {
             height: 101px;
             position: relative;
+
             .footer-one-btn {
                 height: 50px;
                 bottom: 51px;
@@ -364,11 +378,13 @@ const openPlanAddView = () =>{
         padding-left: 10px;
         margin-top: 6px;
         align-items: end;
+
         .search-button {
             width: 15%;
             height: 80%;
         }
     }
+
     .search-button-date {
         height: 3%;
         display: flex;
@@ -377,10 +393,12 @@ const openPlanAddView = () =>{
         margin-top: 15px;
         align-items: end;
         position: relative;
+
         .date-select {
             font-size: 20px;
             margin-left: 2%;
         }
+
         .search-button {
             width: 15%;
             height: 80%;