张延森 3 gadus atpakaļ
vecāks
revīzija
793d3025ac

+ 1
- 0
src/app.js Parādīt failu

31
 
31
 
32
       }
32
       }
33
     })
33
     })
34
+
34
   }
35
   }
35
 
36
 
36
   // this.props.children 是将要会渲染的页面
37
   // this.props.children 是将要会渲染的页面

+ 1
- 1
src/pages/DepartmentSelection/index.jsx Parādīt failu

104
   const onClickItem = ({ detail }) => {
104
   const onClickItem = ({ detail }) => {
105
     const activeIdaa = activeId === detail.id ? null : detail.id
105
     const activeIdaa = activeId === detail.id ? null : detail.id
106
     setActiveId(activeIdaa)
106
     setActiveId(activeIdaa)
107
-    setDeptName(detail?.name)
107
+    setDeptName(detail)
108
     console.log('自己: detail.index || 0', activeId, detail?.name);
108
     console.log('自己: detail.index || 0', activeId, detail?.name);
109
 
109
 
110
   }
110
   }

+ 10
- 6
src/pages/index/index.jsx Parādīt failu

11
 
11
 
12
 export default (props) => {
12
 export default (props) => {
13
   const { deptName, person, formValue } = useModel('userData')
13
   const { deptName, person, formValue } = useModel('userData')
14
+  const [useInfo, setUseInfo] = useState()
14
 
15
 
15
 
16
 
16
   const goUserInfo = () => {
17
   const goUserInfo = () => {
20
     })
21
     })
21
   }
22
   }
22
   useEffect(() => {
23
   useEffect(() => {
23
-    console.log('formValue', formValue);
24
-    if (deptName) {
24
+    setUseInfo(person)
25
+    console.log('person?.idNo', person?.idNo);
26
+    if (person?.idNo) {
27
+      console.log('没有身份证',);
25
       Taro.showModal({
28
       Taro.showModal({
26
         title: '提示',
29
         title: '提示',
27
         content: '未添加个人信息!',
30
         content: '未添加个人信息!',
36
         }
39
         }
37
       })
40
       })
38
 
41
 
42
+    } else {
43
+      console.log('有身份证',);
39
     }
44
     }
40
-
41
-  }, [deptName])
45
+  }, [person])
42
 
46
 
43
   const today = useMemo(() => dayjs().format('YYYY-MM-DD'))
47
   const today = useMemo(() => dayjs().format('YYYY-MM-DD'))
44
 
48
 
49
       <View className='index-UserQRcode-headerInfo' >
53
       <View className='index-UserQRcode-headerInfo' >
50
         <View className='index-UserQRcode-headerInfo-User'>
54
         <View className='index-UserQRcode-headerInfo-User'>
51
           <Image src={logo}></Image>
55
           <Image src={logo}></Image>
52
-          <View className='index-UserQRcode-headerInfo-User-NameInfo'>姓名:{person?.personName}</View>
56
+          <View className='index-UserQRcode-headerInfo-User-NameInfo'>姓名:{useInfo?.personName}</View>
53
           <View onClick={goUserInfo} className='index-UserQRcode-headerInfo-User-setNameInfo'><Icon name='edit' />修改信息</View>
57
           <View onClick={goUserInfo} className='index-UserQRcode-headerInfo-User-setNameInfo'><Icon name='edit' />修改信息</View>
54
         </View>
58
         </View>
55
-        <View className='index-UserQRcode-headerInfo-UserID'>身份证:{person?.idNo.replace(/^(\d{6})\d+(\d{4})$/, "$1******$2")}</View>
59
+        <View className='index-UserQRcode-headerInfo-UserID'>科室:{useInfo?.deptName}</View>
56
       </View>
60
       </View>
57
       <View className='index-UserQRcode-cententQR'>
61
       <View className='index-UserQRcode-cententQR'>
58
         <View className='index-UserQRcode-cententQR-Barcode'>
62
         <View className='index-UserQRcode-cententQR-Barcode'>

+ 24
- 23
src/pages/setUserInfo/index.jsx Parādīt failu

10
 
10
 
11
 
11
 
