Merge remote-tracking branch 'HS_MZAP/master'

src/utils/request.js

@@ -91,7 +91,6 @@ var http = {
                 method: 'get',
                 params: params,
                 config: config,
-                cancelToken: new axios.CancelToken(function executor(c) {})
             }).then((response) => {
                 resolve(response.data)
             }).catch((error) => {

src/views/placeManage/placePerson.vue

@@ -6,7 +6,6 @@
       show-action
       shape="round"
       placeholder="请输入姓名/身份证/场所名称"
-      @search="onSearch"
     >
       <template #action>
         <div>
@@ -22,7 +21,7 @@
       </template>
     </van-search>
   </div>
-  <div class="PersonList" v-if="value1 == 0">
+  <div class="PersonList" v-if="value1 == 0 || value == ''">
     <div
       class="PersonItem"
       v-for="item in dataList"
@@ -38,8 +37,8 @@
             >）
           </p>
         </van-col>
-        <van-col span="6" style="">
-          <div
+        <van-col span="6" style="text-align: right">
+          <!-- <div
             v-for="(item2, index) in item.userManagenmetDetailsDTOList"
             :key="index"
             style="font-size: 12px"
@@ -59,12 +58,16 @@
               <span v-if="item2.value == 4" style="color: #d3c701">佛教</span>
               <span v-if="item2.value == 5" style="color: #a0522d">道教</span>
             </p>
-          </div>
+          </div> -->
+          <span v-if="item.sex == 1" style="color: #36a7f3">男</span>
+          <span v-if="item.sex == 2" style="color: #d3c701">女</span>
         </van-col>
       </van-row>
       <van-row>
         <van-col span="18">
-          <span style="color:#a2a2a2;" v-if="item.location.id">{{item.location.value}}</span>
+          <span style="color: #a2a2a2" v-if="item.locationName">{{
+            item.locationName
+          }}</span>
         </van-col>
         <van-col span="6" style="text-align: right; font-size: 12px">
           <span v-if="item.personnelType == 1">宗教从业人员</span>
@@ -93,7 +96,7 @@
       </van-row>
     </div>
   </div>
-  <div class="PersonList" v-if="value1 != 0">
+  <div class="PersonList" v-if="value1 != 0 && value != ''">
     <div
       class="PersonItem"
       v-for="item in PersonList"
@@ -109,8 +112,8 @@
             >）
           </p>
         </van-col>
-        <van-col span="6" style="">
-          <div
+        <van-col span="6" style="text-align: right">
+          <!-- <div
             v-for="(item2, index) in item.userManagenmetDetailsDTOList"
             :key="index"
             style="font-size: 12px"
@@ -130,12 +133,16 @@
               <span v-if="item2.value == 4" style="color: #d3c701">佛教</span>
               <span v-if="item2.value == 5" style="color: #a0522d">道教</span>
             </p>
-          </div>
+          </div> -->
+          <span v-if="item.sex == 1" style="color: #36a7f3">男</span>
+          <span v-if="item.sex == 2" style="color: #d3c701">女</span>
         </van-col>
       </van-row>
       <van-row>
         <van-col span="18">
-          <span style="color:#a2a2a2;" v-if="item.location.id">{{item.location.value}}</span>
+          <span style="color: #a2a2a2" v-if="item.locationName">{{
+            item.locationName
+          }}</span>
         </van-col>
         <van-col span="6" style="text-align: right; font-size: 12px">
           <span v-if="item.personnelType == 1">宗教从业人员</span>
@@ -167,57 +174,30 @@
 </template>
 
 <script>
-import {  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("");
     const value1 = ref(0);
+    // const option1 = [
+    //   { text: "所有教别", value: 0 },
+    //   { text: "伊斯兰教", value: 1 },
+    //   { text: "基督教", value: 2 },
+    //   { text: "天主教", value: 3 },
+    //   { text: "佛教", value: 4 },
+    //   { text: "道教", value: 5 },
+    // ];
     const option1 = [
-      { text: "所有教别", value: 0 },
-      { text: "伊斯兰教", value: 1 },
-      { text: "基督教", value: 2 },
-      { text: "天主教", value: 3 },
-      { text: "佛教", value: 4 },
-      { text: "道教", value: 5 },
+      { text: "搜索选择", value: 0 },
+      { text: "姓名", value: 1 },
+      { text: "身份证号", value: 2 },
+      { text: "场所名称", value: 3 },
     ];
     let PersonList = ref([]);
     let dataList = ref([]);
-    //宗教选择
-    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;
-      }
-    };
-
-    //跳转
-    let router = useRouter();
-    const goPlacePersonInfo = (item) => {
-      var data = JSON.stringify(item);
-      router.push({
-        path: "/placePersoninfo",
-        query: { data: data },
-      });
-    };
-
     //数据获取
-    let list = ref([]);
     const loading = ref(false);
     const finished = ref(false);
     new UserManage()
@@ -226,27 +206,60 @@ export default {
         size: 10,
       })
       .then((res) => {
-        list.value.push(...res.records);
-        let Ids = [];
-        list.value.forEach((item) => {
-          Ids.push(item.id);
-        });
-        Ids.forEach((item2) => {
-          new UserManage().queryById(item2).then((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);
+        let list2 = [];
+        list2.push(...res.records);
+        list2.forEach((n1) => {
+          let id = n1.id;
+          new UserManage().queryById(id).then((LP) => {
+            n1.userManagenmetDetailsDTOList = LP.userManagenmetDetailsDTOList;
           });
         });
+        dataList.value = list2;
       });
+    //跳转
+    let router = useRouter();
+    const goPlacePersonInfo = (item) => {
+      var data = JSON.stringify(item);
+      router.push({
+        path: "/placePersoninfo",
+        query: { data: data },
+      });
+    };
+    //宗教选择
+    const changeValue = (value2) => {
+      if (value.value != "") {
+        switch (value2) {
+          case 0:
+            PersonList.value = dataList.value;
+            break;
+          case 1:
+            dataList.value.forEach((s1) => {
+              if (s1.name == value.value) {
+                PersonList.value.push(s1);
+              }
+            });
+            break;
+          case 2:
+            dataList.value.forEach((s1) => {
+              if (s1.idcard == value.value) {
+                PersonList.value.push(s1);
+              }
+            });
+            break;
+          case 3:
+            dataList.value.forEach((s1) => {
+              if (s1.locationName == value.value) {
+                PersonList.value.push(s1);
+              }
+            });
+            break;
+          default:
+            break;
+        }
+      }else{
+        PersonList.value.splice(0,PersonList.value.length)
+      }
+    };
     //返回
     const goback = () => {
       history.back();
@@ -261,7 +274,7 @@ export default {
       goPlacePersonInfo,
       changeValue,
       PersonList,
-      dataList
+      dataList,
     };
   },
 };

src/views/placeManage/placePersoninfo.vue

@@ -215,7 +215,6 @@
 <script>
 import { useRouter } from 'vue-router'
 import {onMounted, reactive,ref} from "vue"
-import UserManage from '@/api/user/UserManage';
 export default {
   setup(){
     const data = reactive({
@@ -227,17 +226,8 @@ export default {
     const router = useRouter();
     onMounted(()=>{
       var item = JSON.parse(router.currentRoute.value.query.data)
-      id = item.id
-      console.log(id);
-      //id查询扩展信息
-      new UserManage().queryById(id).then((res)=>{
-        data.data = res
-        
-        console.log(res);
-        // res.userManagenmetDetailsDTOList.forEach(item => {
-        //   data.dataArray.push(item.value);
-        // });
-      })
+      console.log(item);
+      data.data = item;
     })
     //返回
     const goback = () => {

src/views/placeManage/placeTabletInfo.vue

@@ -210,7 +210,7 @@ html {
 .content {
   position: fixed;
   width: 85%;
-  top: 240px;
+  top: 180px;
   left: 50%;
   padding: 20px 10px;
   transform: translateX(-50%);