Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/UserController.java

@@ -114,6 +114,15 @@ public class UserController {
         return userService.getUserInfo(userId);
     }
 
+    @RequestMapping("/getBaseInfo")
+    public HttpRespMsg getBaseInfo(@RequestParam String userId){
+        HttpRespMsg msg=new HttpRespMsg();
+        User user = userService.getById(userId);
+        msg.setData(user);
+
+        return msg;
+    }
+
     /**
      * 获取员工的列表
      * departmentId 检索的部门id -1为全部 0为其他

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/groupView/groupView.vue

@@ -5,9 +5,9 @@
       <van-list  :finished="true" >
       <van-cell v-for="item in list" :key="item.id" :id="item.id" :title="item.name" @click="onClick">
         <template>
-          <div>
-            <span>工种</span>
-            <span>工号</span>
+          <div style="width:100%;text-align: left;" >
+            <span style="width:50%;color:#323232;">工种</span>
+            <span style="float:right;color:#323232;">工号</span>
           </div>
         </template>
       </van-cell>
@@ -55,7 +55,7 @@ export default {
       })
     },
     onClick(e){
-      console.log(item, '点击的数据')
+      console.log(e.currentTarget.innerText, '点击的数据')
       this.$router.push({
         path: '/MemberInfo',
         query: {
@@ -63,9 +63,9 @@ export default {
         }
       })
 
-      console.log(e)
+     /*  console.log(e)
       console.log(e.currentTarget.id)
-      console.log(e.currentTarget.innerText)
+      console.log(e.currentTarget.innerText) */
     }
 
   },

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/groupView/info.vue

@@ -26,6 +26,7 @@ export default {
     mounted() {
         this.id = this.$route.query.id,
         this.getMemberInfo();
+        
     },
     methods: {
          
@@ -33,11 +34,11 @@ export default {
             this.$router.go(-1);
         },
         getMemberInfo() {
-            this.$axios.post('/user/getUserInfo', { userId : this.id})
+            this.$axios.post('/user/getBaseInfo', { userId : this.id})
                 .then(res => {
                     if (res.code == "ok") {
                         this.user = res.data
-
+                        console.log(this.user)
                     } else {
                         this.$toast.clear();
                         this.$toast.fail(res.msg);