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

# Conflicts:
#	src/services/apis.js

config/routes.js

@@ -154,6 +154,12 @@ export default [
                 name: '关联组织',
                 component: './eContract/relatedOrganization',
               },
+              {
+                path: '/eContract/relatedOrganization/add',
+                name: '新增关联组织',
+                hideInMenu: true,
+                component: './eContract/relatedOrganization/add',
+              },
               {
                 path: '/eContract/signedContract',
                 name: '已签署合同',

src/pages/eContract/company/edit.jsx

@@ -45,7 +45,7 @@ const header = props => {
         addCompanyData();
       },[])
 
-      // 查询列表
+      // 添加
       const addCompanyData = () => {
         request({
             ...apis.company.add,
@@ -60,6 +60,16 @@ const header = props => {
     const openFddUrl = () => {
       window.open(data.certifiedAddress)
     }
+
+    const getCompanyInfo = () => {
+      request({
+          ...apis.company.refresh,urlData: { id: data.companyId }
+      }).then((data) => {
+        setData(data)
+      }).catch((err) => {
+        message.error(err.msg || err.message)
+      })
+    }
   
     return (
       <Tabs type="card">
@@ -79,7 +89,7 @@ const header = props => {
             <Row>
               <Col span={8}></Col>
               <Col span={4}>企业管理员身份</Col>
-              <Col span={4}>{data.companyManagerType}</Col>
+              <Col span={4}>{data.companyManagerType === 'legal' ? '法人' : data.companyManagerType === 'agent' ? "代理人" : "" }</Col>
               <Col span={8}></Col>
             </Row>
             <Row>
@@ -97,16 +107,17 @@ const header = props => {
             <Row>
               <Col span={8}></Col>
               <Col span={4}>实名认证状态</Col>
-              <Col span={4}>{data.certifiedStatus}</Col>
+              <Col span={4}>{data.status === 0 ? '未认证' : data.status === 1 ? "管理员资料已提交" : data.status === 2 ? "企业基本资料（没有申请表）已提交" : data.status === 3 ? "已提交待审核" : 
+                             data.status === 4 ? '审核通过' : data.status === 5 ? "审核不通过" : data.status === 6 ? "人工初审通过" : "" }</Col>
               <Col span={8}></Col>
             </Row>
             <Row>
               <Col span={8}></Col>
               <Col span={4}>
-                <Button type="danger" >更新认证状态</Button>
+                <Button type="danger" onClick={getCompanyInfo}>更新认证状态</Button>
               </Col>
               <Col span={4}>
-                <Button type="danger" >返回</Button>
+                <Button type="danger" onClick={() => router.go(-1)}>返回</Button>
               </Col>
               <Col span={8}></Col>
             </Row>
@@ -115,25 +126,26 @@ const header = props => {
         <Row>
               <Col span={8}></Col>
               <Col span={4}>认证状态</Col>
-              <Col span={4}>{data.companyCode}</Col>
+              <Col span={4}>{data.status === 0 ? '未认证' : data.status === 1 ? "管理员资料已提交" : data.status === 2 ? "企业基本资料（没有申请表）已提交" : data.status === 3 ? "已提交待审核" : 
+                             data.status === 4 ? '审核通过' : data.status === 5 ? "审核不通过" : data.status === 6 ? "人工初审通过" : "" }</Col>
               <Col span={8}></Col>
             </Row>
             <Row>
               <Col span={8}></Col>
               <Col span={4}>不通过原因</Col>
-              <Col span={4}>{data.fadadaCode}</Col>
+              <Col span={4}>{data.reason}</Col>
               <Col span={8}></Col>
             </Row>
             <Row>
               <Col span={8}></Col>
               <Col span={4}>审核时间</Col>
-              <Col span={4}>{data.companyManagerType}</Col>
+              <Col span={4}>{data.verifyTime}</Col>
               <Col span={8}></Col>
             </Row>
             <Row>
               <Col span={8}></Col>
               <Col span={4}>认证方式</Col>
-              <Col span={4}>{data.certifiedSerialNumber}</Col>
+              <Col span={4}>{data.certifiedType === 0 ? "银行卡认证" : data.certifiedType === 1 ? "纸质审核认证" : ""}</Col>
               <Col span={8}></Col>
             </Row>
             <Row>
@@ -145,13 +157,13 @@ const header = props => {
             <Row>
               <Col span={8}></Col>
               <Col span={4}>企业名称</Col>
-              <Col span={4}>{data.certifiedStatus}</Col>
+              <Col span={4}>{data.companyName}</Col>
               <Col span={8}></Col>
             </Row>
             <Row>
               <Col span={8}></Col>
               <Col span={4}>统一社会信用代码</Col>
-              <Col span={4}>{data.certifiedStatus}</Col>
+              <Col span={4}>{data.creditCode}</Col>
               <Col span={8}></Col>
             </Row>
 
@@ -164,53 +176,53 @@ const header = props => {
             <Row>
               <Col span={8}></Col>
               <Col span={4}>银行名称</Col>
-              <Col span={4}>{data.certifiedStatus}</Col>
+              <Col span={4}>{data.bankName}</Col>
               <Col span={8}></Col>
             </Row>
             <Row>
               <Col span={8}></Col>
               <Col span={4}>银行帐号</Col>
-              <Col span={4}>{data.certifiedStatus}</Col>
+              <Col span={4}>{data.bankAccount}</Col>
               <Col span={8}></Col>
             </Row>
             <Row>
               <Col span={8}></Col>
               <Col span={4}>开户支行名称</Col>
-              <Col span={4}>{data.certifiedStatus}</Col>
+              <Col span={4}>{data.subbranchName}</Col>
               <Col span={8}></Col>
             </Row>
 
             <Row>
               <Col span={8}></Col>
               <Col span={4}>企业管理员身份</Col>
-              <Col span={4}>{data.certifiedStatus}</Col>
+              <Col span={4}>{data.companyManagerType === 'legal' ? '法人' : data.companyManagerType === 'agent' ? "代理人" : ""}</Col>
               <Col span={8}></Col>
             </Row>
             <Row>
               <Col span={8}></Col>
               <Col span={4}>姓名</Col>
-              <Col span={4}>{data.certifiedStatus}</Col>
+              <Col span={4}>{data.userName}</Col>
               <Col span={8}></Col>
             </Row>
             <Row>
               <Col span={8}></Col>
               <Col span={4}>手机号</Col>
-              <Col span={4}>{data.certifiedStatus}</Col>
+              <Col span={4}>{data.tel}</Col>
               <Col span={8}></Col>
             </Row>
             <Row>
               <Col span={8}></Col>
               <Col span={4}>身份证号码</Col>
-              <Col span={4}>{data.certifiedStatus}</Col>
+              <Col span={4}>{data.idCard}</Col>
               <Col span={8}></Col>
             </Row>
             <Row>
               <Col span={8}></Col>
               <Col span={4}>
-                <Button type="danger" >更新企业认证信息</Button>
+                <Button type="danger" onClick={getCompanyInfo}>更新企业认证信息</Button>
               </Col>
               <Col span={4}>
-                <Button type="danger" >返回</Button>
+                <Button type="danger" onClick={() => router.go(-1)}>返回</Button>
               </Col>
               <Col span={8}></Col>
             </Row>

src/pages/eContract/company/index.jsx

@@ -15,7 +15,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 function header(props) {
   // 获取初始化数据
   const [ data, setData ] = useState({})
-  const [demandIdList, setDemandIdList] = useState([])
+  const [deleteList, setDeleteList] = useState([])
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10 });
@@ -48,7 +48,7 @@ function header(props) {
   const rowSelection = {
     onChange: (selectedRowKeys, selectedRows) => {
       console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
-      setDemandIdList(selectedRows)
+      setDeleteList(selectedRows)
     },
   };
 
@@ -73,18 +73,18 @@ function header(props) {
 
   
   const changeStatus = () => {
-    if(demandIdList.length < 1){
+    if(deleteList.length < 1){
       message.error('请先选择要删除的数据！')
       return
     }
-    const title = '确认将所选的' + demandIdList.length + '条数据删除？可删除条件：需求单状态 为 作废。'
+    const title = '确认将所选的' + deleteList.length + '条数据删除？认证通过的企业不会被删除'
     Modal.confirm({
       title: title,
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        request({ ...apis.sample.put, data: { ids: demandIdList.map(x => x.demandId) } }).then((data) => {
-          const resultMessage = '操作成功，其中'+data.successNum+'条成功删除，'+data.failNum+'条非作废状态未删除。'
+        request({ ...apis.company.delete, data: { ids: deleteList.map(x => x.companyId) } }).then((data) => {
+          const resultMessage = '操作成功，其中'+data.successNum+'条成功删除，'+data.failNum+'条已认证数据无法删除。'
           message.info(resultMessage)
           getList({ pageNum: 1, pageSize: 10 });
         }).catch((err) => {
@@ -122,15 +122,18 @@ function header(props) {
     },
     {
       title: '实名认证状态',
-      dataIndex: 'certifiedStatus',
-      key: 'certifiedStatus',
+      dataIndex: 'status',
+      key: 'status',
       align: 'center',
+      render: (status) => <span>{status === 0 ? '未认证' : status === 1 ? "管理员资料已提交" : status === 2 ? "企业基本资料（没有申请表）已提交" : status === 3 ? "已提交待审核" : 
+      status === 4 ? '审核通过' : status === 5 ? "审核不通过" : status === 6 ? "人工初审通过" : "" }</span>,
     },
     {
       title: '企业管理员身份',
       dataIndex: 'companyManagerType',
       key: 'companyManagerType',
       align: 'center',
+      render: (companyManagerType) => <span>{companyManagerType === 'legal' ? '法人' : companyManagerType === 'agent' ? "代理人" : "" }</span>,
     },
     {
       title: '操作',
@@ -171,15 +174,15 @@ function header(props) {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('certifiedStatus')(
+          {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="实名认证状态">
-              <Select.Option value="1">未认证</Select.Option>
-              <Select.Option value="2">管理员资料已提交</Select.Option>
-              <Select.Option value="3">企业基本资料（没有申请表）已提交</Select.Option>
-              <Select.Option value="4">已提交待审核</Select.Option>
-              <Select.Option value="5">审核通过</Select.Option>
-              <Select.Option value="6">审核不通过</Select.Option>
-              <Select.Option value="7">人工初审通过</Select.Option>
+              <Select.Option value="0">未认证</Select.Option>
+              <Select.Option value="1">管理员资料已提交</Select.Option>
+              <Select.Option value="2">企业基本资料（没有申请表）已提交</Select.Option>
+              <Select.Option value="3">已提交待审核</Select.Option>
+              <Select.Option value="4">审核通过</Select.Option>
+              <Select.Option value="5">审核不通过</Select.Option>
+              <Select.Option value="6">人工初审通过</Select.Option>
             </Select>,
           )}
         </Form.Item>

src/pages/eContract/relatedOrganization/add.jsx

@@ -0,0 +1,95 @@
+import React, { useState, useEffect } from 'react';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Steps, Pagination, Modal, Breadcrumb } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import styles from './style.less';
+import { fetch, apis } from '../../../utils/request';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import Enterprise from './components/enterprise';
+import Organization from './components/organization';
+
+const { Step } = Steps;
+
+let ent = null
+
+function header(props) {
+
+  console.log(props, 'props')
+
+  const [current, setCurrent] = useState()
+  const [status, setStatus] = useState({})
+
+  useEffect(() => {
+    setCurrent(0)
+    setStatus({
+   
+      ent: "process",
+      org: "wait",
+      disabled: true,
+    })
+  }, [])
+
+
+  const relation = (orgId, companyId) => {
+    request({ ...apis.relatedOrganization.post, data: { orgId: orgId, companyId: companyId }, }).then(data => {
+      message.info("关联成功")
+      router.push({
+        pathname: '/eContract/relatedOrganization',
+        query: {
+          //   salesBatchId: data.salesBatchId,
+        },
+      });
+    }).catch((err) => {
+      message.info(err.msg || err.message)
+    })
+  }
+  const onChange = current => {
+    console.log('onChange:', current);
+    setCurrent(current);
+  };
+
+  const onChoiceEnt = (value) => {
+    console.log("onChoiceEnt", value);
+    ent = value.companyId
+    setCurrent(1)
+    setStatus({
+      enttitle: "选择已认证企业",
+      ent: "finish",
+      org: "process",
+      disabled: false,
+    })
+  };
+
+  const onChoiceOrg = (value) => {
+    console.log("onChoiceOrg", value);
+    console.log("ent", ent);
+    relation(value.orgId,ent )
+
+
+  };
+
+  return (<>
+    <div style={{ maxWidth: 600 }}>
+      <Steps
+        type="navigation"
+        current={current}
+        onChange={onChange}
+        className="site-navigation-steps"
+      >
+        <Step status={status.ent} title="选择已认证企业" disabled />
+        <Step status={status.org} title="选择关联的组织" disabled />
+        {/* <Step status="wait" title="Step 3" /> */}
+
+      </Steps>
+
+    </div>
+    {current === 0 && <Enterprise onChoiceEnt={onChoiceEnt} />}
+    {current === 1 && <Organization onChoiceOrg={onChoiceOrg} />}
+  </>)
+}
+
+
+
+export default header

src/pages/eContract/relatedOrganization/components/enterprise.jsx

@@ -0,0 +1,148 @@
+import React, { useState, useEffect } from 'react';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Steps, Pagination, Modal, Breadcrumb } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import styles from '../style.less';
+import { fetch, apis } from '../../../../utils/request';
+import request from '../../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+
+
+
+
+function header(props, ref) {
+
+    console.log(props, 'ent')
+    console.log(props, 'ref')
+
+    const [data, setData] = useState({})
+
+    useEffect(() => {
+        getList({ pageNum: 1, pageSize: 10 });
+    }, [])
+    // 查询列表
+
+    const getList = params => {
+        // certifiedStatus: true,
+        request({ ...apis.relatedOrganization.listCompany, params: { ...params } }).then(data => {
+            setData(data)
+        })
+    }
+    function handleReset() {
+        props.form.resetFields();
+        getList({ pageNum: 1, pageSize: 10 });
+    }
+
+    const changePageNum = pageNumber => {
+        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+    }
+
+    const choiceent = value => {
+        console.log(value, 'value')
+
+        // Modal.confirm({
+        //     title: '确认将所选数据删除？',
+        //     okText: '确定',
+        //     cancelText: '取消',
+        //     onOk() {
+
+        //     },
+        // });
+        props.onChoiceEnt(value)
+    }
+
+
+    const handleSubmit = (e, props) => {
+        e.preventDefault();
+
+
+
+        getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
+
+
+    }
+
+
+    const columns = [
+        {
+            title: '企业名称',
+            dataIndex: 'companyName',
+            key: 'companyName',
+            align: 'center',
+
+        },
+        {
+            title: '企业编号',
+            dataIndex: 'companyCode',
+            key: 'companyCode',
+            align: 'center',
+
+        },
+        {
+            title: '法大大客户编号',
+            dataIndex: 'fadadaCode',
+            key: 'fadadaCode',
+            align: 'center',
+
+        },
+        {
+            title: '操作',
+            dataIndex: 'handle',
+            key: 'handle',
+            align: 'center',
+            render: (x, row) => (
+                <>
+
+
+                    <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={e => choiceent(row)}>
+                        选择<Icon type="form" className={styles.edit} />
+                    </span>
+
+                </>
+            ),
+        }
+    ]
+
+    const { getFieldDecorator } = props.form
+    return (<>
+        <div>
+            <Form layout="inline" style={{ marginTop: '30px' }} onSubmit={e => handleSubmit(e, props)}>
+                <Form.Item>
+                    {getFieldDecorator('companyName')(
+                        <Input
+                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                            placeholder="企业名称 "
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('companyCode')(
+                        <Input
+                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                            placeholder="企业编号 "
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    <Button type="primary" htmlType="submit" className={styles.searchBtn}>搜索</Button>
+                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
+                </Form.Item>
+            </Form>
+
+
+
+            <Table id='noticeTable' style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} />
+
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+            </div>
+
+
+        </div>
+    </>)
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/eContract/relatedOrganization/components/organization.jsx

@@ -0,0 +1,136 @@
+import React, { useState, useEffect } from 'react';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Steps, Pagination, Modal, Breadcrumb } from 'antd';
+import router from 'umi/router';
+import moment from 'moment';
+import styles from '../style.less';
+import { fetch, apis } from '../../../../utils/request';
+import request from '../../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+
+
+
+
+function header(props) {
+
+    const [ data, setData ] = useState({})
+
+    useEffect(() => {
+        console.log('org')
+        getList({ pageNum: 1, pageSize: 10 });
+    }, [])
+    // 查询列表
+
+    const getList = params => {
+        request({ ...apis.relatedOrganization.listOrg, params: { ...params } }).then(data => {
+            setData(data)
+        })
+    }
+    function handleReset() {
+        props.form.resetFields();
+        getList({ pageNum: 1, pageSize: 10 });
+    }
+
+    const changePageNum = pageNumber => {
+        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+    }
+
+    const handleSubmit = (e, props) => {
+        e.preventDefault();
+        getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
+    }
+
+    const choiceorg = value =>{
+        console.log(value,'org')
+        props.onChoiceOrg(value)
+    }
+
+    const columns = [
+        {
+            title: '组织名称',
+            dataIndex: 'name',
+            key: 'name',
+            align: 'center',
+
+        },
+        {
+            title: '组织编号',
+            dataIndex: 'orgId',
+            key: 'orgId',
+            align: 'center',
+           
+        },
+        {
+            title: '小程序名称',
+            dataIndex: 'miniAppName',
+            key: 'miniAppName',
+            align: 'center',
+           
+        },
+        {
+            title: '代理商名称',
+            dataIndex: 'channelProxyName',
+            key: 'channelProxyName',
+            align: 'center',
+           
+        },
+        {
+            title: '操作',
+            dataIndex: 'handle',
+            key: 'handle',
+            align: 'center',
+            render: (x, row) => (
+                <>
+
+
+                    <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={e=>choiceorg(row)}>
+                    选择<Icon type="form" className={styles.edit} />
+                    </span>
+
+                </>
+            ),
+        }
+    ]
+   
+    const { getFieldDecorator } = props.form
+    return (<>
+        <div>
+        <Form layout="inline" style={{ marginTop: '30px' }} onSubmit={e => handleSubmit(e, props) }>
+                <Form.Item>
+                    {getFieldDecorator('orgName')(
+                        <Input
+                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                            placeholder="组织名称 "
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('miniAppName')(
+                        <Input
+                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                            placeholder="小程序名称 "
+                        />,
+                    )}
+                    </Form.Item>
+                    <Form.Item>
+                    <Button type="primary" htmlType="submit" className={styles.searchBtn}>搜索</Button>
+                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
+                </Form.Item>
+            </Form>
+
+            
+
+            <Table id='noticeTable' style={{ marginTop: '30px' }}  dataSource={data.records} columns={columns} pagination={false} />
+
+                <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                    <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+                </div>
+
+
+        </div>
+    </>)
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/eContract/relatedOrganization/index.jsx

@@ -19,25 +19,41 @@ function header(props) {
     // 查询列表
 
     const getList = params => {
-       
+        request({ ...apis.relatedOrganization.get, params: { ...params } }).then(data => {
+            setData(data)
+        })
     }
 
-    const toEditResource = (id) => () => {
-        if(id){
-        router.push({
-            pathname: '/resource/openScreen/edit',
-              query: {
-                id
-              },
-        });
-    }else{
+    const toAdd = (id) => () => {
+        
             router.push({
-                pathname: '/resource/openScreen/add',
+                pathname: '/eContract/relatedOrganization/add',
                   query: {
                     id
                   },
             });
-        }
+        
+    }
+
+    const onDelete = rowData =>  {
+        // if (taNoticeList.length < 1) {
+        //     message.error('请至少选择一条数据')
+        //     return
+        // }
+
+        Modal.confirm({
+            title: '删除后组织将不能使用企业电子签章，确认删除？',
+            okText: '确定',
+            cancelText: '取消',
+            onOk() {
+                request({ ...apis.relatedOrganization.delete, urlData: { id: rowData.companyOrgId }}).then((data) => {
+                    message.info("操作成功")
+                    getList({ pageNum: 1, pageSize: 10 });
+                  
+                  }).catch((err) => {
+                  })
+            },
+        });
     }
 
     const handleSubmit = (e, props) => {
@@ -50,43 +66,155 @@ function header(props) {
         getList({ pageNum: 1, pageSize: 10 });
     }
 
-    const toDelBatch = rowData => () => {
-        console.log(taNoticeList, 'taNoticeList')
-        if (taNoticeList.length < 1) {
-            message.error('请至少选择一条数据')
-            return
-        }
-
-        Modal.confirm({
-            title: '确认将所选数据删除？',
-            okText: '确定',
-            cancelText: '取消',
-            onOk() {
-              
-            },
-        });
-    }
 
     const changePageNum = pageNumber => {
         getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
     }
 
-     
-    const { getFieldDecorator } = props.form
+    const columns = [
+        {
+            title: '企业名称',
+            dataIndex: 'companyName',
+            key: 'companyName',
+            align: 'center',
 
-    const rowSelection = {
-        onChange: (selectedRowKeys, selectedRows) => {
-          console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
-          setTaNoticeList(selectedRows)
         },
-      };
+        {
+            title: '企业编号',
+            dataIndex: 'companyCode',
+            key: 'companyCode',
+            align: 'center',
+           
+        },
+        {
+            title: '实名认证状态',
+            dataIndex: 'companyStatus',
+            key: 'companyStatus',
+            align: 'center',
+            render: (companyStatus) => <>
+            {companyStatus === 0 && <span>未认证</span>}
+            {companyStatus === 1 && <span>管理员资料已提交</span>}
+            {companyStatus === 2 && <span>企业基本资料（没有申请表）已提交</span>}
+            {companyStatus === 3 && <span>已提交待审核</span>}
+            {companyStatus === 4 && <span>审核通过</span>}
+            {companyStatus === 5 && <span>审核不通过</span>}
+            {companyStatus === 6 && <span>人工初核通过</span>}
+           
+            </>,
+          
+        },
+        {
+            title: '关联组织名',
+            dataIndex: 'orgName',
+            key: 'orgName',
+            align: 'center',
+        },
+        {
+            title: '组织编号',
+            dataIndex: 'orgId',
+            key: 'orgId',
+            align: 'center',
+           
+        }, 
+        {
+            title: '小程序名称',
+            dataIndex: 'miniAppName',
+            key: 'miniAppName',
+            align: 'center',
+            
+        },
+        
+        {
+            title: '关联时间',
+            dataIndex: 'createDate',
+            key: 'createDate',
+            align: 'center',
+            render: (x, row) => <><span>{row.createDate?`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>,
+        },
+        {
+            title: '操作',
+            dataIndex: 'handle',
+            key: 'handle',
+            align: 'center',
+            render: (x, row) => (
+                <>
+
+
+                    <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={e=>onDelete(row)}>
+                    删除<Icon type="form" className={styles.edit} />
+                    </span>
+
+                </>
+            ),
+        },
+        
+    ];
+
+     
+    const { getFieldDecorator } = props.form
  
     return (
 
         <>
-            <div>
-           234
-            </div>
+            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                <Form.Item>
+                    {getFieldDecorator('companyName')(
+                        <Input
+                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                            placeholder="企业名称 "
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('companyCode')(
+                        <Input
+                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                            placeholder="企业编号 "
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('companyStatus')(
+                        <Select style={{ width: '280px' }} placeholder="实名认证状态">
+                            <Select.Option value="">全部</Select.Option>
+                            <Select.Option value="0">未认证</Select.Option>
+                            <Select.Option value="1">管理员资料已提交</Select.Option>
+                            <Select.Option value="2">企业基本资料（没有申请表）已提交</Select.Option>
+                            <Select.Option value="3">已提交待审核</Select.Option>
+                            <Select.Option value="4">审核通过</Select.Option>
+                            <Select.Option value="5">审核不通过</Select.Option>
+                            <Select.Option value="6">人工初核通过</Select.Option>
+                        </Select>,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('orgName')(
+                        <Input
+                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                            placeholder="关联组织名 "
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('miniAppName')(
+                        <Input
+                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                            placeholder="小程序名称 "
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    <Button type="primary" htmlType="submit" className={styles.searchBtn}>搜索</Button>
+                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
+                </Form.Item>
+            </Form>
+            <Button type="danger" className={styles.addBtn} onClick={toAdd()}>新增</Button>
+
+            <Table id='noticeTable'   dataSource={data.records} columns={columns} pagination={false} />
+
+                <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                    <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} />
+                </div>
         </>
     )
 }

src/pages/eContract/relatedOrganization/style.less

@@ -45,4 +45,10 @@
     color: #bebebe;
     margin-left: 6px;
     font-size: 15px;
+  }
+
+  .site-navigation-steps {
+    width: 300px;
+    margin-bottom: 60px;
+    box-shadow: 0px -1px 0 0 #e8e8e8 inset;
   }

src/pages/eContract/signedContract/index.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
+import { Form, Input, Button, Icon, Select, message, Table, InputNumber, Divider, Tag, DatePicker, Pagination, Modal, Breadcrumb } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import styles from './style.less';
@@ -8,41 +8,60 @@ import { fetch, apis } from '../../../utils/request';
 import request from '../../../utils/request';
 import AuthButton from '@/components/AuthButton';
 
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
 function header(props) {
-    
-    const [taNoticeList, setTaNoticeList] = useState([])
-    const [ data, setData ] = useState({})
+
+    const [taContractList, setTaContractList] = useState([])
+    const [data, setData] = useState({})
+    const [checkData, setCheckData] = useState()
+    const [visible, setVisible] = useState()
+    const [price, setPrice] = useState()
 
     useEffect(() => {
+        setVisible(false)
+        setCheckData(0)
         getList({ pageNum: 1, pageSize: 10 });
     }, [])
     // 查询列表
 
     const getList = params => {
-       
-    }
 
-    const toEditResource = (id) => () => {
-        if(id){
-        router.push({
-            pathname: '/resource/openScreen/edit',
-              query: {
-                id
-              },
-        });
-    }else{
-            router.push({
-                pathname: '/resource/openScreen/add',
-                  query: {
-                    id
-                  },
-            });
-        }
+        request({ ...apis.signedContract.get, params: { ...params } }).then(data => {
+            setData(data)
+        })
+
     }
 
+
     const handleSubmit = (e, props) => {
         e.preventDefault();
-        getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
+        console.log(e, props)
+        props.form.validateFields((err, values) => {
+            if (!err) {
+                let { signatoryTime, settlementTime, ...submitValue } = values
+                if (null != signatoryTime && signatoryTime.length > 0) {
+                    const [signatoryStartTime, signatoryEndTime] = signatoryTime
+                    submitValue.signatoryStartTime = moment(signatoryStartTime).format('YYYY-MM-DD');
+                    submitValue.signatoryEndTime = moment(signatoryEndTime).format('YYYY-MM-DD');
+                } else {
+                    submitValue.signatoryStartTime = null
+                    submitValue.signatoryEndTime = null
+                }
+
+                if (null != settlementTime && settlementTime.length > 0) {
+                    const [settlementStartTime, settlementEndTime] = settlementTime
+                    submitValue.settlementStartTime = moment(settlementStartTime).format('YYYY-MM-DD');
+                    submitValue.settlementEndTime = moment(settlementEndTime).format('YYYY-MM-DD');
+                } else {
+                    submitValue.settlementStartTime = null
+                    submitValue.settlementEndTime = null
+                }
+              
+                getList({ pageNum: 1, pageSize: 10, ...submitValue });
+            }
+        });
+       
     }
 
     function handleReset() {
@@ -51,18 +70,18 @@ function header(props) {
     }
 
     const toDelBatch = rowData => () => {
-        console.log(taNoticeList, 'taNoticeList')
-        if (taNoticeList.length < 1) {
-            message.error('请至少选择一条数据')
-            return
-        }
+        // if (taContractList.length < 1) {
+        //     message.error('请至少选择一条数据')
+        //     return
+        // }
 
         Modal.confirm({
             title: '确认将所选数据删除？',
             okText: '确定',
             cancelText: '取消',
             onOk() {
-              
+            
+                console.log(price,'price')
             },
         });
     }
@@ -71,22 +90,238 @@ function header(props) {
         getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
     }
 
-     
+
     const { getFieldDecorator } = props.form
 
     const rowSelection = {
         onChange: (selectedRowKeys, selectedRows) => {
-          console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
-          setTaNoticeList(selectedRows)
+            console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+            setTaContractList(selectedRows)
+        },
+    };
+
+    const onChange = (value) => {
+        console.log(value, 'value')
+        setPrice(value)
+    }
+
+
+
+    const columns = [
+        {
+            title: '企业名称',
+            dataIndex: 'companyName',
+            key: 'companyName',
+            align: 'center',
+
+        },
+        {
+            title: '企业编号',
+            dataIndex: 'companyNumber',
+            key: 'companyNumber',
+            align: 'center',
+
+        },
+        {
+            title: '代理商名称',
+            dataIndex: 'channelProxyName',
+            key: 'channelProxyName',
+            align: 'center',
+
+        },
+        {
+            title: '组织名称',
+            dataIndex: 'orgName',
+            key: 'orgName',
+            align: 'center',
         },
-      };
- 
+        {
+            title: '小程序名称',
+            dataIndex: 'miniAppName',
+            key: 'miniAppName',
+            align: 'center',
+
+        },
+        {
+            title: '合同编号',
+            dataIndex: 'contractId',
+            key: 'contractId',
+            align: 'center',
+
+        },
+        {
+            title: '甲方签署时间',
+            dataIndex: 'signatoryTime',
+            key: 'signatoryTime',
+            align: 'center',
+            render: (x, row) => <><span>{row.signatoryStartTime ? `${moment(row.signatoryStartTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
+        },
+        {
+            title: '是否结算',
+            dataIndex: 'settlement',
+            key: 'settlement',
+            align: 'center',
+        render: (x, row) =><><span>{row.settlement?'是':'否'}</span></>
+        },
+        {
+            title: '结算时间',
+            dataIndex: 'settlementTime',
+            key: 'settlementTime',
+            align: 'center',
+            render: (x, row) => <><span>{row.settlementTime ? `${moment(row.settlementTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
+        },
+        {
+            title: '结算单价',
+            dataIndex: 'settlementPrice',
+            key: 'settlementPrice',
+         
+            render: (x, row) =><><span>{row.settlementPrice? `￥ ${row.settlementPrice/100}`.replace(/\B(?=(\d{3})+(?!\d))/g, ','):row.settlementPrice===0?0:''}</span></>
+        },
+    ];
+
+    const handleShowModel = val => {
+
+        if (taContractList.length < 1) {
+            message.error('请至少选择一条数据')
+            return
+        }
+        let count = 0
+        taContractList.map((x)=>{
+         
+            if(x.settlement) {
+                count++
+            }
+        })
+        setCheckData(count)
+   
+ setVisible(true);
+
+    }
+
+    const handleCancel = val => {
+        setVisible(false);
+    }
+
+    const handleOk = val => {
+
+        console.log(price,'price')
+        request({ ...apis.signedContract.put, data:  { price: price||0, taContractList: taContractList }}).then(data => {
+            message.info("操作成功")
+            setVisible(false);
+            getList({ pageNum: 1, pageSize: 10 })
+            
+        })
+        
+    }
+
+
     return (
 
         <>
-            <div>
-           234
+            <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+                <Form.Item>
+                    {getFieldDecorator('companyName')(
+                        <Input
+                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                            placeholder="企业名称 "
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('companyNumber')(
+                        <Input
+                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                            placeholder="企业编号 "
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('channelProxyName')(
+                        <Input
+                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                            placeholder="代理商名称 "
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('orgName')(
+                        <Input
+                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                            placeholder="组织名称 "
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('miniAppName')(
+                        <Input
+                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                            placeholder="小程序名称 "
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('contractId')(
+                        <Input
+                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                            placeholder="合同编号 "
+                        />,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('contractName')(
+                        <Input
+                            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                            placeholder="合同标题 "
+                        />,
+                    )}
+                </Form.Item>
+
+                <Form.Item>
+                    <span style={{ marginRight: '10px' }}>甲方签署时间：</span>
+                    {getFieldDecorator('signatoryTime')(
+                        <RangePicker placeholder={['开始时间', '结束时间']} />
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    {getFieldDecorator('settlement')(
+                        <Select style={{ width: '180px' }} placeholder="是否结算">
+                            <Select.Option value={true}>是</Select.Option>
+                            <Select.Option value={false}>否</Select.Option>
+                        </Select>,
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    <span style={{ marginRight: '10px' }}>结算时间</span>
+                    {getFieldDecorator('settlementTime')(
+                        <RangePicker placeholder={['开始时间', '结束时间']} />
+                    )}
+                </Form.Item>
+                <Form.Item>
+                    <Button type="primary" htmlType="submit" className={styles.searchBtn}>搜索</Button>
+                    <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
+                </Form.Item>
+            </Form>
+            <Button type="primary" className={styles.addBtn} onClick={e => handleShowModel()} style={{ marginLeft: '30px' }} >批量结算</Button>
+            <Table id='noticeTable' rowSelection={rowSelection} rowKey={r => r.contractId} dataSource={data.records} columns={columns} pagination={false} />
+            {/*  */}
+            <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+                <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} />
             </div>
+            <Modal
+                title="批量结算"
+                visible={visible}
+                onOk={handleOk}
+
+                onCancel={handleCancel}
+            // footer={null} 
+            >
+                <p>确认结算所选{taContractList.length}份合同手续费？其中{checkData}份已结算过，若不想再结算，请取消勾选。</p>
+                <div style={{  marginTop: '50px',textAlign:'center' }}>结算单价:<InputNumber  style={{  marginLeft: '10px',width:'150px' }} formatter={value => `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',')} defaultValue={0} precision={2} onChange={onChange} />元/份</div>
+
+
+
+            </Modal>
+
         </>
     )
 }

src/services/apis.js

@@ -192,6 +192,52 @@ const apis = {
       action: 'channel',
     },
   },
+  relatedOrganization:{
+    get:{
+      url: `${prefix}/contract/listCompanyOrg`,
+      method: 'GET',
+      action: 'channel',
+    },
+    listCompany:{
+      url: `${prefix}/contract/listCompany`,
+      method: 'GET',
+      action: 'channel',
+    },
+    listOrg:{
+      url: `${prefix}/contract/listOrg`,
+      method: 'GET',
+      action: 'channel',
+    },
+    post:{
+      url: `${prefix}/contract/taCompanyOrg`,
+      method: 'post',
+      action: 'channel',
+    },
+    delete:{
+      url: `${prefix}/taCompanyOrg/:id`,
+      method: 'delete',
+      action: 'channel',
+
+    },
+ 
+  },
+  signedContract:{
+    get:{
+      url: `${prefix}/contract/list`,
+      method: 'GET',
+      action: 'channel',
+    },
+    check:{
+      url: `${prefix}/contract/checkBeforeBatchUpdatePrice`,
+      method: 'post',
+      action: 'channel',
+    },
+    put: {
+      url: `${prefix}/contract/batchUpdatePrice`,
+      method: 'put',
+      action: 'channel',
+    },
+  },
 
   company: {
     list: {
@@ -255,10 +301,18 @@ const apis = {
     delSealById: {
       url: `${prefix}/delCompanySeal/:id`,
       method: 'PUT',
+    refresh: {
+      url: `${prefix}/company/fdd/:id`,
+      method: 'GET',
+      action: 'channel',
+    },
+    delete: {
+      url: `${prefix}/company/delete`,
+      method: 'DELETE',
       action: 'channel',
     }
   }
-  
+  }  
 }
 
 export default apis;