feats

src/app.js

@@ -31,6 +31,7 @@ class App extends Component {
 
       }
     })
+
   }
 
   // this.props.children 是将要会渲染的页面

src/pages/DepartmentSelection/index.jsx

@@ -104,7 +104,7 @@ export default (props) => {
   const onClickItem = ({ detail }) => {
     const activeIdaa = activeId === detail.id ? null : detail.id
     setActiveId(activeIdaa)
-    setDeptName(detail?.name)
+    setDeptName(detail)
     console.log('自己: detail.index || 0', activeId, detail?.name);
 
   }

src/pages/index/index.jsx

@@ -11,6 +11,7 @@ import './style.less'
 
 export default (props) => {
   const { deptName, person, formValue } = useModel('userData')
+  const [useInfo, setUseInfo] = useState()
 
 
   const goUserInfo = () => {
@@ -20,8 +21,10 @@ export default (props) => {
     })
   }
   useEffect(() => {
-    console.log('formValue', formValue);
-    if (deptName) {
+    setUseInfo(person)
+    console.log('person?.idNo', person?.idNo);
+    if (person?.idNo) {
+      console.log('没有身份证',);
       Taro.showModal({
         title: '提示',
         content: '未添加个人信息!',
@@ -36,9 +39,10 @@ export default (props) => {
         }
       })
 
+    } else {
+      console.log('有身份证',);
     }
-
-  }, [deptName])
+  }, [person])
 
   const today = useMemo(() => dayjs().format('YYYY-MM-DD'))
 
@@ -49,10 +53,10 @@ export default (props) => {
       <View className='index-UserQRcode-headerInfo' >
         <View className='index-UserQRcode-headerInfo-User'>
           <Image src={logo}></Image>
-          <View className='index-UserQRcode-headerInfo-User-NameInfo'>姓名：{person?.personName}</View>
+          <View className='index-UserQRcode-headerInfo-User-NameInfo'>姓名：{useInfo?.personName}</View>
           <View onClick={goUserInfo} className='index-UserQRcode-headerInfo-User-setNameInfo'><Icon name='edit' />修改信息</View>
         </View>
-        <View className='index-UserQRcode-headerInfo-UserID'>身份证：{person?.idNo.replace(/^(\d{6})\d+(\d{4})$/, "$1******$2")}</View>
+        <View className='index-UserQRcode-headerInfo-UserID'>科室：{useInfo?.deptName}</View>
       </View>
       <View className='index-UserQRcode-cententQR'>
         <View className='index-UserQRcode-cententQR-Barcode'>

src/pages/setUserInfo/index.jsx

@@ -10,24 +10,28 @@ import './style.less'
 
 
 export default (props) => {
-  const [phone, setPhone] = useState('')
+  const [phone, setPhone] = useState('18052044111')
 
   const { deptName, person, sessionKey, setFormValue, formValue } = useModel('userData')
   console.log('formValue', formValue);
   let form = null
+  useEffect(() => {
+    form.getFieldsValue(person)
+  }, [person])
   const onSubmit = (e) => {
     form.validateFields((errorMessage, fieldValues) => {
       if (errorMessage && errorMessage.length) {
+        console.info('fieldValues', fieldValues)
+
         return console.info('errorMessage', errorMessage)
       } else {
-        console.info(fieldValues)
+        console.info('fieldValues', fieldValues)
         // setFormValue(fieldValues)
         // Taro.redirectTo({
         //   url: '/pages/index/index'
         // })
-        setUserInfo({ ...fieldValues, person: person?.personId }).then(() => {
-          setFormValue(fieldValues)
-
+        setUserInfo({ ...fieldValues, person: person?.personId, deptCode: deptName?.id }).then(() => {
+          // setFormValue(fieldValues)
           Taro.showToast({
             title: '保存成功',
             icon: 'none',
@@ -42,15 +46,21 @@ export default (props) => {
 
       }
     })
-
-
   }
+
   const goDepartmen = () => {
     Taro.navigateTo({
       url: '/pages/DepartmentSelection/index'
     })
 
   }
+
+  useEffect(() => {
+    console.log('form', form);
+    form.setFields(person)
+  }, [form, person])
+
+
   const getPhone = (e) => {
     console.log('deptName', deptName);
     console.log('手机号', e);
@@ -65,14 +75,6 @@ export default (props) => {
   return (
     <View className='page-index'>
       <Form
-        initialValues={{
-          // ...formValue,
-          // phone: formValue?.phone || phone,
-          phone: phone,
-          deptName: deptName
-
-
-        }}
         ref={(el) => (form = el)}
         onFinish={(e) => onSubmit(e)}
       >
@@ -82,7 +84,6 @@ export default (props) => {
           required
           trigger='onInput'
           validateTrigger='onBlur'
-          // taro的input的onInput事件返回对应表单的最终值为e.detail.value
           valueFormat={(e) => e.detail.value}
         >
           <Input placeholder='请输入用户名' />
@@ -94,9 +95,7 @@ export default (props) => {
           required
           validateTrigger='onBlur'
           valueFormat={(e) => e.detail.value}
-        >
-          <Input placeholder='请输入手机号' type='number' maxlength={11} disabled value={formValue?.phone || phone} />
-          <Button
+          renderRight={<Button
             plain
             hairline
             size='small'
@@ -106,7 +105,11 @@ export default (props) => {
             onGetPhoneNumber={getPhone}
           >
             授权手机
-          </Button>
+          </Button>}
+        >
+          <Input placeholder='请输入手机号' maxlength={11} disabled />
+
+
         </FormItem>
 
         <FormItem
@@ -115,7 +118,6 @@ export default (props) => {
           required
           trigger='onInput'
           validateTrigger='onBlur'
-          // taro的input的onInput事件返回对应表单的最终值为e.detail.value
           valueFormat={(e) => e.detail.value}
         >
           <Input placeholder='请输入身份证号' type='number' maxlength={18} />
@@ -127,10 +129,9 @@ export default (props) => {
           trigger='onInput'
           required
           validateTrigger='onBlur'
-          // taro的input的onInput事件返回对应表单的最终值为e.detail.value
           valueFormat={(e) => e.detail.value}
         >
-          <Input placeholder='请选择科室' disabled onClick={goDepartmen} />
+          <Input placeholder='请选择科室' onClick={goDepartmen} disabled />
         </FormItem>
         <View className='buttom-box'>
           <Button

src/store/userData.js

@@ -8,7 +8,7 @@ export default () => {
   const [sessionKey, setSessionKey] = useState()
   const [userPhoneInfo, setUserPhoneInfo] = useState()
   const [deptName, setDeptName] = useState()
-  const [formValue, setFormValue] = useState({})
+  const [formValue, setFormValue] = useState()