Squashed commit of the following:

commit 67ad4bae7e2c7cd8552616f7ee605590fab20c79
Merge: 0434f91 754936c
Author: yin_yu820 <895937358@qq.com>
Date:   Tue Apr 4 18:21:13 2023 +0800

    Merge remote-tracking branch 'HS_MZAP/master'

src/api/placeRegister/placeRegister.js

@@ -7,7 +7,13 @@ export default class placeRegister {
             inputFrom
         )
     };
-    //地点
+    //所属场所
+    queryById(id) {
+            return request.get(
+                `/religioussites/siteinfo/religiousSitesInfo/queryById`, { id: id }
+            )
+        }
+        //地点
     treeDate(params) {
         return request.get(
             `/tools/area_yc/treeData`,

src/views/activityMan/religiousConference/religiousConferenceView.vue

@@ -1,6 +1,409 @@
 <template>
-    <div class="about">
-      <h1>This is an about page</h1>
+  <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">
+    <p class="title">场所负责人会议上报</p>
+    <div class="formArea">
+      <p class="miniTitle">基础信息</p>
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.placeSelectName"
+          center
+          readonly
+          label="会议地点:"
+          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="inputForm.venueDetailed"
+          center
+          label="详细地址:"
+          placeholder="请填写具体地址"
+          input-align="right"
+          right-icon="location"
+        />
+      </van-cell-group>
+
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.meetingTime"
+          center
+          readonly
+          label="会议时间:"
+          placeholder="请选择会议时间"
+          input-align="right"
+          right-icon="arrow-down"
+          @click="showAct = true"
+        />
+        <van-popup v-model:show="showAct" round position="bottom">
+          <van-picker-group
+            :tabs="['选择日期', '选择时间']"
+            next-step-text="下一步"
+            @confirm="getTime"
+            @cancel="showAct = false"
+          >
+            <van-date-picker v-model="currentDate" />
+            <van-time-picker
+              v-model="currentTime"
+              :columns-type="columnsType"
+            />
+          </van-picker-group>
+        </van-popup>
+      </van-cell-group>
+
+      <!-- <van-cell-group>
+        <van-field
+          v-model="inputForm.frequency"
+          center
+          label="频次:"
+          placeholder="请填写频次"
+          input-align="right"
+          type="digit"
+        />
+      </van-cell-group> -->
+
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.siteName.name"
+          readonly
+          required
+          label="会议场所:"
+          placeholder="请选择"
+          input-align="right"
+          right-icon="arrow-down"
+          @click="showPlace = true"
+        />
+        <van-dialog
+          v-model:show="showPlace"
+          title="选择场所"
+          show-cancel-button
+          @confirm="reselected2"
+        >
+          <site-list @selected="selected2" :type="1"></site-list>
+        </van-dialog>
+      </van-cell-group>
+      
+      <van-cell-group>
+        <van-field
+          v-model="inputForm.participants.name"
+          center
+          required
+          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>
+        </van-dialog>
+      </van-cell-group>
+      <van-cell-group>
+        <van-field label="内容:" label-align="top">
+          <template #input>
+            <wang-editor ref="contentEditor" v-model="inputForm.meetingTopics" />
+          </template>
+        </van-field>
+      </van-cell-group>
     </div>
-  </template>
-  
+    <div class="subbtn">
+      <van-button type="primary" @click="submit">提交</van-button>
+      <van-button type="default" hairline>取消</van-button>
+    </div>
+  </div>
+</template>
+  
+  <script>
+import { ref, onMounted } from "vue";
+import personList from "../personList.vue";
+import siteList from "../siteList.vue";
+import tools from "@/api/sys/tools";
+import religiousConferenceService from "@/api/religiousConference/religiousConferenceService";
+import UserManage from "@/api/user/UserManage";
+import { useRoute } from "vue-router";
+// 富文本编辑器
+import WangEditor from "@/components/editor/WangEditor";
+export default {
+  components: { personList, WangEditor,siteList },
+  setup() {
+    // 加载
+    let isLoading = ref(true);
+    // 返回
+    const onClickLeft = () => {
+      history.back();
+    };
+    // 私设聚会点信息
+    let inputForm = ref({
+      id: "",
+      siteName: {
+        id: "",
+        name: "",
+      },
+      venue: "320900",
+      placeSelectName: "盐城市",
+      placeSelectType3: "320900",
+      placeSelectType4: "",
+      placeSelectType5: "",
+      placeSelectType6: "",
+      venueDetailed: "",
+      meetingTime: "",
+      participants: {
+        id: "",
+        name: "",
+      },      
+      meetingTopics: "",
+      state: "0",
+      assessment: "0",
+    });
+    const contentEditor = ref(null);
+    let route = useRoute();
+    onMounted(() => {
+      // 根据路由初始化
+      if (route.query.id) {
+        new religiousConferenceService()
+          .queryById(route.query.id)
+          .then((data) => {
+            inputForm.value = data;
+            let ids = data.participants.id.split(",");
+            inputForm.value.participants.name = "";
+            ids.forEach((item) => {
+              new UserManage().queryById(item).then((data) => {
+                inputForm.value.participants.name += data.name + ",";
+              });
+            });
+            contentEditor.value.init(inputForm.value.meetingTopics);
+            isLoading.value = false;
+          });
+      } else {
+        contentEditor.value.init(inputForm.value.meetingTopics);
+        isLoading.value = false;
+      }
+    });
+    // 获取活动时间
+    let showAct = ref(false);
+    let currentDate = ref(["" + new Date().getFullYear(), "01", "01"]);
+    let currentTime = ref(["00", "00", "00"]);
+    const columnsType = ["hour", "minute", "second"];
+    const getTime = () => {
+      showAct.value = false;
+      inputForm.value.meetingTime = `${currentDate.value.join(
+        "-"
+      )} ${currentTime.value.join(":")}`;
+    };
+    // 会议场所
+    let showPlace = ref(false);
+    let list2 = {
+      value: [],
+      type: "",
+    };
+    const selected2 = (val, type) => {
+      list2.value = val;
+      list2.type = type;
+    };
+    const reselected2 = () => {
+      let ids = [];
+      let names = [];
+      if (list2.type == 1) {
+        list2.value.forEach((item) => {
+          ids.push(item.id);
+          names.push(item.name);
+        });
+        inputForm.value.siteName.id = ids.join(",");
+        inputForm.value.siteName.name = names.join(",");
+      }
+    };
+    // 相关人
+    let showPerson = ref(false);
+    let list = {
+      value: [],
+      type: "",
+    };
+    const selected = (val, type) => {
+      list.value = val;
+      list.type = type;
+    };
+    const reselected = () => {
+      let ids = [];
+      let names = [];
+      if (list.type == 1) {
+        list.value.forEach((item) => {
+          ids.push(item.id);
+          names.push(item.name);
+        });
+        inputForm.value.participants.id = ids.join(",");
+        inputForm.value.participants.name = names.join(",");
+      }
+    };
+    // 地区选择
+    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;
+      inputForm.value.placeSelectName = selectedOptions
+        .map((option) => option.name)
+        .join("/");
+        console.log("选择地区："+selectedOptions);
+
+        inputForm.value.venue = selectedOptions
+        .map((option) => option.id)
+        .join("/");
+
+        inputForm.value.venue = selectedOptions
+        .map((option) => option.id)
+        .join("/");
+
+        inputForm.value.placeSelectType3= selectedOptions[0].id;
+        inputForm.value.placeSelectType4= selectedOptions[1].id;
+        inputForm.value.placeSelectType5= selectedOptions[2].id;
+        console.log("11:"+inputForm.value);
+
+        //inputForm.value.placeSelectType6= selectedOptions[2].id,
+
+    };
+    const submit = () => {
+      isLoading.value = true;
+      new religiousConferenceService().save(inputForm.value).then((res) => {
+        if(res.data=="保存宗教场所负责人会议上报成功"){
+          window.xm.showToast({
+             message:"保存成功!"
+          })
+          onClickLeft();
+        isLoading.value = false;
+        }        
+      });
+    };
+    return {
+      isLoading,
+      inputForm,
+      // 活动时间
+      showAct,
+      currentDate,
+      currentTime,
+      columnsType,
+      getTime,
+      // 返回
+      onClickLeft,
+      // 场所选择
+      showPlace,
+      selected2,
+      reselected2,
+      // 人员选择
+      showPerson,
+      selected,
+      reselected,
+      // 地区选择
+      showArea,
+      fieldNames,
+      options,
+      onFinish,
+      cascaderValue,
+      contentEditor,
+      // change,
+      submit,
+    };
+  },
+};
+</script>
+  
+  <style scoped>
+* {
+  margin: 0;
+  padding: 0;
+}
+.main {
+  background: #fff;
+  position: relative;
+  top: 40px;
+}
+.title,
+.miniTitle {
+  height: 40px;
+  line-height: 40px;
+  color: #36a7f3;
+  border-bottom: 1px solid #eee;
+}
+.title {
+  font-size: 20px;
+  font-weight: 700;
+  padding-left: 20px;
+}
+.miniTitle {
+  font-size: 16px;
+}
+.formArea {
+  padding: 0px 20px;
+}
+.formArea .van-cell-group .van-field__label {
+  height: 40px;
+}
+.formArea .van-cell-group .van-cell {
+  line-height: 40px;
+}
+.van-cell__value .van-field__right-icon .van-icon-location {
+  color: #36a7f3 !important;
+}
+#editor {
+  position: relative;
+  height: 200px;
+}
+.w-e-text-container {
+  height: 150px !important;
+}
+.subbtn {
+  margin: 20px;
+  text-align: center;
+}
+.subbtn .van-button {
+  width: 40%;
+  margin: 5px;
+}
+.van-uploader .van-button {
+  border: none;
+  color: #36a7f3;
+  top: -4px;
+}
+.van-dialog {
+  width: 80%;
+  top: 50%;
+}
+.van-loading {
+  text-align: center;
+  margin-top: 80px;
+}
+</style>

