[baozhangchao] 3 лет назад
Родитель
Сommit
65c32c7a0d
4 измененных файлов: 51 добавлений и 33 удалений
  1. 2
    2
      src/pages/DepartmentSelection/index.jsx
  2. 2
    21
      src/pages/index/index.jsx
  3. 25
    10
      src/pages/setUserInfo/index.jsx
  4. 22
    0
      src/store/userData.js

+ 2
- 2
src/pages/DepartmentSelection/index.jsx Просмотреть файл

95
       console.log('父级: detail.index || 0', departItem[detail.index]);
95
       console.log('父级: detail.index || 0', departItem[detail.index]);
96
 
96
 
97
     } else {
97
     } else {
98
-      setDeptName(departItem[detail.index]?.name)
99
-      console.log('没有子节点: children || 0', departItem[detail.index]?.name);
98
+      setDeptName(departItem[detail.index])
99
+      console.log('没有子节点: children || 0', departItem[detail.index]);
100
 
100
 
101
     }
101
     }
102
 
102
 

+ 2
- 21
src/pages/index/index.jsx Просмотреть файл

20
     })
20
     })
21
   }
21
   }
22
   useEffect(() => {
22
   useEffect(() => {
23
-    setUseInfo(person)
24
     console.log('person?.idNo', person?.idNo);
23
     console.log('person?.idNo', person?.idNo);
25
-    if (person?.idNo) {
26
-      console.log('没有身份证',);
27
-      Taro.showModal({
28
-        title: '提示',
29
-        content: '未添加个人信息!',
30
-        showCancel: false,
31
-        success: function (res) {
32
-          if (res.confirm) {
33
-            Taro.redirectTo({
34
-              url: '/pages/setUserInfo/index'
35
-            })
36
 
24
 
37
-          }
38
-        }
39
-      })
40
-
41
-    } else {
42
-      console.log('有身份证',);
43
-    }
44
   }, [person])
25
   }, [person])
45
 
26
 
46
   const today = useMemo(() => dayjs().format('YYYY-MM-DD'))
27
   const today = useMemo(() => dayjs().format('YYYY-MM-DD'))
51
       {/* <View className='index-UserQRcode-headerInfo' style={{ backgroundImage: `url(${userBck})` }}> */}
32
       {/* <View className='index-UserQRcode-headerInfo' style={{ backgroundImage: `url(${userBck})` }}> */}
52
       <View className='index-UserQRcode-headerInfo' >
33
       <View className='index-UserQRcode-headerInfo' >
53
         <View className='index-UserQRcode-headerInfo-User'>
34
         <View className='index-UserQRcode-headerInfo-User'>
54
-          <View className='index-UserQRcode-headerInfo-User-NameInfo'>姓名:{useInfo?.personName}</View>
35
+          <View className='index-UserQRcode-headerInfo-User-NameInfo'>姓名:{person?.personName}</View>
55
           <View onClick={goUserInfo} className='index-UserQRcode-headerInfo-User-setNameInfo'><Icon name='edit' />修改信息</View>
36
           <View onClick={goUserInfo} className='index-UserQRcode-headerInfo-User-setNameInfo'><Icon name='edit' />修改信息</View>
56
         </View>
37
         </View>
57
-        <View className='index-UserQRcode-headerInfo-UserID'>科室:{useInfo?.deptName}</View>
38
+        <View className='index-UserQRcode-headerInfo-UserID'>科室:{person?.deptName}</View>
58
       </View>
39
       </View>
59
       <View className='index-UserQRcode-cententQR'>
40
       <View className='index-UserQRcode-cententQR'>
60
         <View className='index-UserQRcode-cententQR-Barcode'>
41
         <View className='index-UserQRcode-cententQR-Barcode'>

+ 25
- 10
src/pages/setUserInfo/index.jsx Просмотреть файл

8
 // import BottomMoadl from '@/components/BottomMoadl/index'
8
 // import BottomMoadl from '@/components/BottomMoadl/index'
9
 import './style.less'
9
 import './style.less'
10
 
10
 
11
+let form = null
11
 
12
 
