新需求

config/routes.js

@@ -126,6 +126,18 @@ export default [
                 name: '企业认证管理',
                 component: './eContract/company/index',
               },
+              {
+                path: '/eContract/company/add',
+                name: '新增企业认证',
+                hideInMenu: true,
+                component: './eContract/company/add',
+              },
+              {
+                path: '/eContract/company/edit',
+                name: '编辑企业认证',
+                hideInMenu: true,
+                component: './eContract/company/edit',
+              },
               {
                 path: '/eContract/relatedOrganization',
                 name: '关联组织',

src/pages/eContract/company/add.jsx

@@ -0,0 +1,97 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import XForm, { FieldTypes } from '../../../components/XForm';
+import router from 'umi/router';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import moment from 'moment';
+
+
+const header = props => {
+    const companyId = props.location.query.id
+  
+    const [ data, setData ] = useState({})
+    if(companyId){
+      useEffect(() => {
+        getCompanyData(companyId);
+      },[])
+    
+      // 查询列表
+      const getCompanyData = (companyId) => {
+        request({
+            ...apis.company.get,
+            urlData: { id: companyId }
+        }).then((data) => {
+          setData(data)
+        }).catch((err) => {
+          message.error(err.msg || err.message)
+        })
+      }
+    }else{
+      //第一次进入就创建新的企业
+      useEffect(() => {
+        addCompanyData();
+      },[])
+
+      // 查询列表
+      const addCompanyData = () => {
+        request({
+            ...apis.company.add,
+        }).then((data) => {
+          setData(data)
+        }).catch((err) => {
+          message.error(err.msg || err.message)
+        })
+      }
+    }
+  
+    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>,
+      },
+    ]
+  
+     
+    const handleSubmit = (values) => {
+      if(companyId){
+          request({ ...apis.sample.update, urlData: { id: companyId }, data: { ...values }}).then((data) => {
+            cancelPage();
+          }).catch((err) => {
+            message.error(err.msg || err.message)
+          })
+        }
+    }
+  
+    const cancelPage = () => {
+      router.push({
+        pathname: '/sample/demand/list',
+      });
+    }
+  
+    return (
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+    )
+  }
+  
+  const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+  export default WrappedNormalLoginForm

src/pages/eContract/company/edit.jsx

@@ -0,0 +1,106 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import XForm, { FieldTypes } from '../../../components/XForm';
+import router from 'umi/router';
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import moment from 'moment';
+
+
+const header = props => {
+    const companyId = props.location.query.id
+  
+    const [ data, setData ] = useState({})
+    if(companyId){
+      useEffect(() => {
+        getCompanyData(companyId);
+      },[])
+    
+      // 查询列表
+      const getCompanyData = (companyId) => {
+        request({
+            ...apis.company.get,
+            urlData: { id: companyId }
+        }).then((data) => {
+          if(data.certifiedStatus === 'registered'){
+            router.push({
+              pathname: '/eContract/company/add',
+              query: {
+                id: companyId
+              },
+            });
+            return
+          }
+          setData(data)
+        }).catch((err) => {
+          message.error(err.msg || err.message)
+        })
+      }
+    }else{
+      //第一次进入就创建新的企业
+      useEffect(() => {
+        addCompanyData();
+      },[])
+
+      // 查询列表
+      const addCompanyData = () => {
+        request({
+            ...apis.company.add,
+        }).then((data) => {
+          setData(data)
+        }).catch((err) => {
+          message.error(err.msg || err.message)
+        })
+      }
+    }
+  
+    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>,
+      },
+    ]
+  
+     
+    const handleSubmit = (values) => {
+      if(companyId){
+          request({ ...apis.sample.update, urlData: { id: companyId }, data: { ...values }}).then((data) => {
+            cancelPage();
+          }).catch((err) => {
+            message.error(err.msg || err.message)
+          })
+        }
+    }
+  
+    const cancelPage = () => {
+      router.push({
+        pathname: '/sample/demand/list',
+      });
+    }
+  
+    return (
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+    )
+  }
+  
+  const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+  export default WrappedNormalLoginForm

src/pages/eContract/company/index.jsx

