Squashed commit of the following:

commit b65eef86bac349b0304ffa011564ff7aa04c836c
Author: guoqing <1624870927@qq.com>
Date:   Thu Mar 30 17:54:47 2023 +0800

    待办更新

src/api/toBeDone/toBeDone.js

@@ -3,7 +3,7 @@ import request from "@/utils/request";
 export default class toBeDone {
     list(params) {
         return request.get(
-            `/workbench/index/queryWorkDbList`,
+            `/assign/assignWorkOrder/list2`,
             params
         )
     }

src/api/user/UserManage.js

@@ -6,10 +6,11 @@ export default class UserManage {
             `/user/usermanagement/userManagement/list`,
             params
         )
-    }
+    };
     queryById(id) {
         return request.get(
-            '/user/usermanagement/userManagement/queryById', { id: id }
+            `/user/usermanagement/userManagement/queryById`, { id: id }
         )
     }
+
 }

src/views/placeManage/placePerson.vue

@@ -26,7 +26,7 @@
       class="PersonItem"
       v-for="item in Person.PersonList"
       :key="item.id"
-      @click="goPlacePersonInfo"
+      @click="goPlacePersonInfo(item)"
     >
       <van-row>
         <van-col span="18">
@@ -45,7 +45,7 @@
       </van-row>
       <van-row>
         <van-col span="18">
-          <p>{{ item.nativePlace }}</p>
+          <p>{{ item.locationName }}</p>
         </van-col>
         <van-col span="6">
           <p>{{ item.position }}</p>
@@ -71,48 +71,16 @@ export default {
       { text: "伊斯兰教", value: 3 },
     ];
     const Person = reactive({
-      PersonList: [
-        {
-          name: "孙辉",
-          id: "320902198901523010",
-          church: "基督教",
-          address: "盐都基督教总教",
-          position: "教职人员",
-        },
-        {
-          name: "孙辉",
-          id: "320902198901523010",
-          church: "佛教",
-          address: "盐城永宁寺",
-          position: "教职人员",
-        },
-        {
-          name: "孙辉",
-          id: "320902198901523010",
-          church: "基督教",
-          address: "盐都基督教总教",
-          position: "教职人员",
-        },
-        {
-          name: "孙辉",
-          id: "320902198901523010",
-          church: "基督教",
-          address: "盐都基督教总教",
-          position: "教职人员",
-        },
-        {
-          name: "孙辉",
-          id: "320902198901523010",
-          church: "伊斯兰教",
-          address: "盐都清真寺",
-          position: "教职人员",
-        },
-      ],
+      PersonList: [],
     });
     //跳转
     let router = useRouter();
-    const goPlacePersonInfo = () => {
-      router.push("/placePersoninfo");
+    const goPlacePersonInfo = (item) => {
+      var data = JSON.stringify(item)
+      router.push({
+        path:"/placePersoninfo",
+        query:{'data':data}
+      });
     };
 
     //数据获取
@@ -125,7 +93,7 @@ export default {
         size: 10,
       })
       .then((res) => {
-        // console.log(res);
+        console.log(res);
         list.value.push(...res.records)
         Person.PersonList = list
       });

src/views/placeManage/placePersoninfo.vue

@@ -7,14 +7,14 @@
   </div>
   <div class="content">
     <div class="itemInfo">
-    <h3 style="color: #40abf4">个人信息-孙辉</h3>
+    <h3 style="color: #40abf4">个人信息-{{data.data.name}}</h3>
       <van-row justify="space-between">
         <van-col span="14">
           <van-row class="item">
             <van-col span="24">
               <van-row justify="space-between">
                 <van-col span="8"> 姓名： </van-col>
-                <van-col span="8" style="text-align: right"> 孙辉 </van-col>
+                <van-col span="8" style="text-align: right"> {{data.data.name}} </van-col>
               </van-row>
             </van-col>
           </van-row>
@@ -22,7 +22,7 @@
             <van-col span="24">
               <van-row justify="space-between">
                 <van-col span="8"> 性别： </van-col>
-                <van-col span="8" style="text-align: right"> 男 </van-col>
+                <van-col span="8" style="text-align: right"> {{data.data.sex == 1?'男':'女'}} </van-col>
               </van-row>
             </van-col>
           </van-row>
@@ -30,13 +30,13 @@
             <van-col span="24">
               <van-row justify="space-between">
                 <van-col span="12"> 证件类型： </van-col>
