活动

src/views/activityMan/personList.vue

@@ -125,6 +125,7 @@ export default {
   props: ["type", "siteId"],
   setup(props, { emit }) {
     const { siteId } = toRefs(props);
+    const { type } = toRefs(props);
     const searchForm = ref({
       name: "",
       sex: "",
@@ -225,6 +226,10 @@ export default {
           // 数据全部加载完成
           if (records.length < 15) {
             finished.value = true;
+            window.xm.showToast({
+              message:
+                "siteId" + searchForm.value.location.id + "," + siteId.value,
+            });
             if (
               finished.value &&
               !loading.value &&
@@ -238,9 +243,9 @@ export default {
           }
         });
     };
-    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;
+    // }
     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"