完成了场所活动上报需要自动携带数据

src/api/sys/tools.js

@@ -15,21 +15,21 @@ export default class Tools {
             `/religioussites/videopoint/videoPoint/list`,
             params
         )
-    }; 
+    };
     //消防点位列表
     fireStationList(params) {
         return request.get(
             `/religioussites/fire/fireEquipment/list`,
             params
         )
-    };  
+    };
     //非宗教类组织列表
     NonReligiousInformationOrgList(params) {
         return request.get(
             `/zjzz/religion/listByGrid`,
             params
         )
-    };  
+    };
     // 文件上传
     uploadFile(formData, uploadPath) {
         return request.uploadFile(
@@ -46,8 +46,13 @@ export default class Tools {
     };
     // 用户查询
     queryById(id) {
+            return request.get(
+                `/sys/user/queryById`, { id: id }
+            )
+        }
+        // 获取场所地点
+    areaQueryById(id) {
         return request.get(
-            `/sys/user/queryById`, { id: id }
-        )
+            '/religioussites/siteinfo/religiousSitesInfo/queryById', { id: id })
     }
 }

src/views/activityMan/differentbelievers/ReligiousPeopleReportList.vue

@@ -36,10 +36,7 @@
           finished-text="没有更多了"
           @load="onLoad"
         >
-          <van-swipe-cell
-            v-for="item in list"
-            :key="item"
-          >
+          <van-swipe-cell v-for="item in list" :key="item">
             <div class="list_item" @click="goInfo(item.id)">
               <div class="item-left">
                 <p v-show="item.partyTime != ''" style="color: #c4c4c4">
@@ -80,10 +77,10 @@
       </van-tab>
       <van-tab title="已审核" name="1">
         <van-list
-          v-model:loading="loading"
-          :finished="finished"
+          v-model:loading="loading1"
+          :finished="finished1"
           finished-text="没有更多了"
-          @load="onLoad"
+          @load="onLoad1"
         >
           <van-swipe-cell v-for="item in readList" :key="item">
             <div class="list_item" @click="goInfo(item.id)">
