Merge branch 'master' of http://git.ycjcjy.com/estateagents/pc-channel

src/pages/eContract/company/add.jsx

@@ -46,46 +46,24 @@ const header = props => {
         })
       }
     }
-  
-    const fields = [
-      {
-        label: '已自动生成企业编号',
-        name: 'companyCode',
-        value: data.companyCode,
-        render: <span>{data.companyCode}</span>
-      },    
-      {
-        label: '已生成法大大客户编号',
-        name: 'fadadaCode',
-        value: data.fadadaCode,
-        render: <span>{data.fadadaCode}</span>
-      },
-      {
-        label: '请选择企业管理员身份',
-        name: 'companyManagerType',
-        value: data.companyManagerType,
-        render: <Select style={{ width: '180px' }} placeholder="请选择企业管理员身份">
-                  <Select.Option value="legal">法人</Select.Option>
-                  <Select.Option value="agent">代理人</Select.Option>
-                </Select>,
-        rules: [
-          { required: true, message: '请选择企业管理员身份' },
-        ],
-      },
-    ]
-  
      
-    const handleSubmit = (values) => {
-      if(data.companyId){
-          request({ ...apis.company.update, urlData: { id: data.companyId }, data: { ...values }}).then((data) => {
-            console.log(data,"dadadasdadasdasdasdasda")
-            message.info("提交成功，请完成认证信息！")
-            window.open(data.certifiedAddress);
-            cancelPage();
-          }).catch((err) => {
-            message.error(err.msg || err.message)
-          })
+    const handleSubmit = (e) => {
+      e.preventDefault();
+      props.form.validateFields((err, values) => {
+        if (!err) {
+          console.log(values, "-------------111")
+        if(data.companyId){
+            request({ ...apis.company.update, urlData: { id: data.companyId }, data: { ...values }}).then((data) => {
+              console.log(data,"dadadasdadasdasdasdasda")
+              message.info("提交成功，请完成认证信息！")
+              window.open(data.certifiedAddress);
+              cancelPage();
+            }).catch((err) => {
+              message.error(err.msg || err.message)
+            })
+          }
         }
+      });
     }
   
     const cancelPage = () => {
@@ -94,8 +72,37 @@ const header = props => {
       });
     }
   
+    const { getFieldDecorator } = props.form;
+
     return (
-      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+      <>
+        <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }}>
+          <Form.Item label="已自动生成企业编号">
+            {getFieldDecorator('companyCode',{
+              initialValue: data.companyCode
+            })( <span>{data.companyCode}</span>)}
+          </Form.Item>
+          <Form.Item label="已生成法大大客户编号">
+          {getFieldDecorator('fadadaCode',{
+              initialValue: data.fadadaCode
+            })( <span>{data.fadadaCode}</span>)}
+          </Form.Item>
+          <Form.Item label="请选择企业管理员身份" help="若企业法人可以配合认证可免于对公账户打款验证，实名认证速度快。若企业法人无法配合，请选择代理人，代理人身份需要对公打款账户验证，耗时较长。">
+          {getFieldDecorator('companyManagerType', {
+            rules: [ { required: true, message: '请选择企业管理员身份' }],
+          })(
+                <Select style={{ width: '180px' }} placeholder="请选择企业管理员身份">
+                  <Select.Option value="legal">法人</Select.Option>
+                  <Select.Option value="agent">代理人</Select.Option>
+                </Select>)}
+          </Form.Item>
+          <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
+            <Button type="danger" onClick={handleSubmit} style={{marginRight:'20px'}} >
+              下一步
+            </Button>
+          </Form.Item>
+        </Form>
+      </>
     )
   }
   

src/pages/eContract/company/edit.jsx

@@ -92,7 +92,7 @@ const header = props => {
     },
     {
       name: "实名认证地址",
-      render: <a onClick={openFddUrl}>{data.certifiedAddress}</a>
+      render: <span style={{wordWrap: 'break-word'}}><a onClick={openFddUrl}>{data.certifiedAddress}</a></span>
     },
     {
       name: "实名认证状态",

src/pages/eContract/company/index.jsx

@@ -77,7 +77,7 @@ function header(props) {
       message.error('请先选择要删除的数据！')
       return
     }
-    const title = '确认将所选的' + deleteList.length + '条数据删除？认证通过的企业不会被删除'
+    const title = '确认将所选的' + deleteList.length + '条数据删除？审核通过的企业不会被删除'
     Modal.confirm({
       title: title,
       okText: '确认',
@@ -175,7 +175,7 @@ function header(props) {
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('status')(
-            <Select style={{ width: '180px' }} placeholder="实名认证状态">
+            <Select style={{ width: '250px' }} placeholder="实名认证状态">
               <Select.Option value="0">未认证</Select.Option>
               <Select.Option value="1">管理员资料已提交</Select.Option>
               <Select.Option value="2">企业基本资料（没有申请表）已提交</Select.Option>

src/services/apis.js

@@ -284,6 +284,11 @@ const apis = {
       url: `${prefix}/company/fdd/:id`,
       method: 'GET',
       action: 'channel',
+    },
+    delete: {
+      url: `${prefix}/company/delete`,
+      method: 'DELETE',
+      action: 'channel',
     }
   },