人员档页面数据更新

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/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);
+        // });
       })
     })
     //返回