src/views/activityMan/siteList.vue

@@ -0,0 +1,161 @@
+<template>
+    <div class="siteList">
+      <van-search
+        v-model="value"
+        show-action
+        placeholder="请输入搜索关键词"
+        @search="onSearch"
+        @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-cell-group inset>
+            <van-cell
+              v-for="(item, index) in list"
+              clickable
+              :key="item"
+              :title="item.name"
+              @click="toggle(index)"
+            >
+              <template #right-icon>
+                <van-checkbox
+                  shape="square"
+                  :name="item"
+                  :ref="(el) => (checkboxRefs[index] = el)"
+                />
+              </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"
+              @click="selectes(item)"
+            >
+              <template #right-icon>
+                <van-radio :name="item" />
+              </template>
+            </van-cell>
+          </van-cell-group>
+        </van-radio-group>
+      </van-list>
+    </div>
+  </template>
+  
+  <script>
+  import { ref } from "vue";
+  import tools from "@/api/sys/tools";
+  export default {
+    name: "siteList",
+    emits: ["selected"],
+    props: ["type"],
+    setup(props, { emit }) {
+      const list = ref([]);
+      const loading = ref(false);
+      const finished = ref(false);
+      let index = 0;
+      const onLoad = () => {
+        // 异步更新数据
+        new tools()
+        .placeList({
+            current: index + 1,
+            size: 10,
+        })
+        .then(({ records }) => {
+            list.value.push(...records);
+            // 加载状态结束
+            loading.value = false;
+            index++;
+            // 数据全部加载完成
+            if (records.length < 10) {
+              finished.value = true;
+            }
+        });
+        
+      };
+      // 搜索
+      const value = ref("");
+      const onSearch = (val) => showToast(val);
+      const onCancel = () => showToast("取消");
+      // 选择场所
+      const checked = ref([]);
+      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);
+        emit("selected", checked.value, 1);
+      };
+      const selectes = (val) => {
+        checked.value = val;
+        emit("selected", checked.value, 0);
+      };
+  
+      return {
+        // 场所
+        list,
+        onLoad,
+        loading,
+        finished,
+        // 搜索
+        value,
+        onSearch,
+        onCancel,
+        // 全选
+        checkAll,
+        toggle,
+        checked,
+        checkboxRefs,
+        checkboxGroup,
+        // 单选
+        selectes,
+      };
+    },
+  };
+  </script>
+  
+  <style scoped>
+  .siteList {
+    height: 65vh;
+    overflow: auto;
+    margin: 10px;
+  }
+  .van-button {
+    top: -5px;
+  }
+  .search {
+    height: 40px;
+    line-height: 40px;
+  }
+  .van-list {
+    height: 80%;
+    margin-top: 5px;
+  }
+  .keyword {
+    width: 70%;
+    height: 25px;
+    border-radius: 25px;
+    border: 1px solid;
+    padding-left: 15px;
+  }
+  </style>

