From a379d2bc02660f174ecab8ec51244ff3c393b719 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Fri, 9 Aug 2024 18:11:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/administrative.js                    |   1 +
 src/views/administrative/appointmentList.vue | 171 ++++++++++++-------
 2 files changed, 110 insertions(+), 62 deletions(-)

diff --git a/src/api/administrative.js b/src/api/administrative.js
index 6404d11..8b01210 100644
--- a/src/api/administrative.js
+++ b/src/api/administrative.js
@@ -13,6 +13,7 @@ export const getByIdToDataFillIn = (id, success, error) => _get("/app/code/enfor
 export const cancelEnterpriseLawEnforcement = (id, success, error) => _get("/app/code/enforcement/cancel/" + id,null,success,error)
 //查询历史检查信息
 export const queryEnterpriseLawEnforcementList = (params, success, error) => _get("/app/code/enforcement/queryList",params,success,error)
+export const queryTotal = (params, success, error) => _get("/app/code/enforcement/queryTotal",params,success,error)
 
 
 
diff --git a/src/views/administrative/appointmentList.vue b/src/views/administrative/appointmentList.vue
index 0e311b6..d154327 100644
--- a/src/views/administrative/appointmentList.vue
+++ b/src/views/administrative/appointmentList.vue
@@ -44,53 +44,49 @@
 
         <!-- 中间 -->
         <div class="shop-center">
-            <lodding-card :isLodding="isLodding">
-                <refresh-list v-model:freshMap="freshMap" @refresh="onRefresh" @onLoad="onLoad"
-                              :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">
-                            <van-swipe-cell class="swipe_cell">
-                                <!--								<div class="card_box" @click="toDetailView(item.id)">-->
-                                <div class="card_box">
+            <van-pull-refresh v-model="data.refreshing" @refresh="onRefresh">
+                <van-list v-model:loading="data.loading" :finished="data.finished" finished-text="没有更多了" @load="onLoad">
+                    <div class="goods_box" v-for="(item, index) in data?.dataList" :key="index">
+                        <van-swipe-cell class="swipe_cell">
+                            <!--								<div class="card_box" @click="toDetailView(item.id)">-->
+                            <div class="card_box">
+                                <div class="card_box_span">
+                                    <p>执法时间：{{ formattedTimeYYYYmmdd(item.checkTime) }}
+    <!--                                            <span class="card_box_action" v-if="item.isSubmit == 0">-->
+    <!--                                            <span class="card_box_action" v-if="item.isReg != 1 && item.status != 1 && item.status != 3">
+                                            <van-button @click="toEditView(item.id)" type="primary"
+                                                        size="mini">编辑</van-button>
+                                        </span>-->
+                                    </p>
+                                </div>
+                                <div @click="toDetailView(item.id)">
+                                    <!--									 <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" />-->
+                                    <div class="van-hairline--bottom"></div>
+                                    <div class="card_box_span">
+                                        <p>{{ item.checkItem }}</p>
+                                    </div>
+                                    <!-- <div class="card_box_span">
+                                        <p><span class="card_box_label">登记编号：</span> {{ item.lawEnforcementCode }}</p>
+                                    </div> -->
                                     <div class="card_box_span">
-                                        <p>执法时间：{{ formattedTimeYYYYmmdd(item.checkTime) }}
-<!--                                            <span class="card_box_action" v-if="item.isSubmit == 0">-->
-<!--                                            <span class="card_box_action" v-if="item.isReg != 1 && item.status != 1 && item.status != 3">
-                     							<van-button @click="toEditView(item.id)" type="primary"
-                                                            size="mini">编辑</van-button>
-                   							</span>-->
-                                        </p>
+                                        <p><span class="card_box_label">执法部门：</span> {{ item.bureauDeptName }}</p>
                                     </div>
-                                    <div @click="toDetailView(item.id)">
-                                        <!--									 <van-divider :style="{ color: '#1989fa', borderColor: '#1989fa',padding: '0 5px' }" />-->
-                                        <div class="van-hairline--bottom"></div>
-                                        <div class="card_box_span">
-                                            <p>{{ item.checkItem }}</p>
-                                        </div>
-                                        <!-- <div class="card_box_span">
-                                            <p><span class="card_box_label">登记编号：</span> {{ item.lawEnforcementCode }}</p>
-                                        </div> -->
-                                        <div class="card_box_span">
-                                            <p><span class="card_box_label">执法部门：</span> {{ item.bureauDeptName }}</p>
-                                        </div>
-                                        <div class="card_box_span">
-                                            <p><span class="card_box_label">企业名称：</span> {{ item.enterpriseName }}</p>
-                                        </div>
-                                        <div class="card_box_span">
-                                            <p v-if="item.isReg == 0"><span class="card_box_label">执法状态：</span> 未登记 </p>
-                                            <p v-if="item.isReg == 1"><span class="card_box_label">执法状态：</span> 已登记 </p>
-                                        </div>
-                                      <div class="btn-list" v-if="item.isReg != 1 && item.status != 1 && item.status != 3">
-                                        <a @click.stop="toEditView(item.id)"><van-icon name="edit" />编辑</a>
-                                      </div>
+                                    <div class="card_box_span">
+                                        <p><span class="card_box_label">企业名称：</span> {{ item.enterpriseName }}</p>
+                                    </div>
+                                    <div class="card_box_span">
+                                        <p v-if="item.isReg == 0"><span class="card_box_label">执法状态：</span> 未登记 </p>
+                                        <p v-if="item.isReg == 1"><span class="card_box_label">执法状态：</span> 已登记 </p>
                                     </div>
+                                  <div class="btn-list" v-if="item.isReg != 1 && item.status != 1 && item.status != 3">
+                                    <a @click.stop="toEditView(item.id)"><van-icon name="edit" />编辑</a>
+                                  </div>
                                 </div>
-                            </van-swipe-cell>
-                        </div>
+                            </div>
+                        </van-swipe-cell>
                     </div>
-                    <van-empty v-else class="no_data" description="暂无数据"/>
-                </refresh-list>
-            </lodding-card>
+                </van-list>
+            </van-pull-refresh>
         </div>
 
         <!-- 底部 -->
@@ -102,7 +98,7 @@
 
 <script setup name="registrationList">
     import {showToast} from "vant";
-    import {queryEnterpriseLawEnforcementList} from '../../api/administrative';
+    import {queryEnterpriseLawEnforcementList, queryTotal} from '../../api/administrative';
     import {setGoodsNum} from "@/util/util";
     import {getDict} from "../../api/Home";
     import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage";
@@ -117,6 +113,9 @@
     let totalPrice = ref(0); // 总钱数
 
     let searchParam = reactive({
+        // 分页
+        pageNum: 1,
+        pageSize: 6,
         //执法事件
         // lawEnforcementIncident:"",
         //执法部门
@@ -145,7 +144,12 @@
         columnsType: ['year', 'month'],
         ga_columns: [],
         dateShow: false,
-        checkNum: null
+        checkNum: null,
+        loading: false,
+        finished: false,
+        refreshing: false,
+        curPage: 1,
+        total: 0,
     });
 
     // 设置初始值为当前时间
@@ -155,7 +159,8 @@
         // }, error => {
         // });
 
-        queryList();
+        getTotal();
+        data.curPage = 1;
         data.dateSearch = nowDate(new Date());
         isLodding.value = false;
     });