-                <van-col span="6" style="text-align: right"> 身份证 </van-col>
+                <van-col span="6" style="text-align: right"> {{data.data.idType==1?'身份证':'其他'}} </van-col>
               </van-row>
             </van-col>
           </van-row>
         </van-col>
         <van-col span="8">
-          <img class="personImg" src="../../assets/logo.png" alt="" />
+          <img class="personImg" :src="data.data.workPicture" alt="" />
         </van-col>
       </van-row>
       <van-row class="item">
@@ -44,7 +44,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 证件号码： </van-col>
             <van-col span="14" style="text-align: right">
-              320911198904021563
+              {{data.data.idcard}}
             </van-col>
           </van-row>
         </van-col>
@@ -54,7 +54,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 手机号： </van-col>
             <van-col span="14" style="text-align: right">
-              18356568569
+              {{data.data.phone}}
             </van-col>
           </van-row>
         </van-col>
@@ -64,7 +64,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 所属场所： </van-col>
             <van-col span="14" style="text-align: right">
-              盐都基督教总教
+              {{data.data.locationName}}
             </van-col>
           </van-row>
         </van-col>
@@ -74,7 +74,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 人员类型： </van-col>
             <van-col span="14" style="text-align: right">
-              教职人员
+              {{data.data.personnelType}}
             </van-col>
           </van-row>
         </van-col>
@@ -84,7 +84,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 从业类型： </van-col>
             <van-col span="14" style="text-align: right">
-              场所负责人
+              {{data.data.typeOfEmployees}}
             </van-col>
           </van-row>
         </van-col>
@@ -94,7 +94,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 籍贯： </van-col>
             <van-col span="14" style="text-align: right">
-              中国/江苏/盐城
+              {{data.data.nativePlace}}
             </van-col>
           </van-row>
         </van-col>
@@ -104,7 +104,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 现居地： </van-col>
             <van-col span="14" style="text-align: right">
-              中国/江苏省/盐城市/盐都区
+              {{data.data.currentResidence}}
             </van-col>
           </van-row>
         </van-col>
@@ -114,7 +114,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 详细地址： </van-col>
             <van-col span="14" style="text-align: right">
-              世纪大道3838号
+              {{data.data.currentResidenceDetail}}
             </van-col>
           </van-row>
         </van-col>
@@ -125,7 +125,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 法名： </van-col>
             <van-col span="14" style="text-align: right">
-              普宁居士
+              {{data.dataArray[0]}}
             </van-col>
           </van-row>
         </van-col>
@@ -135,7 +135,7 @@
           <van-row justify="space-between">
             <van-col span="10">教别： </van-col>
             <van-col span="14" style="text-align: right">
-              基督教
+              {{data.dataArray[1]}}
             </van-col>
           </van-row>
         </van-col>
@@ -145,7 +145,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 教职名称： </van-col>
             <van-col span="14" style="text-align: right">
-              传教士
+              {{data.dataArray[2]}}
             </van-col>
           </van-row>
         </van-col>
@@ -155,7 +155,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 教职证书号： </van-col>
             <van-col span="14" style="text-align: right">
-              JS25645784
+              {{data.dataArray[3]}}
             </van-col>
           </van-row>
         </van-col>
@@ -165,7 +165,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 备案时间： </van-col>
             <van-col span="14" style="text-align: right">
-              2020-10-26
+              {{data.dataArray[4]}}
             </van-col>
           </van-row>
         </van-col>
@@ -175,7 +175,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 备案部门： </van-col>
             <van-col span="14" style="text-align: right">
-              盐城市民宗局
+              {{data.dataArray[5]}}
             </van-col>
           </van-row>
         </van-col>
@@ -185,7 +185,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 证书备案编号： </van-col>
             <van-col span="14" style="text-align: right">
-              20201026302
+              {{data.dataArray[6]}}
             </van-col>
           </van-row>
         </van-col>
@@ -195,7 +195,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 证书有效期： </van-col>
             <van-col span="14" style="text-align: right">
-              2023-10-26
+              {{data.dataArray[8]}}
             </van-col>
           </van-row>
         </van-col>
@@ -205,7 +205,7 @@
           <van-row justify="space-between">
             <van-col span="10"> 教职人员类型： </van-col>
             <van-col span="14" style="text-align: right">
-              负责人
+              {{data.dataArray[9]}}
             </van-col>
           </van-row>
         </van-col>