12
 export default (props) => {
12
 export default (props) => {
13
-  const [phone, setPhone] = useState('')
13
+  const [phone, setPhone] = useState('18052044111')
14
 
14
 
15
   const { deptName, person, sessionKey, setFormValue, formValue } = useModel('userData')
15
   const { deptName, person, sessionKey, setFormValue, formValue } = useModel('userData')
16
   console.log('formValue', formValue);
16
   console.log('formValue', formValue);
17
   let form = null
17
   let form = null
18
+  useEffect(() => {
19
+    form.getFieldsValue(person)
20
+  }, [person])
18
   const onSubmit = (e) => {
21
   const onSubmit = (e) => {
19
     form.validateFields((errorMessage, fieldValues) => {
22
     form.validateFields((errorMessage, fieldValues) => {
20
       if (errorMessage && errorMessage.length) {
23
       if (errorMessage && errorMessage.length) {
24
+        console.info('fieldValues', fieldValues)
25
+
21
         return console.info('errorMessage', errorMessage)
26
         return console.info('errorMessage', errorMessage)
22
       } else {
27
       } else {
23
-        console.info(fieldValues)
28
+        console.info('fieldValues', fieldValues)
24
         // setFormValue(fieldValues)
29
         // setFormValue(fieldValues)
25
         // Taro.redirectTo({
30
         // Taro.redirectTo({
26
         //   url: '/pages/index/index'
31
         //   url: '/pages/index/index'
27
         // })
32
         // })
28
-        setUserInfo({ ...fieldValues, person: person?.personId }).then(() => {
29
-          setFormValue(fieldValues)
30
-
33
+        setUserInfo({ ...fieldValues, person: person?.personId, deptCode: deptName?.id }).then(() => {
34
+          // setFormValue(fieldValues)
31
           Taro.showToast({
35
           Taro.showToast({
32
             title: '保存成功',
36
             title: '保存成功',
33
             icon: 'none',
37
             icon: 'none',
42
 
46
 
43
       }
47
       }
44
     })
48
     })
45
-
46
-
47
   }
49
   }
50
+
48
   const goDepartmen = () => {
51
   const goDepartmen = () => {
49
     Taro.navigateTo({
52
     Taro.navigateTo({
50
       url: '/pages/DepartmentSelection/index'
53
       url: '/pages/DepartmentSelection/index'
51
     })
54
     })
52
 
55
 
53
   }
56
   }
57
+
58
+  useEffect(() => {
59
+    console.log('form', form);
60
+    form.setFields(person)
61
+  }, [form, person])
62
+
63
+
54
   const getPhone = (e) => {
64
   const getPhone = (e) => {
55
     console.log('deptName', deptName);
65
     console.log('deptName', deptName);
56
     console.log('手机号', e);
66
     console.log('手机号', e);
65
   return (
75
   return (
66
     <View className='page-index'>
76
     <View className='page-index'>
67
       <Form
77
       <Form
68
-        initialValues={{
69
-          // ...formValue,
70
-          // phone: formValue?.phone || phone,
71
-          phone: phone,
72
-          deptName: deptName
73
-
74
-
75
-        }}
76
         ref={(el) => (form = el)}
78
         ref={(el) => (form = el)}
77
         onFinish={(e) => onSubmit(e)}
79
         onFinish={(e) => onSubmit(e)}
78
       >
80
       >
82
           required
84
           required
83
           trigger='onInput'
85
           trigger='onInput'
84
           validateTrigger='onBlur'
86
           validateTrigger='onBlur'
85
-          // taro的input的onInput事件返回对应表单的最终值为e.detail.value
86
           valueFormat={(e) => e.detail.value}
87
           valueFormat={(e) => e.detail.value}
87
         >
88
         >
88
           <Input placeholder='请输入用户名' />
89
           <Input placeholder='请输入用户名' />
94
           required
95
           required
95
           validateTrigger='onBlur'
96
           validateTrigger='onBlur'
96
           valueFormat={(e) => e.detail.value}
97
           valueFormat={(e) => e.detail.value}
97
-        >
98
-          <Input placeholder='请输入手机号' type='number' maxlength={11} disabled value={formValue?.phone || phone} />
99
-          <Button
98
+          renderRight={<Button
100
             plain
99
             plain
101
             hairline
100
             hairline
102
             size='small'
101
             size='small'
106
             onGetPhoneNumber={getPhone}
105
             onGetPhoneNumber={getPhone}
107
           >
106
           >
108
             授权手机
107
             授权手机
109
-          </Button>
108
+          </Button>}
109
+        >
110
+          <Input placeholder='请输入手机号' maxlength={11} disabled />
111
+
112
+
110
         </FormItem>
113
         </FormItem>
111
 
114
 
112
         <FormItem
115
         <FormItem
115
           required
118
           required
116
           trigger='onInput'
119
           trigger='onInput'
117
           validateTrigger='onBlur'
120
           validateTrigger='onBlur'
118
-          // taro的input的onInput事件返回对应表单的最终值为e.detail.value
119
           valueFormat={(e) => e.detail.value}
121
           valueFormat={(e) => e.detail.value}
120
         >
122
         >
121
           <Input placeholder='请输入身份证号' type='number' maxlength={18} />
123
           <Input placeholder='请输入身份证号' type='number' maxlength={18} />
127
           trigger='onInput'
129
           trigger='onInput'
128
           required
130
           required
129
           validateTrigger='onBlur'
131
           validateTrigger='onBlur'
130
-          // taro的input的onInput事件返回对应表单的最终值为e.detail.value
131
           valueFormat={(e) => e.detail.value}
132
           valueFormat={(e) => e.detail.value}
132
         >
133
         >
133
-          <Input placeholder='请选择科室' disabled onClick={goDepartmen} />
134
+          <Input placeholder='请选择科室' onClick={goDepartmen} disabled />
134
         </FormItem>
135
         </FormItem>
135
         <View className='buttom-box'>
136
         <View className='buttom-box'>
136
           <Button
137
           <Button

+ 1
- 1
src/store/userData.js Parādīt failu

8
   const [sessionKey, setSessionKey] = useState()
8
   const [sessionKey, setSessionKey] = useState()
9
   const [userPhoneInfo, setUserPhoneInfo] = useState()
9
   const [userPhoneInfo, setUserPhoneInfo] = useState()
10
   const [deptName, setDeptName] = useState()
10
   const [deptName, setDeptName] = useState()
11
-  const [formValue, setFormValue] = useState({})
11
+  const [formValue, setFormValue] = useState()
12
 
12
 
13
 
13
 
14
 
14