12
 export default (props) => {
13
 export default (props) => {
13
   const [phone, setPhone] = useState('18052044111')
14
   const [phone, setPhone] = useState('18052044111')
14
 
15
 
15
-  const { deptName, person, sessionKey, setFormValue, formValue } = useModel('userData')
16
+  const { deptName, person, sessionKey, setPerson, formValue } = useModel('userData')
16
   console.log('formValue', formValue);
17
   console.log('formValue', formValue);
17
-  let form = null
18
-  useEffect(() => {
19
-    form.getFieldsValue(person)
20
-  }, [person])
18
+
21
   const onSubmit = (e) => {
19
   const onSubmit = (e) => {
22
     form.validateFields((errorMessage, fieldValues) => {
20
     form.validateFields((errorMessage, fieldValues) => {
23
       if (errorMessage && errorMessage.length) {
21
       if (errorMessage && errorMessage.length) {
30
         // Taro.redirectTo({
28
         // Taro.redirectTo({
31
         //   url: '/pages/index/index'
29
         //   url: '/pages/index/index'
32
         // })
30
         // })
33
-        setUserInfo({ ...fieldValues, person: person?.personId, deptCode: deptName?.id }).then(() => {
31
+        setUserInfo({ ...fieldValues, person: person?.personId, deptCode: deptName?.id }).then((e) => {
34
           // setFormValue(fieldValues)
32
           // setFormValue(fieldValues)
33
+          setPerson(e);
35
           Taro.showToast({
34
           Taro.showToast({
36
             title: '保存成功',
35
             title: '保存成功',
37
             icon: 'none',
36
             icon: 'none',
54
     })
53
     })
55
 
54
 
56
   }
55
   }
56
+  useDidShow(() => {
57
+
58
+
59
+  }, [deptName])
57
 
60
 
58
   useEffect(() => {
61
   useEffect(() => {
59
-    console.log('form', form);
60
-    form.setFields(person)
61
-  }, [form, person])
62
+    if (person) {
63
+      form.setFields(person)
64
+
65
+    }
66
+    console.log('deptName', deptName);
67
+    if (deptName) {
68
+      form.setFieldsValue('deptName', deptName?.name)
69
+
70
+      // form.setFieldsValue({ name: 'deptName', modelValue: deptName?.deptName })
71
+
72
+    }
73
+  }, [deptName, person])
62
 
74
 
63
 
75
 
64
   const getPhone = (e) => {
76
   const getPhone = (e) => {
68
 
80
 
69
     getPhoneuser({ ...data, sessionKey: sessionKey }).then((res) => {
81
     getPhoneuser({ ...data, sessionKey: sessionKey }).then((res) => {
70
       setPhone(res?.phoneNumber)
82
       setPhone(res?.phoneNumber)
71
-      setFormValue({ phone: res?.phoneNumber })
83
+      console.log('form', form);
84
+      form.setFieldsValue('phone', res?.phoneNumber)
85
+      // form.setFieldsValue({ phone: res.phoneNumber })
86
+      // setFormValue({ phone: res?.phoneNumber })
72
     })
87
     })
73
 
88
 
74
   }
89
   }

+ 22
- 0
src/store/userData.js Просмотреть файл

1
 import { useState } from "react"
1
 import { useState } from "react"
2
+import Taro from "@tarojs/taro"
2
 
3
 
3
 import { login } from "../services/user"
4
 import { login } from "../services/user"
4
 
5
 
20
     console.log('login');
21
     console.log('login');
21
 
22
 
22
     login(params).then((res) => {
23
     login(params).then((res) => {
24
+
23
       const { person: taPerson, sessionKey: skey } = res;
25
       const { person: taPerson, sessionKey: skey } = res;
24
       // taPerson.phone = null
26
       // taPerson.phone = null
27
+
25
       setPerson(taPerson);
28
       setPerson(taPerson);
26
       setSessionKey(skey);
29
       setSessionKey(skey);
30
+      if (!res.person) {
31
+        console.log('没有身份证',);
32
+        Taro.showModal({
33
+          title: '提示',
34
+          content: '未添加个人信息!',
35
+          showCancel: false,
36
+          success: function (res) {
37
+            if (res.confirm) {
38
+              Taro.redirectTo({
39
+                url: '/pages/setUserInfo/index'
40
+              })
41
+
42
+            }
43
+          }
44
+        })
45
+
46
+      } else {
47
+        console.log('有身份证',);
48
+      }
27
     })
49
     })
28
   }
50
   }
29
   console.log("🚀 来自store的打印 person数据formValue", person, formValue)
51
   console.log("🚀 来自store的打印 person数据formValue", person, formValue)