Merge branch 'master' of http://123.57.226.179:8080/yin_yu820/HS_MZAP

src/styles/index.css

@@ -29,6 +29,11 @@ p {
     margin: 5px;
 }
 
+.main .formArea .van-dialog {
+    width: 80% !important;
+    top: 50%;
+}
+
 
 /*字体黑，正文常用*/
 
@@ -184,4 +189,4 @@ p {
 .settingtitlelay {
     display: flex;
     margin-top: 30px;
-}
+}

src/views/activityMan/differentbelievers/ReligiousPeopleReportInfo.vue

@@ -1,5 +1,5 @@
 <template>
-  <van-nav-bar fixed title="私设聚会点" left-text="" left-arrow @click-left="onClickLeft" />
+  <van-nav-bar fixed title="信教群众异常" left-text="" left-arrow @click-left="onClickLeft" />
   <van-loading size="16px" v-if="isLoading">加载中...</van-loading>
   <div class="main" v-if="!isLoading">
     <div class="banner">
@@ -143,12 +143,12 @@ export default {
       }).then((result) => {
         if (result == "ok") {
           inputForm.value.assessment = 1;
-          new PrivatePartyPointService().save(inputForm.value).then((res) => {
-            if (res.status == 200 || res.statusText == "OK") {
-              xm.showToast({
-                message: "已审核",
-              });
-            }
+          new ReligiousPeopleReportService().save(inputForm.value).then((res) => {
+
+            xm.showToast({
+              message: "已审核",
+            });
+
             onClickLeft();
           });
         }

src/views/activityMan/differentbelievers/ReligiousPeopleReportList.vue

@@ -1,56 +1,27 @@
 <template>
-  <van-nav-bar
-    fixed
-    title="信教群众异常"
-    right-text="上报"
-    left-arrow
-    @click-left="onClickLeft"
-    @click-right="onClickRight"
-    :style="{ 'background-color': selectColor }"
-  >
+  <van-nav-bar fixed title="信教群众异常" right-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"
-      placeholder="请输入搜索关键词"
-      label="姓名"
-      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" placeholder="请输入搜索关键词" label="姓名"
+      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">
                 <p v-show="item.partyTime != ''" style="color: #c4c4c4">
-                  {{ item.partyTime }}
+                  {{ item.createDate }}
                 </p>
                 <p style="color: red">待审核</p>
               </div>
               <van-cell>
                 <template #title>
-                  <van-text-ellipsis
-                    rows="2"
-                    :content="`${item.abnormalName}存在${item.abnormalBehavior}异常行为`"
-                  />
+                  <van-text-ellipsis rows="2" :content="`${item.abnormalName}存在${item.abnormalBehavior}异常行为`" />
                 </template>
                 <template #label>
                   {{ item.currentResidence }}
@@ -58,43 +29,23 @@
               </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">
-                <p style="color: #c4c4c4">{{ item.partyTime }}</p>
+                <p style="color: #c4c4c4">{{ item.createDate }}</p>
                 <p style="color: red">已审核</p>
               </div>
               <van-cell>
                 <template #title>
-                  <van-text-ellipsis
-                    rows="2"
-                    :content="`${item.abnormalName}存在${item.abnormalBehavior}异常行为`"
-                  />
+                  <van-text-ellipsis rows="2" :content="`${item.abnormalName}存在${item.abnormalBehavior}异常行为`" />
                 </template>
                 <template #label>
                   {{ item.currentResidence }}
@@ -106,13 +57,7 @@
       </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">
@@ -121,10 +66,7 @@
           </div>
           <van-cell>
             <template #title>
-              <van-text-ellipsis
-                rows="2"
-                :content="`${item.abnormalName}存在${item.abnormalBehavior}异常行为`"
-              />
+              <van-text-ellipsis rows="2" :content="`${item.abnormalName}存在${item.abnormalBehavior}异常行为`" />
             </template>
             <template #label>
               {{ item.currentResidence }}
@@ -137,7 +79,7 @@
 </template>
     
 <script>
-import { ref } from "vue";
+import { ref, getCurrentInstance } from "vue";
 import ReligiousPeopleReportService from "@/api/differentbelievers/ReligiousPeopleReportService";
 import { useRouter } from "vue-router";
 export default {
@@ -292,5 +234,4 @@ export default {
 };
 </script >
     
-<style scope>
-</style>
+<style scope></style>

src/views/activityMan/differentbelievers/ReligiousPeopleReportView.vue

@@ -62,16 +62,16 @@
       </van-cell-group>
       <van-cell-group>
         <div class="rowTextArea">
-          <van-field v-model="inputForm.abnormalBehavior" placeholder="请填写异常行为" center rows="2" type="textarea"
-            label="异常行为:" label-align="top" />
+          <van-field v-model="inputForm.abnormalBehavior" required :rules="[{ required: true }]" placeholder="请填写异常行为"
+            center rows="2" type="textarea" label="异常行为:" label-align="top" />
         </div>
       </van-cell-group>
       <van-cell-group>
-        <van-field name="uploader" required :rules="[{ required: true }]" label="附件上传:">
+        <van-field name="uploader" required :rules="[{ required: true }]" label="证据上传:">
           <template #input>
             <van-uploader :after-read="afterRead" v-model="fileList" :max-count="5" capture="camera" accept=""
               :preview-full-image="false" :before-delete="deleteRead">
-              <van-button>上传文件</van-button>
+              <van-button>上传文件(可添加音、视频和文本类型等)</van-button>
             </van-uploader>
           </template>
         </van-field>

src/views/activityMan/personList.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="personList">
-    <van-search v-model="searchVal" clearable show-action shape="round" placeholder="请输入搜索关键词" input-align="center"
-      @search="onSearch" @cancel="onCancel" />
+    <van-search v-model="searchForm.name" clearable show-action shape="round" placeholder="请输入搜索关键词" input-align="center"
+      @search="onLoad" @cancel="onCancel" />
     <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
       <van-checkbox-group v-if="type == 1" v-model="checked" ref="checkboxGroup">
         <van-button type="primary" size="mini" @click="checkAll">全选</van-button>
+        <van-button type="primary" size="mini" @click="nocheckAll">取消全选</van-button>
         <van-cell-group inset>
           <van-cell v-for="(item, index) in list" clickable :key="item" :title="item.name" @click="toggle(index)">
             <template #right-icon>
@@ -27,40 +28,14 @@
 </template>
 
 <script>
-import { ref } from "vue";
+import { ref, watch } from "vue";
 import UserManage from "@/api/user/UserManage";
 export default {
   name: "personList",
   emits: ["selected"],
-  props: ["type"],
+  props: ["type", "siteId"],
   setup(props, { emit }) {
-    const list = ref([]);
-    const loading = ref(false);
-    const finished = ref(false);
-    let index = 0;
-    const onLoad = () => {
-      // 异步更新数据
-      new UserManage()
-        .list({
-          current: index + 1,
-          size: 10,
-          ...searchForm.value
-        })
-        .then(({ records }) => {
-          list.value.push(...records);
-          // 加载状态结束
-          loading.value = false;
-          // 数据全部加载完成
-          if (records.length < 10) {
-            finished.value = true;
-          } else {
-            index++;
-          }
-        });
-    };
-    // 搜索
-    const searchVal = ref("");
-    let searchForm = ref({
+    const searchForm = ref({
       name: "",
       sex: "",
       idType: "",
@@ -74,27 +49,12 @@ export default {
       religion: "",
       sjfw: [],
       nativePlace: '',
-      currentResidence: ''
+      currentResidence: '',
     })
-    const onSearch = () => {
-      searchForm.value.name = searchVal.value;
-      new UserManage()
-        .list({
-          current: 1,
-          size: 10000,
-          ...searchForm.value
-        })
-        .then(({ records }) => {
-          list.value = [];
-          list.value.push(...records);
-          // 加载状态结束
-          loading.value = false;
-          // 数据全部加载完成
-          finished.value = true;
-        });
-    };
+
+
+    // 搜索
     const onCancel = () => {
-      searchVal.value = "";
       list.value = [];
       index = 0;
       finished.value = false;
@@ -106,19 +66,72 @@ export default {
     const checkboxRefs = ref([]);
     const checkboxGroup = ref(null);
     const toggle = (index) => {
+
       checkboxRefs.value[index].toggle();
       emit("selected", checked.value, 1);
     };
     // 全选
     const checkAll = () => {
+
       checkboxGroup.value.toggleAll(true);
+      console.log("checked", checked);
+      emit("selected", checked.value, 1);
+    };
+    // 取消全选
+    const nocheckAll = () => {
+      checkboxGroup.value.toggleAll(false);
       emit("selected", checked.value, 1);
     };
     const selectes = (val) => {
       checked.value = val;
       emit("selected", checked.value, 0);
     };
+    const list = ref([]);
+    const loading = ref(false);
+    const finished = ref(false);
+    let index = 0;
+    watch(
+      () => {
+        return { ...searchForm.value };
+      },
+      (newValue, oldValue) => {
+        if (oldValue != newValue) {
+          index = 0;
 
+        }
+      },
+      { deep: true }
+    );
+    const onLoad = () => {
+      if (index == 0) {
+        list.value = [];
+        loading.value = true;
+      }
+      // 异步更新数据
+      new UserManage()
+        .list({
+          current: index + 1,
+          size: 15,
+          ...searchForm.value
+        })
+        .then(({ records }) => {
+          list.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)
+            }
+          } else {
+            index++;
+          }
+        });
+    };
+    if (props.siteId != "") {
+      searchForm.value.location.id = props.siteId;
+    }
     return {
       // 人员
       list,
@@ -126,11 +139,12 @@ export default {
       loading,
       finished,
       // 搜索
-      searchVal,
-      onSearch,
+      searchForm,
       onCancel,
       // 全选
       checkAll,
+      // 取消全选
+      nocheckAll,
       toggle,
       checked,
       checkboxRefs,

src/views/activityMan/placeactivity/placeActivityInfo.vue

@@ -1,11 +1,5 @@
 <template>
-  <van-nav-bar
-    fixed
-    title="场所活动"
-    left-text=""
-    left-arrow
-    @click-left="onClickLeft"
-  />
+  <van-nav-bar fixed title="场所活动" left-text="" left-arrow @click-left="onClickLeft" />
   <van-loading size="16px" v-show="isLoading">加载中...</van-loading>
   <div class="main" v-show="!isLoading">
     <div class="banner">
@@ -14,174 +8,81 @@
     <div class="info">
       <p class="miniTitle">详细信息</p>
       <van-cell-group>
-        <van-field
-          v-model="placeActivity.activityName"
-          center
-          readonly
-          clearable
-          label="活动名称:"
-          placeholder="请填写活动名称"
-          input-align="right"
-        />
+        <van-field v-model="placeActivity.activityName" center readonly clearable label="活动名称:" placeholder="请填写活动名称"
+          input-align="right" />
       </van-cell-group>
       <van-cell-group>
-        <van-field
-          v-model="placeActivity.siteName.name"
-          readonly
-          label="场所名称:"
-          placeholder="请选择"
-          input-align="right"
-        />
+        <van-field v-model="placeActivity.siteName.name" readonly label="场所名称:" placeholder="请选择" input-align="right" />
       </van-cell-group>
       <van-cell-group>
-        <van-field
-          v-model="placeActivity.activityTime"
-          center
-          readonly
-          label="活动时间:"
-          input-align="right"
-        />
+        <van-field v-model="placeActivity.activitiesType" center readonly label="活动类型:" input-align="right">
+          <template #input>
+            <template v-if="placeActivity.activitiesType == 1">常规活动</template>
+            <template v-if="placeActivity.activitiesType == 2">日常活动</template>
+          </template>
+        </van-field>
       </van-cell-group>
       <van-cell-group>
-        <van-field
-          v-model="placeActivity.participantsNum"
-          center
-          readonly
-          clearable
-          label="参会人数:"
-          input-align="right"
-        />
+        <van-field v-model="placeActivity.activityTime" center readonly label="活动时间:" input-align="right" />
       </van-cell-group>
       <van-cell-group>
-        <van-field
-          v-model="placeActivity.knownList.name"
-          center
-          readonly
-          label="已知名单:"
-          input-align="right"
-        />
+        <van-field v-model="placeActivity.participantsNum" center readonly clearable label="参会人数:" input-align="right" />
       </van-cell-group>
       <van-cell-group>
-        <van-field
-          v-model="placeActivity.reporter.name"
-          center
-          readonly
-          label="报告人:"
-          input-align="right"
-        />
+        <van-field v-model="placeActivity.knownList.name" center readonly label="已知名单:" input-align="right" />
       </van-cell-group>
       <van-cell-group>
-        <van-field
-          v-model="placeActivity.participation"
-          center
-          readonly
-          label="参加范围:"
-          input-align="right"
-        />
+        <van-field v-model="placeActivity.reporter.name" center readonly label="报告人:" input-align="right" />
       </van-cell-group>
       <van-cell-group>
-        <van-field
-          v-model="placeActivity.place"
-          center
-          readonly
-          label="活动地点:"
-          input-align="right"
-        />
+        <van-field v-model="placeActivity.participation" center readonly label="参加范围:" input-align="right" />
       </van-cell-group>
       <van-cell-group>
-        <van-field
-          v-model="placeActivity.placeDel"
-          center
-          readonly
-          label="详细地址:"
-          input-align="right"
-        >
+        <van-field v-model="placeActivity.place" center readonly label="活动地点:" input-align="right" />
+      </van-cell-group>
+      <van-cell-group>
+        <van-field v-model="placeActivity.placeDel" center readonly label="详细地址:" input-align="right">
           <template #right-icon>
             <van-icon name="location" />
           </template>
         </van-field>
       </van-cell-group>
       <van-cell-group>
-        <van-field
-          v-model="placeActivity.sourceFunds"
-          center
-          readonly
-          label="经费来源:"
-          input-align="right"
-        />
+        <van-field v-model="placeActivity.sourceFunds" center readonly label="经费来源:" input-align="right" />
       </van-cell-group>
       <van-cell-group>
-        <van-field
-          v-model="placeActivity.activityPerson.name"
-          center
-          readonly
-          label="活动负责人:"
-          input-align="right"
-        />
+        <van-field v-model="placeActivity.activityPerson.name" center readonly label="活动负责人:" input-align="right" />
       </van-cell-group>
       <van-cell-group>
-        <van-field
-          v-model="placeActivity.phone"
-          center
-          readonly
-          type="tel"
-          label="联系方式:"
-          input-align="right"
-        />
+        <van-field v-model="placeActivity.phone" center readonly type="tel" label="联系方式:" input-align="right" />
       </van-cell-group>
       <van-cell-group>
-        <van-field
-          name="uploader"
-          readonly
-          label="安全预案:"
-          input-align="right"
-        >
+        <van-field name="uploader" readonly label="安全预案:" input-align="right">
           <template #input>
             <span v-show="fileList.length == 0">无</span>
-            <van-uploader
-              v-show="fileList.length != 0"
-              v-model="fileList"
-              :max-count="fileList.length"
-              :deletable="false"
-              @click-preview="downHandle"
-            >
+            <van-uploader v-show="fileList.length != 0" v-model="fileList" :max-count="fileList.length" :deletable="false"
+              @click-preview="downHandle">
             </van-uploader>
           </template>
         </van-field>
       </van-cell-group>
       <van-cell-group>
-        <van-field
-          name="content"
-          readonly
-          label="主题内容:"
-          input-align="right"
-        >
+        <van-field name="content" readonly label="主题内容:" input-align="right">
           <template #input>
             <span v-show="placeActivity.subjectContent == ''">无</span>
-            <span
-              v-show="placeActivity.subjectContent != ''"
-              style="color: #36a7f3"
-              @click="open"
-              >查看内容</span
-            >
+            <span v-show="placeActivity.subjectContent != ''" style="color: #36a7f3" @click="open">查看内容</span>
           </template>
         </van-field>
       </van-cell-group>
     </div>
-    <van-button
-      v-if="placeActivity.assessment == 0"
-      type="primary"
-      class="btn-sub"
-      @click="update"
-      >审核</van-button
-    >
+    <van-button v-if="placeActivity.assessment == 0" type="primary" class="btn-sub" @click="update">审核</van-button>
   </div>
   <van-popup v-model:show="showReport">
     <div v-html="placeActivity.subjectContent" class="showhtml"></div>
   </van-popup>
 </template>
   
-  <script>
+<script>
 import "vant/es/toast/style";
 import { ref, onMounted, nextTick } from "vue";
 import placeActivityServer from "@/api/placeActivity/placeActivityServer";
@@ -203,6 +104,7 @@ export default {
     const placeActivity = ref({
       id: "",
       activityName: "",
+      activitiesType: "",
       siteName: {
         id: "",
         name: "",
@@ -334,12 +236,13 @@ export default {
   margin-bottom: 40px;
   margin-top: -100px;
 }
+
 .van-popup--center {
   width: 98% !important;
   border-radius: 10px;
-  height: 70vh;
   overflow: auto;
 }
+
 .showhtml {
   width: 94%;
   padding: 10px;

src/views/activityMan/placeactivity/placeActivityView.vue

@@ -13,6 +13,8 @@
         <van-field v-model="placeActivity.siteName.name" readonly required :rules="[{ required: true }]" label="场所名称:"
           placeholder="请选择场所名称" input-align="right" right-icon="arrow-down" @click="showPlace = true" />
         <van-popup v-model:show="showPlace" round position="bottom">
+          <van-search placeholder="请输入场所名称" shape="round" input-align="center" v-model="interSearch" @search="onSearch"
+            @cancel="onCancel" />
           <van-picker title="活动场所" :columns="places" :columns-field-names="customFieldName" @cancel="showPlace = false"
             @confirm="getPlace" />
         </van-popup>
@@ -36,7 +38,7 @@
         <van-field v-model="placeActivity.knownList.name" center required :rules="[{ required: true }]" label="已知名单:"
           placeholder="请选择参会已知名单" input-align="right" right-icon="arrow-down" @click="showPerson = true" />
         <van-dialog v-model:show="showPerson" title="选择人员名单" show-cancel-button @confirm="reselected">
-          <person-list @selected="selected" :type="1"></person-list>
+          <person-list v-if="showPerson" @selected="selected" :type="1" :siteId="placeActivity.siteName.id"></person-list>
         </van-dialog>
       </van-cell-group>
       <van-cell-group>
@@ -66,7 +68,7 @@
         <van-field v-model="placeActivity.activityPerson.name" center label="活动负责人:" placeholder="请选择活动负责人"
           input-align="right" right-icon="arrow-down" @click="showReport = true" />
         <van-dialog v-model:show="showReport" title="选择活动负责人" show-cancel-button @confirm="reselected">
-          <person-list @selected="selected" :type="0" ref="person"></person-list>
+          <person-list v-if="showReport" @selected="selected" :type="0" :siteId="placeActivity.siteName.id"></person-list>
         </van-dialog>
       </van-cell-group>
       <van-cell-group>
@@ -78,7 +80,7 @@
           <template #input>
             <van-uploader :after-read="afterRead" v-model="fileList" :max-count="5" capture="camera" accept=""
               :preview-full-image="false" :before-delete="deleteRead">
-              <van-button>上传文件</van-button>
+              <van-button>上传文件(可添加音、视频和文本类型等)</van-button>
             </van-uploader>
           </template>
         </van-field>
@@ -123,6 +125,7 @@ export default {
     let placeActivity = ref({
       id: "",
       activityName: "",
+      activitiesType: "1",
       siteName: {
         id: "",
         name: "",
@@ -202,24 +205,64 @@ export default {
     });
     // 场所名称
     let places = ref([]);
+    // 场所搜索
+    let interSearch = ref("");
+    const onCancel = () => {
+      interSearch.value = "";
+      places.value = [];
+      placelist();
+    };
+    const onSearch = () => {
+      places.value = [];
+      new tools()
+        .placeList({
+          current: 1,
+          size: 10000,
+          name: interSearch.value
+        })
+        .then(({ records }) => {
+          places.value.push(...records);
+        });
+    };
     const customFieldName = {
       text: "name",
       value: "id",
     };
-    new tools()
-      .placeList({
-        current: 1,
-        size: 10000,
-      })
-      .then(({ records }) => {
-        places.value.push(...records);
-      });
+    const placelist = () => {
+      new tools()
+        .placeList({
+          current: 1,
+          size: 10000,
+        })
+        .then(({ records }) => {
+          places.value.push(...records);
+        });
+    }
+    placelist();
     let showPlace = ref(false);
     const getPlace = ({ selectedOptions }) => {
       showPlace.value = false;
       placeActivity.value.siteName = selectedOptions[0];
       placeActivity.value.place = selectedOptions[0].placeSelectName;
       placeActivity.value.placeDel = selectedOptions[0].place;
+      let searchForm = {
+        location: {
+          id: selectedOptions[0].id
+        }
+      }
+      new UserManage()
+        .list({
+          current: 1,
+          size: 10000,
+          ...searchForm
+        }).then(({ records }) => {
+          placeActivity.value.knownList.name = "";
+          placeActivity.value.knownList.id = "";
+          records.forEach((item) => {
+            placeActivity.value.knownList.name += item.name + ",";
+            placeActivity.value.knownList.id += item.id + ",";
+          });
+        })
     };
     const getLocation = () => {
       xm.getLocation().then(data => {
@@ -328,6 +371,9 @@ export default {
       customFieldName,
       showPlace,
       places,
+      interSearch,
+      onSearch,
+      onCancel,
       getPlace,
       getLocation,
       // 活动时间

src/views/activityMan/selfMeetingReport/selfMeetingInfo.vue

@@ -1,11 +1,5 @@
 <template>
-  <van-nav-bar
-    fixed
-    title="私设聚会点"
-    left-text=""
-    left-arrow
-    @click-left="onClickLeft"
-  />
+  <van-nav-bar fixed title="私设聚会点" left-text="" left-arrow @click-left="onClickLeft" />
   <van-loading size="16px" v-show="isLoading">加载中...</van-loading>
   <div class="main" v-show="!isLoading">
     <div class="banner">
@@ -14,83 +8,40 @@
     <div class="info">
       <p class="miniTitle">详细信息</p>
       <van-cell-group>
-        <van-field
-          v-model="inputForm.placeSelectName"
-          center
-          readonly
-          label="地点:"
-          input-align="right"
-        />
+        <van-field v-model="inputForm.placeSelectName" center readonly label="地点:" input-align="right" />
       </van-cell-group>
       <van-cell-group>
-        <van-field
-          v-model="inputForm.placeDel"
-          center
-          label="详细地址:"
-          readonly
-          input-align="right"
-          right-icon="location"
-        />
+        <van-field v-model="inputForm.placeDel" center label="详细地址:" readonly input-align="right" right-icon="location" />
       </van-cell-group>
 
       <van-cell-group>
-        <van-field
-          v-model="inputForm.frequency"
-          center
-          label="频次:"
-          input-align="right"
-          readonly
-        />
+        <van-field v-model="inputForm.frequency" center label="频次:" input-align="right" readonly />
       </van-cell-group>
       <van-cell-group>
-        <van-field
-          v-model="inputForm.partyTime"
-          center
-          readonly
-          label="时间:"
-          input-align="right"
-        />
+        <van-field v-model="inputForm.partyTime" center readonly label="时间:" input-align="right" />
       </van-cell-group>
       <van-cell-group>
-        <van-field
-          v-model="inputForm.relatedPersons.name"
-          center
-          readonly
-          label="相关人:"
-          input-align="right"
-        />
+        <van-field v-model="inputForm.relatedPersons.name" center readonly label="相关人:" input-align="right" />
       </van-cell-group>
       <van-cell-group>
         <van-field label="内容:" input-align="right">
           <template #input>
             <span v-show="inputForm.content == ''">无</span>
-            <span
-              v-show="inputForm.content != ''"
-              style="color: #36a7f3"
-              @click="open"
-              >查看内容</span
-            >
+            <span v-show="inputForm.content != ''" style="color: #36a7f3" @click="open">查看内容</span>
           </template>
         </van-field>
       </van-cell-group>
     </div>
-    <van-button
-      v-if="inputForm.assessment == 0"
-      type="primary"
-      class="btn-sub"
-      @click="update"
-      >审核</van-button
-    >
+    <van-button v-if="inputForm.assessment == 0" type="primary" class="btn-sub" @click="update">审核</van-button>
   </div>
   <!-- 富文本编辑器 -->
-  <van-popup v-model:show="showReport"
-    >
+  <van-popup v-model:show="showReport">
     <!-- <wang-editor ref="contentEditor" v-model="inputForm.content" /> -->
     <div v-html="inputForm.content" class="showhtml"></div>
   </van-popup>
 </template>
     
-    <script>
+<script>
 import { ref, nextTick } from "vue";
 import { useRoute } from "vue-router";
 import PrivatePartyPointService from "@/api/privateparty/PrivatePartyPointService";
@@ -189,12 +140,13 @@ export default {
   margin-left: 5%;
   margin-bottom: 40px;
 }
+
 .van-popup--center {
   width: 98% !important;
   border-radius: 10px;
-  height: 70vh;
   overflow: auto;
 }
+
 .showhtml {
   width: 94%;
   padding: 10px;

src/views/activityMan/selfMeetingReport/selfMeetingView.vue

@@ -39,7 +39,7 @@
         <van-field v-model="inputForm.relatedPersons.name" center required :rules="[{ required: true }]" label="相关人:"
           placeholder="请选择相关人" input-align="right" right-icon="arrow-down" @click="showPerson = true" />
         <van-dialog v-model:show="showPerson" title="选择人员" show-cancel-button @confirm="reselected">
-          <person-list @selected="selected" :type="1"></person-list>
+          <person-list @selected="selected" :type="1" siteId=""></person-list>
         </van-dialog>
       </van-cell-group>
       <van-cell-group>