src/views/placeManage/placePerson.vue

@@ -9,7 +9,7 @@
       @search="onSearch"
     >
       <template #action>
-        <div @click="onClickButton">
+        <div>
           <van-dropdown-menu>
             <van-dropdown-item
               overlay="false"
@@ -22,10 +22,10 @@
       </template>
     </van-search>
   </div>
-  <div class="PersonList">
+  <div class="PersonList" v-if="value1 == 0">
     <div
       class="PersonItem"
-      v-for="item in Person.PersonList"
+      v-for="item in dataList"
       :key="item.id"
       @click="goPlacePersonInfo(item)"
     >
@@ -38,20 +38,128 @@
             >）
           </p>
         </van-col>
-        <van-col span="6">
-          <p v-if="item.userManagenmetDetailsDTOList[1].value == 1" style="color: #36a7f3">伊斯兰教</p>
-          <p v-if="item.userManagenmetDetailsDTOList[1].value == 2" style="color: #36a7f3">基督教</p>
-          <p v-if="item.userManagenmetDetailsDTOList[1].value == 3" style="color: #36a7f3">天主教</p>
-          <p v-if="item.userManagenmetDetailsDTOList[1].value == 4" style="color: #36a7f3">佛教</p>
-          <p v-if="item.userManagenmetDetailsDTOList[1].value == 5" style="color: #36a7f3">道教</p>
+        <van-col span="6" style="">
+          <div
+            v-for="(item2, index) in item.userManagenmetDetailsDTOList"
+            :key="index"
+            style="font-size: 12px"
+          >
+            <p
+              v-if="
+                item2.dataType == 1 &&
+                item2.dataDictionary == 'hs_religion_type'
+              "
+              style="color: #36a7f3"
+            >
+              <span v-if="item2.value == 1" style="color: #1eba56"
+                >伊斯兰教</span
+              >
+              <span v-if="item2.value == 2" style="color: #36a7f3">基督教</span>
+              <span v-if="item2.value == 3" style="color: #ffa500">天主教</span>
+              <span v-if="item2.value == 4" style="color: #d3c701">佛教</span>
+              <span v-if="item2.value == 5" style="color: #a0522d">道教</span>
+            </p>
+          </div>
         </van-col>
       </van-row>
       <van-row>
         <van-col span="18">