@@ -173,23 +170,17 @@ export default {
       loading.value = true;
       finished.value = false;
       // 异步更新数据
-      new ReligiousPeopleReportService()
+      new placeActivityServer()
         .list({
           current: index + 1,
           size: 10,
+          assessment: 0,
         })
         .then(({ records, total }) => {
-          records.forEach((item) => {
-            if (item.assessment == 0) {
-              list.value.push(item);
-            } else {
-              readList.value.push(item);
-            }
-          });
+          list.value.push(...records);
           // 加载状态结束
           loading.value = false;
           let page = parseInt(total / 10);
-
           // 数据全部加载完成
           if (index >= page || total < 10) {
             finished.value = true;
@@ -198,6 +189,32 @@ export default {
           }
         });
     };
+    const loading1 = ref(false);
+    const finished1 = ref(false);
+    let index1 = 0;
+    const onLoad1 = () => {
+      loading1.value = true;
+      finished1.value = false;
+      // 异步更新数据
+      new placeActivityServer()
+        .list({
+          current: index1 + 1,
+          size: 10,
+          assessment: 1,
+        })
+        .then(({ records, total }) => {
+          readList.value.push(...records);
+          // 加载状态结束
+          loading1.value = false;
+          let page = parseInt(total / 10);
+          // 数据全部加载完成
+          if (index >= page || total < 10) {
+            finished1.value = true;
+          } else {
+            index1++;
+          }
+        });
+    };
     // 搜索
     let searchShow = ref(false);
     let searchList = ref([]);
@@ -262,6 +279,9 @@ export default {
       onLoad,
       loading,
       finished,
+      onLoad1,
+      loading1,
+      finished1,
       searchShow,
       searchVal,
       searchList,

src/views/activityMan/placeactivity/placeActivityList.vue

@@ -77,10 +77,10 @@
       </van-tab>
       <van-tab title="已审核" name="1">
         <van-list
-          v-model:loading="loading"
-          :finished="finished"
+          v-model:loading="loading1"
+          :finished="finished1"
           finished-text="没有更多了"
-          @load="onLoad"
+          @load="onLoad1"
         >
           <van-swipe-cell v-for="item in readList" :key="item">
             <div class="list_item" @click="goInfo(item.id)">
@@ -183,19 +183,13 @@ export default {
         .list({
           current: index + 1,
           size: 10,
+          assessment: 0,
         })
         .then(({ records, total }) => {
-          records.forEach((item) => {
-            if (item.assessment == 0) {
-              list.value.push(item);
-            } else {
-              readList.value.push(item);
-            }
-          });
+          list.value.push(...records);
           // 加载状态结束
           loading.value = false;
           let page = parseInt(total / 10);
-
           // 数据全部加载完成
           if (index >= page || total < 10) {
             finished.value = true;
@@ -204,6 +198,32 @@ export default {
           }
         });
     };
+    const loading1 = ref(false);
+    const finished1 = ref(false);
+    let index1 = 0;
+    const onLoad1 = () => {
+      loading1.value = true;
+      finished1.value = false;
+      // 异步更新数据
+      new placeActivityServer()
+        .list({
+          current: index1 + 1,
+          size: 10,
+          assessment: 1,
+        })
+        .then(({ records, total }) => {
+          readList.value.push(...records);
+          // 加载状态结束
+          loading1.value = false;
+          let page = parseInt(total / 10);
+          // 数据全部加载完成
+          if (index >= page || total < 10) {
+            finished1.value = true;
+          } else {
+            index1++;
+          }
+        });
+    };
     // 搜索
     let searchShow = ref(false);
     let searchList = ref([]);
@@ -267,6 +287,9 @@ export default {
       onLoad,
       loading,
       finished,
+      onLoad1,
+      loading1,
+      finished1,
       searchShow,
       searchVal,
       searchList,

src/views/activityMan/placeactivity/placeActivityView.vue

@@ -126,29 +126,18 @@
           center
           readonly
           label="活动地点:"
-          placeholder="请填写参加地点"
+          placeholder="请选择场所"
           input-align="right"
           right-icon="arrow-down"
-          @click="showArea = true"
         />
-        <van-popup v-model:show="showArea" round position="bottom">
-          <van-cascader
-            v-model="cascaderValue"
-            title="请选择所在地区"
-            :options="options"
-            @close="showArea = false"
-            @finish="onFinish"
-            :field-names="fieldNames"
-          />
-        </van-popup>
       </van-cell-group>
       <van-cell-group>
         <van-field
           v-model="placeActivity.placeDel"
           center
-          clearable
+          readonly
           label="详细地址:"
-          placeholder="请填写活参加地点"
+          placeholder="请选择场所"
           input-align="right"
         >
           <template #right-icon>
@@ -182,7 +171,11 @@
           show-cancel-button
           @confirm="reselected"
         >
-          <person-list @selected="selected" :type="0"></person-list>
+          <person-list
+            @selected="selected"
+            :type="0"
+            ref="person"
+          ></person-list>
         </van-dialog>
       </van-cell-group>
       <van-cell-group>
@@ -343,6 +336,8 @@ export default {
     const getPlace = ({ selectedOptions }) => {
       showPlace.value = false;
       placeActivity.value.siteName = selectedOptions[0];
+      placeActivity.value.place = selectedOptions[0].placeSelectName;
+      placeActivity.value.placeDel = selectedOptions[0].place;
     };
     // 获取活动时间
     let showAct = ref(false);
@@ -379,29 +374,10 @@ export default {
         placeActivity.value.knownList.name = names.join(",");
       } else {
         placeActivity.value.activityPerson.id = list.value.id;
+        placeActivity.value.phone = list.value.phone;
         placeActivity.value.activityPerson.name = list.value.name;
       }
     };
-    // 地区选择
-    let showArea = ref(false);
-    const cascaderValue = ref("");
-    const fieldNames = {
-      text: "name",
-      value: "code",
-      children: "children",
-    };
-    // 选项列表，children 代表子选项，支持多级嵌套
-    let options = ref([]);
-    new tools().treeData().then((res) => {
-      options.value.push(res[0]);
-    });
-    // 全部选项选择完毕后，会触发 finish 事件
-    const onFinish = ({ selectedOptions }) => {
-      showArea.value = false;
-      placeActivity.value.place = selectedOptions
-        .map((option) => option.name)
-        .join("/");
-    };
     // 文件上传
     let fileList = ref([]);
     const afterRead = (file) => {
@@ -451,12 +427,6 @@ export default {
       showReport,
       selected,
       reselected,
-      // 地区选择
-      showArea,
-      fieldNames,
-      options,
-      onFinish,
-      cascaderValue,
       // 文件上传
       afterRead,
       fileList,

src/views/activityMan/selfMeetingReport/selfMeetingList.vue

@@ -80,10 +80,10 @@
       </van-tab>
       <van-tab title="已审核" name="1">
         <van-list
-          v-model:loading="loading"
-          :finished="finished"
+          v-model:loading="loading1"
+          :finished="finished1"
           finished-text="没有更多了"
-          @load="onLoad"
+          @load="onLoad1"
         >
           <van-swipe-cell v-for="item in readList" :key="item">
             <div class="list_item" @click="goInfo(item.id)">
@@ -184,23 +184,17 @@ export default {
       loading.value = true;
       finished.value = false;
       // 异步更新数据
-      new PrivatePartyPointService()
+      new placeActivityServer()
         .list({
           current: index + 1,
           size: 10,
+          assessment: 0,
         })
         .then(({ records, total }) => {
-          records.forEach((item) => {
-            if (item.assessment == 0) {
-              list.value.push(item);
-            } else {
-              readList.value.push(item);
-            }
-          });
+          list.value.push(...records);
           // 加载状态结束
           loading.value = false;
           let page = parseInt(total / 10);
-
           // 数据全部加载完成
           if (index >= page || total < 10) {
             finished.value = true;
@@ -209,6 +203,32 @@ export default {
           }
         });
     };
+    const loading1 = ref(false);
+    const finished1 = ref(false);
+    let index1 = 0;
+    const onLoad1 = () => {
+      loading1.value = true;
+      finished1.value = false;
+      // 异步更新数据
+      new placeActivityServer()
+        .list({
+          current: index1 + 1,
+          size: 10,
+          assessment: 1,
+        })
+        .then(({ records, total }) => {
+          readList.value.push(...records);
+          // 加载状态结束
+          loading1.value = false;
+          let page = parseInt(total / 10);
+          // 数据全部加载完成
+          if (index >= page || total < 10) {
+            finished1.value = true;
+          } else {
+            index1++;
+          }
+        });
+    };
     // 搜索
     let searchShow = ref(false);
     let searchList = ref([]);
@@ -273,6 +293,9 @@ export default {
       onLoad,
       loading,
       finished,
+      onLoad1,
+      loading1,
+      finished1,
       searchShow,
       searchVal,
       searchList,