@@ -23,7 +23,7 @@ function header(props) {
 
   // 查询列表
   const getList = (params) => {
-    request({ ...apis.sample.list, params: { ...params } }).then((data) => {
+    request({ ...apis.company.list, params: { ...params } }).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -35,31 +35,14 @@ function header(props) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        let {createDate, ...submitValue} = values
-        if(null != createDate && createDate.length > 0){
-          const [startCreateDate, endCreateDate] = createDate
-          submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
-          submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
-        }else{
-          submitValue.startCreateDate = null
-          submitValue.endCreateDate = null
-        }
-        getList({ pageNum: 1, pageSize: 10, ...submitValue })
+        getList({ pageNum: 1, pageSize: 10, ...values })
       }
     });
   }
 
   const changePageNum = (pageNumber) => {
-    let {createDate, ...submitValue}  = props.form.getFieldsValue()
-    if(null != createDate && createDate.length > 0){
-      const [startCreateDate, endCreateDate] = createDate
-      submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
-      submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
-    }else{
-      submitValue.startCreateDate = null
-      submitValue.endCreateDate = null
-    }
-    getList({ pageNum: pageNumber, pageSize: 10, ...submitValue })
+    let values  = props.form.getFieldsValue()
+    getList({ pageNum: pageNumber, pageSize: 10, ...values })
   }
 
   const rowSelection = {
@@ -71,9 +54,9 @@ function header(props) {
 
 
   // 跳转到编辑资讯
-  const toEditDemand = (id) => () => {
+  const toEditCompany = (id) => () => {
     router.push({
-      pathname: '/sample/demand/edit',
+      pathname: '/eContract/company/edit',
       query: {
         id
       },
@@ -81,6 +64,14 @@ function header(props) {
   }
 
   
+  // 跳转到编辑资讯
+  const toAddCompany = () => {
+    router.push({
+      pathname: '/eContract/company/add',
+    });
+  }
+
+  
   const changeStatus = () => {
     if(demandIdList.length < 1){
       message.error('请先选择要删除的数据！')
@@ -112,35 +103,34 @@ function header(props) {
   const columns = [
     {
       title: '企业名称',
-      dataIndex: 'sampleName',
-      key: 'sampleName',
+      dataIndex: 'companyName',
+      key: 'companyName',
       align: 'center',
     },
     {
       title: '企业编号',
-      dataIndex: 'orgName',
-      key: 'orgName',
+      dataIndex: 'companyCode',
+      key: 'companyCode',
       align: 'center',
     },
     {
       title: '法大大客户编号',
-      dataIndex: 'orderer',
-      key: 'orderer',
+      dataIndex: 'fadadaCode',
+      key: 'fadadaCode',
       align: 'center',
 
     },
     {
       title: '实名认证状态',
-      dataIndex: 'phone',
-      key: 'phone',
+      dataIndex: 'certifiedStatus',
+      key: 'certifiedStatus',
       align: 'center',
     },
     {
       title: '企业管理员身份',
-      dataIndex: 'createDate',
-      key: 'createDate',
+      dataIndex: 'companyManagerType',
+      key: 'companyManagerType',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
     },
     {
       title: '操作',
@@ -148,7 +138,7 @@ function header(props) {
       key: 'handle',
       align: 'center',
       render: (x, row) => (
-        <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditDemand(row.demandId)}>
+        <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditCompany(row.companyId)}>
           查看详情<Icon type="form" className={styles.edit} />
         </span>
       ),
@@ -165,7 +155,7 @@ function header(props) {
     <>
     <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
-          {getFieldDecorator('sampleName')(
+          {getFieldDecorator('companyName')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
               placeholder="企业名称"
@@ -173,7 +163,7 @@ function header(props) {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('orgName')(
+          {getFieldDecorator('companyCode')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
               placeholder="企业编号"
@@ -181,7 +171,7 @@ function header(props) {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('demandStatus')(
+          {getFieldDecorator('certifiedStatus')(
             <Select style={{ width: '180px' }} placeholder="实名认证状态">
               <Select.Option value="1">未认证</Select.Option>
               <Select.Option value="2">管理员资料已提交</Select.Option>
@@ -203,7 +193,10 @@ function header(props) {
         </Form.Item>
       </Form>
       <AuthButton name="admin.taNewsType.post" noRight={null}>
-        <Button type="danger" className={styles.addBtn} onClick={changeStatus}>删除</Button>
+        <Button type="danger" className={styles.addBtn} onClick={toAddCompany}>新增</Button>
+      </AuthButton>
+      <AuthButton name="admin.taNewsType.post" noRight={null}>
+        <Button type="danger" style={{ marginLeft: 15 }} onClick={changeStatus}>删除</Button>
       </AuthButton>
       <Table rowSelection={rowSelection} rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/services/apis.js

@@ -115,12 +115,12 @@ const apis = {
     uploadForAnt: {
       url: `${prefix}/antd/image`,
       method: 'POST',
-      action: 'center',
+      action: 'channel',
     },
     upload: {
       url: `${prefix}/image`,
       method: 'POST',
-      action: 'center',
+      action: 'channel',
     },
   },
   openScreen: {
@@ -164,33 +164,51 @@ const apis = {
     listContactByCondition: {
       url: `${prefix}/listContactByCondition`,
       method: 'GET',
-      action: 'center',
+      action: 'channel',
     },
     taContactAdd: {
       url: `${prefix}/taContact`,
       method: 'POST',
-      action: 'center',
+      action: 'channel',
     },
     batchDeleteContact: {
       url: `${prefix}/taContact/batchDelete`,
       method: 'PUT',
-      action: 'center',
+      action: 'channel',
     },
     taContactGet: {
       url: `${prefix}/taContact/:id`,
       method: 'GET',
-      action: 'center',
+      action: 'channel',
     },
     taContactUpdate: {
       url: `${prefix}/taContact/:id`,
       method: 'PUT',
-      action: 'center',
+      action: 'channel',
     },
     list: {
       url: `${prefix}/taContact`,
       method: 'GET',
       action: 'channel',
     },
+  },
+
+  company: {
+    list: {
+      url: `${prefix}/company/list`,
+      method: 'GET',
+      action: 'channel',
+    },
+    add: {
+      url: `${prefix}/company/add`,
+      method: 'POST',
+      action: 'channel',
+    },
+    get: {
+      url: `${prefix}/company/:id`,
+      method: 'GET',
+      action: 'channel',
+    },
   }
   
 }