-          <p>{{ item.nativePlace }}</p>
+          <span style="color:#a2a2a2;" v-if="item.location.id">{{item.location.value}}</span>
         </van-col>
-        <van-col span="6">
-          <p>{{ item.position }}</p>
+        <van-col span="6" style="text-align: right; font-size: 12px">
+          <span v-if="item.personnelType == 1">宗教从业人员</span>
+          <span v-else-if="item.personnelType == 2">民族场所从业人员</span>
+          <span v-else-if="item.personnelType == 3">教职人员</span>
+          <span v-else-if="item.personnelType == 4">固定信徒</span>
+          <span v-else-if="item.personnelType == 5">场所居住人员</span>
+          <span v-else-if="item.personnelType == 6">境外人员</span>
+          <span v-else-if="item.personnelType == 7">非本市人员</span>
+          <span v-else-if="item.personnelType == 8">非本教人员</span>
+          <span v-else-if="item.personnelType == 9">新增信徒人员</span>
+          <span v-else-if="item.personnelType == 10">临时人员</span>
+          <span v-else-if="item.personnelType == 11">异常人员</span>
+          <span v-else-if="item.personnelType == 12">邪教人员</span>
+          <span v-else-if="item.personnelType == 13">管理人员</span>
+          <span v-else-if="item.personnelType == 14">全能神离家人员</span>
+          <span v-else-if="item.personnelType == 15">全能神骨干人员</span>
+          <span v-else-if="item.personnelType == 16">网络运营人员</span>
+          <span v-else-if="item.personnelType == 17">涉政有害活动人员</span>
+          <span v-else-if="item.personnelType == 18">境内外记者</span>
+          <span v-else-if="item.personnelType == 19">境外法轮功骨干人员</span>
+          <span v-else-if="item.personnelType == 20">其他邪教骨干人员</span>
+          <span v-else-if="item.personnelType == 21">心灵法门骨干人员</span>
+          <span v-else>“精神控制”有害培训骨干人员</span>
+        </van-col>
+      </van-row>
+    </div>
+  </div>
+  <div class="PersonList" v-if="value1 != 0">
+    <div
+      class="PersonItem"
+      v-for="item in PersonList"
+      :key="item.id"
+      @click="goPlacePersonInfo(item)"
+    >
+      <van-row>
+        <van-col span="18">
+          <p>
+            {{ item.name }}（<span style="color: #36a7f3">{{
+              item.idcard
+            }}</span
+            >）
+          </p>
+        </van-col>
+        <van-col span="6" style="">
+          <div
+            v-for="(item2, index) in item.userManagenmetDetailsDTOList"
+            :key="index"
+            style="font-size: 12px"
+          >
+            <p
+              v-if="
+                item2.dataType == 1 &&
+                item2.dataDictionary == 'hs_religion_type'
+              "
+              style="color: #36a7f3"
+            >
+              <span v-if="item2.value == 1" style="color: #1eba56"
+                >伊斯兰教</span
+              >
+              <span v-if="item2.value == 2" style="color: #36a7f3">基督教</span>
+              <span v-if="item2.value == 3" style="color: #ffa500">天主教</span>
+              <span v-if="item2.value == 4" style="color: #d3c701">佛教</span>
+              <span v-if="item2.value == 5" style="color: #a0522d">道教</span>
+            </p>
+          </div>
+        </van-col>
+      </van-row>
+      <van-row>
+        <van-col span="18">
+          <span style="color:#a2a2a2;" v-if="item.location.id">{{item.location.value}}</span>
+        </van-col>
+        <van-col span="6" style="text-align: right; font-size: 12px">
+          <span v-if="item.personnelType == 1">宗教从业人员</span>
+          <span v-else-if="item.personnelType == 2">民族场所从业人员</span>
+          <span v-else-if="item.personnelType == 3">教职人员</span>
+          <span v-else-if="item.personnelType == 4">固定信徒</span>
+          <span v-else-if="item.personnelType == 5">场所居住人员</span>
+          <span v-else-if="item.personnelType == 6">境外人员</span>
+          <span v-else-if="item.personnelType == 7">非本市人员</span>
+          <span v-else-if="item.personnelType == 8">非本教人员</span>
+          <span v-else-if="item.personnelType == 9">新增信徒人员</span>
+          <span v-else-if="item.personnelType == 10">临时人员</span>
+          <span v-else-if="item.personnelType == 11">异常人员</span>
+          <span v-else-if="item.personnelType == 12">邪教人员</span>
+          <span v-else-if="item.personnelType == 13">管理人员</span>
+          <span v-else-if="item.personnelType == 14">全能神离家人员</span>
+          <span v-else-if="item.personnelType == 15">全能神骨干人员</span>
+          <span v-else-if="item.personnelType == 16">网络运营人员</span>
+          <span v-else-if="item.personnelType == 17">涉政有害活动人员</span>
+          <span v-else-if="item.personnelType == 18">境内外记者</span>
+          <span v-else-if="item.personnelType == 19">境外法轮功骨干人员</span>
+          <span v-else-if="item.personnelType == 20">其他邪教骨干人员</span>
+          <span v-else-if="item.personnelType == 21">心灵法门骨干人员</span>
+          <span v-else>“精神控制”有害培训骨干人员</span>
         </van-col>
       </van-row>
     </div>