@@ -217,7 +217,7 @@
           </van-row>
           <van-row>
             <van-col span="10">
-                <img class="personImg" src="../../assets/logo.png" alt="" />
+                <img class="personImg" :src="data.dataArray[7]" alt="" />
             </van-col>
           </van-row>
         </van-col>
@@ -227,16 +227,39 @@
 </template>
 
 <script>
-import { reactive,ref } from "vue";
+import { useRouter } from 'vue-router'
+import {onMounted, reactive,ref} from "vue"
+import UserManage from '@/api/user/UserManage';
 export default {
   setup(){
-    
+    const data = reactive({
+      //个人数据
+      data:{},
+      //个人扩展数据
+      dataArray:[],
+    })
+    let id = ref('')
+    //数据接收
+    const router = useRouter();
+    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)=>{
+        res.userManagenmetDetailsDTOList.forEach(item => {
+          data.dataArray.push(item.value);
+        });
+      })
+    })
     //返回
     const goback = () => {
       history.back();
     };
     return{
-      goback
+      goback,
+      data
     }
   }
 };

src/views/tab_a/tabAll.vue

@@ -47,8 +47,8 @@
 	</div>
 
 	<van-grid :border="false">
-		<van-grid-item icon="../../../loginbg/csdj.png" text="场所登记"  />
-		<van-grid-item icon="../../../loginbg/csry.png" text="场所人员信息"  />
+		<van-grid-item icon="../../../loginbg/csdj.png" text="场所登记" @click="goPlaceRegister"/>
+		<van-grid-item icon="../../../loginbg/csry.png" text="场所人员信息" @click="goPlacePerson" />
 		<van-grid-item icon="../../../loginbg/cspw.png" text="牌位管理" />
 	</van-grid>
 
@@ -99,6 +99,12 @@ import onlineXm from "../../utils/onlineXm"
             goToBeDone() {
               this.$router.push("/toBeDone");
             },
+			goPlaceRegister() {
+              this.$router.push("/placeRegister");
+            },
+			goPlacePerson() {
+              this.$router.push("/placePerson");
+            },
 
 			onClickLeft(){
 				history.back();

src/views/toBeDone/toBeDone.vue

@@ -42,7 +42,7 @@
           <van-col span="18" style="border-left: 1px solid #e3e3e3" class="list-item-right">
             <van-row>
               <van-col span="24">
-                <span>{{item.title}}</span>
+                <p>{{item.title}}</p>
               </van-col>
             </van-row>
             <van-row justify="space-between">

src/views/toBeDone/toBeDone_details.vue

@@ -7,64 +7,63 @@
   </div>
   <div class="content">
     <div class="content-top">
-        <p>问题内容：</p>
-        <p v-html="PersonInfo.data.problemContent"></p>
-        <p>发起部门：{{PersonInfo.createDepartment.name}}</p>
-        <p>发起人：{{PersonInfo.todoBy.name}}</p>
-        <p>交办类型：{{PersonInfo.data.assignTypeName}}</p>
-        <p>问题发生区域：{{PersonInfo.data.problemArea}}</p>
-        <p>问题场所：{{PersonInfo.data.siteName}}</p>
-        <p>详细地址：{{PersonInfo.data.areaSelectName}}</p>
-        <p>发生时间：{{PersonInfo.data.problemTime}}</p>
-        <p>截止时间：{{PersonInfo.data.deadlineTime}}</p>
-        <p>问题附件：<span style="color:#6892ff;">活动申请书</span></p>
+      <p>问题内容：</p>
+      <p v-html="PersonInfo.data.problemContent"></p>
+      <p>发起部门：{{ PersonInfo.createDepartment.name }}</p>
+      <p>发起人：{{ PersonInfo.todoBy.name }}</p>
+      <p>交办类型：{{ PersonInfo.data.assignTypeName }}</p>
+      <p>问题发生区域：{{ PersonInfo.data.problemArea }}</p>
+      <p>问题场所：{{ PersonInfo.data.siteName }}</p>
+      <p>详细地址：{{ PersonInfo.data.areaSelectName }}</p>
+      <p>发生时间：{{ PersonInfo.data.problemTime }}</p>
+      <p>截止时间：{{ PersonInfo.data.deadlineTime }}</p>
+      <p>问题附件：<span style="color: #6892ff">活动申请书</span></p>
     </div>
     <div class="content-bottom">
-        <p>
-          处理结果：
-        </p>
-        <div>
-          <form action="">
-            <textarea name="" id="" cols="40" rows="5"></textarea>
-          </form>
-        </div>
-        <div style="margin-top:15px;">
-          处理证据资料：<img class="uploadImg" src="../../assets/upload.png" alt=""><span  style="color:#58b5f5;font-size:14px;">点击上传</span>
-        </div>
+      <p>处理结果：</p>
+      <div>
+        <form action="">
+          <textarea name="" id="" cols="40" rows="5"></textarea>
+        </form>
+      </div>
+      <div style="margin-top: 15px">
+        处理证据资料：
+        <van-uploader>
+          <van-button icon="plus" >点击上传</van-button>
+        </van-uploader>
+      </div>
     </div>
-     <van-button type="primary">确认</van-button>
+    <van-button type="primary">确认</van-button>
   </div>
- 
 </template>
 
 <script>
-
-import { useRouter } from 'vue-router'
-import {onMounted, reactive,ref} from "vue"
+import { useRouter } from "vue-router";
+import { onMounted, reactive, ref } from "vue";
 export default {
   setup() {
     const router = useRouter();
     const PersonInfo = reactive({
-      data:{},
-      createDepartment:{},
-      todoBy:{}
-    })
+      data: {},
+      createDepartment: {},
+      todoBy: {},
+    });
     //数据接收
-    onMounted(()=>{
-      var item = JSON.parse(router.currentRoute.value.query.data)
+    onMounted(() => {
+      var item = JSON.parse(router.currentRoute.value.query.data);
       PersonInfo.data = item;
-      PersonInfo.createDepartment = PersonInfo.data.createDepartment
-      PersonInfo.todoBy = PersonInfo.data.todoBy
-      
-    })
+      console.log(PersonInfo.data);
+      PersonInfo.createDepartment = PersonInfo.data.createDepartment;
+      PersonInfo.todoBy = PersonInfo.data.todoBy;
+    });
     //返回事件
     const goback = () => {
       history.back();
     };
-    
+
     return {
       goback,
-      PersonInfo
+      PersonInfo,
     };
   },
 };
