lanjianrong 4 years ago
parent
commit
49b2c42bd1

+ 0 - 1
src/components/EditableForm/src/editableFormItem.jsx

@@ -131,7 +131,6 @@ const EditableFormItem = ({
     }
   }
   const save = async e => {
-    console.log('1111', e)
     const { value = null, local = '' } = e.currentTarget || {}
     // console.log(value)
     if (value === record || isNull(value)) {

+ 1 - 0
src/pages/User/Account/Settings/components/AvatarView.jsx

@@ -4,6 +4,7 @@ import ImgCrop from 'antd-img-crop'
 import { Upload } from 'antd'
 import { UploadOutlined } from '@ant-design/icons'
 import { getToken } from '@/utils/auth'
+import 'antd/es/slider/style/css'
 
 const AvatarView = ({ avatar, setAvatar }) => {
   const [fileList, setFileList] = useState([])

+ 16 - 11
src/pages/User/Account/Settings/components/BaseView.jsx

@@ -74,7 +74,7 @@ const BaseView = () => {
             >
               <ProFormText name="avatar" hidden />
               <Row>
-                <Col span={12}>
+                <Col span={24} xl={12}>
                   <ProFormText disabled name="jobNumber" label="工号" placeholder="" />
                   <ProFormText disabled name="departmentName" label="办事处/部门" placeholder="" />
                   <ProFormText disabled name="birthday" label="入职日期" placeholder="" />
@@ -110,7 +110,7 @@ const BaseView = () => {
                     rules={[{ required: true, message: '请选择最高学历' }]}
                   />
                 </Col>
-                <Col span={12}>
+                <Col span={24} xl={12}>
                   <ProFormText disabled name="username" label="姓名" />
                   <ProFormText disabled name="position" label="岗位" />
                   <ProFormText name="phone" label="手机" />
@@ -128,14 +128,19 @@ const BaseView = () => {
                     rules={[{ required: true, message: '请选择婚姻状况' }]}
                   />
                   <ProFormText name="major" label="所学专业" placeholder="" />
-                  <ProFormDatePicker name="graduationTime" label="毕业时间" placeholder="" />
+                  <ProFormDatePicker
+                    name="graduationTime"
+                    label="毕业时间"
+                    placeholder=""
+                    rules={[{ required: true, message: '请输入毕业时间' }]}
+                  />
                 </Col>
               </Row>
               <Row>
-                <Col span={12}>
+                <Col span={24} xl={12}>
                   <ProFormText name="registeredResidence" label="户口所在地" placeholder="" />
                 </Col>
-                <Col span={12}>
+                <Col span={24} xl={12}>
                   <ProFormSelect
                     name="householdRegistrationType"
                     label="户籍类型"
@@ -150,14 +155,14 @@ const BaseView = () => {
                 rules={[{ required: true, message: '请输入现居住地' }]}
               />
               <Row>
-                <Col span={12}>
+                <Col span={24} xl={12}>
                   <ProFormText
                     name="nativePlace"
                     label="籍贯"
                     rules={[{ required: true, message: '请输入籍贯' }]}
                   />
                 </Col>
-                <Col span={12}>
+                <Col span={24} xl={12}>
                   <ProFormText
                     name="emergencyContacts"
                     label="紧急联系人"
@@ -241,7 +246,7 @@ const BaseView = () => {
               {/* <ProFormGroup title="报销收款帐号"> */}
               <h4 className="mb-4 font-bold">报销收款帐号</h4>
               <Row>
-                <Col span={12}>
+                <Col span={24} xl={12}>
                   <ProFormText
                     name="remittanceName"
                     label="收款人户名"
@@ -253,7 +258,7 @@ const BaseView = () => {
                     rules={[{ required: true, message: '请输入收款开户银行名称' }]}
                   />
                 </Col>
-                <Col span={12}>
+                <Col span={24} xl={12}>
                   <ProFormText
                     name="coupletNumber"
                     label="联行号"
@@ -275,14 +280,14 @@ const BaseView = () => {
               <h4 className="mb-4 font-bold">工资卡</h4>
               {/* <ProFormGroup title="工资卡"> */}
               <Row>
-                <Col span={12}>
+                <Col span={24} xl={12}>
                   <ProFormText
                     name="salaryCard"
                     label="银行卡号"
                     rules={[{ required: true, message: '请输入银行卡号' }]}
                   />
                 </Col>
-                <Col span={12}>
+                <Col span={24} xl={12}>
                   <ProFormText
                     name="salaryBankName"
                     label="开户行"