@@ -59,9 +167,10 @@
 </template>
 
 <script>
-import { reactive, ref } from "vue";
+import {  ref } from "vue";
 import { useRouter } from "vue-router";
 import UserManage from "@/api/user/UserManage";
+import placeRegister from "@/api/placeRegister/placeRegister";
 export default {
   setup() {
     const value = ref("");
@@ -74,14 +183,27 @@ export default {
       { text: "佛教", value: 4 },
       { text: "道教", value: 5 },
     ];
-    const Person = reactive({
-      PersonList: [],
-    });
+    let PersonList = ref([]);
+    let dataList = ref([]);
     //宗教选择
-    const changeValue = (value1) => {
-      Person.PersonList.forEach((item) => {
-        console.log(item);
-      });
+    const changeValue = (value2) => {
+      if (value2 == 0) {
+        PersonList.value = dataList.value;
+      } else {
+        let dealList = [];
+        dataList.value.forEach((L1) => {
+          L1.userManagenmetDetailsDTOList.forEach((L2) => {
+            if (
+              L2.value == value2 &&
+              L2.dataType === "1" &&
+              L2.dataDictionary == "hs_religion_type"
+            ) {
+              dealList.push(L1);
+            }
+          });
+        });
+        PersonList.value = dealList;
+      }
     };
 
     //跳转
@@ -111,12 +233,20 @@ export default {
         });
         Ids.forEach((item2) => {
           new UserManage().queryById(item2).then((res) => {
-            Person.PersonList.push(res);
+            if (res.location.id) {
+              let locationIds = [];
+              let ids = res.location.id;
+              locationIds = ids.split(",");
+              locationIds.forEach((res2) => {
+                new placeRegister().queryById(res2).then((res3) => {
+                  res.location.value += "" + res3.name + ",";
+                });
+              });
+            }
+            dataList.value.push(res);
           });
         });
-        console.log(Person.PersonList);
       });
