活动

src/api/placeActivity/placeActivityServer.js

@@ -19,6 +19,12 @@ export default class placeActivityServer {
             params
         )
     };
+    list1(params) {
+        return request.get(
+            `/reporting/reportingActivities/list1`,
+            params
+        )
+    };
     queryListLonginId() {
         return request.get(
             '/reporting/reportingActivities/queryListLonginId'

src/views/activityMan/personList.vue

@@ -75,7 +75,7 @@
         v-model="checked"
         ref="checkboxGroup"
       >
-        <van-button type="primary" size="mini" @click="checkAll"
+        <van-button ref="myButton" type="primary" size="mini" @click="checkAll"
           >全选</van-button
         >
         <van-button type="primary" size="mini" @click="nocheckAll"
@@ -85,7 +85,7 @@
           <van-cell
             v-for="(item, index) in list"
             clickable
-            :key="item"
+            :key="item.id"
             :title="item.name"
           >
             <template #right-icon>
@@ -103,7 +103,7 @@
           <van-cell
             v-for="item in list"
             clickable
-            :key="item"
+            :key="item.id"
             :title="item.name"
           >
             <template #right-icon>
@@ -117,21 +117,13 @@
 </template>
 
 <script>
-import { ref, watch } from "vue";
+import { ref, watch, onMounted, nextTick } from "vue";
 import UserManage from "@/api/user/UserManage";
 export default {
   name: "personList",
   emits: ["selected"],
   props: ["type", "siteId"],
   setup(props, { emit }) {
-    const { siteId } = toRefs(props);
-    const { type } = toRefs(props);
-    window.xm.showToast({
-      message: "页面加载:" + siteId.value,
-    });
-    window.xm.showToast({
-      message: "siteId:" + siteId.value,
-    });
     const searchForm = ref({
       name: "",
       sex: "",
@@ -139,7 +131,7 @@ export default {
       idcard: "",
       phone: "",
       location: {
-        id: siteId.value,
+        id: "",
       },
       typeOfEmployees: "",
       personnelType: "",
@@ -194,13 +186,6 @@ export default {
       (newValue, oldValue) => {
         if (oldValue != newValue) {
           index = 0;
-          window.xm.showToast({
-            message:
-              "searchForm:" +
-              searchForm.value.location.id +
-              ",siteId:" +
-              siteId.value,
-          });
           onLoad();
         }
       },
@@ -234,35 +219,30 @@ export default {
         })
         .then(({ records }) => {
           list.value.push(...records);
+          if (searchForm.value.location.id != "") {
+            checked.value.push(...records);
+          }
           // 加载状态结束
           loading.value = false;
+
           // 数据全部加载完成
           if (records.length < 15) {
             finished.value = true;
-
-            if (
-              finished.value &&
-              !loading.value &&
-              searchForm.value.location.id != ""
-            ) {
-              checked.value.push(...list.value);
-              window.xm.showToast({
-                message:
-                  "searchForm:" +
-                  searchForm.value.location.id +
-                  ",siteId:" +
-                  siteId.value,
-              });
-              checkAll();
-            }
           } else {
             index++;
           }
         });
     };
-    // if (props.siteId != "" && searchForm.value.location.id != props.siteId) {
-    //   searchForm.value.location.id = props.siteId;
-    // }
+    if (props.siteId != "" && searchForm.value.location.id != props.siteId) {
+      searchForm.value.location.id = props.siteId;
+    }
+    onMounted(() => {
+      // 使用 nextTick 确保元素已经挂载
+      nextTick(() => {
+        // 直接调用点击事件处理函数
+        checkAll();
+      });
+    });
     return {
       // 人员
       list,

src/views/activityMan/placeactivity/placeActivityInfo.vue

@@ -187,10 +187,7 @@
       </van-cell-group>
     </div>
     <van-button
-      v-if="
-        placeActivity.assessment == 0 &&
-        $hasPermission('reporting:reportingActivities:kor')
-      "
+      v-if="placeActivity.assessment == 0"
       type="primary"
       class="btn-sub"
       @click="update"

src/views/activityMan/placeactivity/placeActivityList.vue

@@ -1,16 +1,42 @@
 <template>
-  <van-nav-bar fixed title="场所活动" left-text="" left-arrow @click-left="onClickLeft" @click-right="onClickRight"
-    :style="{ 'background-color': selectColor }">
+  <van-nav-bar
+    fixed
+    title="场所活动"
+    left-text=""
+    left-arrow
+    @click-left="onClickLeft"
+    @click-right="onClickRight"
+    :style="{ 'background-color': selectColor }"
+  >
     <template #right>
       <van-icon name="plus" size="18" />
     </template>
   </van-nav-bar>
   <div class="main">
-    <van-search v-model="searchVal" clearable show-action shape="round" label="活动名称" placeholder="请输入搜索关键词"
-      input-align="center" @search="onSearch" @cancel="onCancel" />
-    <van-tabs v-show="!searchShow" v-model:active="active" title-inactive-color="#bdbdbd" title-active-color="#36a7f3">
+    <van-search
+      v-model="searchVal"
+      clearable
+      show-action
+      shape="round"
+      label="活动名称"
+      placeholder="请输入搜索关键词"
+      input-align="center"
+      @search="onSearch"
+      @cancel="onCancel"
+    />
+    <van-tabs
+      v-show="!searchShow"
+      v-model:active="active"
+      title-inactive-color="#bdbdbd"
+      title-active-color="#36a7f3"
+    >
       <van-tab title="未审核" name="0">
-        <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+        <van-list
+          v-model:loading="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
           <van-swipe-cell v-for="item in list" :key="item">
             <div class="list_item" @click="goInfo(item.id)">
               <div class="item-left">
@@ -21,8 +47,10 @@
               </div>
               <van-cell>
                 <template #title>
-                  <van-text-ellipsis rows="2"
-                    :content="`${item.reporter.name}申请于${item.placeDel}举办${item.activityName}活动`" />
+                  <van-text-ellipsis
+                    rows="2"
+                    :content="`${item.reporter.name}申请于${item.placeDel}举办${item.activityName}活动`"
+                  />
                 </template>
                 <template #label>
                   {{ item.place }}
@@ -30,14 +58,31 @@
               </van-cell>
             </div>
             <template #right>
-              <van-button square type="danger" text="删除" class="button" @click="deleteItem(item.id)" />
-              <van-button square type="primary" text="修改" class="button" @click="updateItem(item)" />
+              <van-button
+                square
+                type="danger"
+                text="删除"
+                class="button"
+                @click="deleteItem(item.id)"
+              />
+              <van-button
+                square
+                type="primary"
+                text="修改"
+                class="button"
+                @click="updateItem(item)"
+              />
             </template>
           </van-swipe-cell>
         </van-list>
       </van-tab>
       <van-tab title="已审核" name="1">
-        <van-list v-model:loading="loading1" :finished="finished1" finished-text="没有更多了" @load="onLoad1">
+        <van-list
+          v-model:loading="loading1"
+          :finished="finished1"
+          finished-text="没有更多了"
+          @load="onLoad1"
+        >
           <van-swipe-cell v-for="item in readList" :key="item">
             <div class="list_item" @click="goInfo(item.id)">
               <div class="item-left">
@@ -48,8 +93,10 @@
               </div>
               <van-cell>
                 <template #title>
-                  <van-text-ellipsis rows="2"
-                    :content="`${item.reporter.name}申请于${item.placeDel}举办${item.activityName}活动`" />
+                  <van-text-ellipsis
+                    rows="2"
+                    :content="`${item.reporter.name}申请于${item.placeDel}举办${item.activityName}活动`"
+                  />
                 </template>
                 <template #label>
                   {{ item.place }}
@@ -61,7 +108,13 @@
       </van-tab>
     </van-tabs>
     <!-- 搜索结果 -->
-    <van-list v-show="searchShow" v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+    <van-list
+      v-show="searchShow"
+      v-model:loading="loading"
+      :finished="finished"
+      finished-text="没有更多了"
+      @load="onLoad"
+    >
       <van-swipe-cell v-for="item in searchList" :key="item">
         <div class="list_item" @click="goInfo(item.id)">
           <div class="item-left">
@@ -69,14 +122,18 @@
               {{ item.activityTime }}
             </p>
             <p>
-              <span v-if="item.assessment == 1" style="color: gray">已审核</span>
+              <span v-if="item.assessment == 1" style="color: gray"
+                >已审核</span
+              >
               <span v-else style="color: red">待审核</span>
             </p>
           </div>
           <van-cell>
             <template #title>
-              <van-text-ellipsis rows="2"
-                :content="` ${item.reporter.name}申请于${item.placeDel}举办${item.activityName}活动`" />
+              <van-text-ellipsis
+                rows="2"
+                :content="` ${item.reporter.name}申请于${item.placeDel}举办${item.activityName}活动`"
+              />
             </template>
             <template #label>
               {{ item.place }}
@@ -120,7 +177,7 @@ export default {
       finished.value = false;
       // 异步更新数据
       new placeActivityServer()
-        .list({
+        .list1({
           current: index + 1,
           size: 10,
           assessment: 0,
@@ -144,7 +201,7 @@ export default {
       finished1.value = false;
       // 异步更新数据
       new placeActivityServer()
-        .list({
+        .list1({
           current: index1 + 1,
           size: 10,
           assessment: 1,
@@ -168,7 +225,7 @@ export default {
       searchShow.value = true;
       searchList.value = [];
       new placeActivityServer()
-        .list({
+        .list1({
           current: 1,
           size: 10000,
           activityName: searchVal.value,