@@ -87,57 +86,52 @@ html {
     color: #fff;
   }
 }
-.banner{
-    background-color: #36a7f3;
-    padding: 20px 50px 40px 50px;
-    color: #fff;
-    h2{
-        &:nth-child(1){
-            margin-top:0px;
-            text-align: left;
-        }
-        &:nth-child(2){
-            text-align: center;
-        }
-        &:nth-child(3){
-            text-align: right;
-        }
+.banner {
+  background-color: #36a7f3;
+  padding: 20px 50px 40px 50px;
+  color: #fff;
+  h2 {
+    &:nth-child(1) {
+      margin-top: 0px;
+      text-align: left;
     }
-}
-.content{
-    position: fixed;
-    width: 85%;
-    height: 640px;
-    top: 240px;
-    left: 50%;
-    padding: 20px 10px;
-    transform: translateX(-50%);
-    background-color: #fff;
-    border-radius: 10px;
-    .content-top{
-        padding-bottom: 30px;
-        border-bottom: 2px solid #e7e7e7;
-        p{
-            margin: 0;
-            padding: 0;
-            margin-bottom: 10px;
-            &:nth-child(2){
-                margin-bottom: 40px;
-            }
-        }
+    &:nth-child(2) {
+      text-align: center;
     }
-    .van-button{
-      width: 100%;
-      border-radius:20px;
+    &:nth-child(3) {
+      text-align: right;
     }
-    .content-bottom{
-      margin-bottom: 30px;
-      .uploadImg{
-        width: 30px;
-        height: 30px;
-        vertical-align: middle;
+  }
+}
+.content {
+  position: fixed;
+  width: 85%;
+  top: 180px;
+  left: 50%;
+  padding: 20px 10px;
+  transform: translateX(-50%);
+  background-color: #fff;
+  border-radius: 10px;
+  .content-top {
+    padding-bottom: 30px;
+    border-bottom: 2px solid #e7e7e7;
+    p {
+      margin: 0;
+      padding: 0;
+      margin-bottom: 10px;
+      &:nth-child(2) {
+        margin-bottom: 40px;
       }
     }
-}
+  }
+  .van-button {
+    margin-top: 10px;
+    width: 100%;
+    border-radius: 20px;
+  }
+  .content-bottom {
+    margin-top: 20px;
 
+  }
+}
 </style>