guoqing пре 2 година
родитељ
комит
8ee3cd9a80

+ 0 - 4
src/views/placeManage/ManageList.vue

@@ -109,10 +109,6 @@ export default {
       onLoad,
       loading,
       finished,
-      // 搜索
-      value,
-      onSearch,
-      onCancel,
       // 全选
       checkAll,
       toggle,

+ 39 - 18
src/views/placeManage/placePerson.vue

@@ -15,6 +15,7 @@
               overlay="false"
               v-model="value1"
               :options="option1"
+              @change="changeValue(value1)"
             />
           </van-dropdown-menu>
         </div>
@@ -31,21 +32,23 @@
       <van-row>
         <van-col span="18">
           <p>
-            {{ item.name }}(<span style="color: #36a7f3">{{ item.idcard }}</span
+            {{ item.name }}(<span style="color: #36a7f3">{{
+              item.idcard
+            }}</span
             >)
           </p>
         </van-col>
         <van-col span="6">
-          <p v-if="item.church == '基督教'" style="color: #36a7f3">基督教</p>
-          <p v-else-if="item.church == '佛教'" style="color: #e4dd65">佛教</p>
-          <p v-else-if="item.church == '伊斯兰教'" style="color: #52ca7d">
-            伊斯兰教
-          </p>
+          <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>
       </van-row>
       <van-row>
         <van-col span="18">
-          <p>{{ item.locationName }}</p>
+          <p>{{ item.nativePlace }}</p>
         </van-col>
         <van-col span="6">
           <p>{{ item.position }}</p>
@@ -65,36 +68,53 @@ export default {
     const value1 = ref(0);
     const option1 = [
       { text: "所有教别", value: 0 },
-      { text: "基督教", value: 1 },
-      { text: "佛教", value: 2 },
-      { text: "伊斯兰教", value: 3 },
+      { text: "伊斯兰教", value: 1 },
+      { text: "基督教", value: 2 },
+      { text: "天主教", value: 3 },
+      { text: "佛教", value: 4 },
+      { text: "道教", value: 5 },
     ];
     const Person = reactive({
       PersonList: [],
     });
+    //宗教选择
+    const changeValue = (value1) => {
+      Person.PersonList.forEach((item) => {
+        console.log(item);
+      });
+    };
+
     //跳转
     let router = useRouter();
     const goPlacePersonInfo = (item) => {
-      var data = JSON.stringify(item)
+      var data = JSON.stringify(item);
       router.push({
-        path:"/placePersoninfo",
-        query:{'data':data}
+        path: "/placePersoninfo",
+        query: { data: data },
       });
     };
 
     //数据获取
-    let list = ref([])
+    let list = ref([]);
     const loading = ref(false);
     const finished = ref(false);
     new UserManage()
       .list({
-        current:  1,
+        current: 1,
         size: 10,
       })
       .then((res) => {
-        console.log(res);
-        list.value.push(...res.records)
-        Person.PersonList = list
+        list.value.push(...res.records);
+        let Ids = [];
+        list.value.forEach((item) => {
+          Ids.push(item.id);
+        });
+        Ids.forEach((item2) => {
+          new UserManage().queryById(item2).then((res) => {
+            Person.PersonList.push(res);
+          });
+        });
+        console.log(Person.PersonList);
       });
 
     //返回
@@ -110,6 +130,7 @@ export default {
       loading,
       finished,
       goPlacePersonInfo,
+      changeValue,
     };
   },
 };

+ 39 - 5
src/views/placeManage/placePersoninfo.vue

@@ -74,7 +74,28 @@
           <van-row justify="space-between">
             <van-col span="10"> 人员类型: </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.personnelType}}
+              <span v-if="data.data.personnelType==1">宗教从业人员</span>
+              <span v-else-if="data.data.personnelType==2">民族场所从业人员</span>
+              <span v-else-if="data.data.personnelType==3">教职人员</span>
+              <span v-else-if="data.data.personnelType==4">固定信徒</span>
+              <span v-else-if="data.data.personnelType==5">场所居住人员</span>
+              <span v-else-if="data.data.personnelType==6">境外人员</span>
+              <span v-else-if="data.data.personnelType==7">非本市人员</span>
+              <span v-else-if="data.data.personnelType==8">非本教人员</span>
+              <span v-else-if="data.data.personnelType==9">新增信徒人员</span>
+              <span v-else-if="data.data.personnelType==10">临时人员</span>
+              <span v-else-if="data.data.personnelType==11">异常人员</span>
+              <span v-else-if="data.data.personnelType==12">邪教人员</span>
+              <span v-else-if="data.data.personnelType==13">管理人员</span>
+              <span v-else-if="data.data.personnelType==14">全能神离家人员</span>
+              <span v-else-if="data.data.personnelType==15">全能神骨干人员</span>
+              <span v-else-if="data.data.personnelType==16">网络运营人员</span>
+              <span v-else-if="data.data.personnelType==17">涉政有害活动人员</span>
+              <span v-else-if="data.data.personnelType==18">境内外记者</span>
+              <span v-else-if="data.data.personnelType==19">境外法轮功骨干人员</span>
+              <span v-else-if="data.data.personnelType==20">其他邪教骨干人员</span>
+              <span v-else-if="data.data.personnelType==21">心灵法门骨干人员</span>
+              <span v-else>“精神控制”有害培训骨干人员</span>
             </van-col>
           </van-row>
         </van-col>
@@ -84,7 +105,13 @@
           <van-row justify="space-between">
             <van-col span="10"> 从业类型: </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.data.typeOfEmployees}}
+              <span v-if="data.data.typeOfEmployees==1">场所负责人</span>
+              <span v-if="data.data.typeOfEmployees==2">堂管会成员</span>
+              <span v-if="data.data.typeOfEmployees==3">小组负责人</span>
+              <span v-if="data.data.typeOfEmployees==4">财会</span>
+              <span v-if="data.data.typeOfEmployees==5">义工</span>
+              <span v-if="data.data.typeOfEmployees==6">保安</span>
+              <span v-if="data.data.typeOfEmployees==7">信息审核员</span>
             </van-col>
           </van-row>
         </van-col>
@@ -135,7 +162,11 @@
           <van-row justify="space-between">
             <van-col span="10">教别: </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.dataArray[1]}}
+              <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>
             </van-col>
           </van-row>
         </van-col>
@@ -205,7 +236,11 @@
           <van-row justify="space-between">
             <van-col span="10"> 教职人员类型: </van-col>
             <van-col span="14" style="text-align: right">
-              {{data.dataArray[9]}}
+              <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>
@@ -244,7 +279,6 @@ export default {
     onMounted(()=>{
       var item = JSON.parse(router.currentRoute.value.query.data)
       data.data = item
-      // console.log(data.data);
       id = data.data.id
       //id查询扩展信息
       new UserManage().queryById(id).then((res)=>{