无token图片上传

src/api/placeActivity/placeActivityServer.js

@@ -28,5 +28,10 @@ export default class placeActivityServer {
         return request.delete(
             '/reporting/reportingActivities/delete', { ids: ids }
         )
+    };
+    kor(ids) {
+        return request.post(
+            '/reporting/reportingActivities/kor', { ids: ids }
+        )
     }
 }

src/views/activityMan/personList.vue

@@ -3,46 +3,109 @@
     <van-row ustify="center">
       <van-col span="12">
         <van-cell-group>
-          <van-field v-model="personType" clearable center readonly placeholder="请选择人员类型" input-align="right"
-            right-icon="arrow-down" @click="showPerson = true" />
+          <van-field
+            v-model="personType"
+            clearable
+            center
+            readonly
+            placeholder="请选择人员类型"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="showPerson = true"
+          />
           <van-popup v-model:show="showPerson" round position="bottom">
-            <van-picker title="人员类型" :columns="$dictUtils.getDictList('hs_people_type')" :columns-field-names="{
-              text: 'label',
-              value: 'value'
-            }" @cancel="showPerson = false" @confirm="getPersonType" />
+            <van-picker
+              title="人员类型"
+              :columns="$dictUtils.getDictList('hs_people_type')"
+              :columns-field-names="{
+                text: 'label',
+                value: 'value',
+              }"
+              @cancel="showPerson = false"
+              @confirm="getPersonType"
+            />
           </van-popup>
         </van-cell-group>
       </van-col>
       <van-col span="12">
         <van-cell-group>
-          <van-field v-model="religiousType" clearable center readonly placeholder="请选择宗教类型" input-align="right"
-            right-icon="arrow-down" @click="showPlace = true" />
+          <van-field
+            v-model="religiousType"
+            clearable
+            center
+            readonly
+            placeholder="请选择宗教类型"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="showPlace = true"
+          />
           <van-popup v-model:show="showPlace" round position="bottom">
-            <van-picker title="宗教类型" :columns="$dictUtils.getDictList('hs_religion_type')" :columns-field-names="{
-              text: 'label',
-              value: 'value'
-            }" @cancel="showPlace = false" @confirm="getType" />
+            <van-picker
+              title="宗教类型"
+              :columns="$dictUtils.getDictList('hs_religion_type')"
+              :columns-field-names="{
+                text: 'label',
+                value: 'value',
+              }"
+              @cancel="showPlace = false"
+              @confirm="getType"
+            />
           </van-popup>
         </van-cell-group>
       </van-col>
     </van-row>
-    <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-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">
+          <van-cell
+            v-for="(item, index) in list"
+            clickable
+            :key="item"
+            :title="item.name"
+          >
             <template #right-icon>
-              <van-checkbox :name="item" :ref="el => (checkboxRefs[index] = el)" @click="toggle(index)" />
+              <van-checkbox
+                :name="item"
+                :ref="(el) => (checkboxRefs[index] = el)"
+                @click="toggle(index)"
+              />
             </template>
           </van-cell>
         </van-cell-group>
       </van-checkbox-group>
       <van-radio-group v-if="type == 0" v-model="checked">
         <van-cell-group inset>
-          <van-cell v-for="item in list" clickable :key="item" :title="item.name">
+          <van-cell
+            v-for="item in list"
+            clickable
+            :key="item"
+            :title="item.name"
+          >
             <template #right-icon>
               <van-radio :name="item" @click="selectes(item)" />
             </template>
@@ -75,21 +138,25 @@ export default {
       religion: "",
       createEnd: "",
       createBegin: "",
-      nativePlace: '',
-      currentResidence: '',
-    })
-
-
+      nativePlace: "",
+      currentResidence: "",
+    });
+    if (
+      props.value.siteId != "" &&
+      searchForm.value.location.id != props.value.siteId
+    ) {
+      searchForm.value.location.id = props.siteId;
+    }
     // 搜索
     const onCancel = () => {
       list.value = [];
       index = 0;
       finished.value = false;
-      searchForm.value.name = ""
-      searchForm.value.religion = ""
-      searchForm.value.personnelType = ""
-      personType.value = ""
-      religiousType.value = ""
+      searchForm.value.name = "";
+      searchForm.value.religion = "";
+      searchForm.value.personnelType = "";
+      personType.value = "";
+      religiousType.value = "";
     };
     // 选择人员
     const checked = ref([]);
@@ -101,7 +168,6 @@ export default {
     };
     // 全选
     const checkAll = () => {
-
       checkboxGroup.value.toggleAll(true);
       console.log("checked", checked);
       emit("selected", checked.value, 1);
@@ -124,27 +190,26 @@ export default {
         return { ...searchForm.value };
       },
       (newValue, oldValue) => {
-
         if (oldValue != newValue) {
           index = 0;
-          onLoad()
+          onLoad();
         }
       },
       { deep: true }
     );
     let showPlace = ref(false);
     let showPerson = ref(false);
-    let religiousType = ref('');
-    let personType = ref('');
+    let religiousType = ref("");
+    let personType = ref("");
     const getType = ({ selectedOptions }) => {
       showPlace.value = false;
       searchForm.value.religion = selectedOptions[0].value;
-      religiousType.value = selectedOptions[0].label
+      religiousType.value = selectedOptions[0].label;
     };
     const getPersonType = ({ selectedOptions }) => {
       showPerson.value = false;
       searchForm.value.personnelType = selectedOptions[0].value;
-      personType.value = selectedOptions[0].label
+      personType.value = selectedOptions[0].label;
     };
     const onLoad = () => {
       if (index == 0) {
@@ -156,26 +221,28 @@ export default {
         .list({
           current: index + 1,
           size: 15,
-          ...searchForm.value
+          ...searchForm.value,
         })
         .then(({ records }) => {
-          list.value.push(...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)
+            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) {
-      searchForm.value.location.id = props.siteId;
-    }
+
     return {
       // 人员
       list,
@@ -200,7 +267,7 @@ export default {
       showPerson,
       getPersonType,
       religiousType,
-      personType
+      personType,
     };
   },
 };

src/views/activityMan/placeactivity/placeActivityInfo.vue

@@ -1,5 +1,11 @@
 <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">
@@ -8,74 +14,188 @@
     <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.activitiesType" 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 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.activityTime" center readonly 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.participantsNum" center readonly clearable 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.knownList.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.reporter.name" 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.participation" 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.place" 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">
+        <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" center readonly label="活动负责人:" input-align="right" />
+        <van-field
+          v-model="placeActivity.activityPerson"
+          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 &&
+        hasPermission('reporting:reportingActivities:kor')
+      "
+      type="primary"
+      class="btn-sub"
+      @click="update"
+      >审核</van-button
+    >
   </div>
   <van-popup v-model:show="showReport">
     <div v-html="placeActivity.subjectContent" class="showhtml"></div>
@@ -198,8 +318,7 @@ export default {
         message: "确定审核所选项吗?",
       }).then((result) => {
         if (result == "ok") {
-          placeActivity.value.assessment = 1;
-          new placeActivityServer().save(placeActivity.value).then((res) => {
+          new placeActivityServer().kor(placeActivity.value.id).then((res) => {
             if (res.status == 200 || res.statusText == "OK") {
               xm.showToast({
                 message: "已审核",