-
     //返回
     const goback = () => {
       history.back();
@@ -126,11 +256,12 @@ export default {
       value,
       value1,
       option1,
-      Person,
       loading,
       finished,
       goPlacePersonInfo,
       changeValue,
+      PersonList,
+      dataList
     };
   },
 };

src/views/placeManage/placePersoninfo.vue

@@ -147,116 +147,67 @@
         </van-col>
       </van-row>
       <h3 style="color: #40abf4;margin-top:10px;">拓展信息</h3>
-      <van-row class="item">
-        <van-col span="24">
+      <van-row class="item" v-for="(item,index) in data.data.userManagenmetDetailsDTOList" :key="index">
+        <van-col span="24" v-if="item.dataType === '1' && item.dataDictionary==''">
           <van-row justify="space-between">
-            <van-col span="10"> 法名： </van-col>
+            <van-col span="10"> {{item.chineseName}} </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.dataArray[0]}}
+              {{item.value}}
             </van-col>
           </van-row>
         </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
+        <van-col span="24" v-if="item.dataType === '1' && item.dataDictionary=='hs_religion_type'">
           <van-row justify="space-between">
-            <van-col span="10">教别： </van-col>
+            <van-col span="10"> {{item.chineseName}} </van-col>
             <van-col span="14" style="text-align: right">