@@ -173,23 +178,43 @@
     }
 
     const queryList = () => {
+        data.finished = false;
+        searchParam.pageNum = (data.curPage-1)*searchParam.pageSize;
         queryEnterpriseLawEnforcementList(searchParam, success => {
-            for (var i = 0; i < success.data.length; i++) {
-                var itemTxt = success.data[i].checkItem;
-                for (var j = 0; j < data.ga_columns.length; j++) {
-                    if (itemTxt == data.ga_columns[j].value) {
-                        success.data[i].checkItem = data.ga_columns[j].text;
-                        break;
-                    }
-                }
+            data.curPage++;
+            data.loading = false;   // 查出结果停止加载
+            if (data.total <= data.dataList.length) {
+                // 查到最后没数据
+                data.finished = true;
+                return;
             }
-            data.dataList = success.data;
+            // for (var i = 0; i < success.data.length; i++) {
+            //     var itemTxt = success.data[i].checkItem;
+            //     for (var j = 0; j < data.ga_columns.length; j++) {
+            //         if (itemTxt == data.ga_columns[j].value) {
+            //             success.data[i].checkItem = data.ga_columns[j].text;
+            //             break;
+            //         }
+            //     }
+            // }
+
+            // data.dataList = success.data;
+            data.dataList.push(...success.data);
         }, error => {
 
         })
     }
+    const getTotal = () => {
+        queryTotal(searchParam, success => {
+            data.total = success.data;
+        }, error => {
+
+        });
+    }
 
     const onSearch = (val) => {
+        data.curPage = 1;
+        data.dataList = [];
         queryEnterpriseLawEnforcementList(
             {
                 "searchValue": searchParam.searchValue
@@ -212,6 +237,9 @@
     }
 
     const onClickButton = () => {
+        getTotal();
+        data.curPage = 1;
+        data.dataList = [];
         queryList();
     }
 
@@ -257,15 +285,25 @@
 
     //下拉刷新
     const onRefresh = () => {
-        freshMap.listFinished = false;
-        freshMap.listLoading = true;
-        getGoodslist();
+        // 清空列表数据
+        data.dataList = [];
+        data.finished = false;
+
+        // 重新加载数据
+        // 将 loading 设置为 true，表示处于加载状态
+        data.loading = true;
+        onLoad();
     };
 
     // 触底加载
     const onLoad = () => {
-        freshMap.listFinished = true;
-        getGoodslist(true);
+        console.log("=============><")
+        setTimeout(() => {
+            if (data.refreshing) {
+                data.refreshing = false;
+            }
+            queryList();
+        }, 1000);
     };
 
 
@@ -290,7 +328,6 @@
     const selectDate = () => {
         data.checkNum = 9;
         data.showDatePicker = true;
-        console.log(data.showDatePicker)
     }
 
     const onDateConfirm = (value) => {
@@ -300,6 +337,10 @@
         searchParam.searchDate = value.selectedValues[0] + "-" + value.selectedValues[1]
         searchParam.dateType =  null;
         data.dateShow = true;
+
+        getTotal();
+        data.curPage = 1;
+        data.dataList = [];
         queryList();
     }
     const nowDate = (time) => {
@@ -314,22 +355,28 @@
         )
     }
 
-
     const searchDateType = (val) => {
         data.checkNum = val;
         searchParam.dateType = val;
         searchParam.isComplaint = null;
         searchParam.searchDate = null;
         data.dateShow = false;
+
+        getTotal();
+        data.curPage = 1;
+        data.dataList = [];
         queryList();
     }
     const searchComplaint = (val) => {
         searchParam.isComplaint = val;
         searchParam.dateType = null;
+
+        getTotal();
+        data.curPage = 1;
+        data.dataList = [];
         queryList();
     }
     const toDetailView = (id) => {
-        console.log(id)
         router.push(
             {
                 // path: "/enterprise/enterpriseInspectionDetail",

From ccf64d830298c6b7938bda99ad7cb00099ee5c97 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Mon, 12 Aug 2024 09:24:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=8A=95=E8=AF=89=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/enterprise/registrationList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/enterprise/registrationList.vue b/src/views/enterprise/registrationList.vue
index 10eae73..411fccc 100644
--- a/src/views/enterprise/registrationList.vue
+++ b/src/views/enterprise/registrationList.vue
@@ -107,7 +107,7 @@
                                         </div>
                                       </div>
                                       <div class="btn-list">
-                                        <a v-if="item.outTimeDayNum<=4 && isComplaint==0"
+                                        <a v-if="item.outTimeDayNum<=4 && item.isComplaint==0"
                                            @click.stop="toComplaintView(item.id,item.lawEnforcementItem,item.lawEnforcementItemText)"><van-icon name="warning-o" />投诉</a>
                                         <a v-if="item.outTimeDayNum<=4 && item.isEvaluate==0"
                                            @click.stop="toEvaluate(item.id,item.lawEnforcementItemText)"><van-icon name="flower-o" />评价</a>