-              <span v-if="data.dataArray[1]==1">伊斯兰教</span>
-              <span v-if="data.dataArray[1]==2">基督教</span>
-              <span v-if="data.dataArray[1]==3">天主教</span>
-              <span v-if="data.dataArray[1]==4">佛教</span>
-              <span v-if="data.dataArray[1]==5">道教</span>
+              <span v-if="item.value==1">伊斯兰教</span>
+              <span v-if="item.value==2">基督教</span>
+              <span v-if="item.value==3">天主教</span>
+              <span v-if="item.value==4">佛教</span>
+              <span v-if="item.value==5">道教</span>
             </van-col>
           </van-row>
         </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
+        <van-col span="24" v-if="item.dataType === '1' && item.dataDictionary=='hs_faculty_type'">
           <van-row justify="space-between">
-            <van-col span="10"> 教职名称： </van-col>
+            <van-col span="10"> {{item.chineseName}} </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.dataArray[2]}}
+              <span v-if="item.value==1">负责人</span>
+              <span v-if="item.value==2">牧师</span>
+              <span v-if="item.value==3">长老</span>
+              <span v-if="item.value==4">传道员</span>
+              <span v-if="item.value==5">神学生</span>
             </van-col>
           </van-row>
         </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
+        <van-col span="24" v-if="item.dataType === '5'">
           <van-row justify="space-between">
-            <van-col span="10"> 教职证书号： </van-col>
+            <van-col span="10"> {{item.chineseName}} </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.dataArray[3]}}
+              {{item.value}}
             </van-col>
           </van-row>
         </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-col span="10"> 备案时间： </van-col>
-            <van-col span="14" style="text-align: right">
-              {{data.dataArray[4]}}
-            </van-col>
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
+        <van-col span="24" v-if="item.dataType === '6'">
           <van-row justify="space-between">
-            <van-col span="10"> 备案部门： </van-col>
+            <van-col span="10"> {{item.chineseName}} </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.dataArray[5]}}
+              {{item.value}}
             </van-col>
           </van-row>
         </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-col span="10"> 证书备案编号： </van-col>
-            <van-col span="14" style="text-align: right">
-              {{data.dataArray[6]}}
-            </van-col>
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-col span="10"> 证书有效期： </van-col>
-            <van-col span="14" style="text-align: right">
-              {{data.dataArray[8]}}
-            </van-col>
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-col span="10"> 教职人员类型： </van-col>
-            <van-col span="14" style="text-align: right">
-              <span v-if="data.dataArray[9]==1">负责人</span>
-              <span v-if="data.dataArray[9]==2">牧师</span>
-              <span v-if="data.dataArray[9]==3">长老</span>
-              <span v-if="data.dataArray[9]==4">传道员</span>
-              <span v-if="data.dataArray[9]==5">神学生</span>
-            </van-col>
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
+        <van-col span="24" v-if="item.dataType === '4'">
           <van-row>
             <van-col span="10"> 证书照片： </van-col>
           </van-row>
           <van-row>
             <van-col span="10">
-                <img class="personImg" :src="data.dataArray[7]" alt="" />
+                <img class="personImg" :src="item.value" alt="" />
             </van-col>
           </van-row>
         </van-col>
       </van-row>
+      
     </div>
   </div>
 </template>
@@ -270,21 +221,22 @@ export default {
     const data = reactive({
       //个人数据
       data:{},
-      //个人扩展数据
-      dataArray:[],
     })
     let id = ref('')
     //数据接收
     const router = useRouter();
     onMounted(()=>{
       var item = JSON.parse(router.currentRoute.value.query.data)
-      data.data = item
-      id = data.data.id
+      id = item.id
+      console.log(id);
       //id查询扩展信息
       new UserManage().queryById(id).then((res)=>{
-        res.userManagenmetDetailsDTOList.forEach(item => {
-          data.dataArray.push(item.value);
-        });
+        data.data = res
+        
+        console.log(res);
+        // res.userManagenmetDetailsDTOList.forEach(item => {
+        //   data.dataArray.push(item.value);
+        // });
       })
     })
     //返回