* 新需求

src/pages/eContract/businessConfig/add.jsx

@@ -0,0 +1,193 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, Radio, Upload, InputNumber } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import router from 'umi/router';
+import moment from 'moment';
+import SelectCity from '../../../components/SelectButton/CitySelect'
+import BuildSelect2 from '../../../components/SelectButton/BuildSelect2'
+import LivePlatSelect from '../../../components/SelectButton/LivePlatSelect'
+import CitySelect3 from '../../../components/SelectButton/CitySelect3'
+import ImageUpload from '../../../components/XForm/ImageUpload'
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import SelectContractTemp from './components/SelectContractTemp';
+import SelectRaise from './components/SelectRaise';
+import SelectCompany from './components/SelectCompany';
+import SelectSeal from './components/SelectSeal';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+let cityId = ''
+
+const header = props => {
+  const { salesBatchId } = props.location.query
+  const [ saleBatchData, setSaleBatchData ] = useState({})
+  const [showHelp, setShowHelp] = useState(false)
+
+  const [targetName, setTargetName] = useState({})
+  const [companyName, setCompanyName] = useState({})
+  const [contractTemplateName, setContractTemplateName] = useState({})
+  const [contractTemplateLink, setContractTemplateLink] = useState('')
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/eContract/businessConfig/list',
+    });
+  }
+
+   //打开新页面
+   const openIndexImg = () => {
+    if(contractTemplateLink){
+     window.open(contractTemplateLink);
+    }else{
+      message.info('请选择合同模板');
+    }
+ }
+
+  function highlightsTypeChange(e) {
+    setTypeState(e.target.value)
+  }
+
+  function disabledDate(current) {
+    // Can not select days before today and today
+    return current && current < moment().endOf('day');
+  }
+
+  function companyOnSuccess(e){
+    console.log(e)
+    setCompanyName(e)
+  }
+
+  function contractOnSuccess(e){
+    console.log('contractOnSuccess', e)
+    setContractTemplateName(e.name)
+    request({ ...apis.taEcontract.taContractTemplateById, urlData: {id: e.id} }).then((data) => {
+      setContractTemplateLink(data.contractTemplateAddress)
+      console.log(contractTemplateLink,'dddddddddd')
+    })
+  }
+
+  function targetOnSuccess(e){
+    console.log('targetOnSuccess', e)
+    setTargetName(e)
+  }
+
+  function sealOnSuccess(e){
+    console.log('sealOnSuccess', e)
+  }
+
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        request({ ...apis.taEcontract.addTaContractBusiness, data: { ...values },}).then((data) => {
+          message.info("保存成功")
+          router.push({
+            pathname: '/eContract/businessConfig/list',
+          });
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="合同标题">
+          {getFieldDecorator('contractTemplateId', {
+            rules: [{ required: true, message: ' 请选择合同模板' }],
+          })(<SelectContractTemp  onSuccess={e => contractOnSuccess(e)}/>)}
+          {getFieldDecorator('contractTemplateName', {initialValue:contractTemplateName,
+            rules: [{ required: true, message: ' 请选择关联业务' }],
+          })(<Input  hidden={true}/>)}
+        </Form.Item>
+        <Form.Item label="合同文件">
+          {getFieldDecorator('contractTemplateId')}<Button type="danger" style={{marginRight:'20px'}} onClick={openIndexImg}>查看文件</Button>
+        </Form.Item>
+        <Form.Item label="关联业务类型"> 
+          {getFieldDecorator('targetType', {
+              rules: [{ required: true, message: '请选择发布状态' }],
+            })(<Select placeholder="关联业务类型" style={{ width: '400px' }}>
+            <Option value="raise">房源认筹</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item label="关联业务">
+          {getFieldDecorator('targetId', {
+            rules: [{ required: true, message: ' 请选择关联业务' }],
+          })(<SelectRaise onSuccess={e => targetOnSuccess(e)}/>)}
+          {getFieldDecorator('targetName', {initialValue:targetName,
+            rules: [{ required: true, message: ' 请选择关联业务' }],
+          })(<Input  hidden={true}/>)}
+        </Form.Item>
+        <Form.Item label="甲方" help="系统会在业务需要时自动签所选企业印章，比如用户在签署认筹合同前系统会自动签署企业印章。">
+          {getFieldDecorator('companyId', {
+            rules: [{ required: true, message: ' 请选择关联企业' }],
+          })(<SelectCompany onSuccess={e => companyOnSuccess(e)}/>)}
+          {getFieldDecorator('companyName', {initialValue:companyName,
+            rules: [{ required: true, message: ' 请选择关联业务' }],
+          })(<Input  hidden={true}/>)}
+        </Form.Item>
+        <Form.Item label="甲方印章" >
+          {getFieldDecorator('sealId', {
+            rules: [{ required: true, message: ' 请选择企业印章' }],
+          })(<SelectSeal onSuccess={e => sealOnSuccess(e)}/>)}
+        </Form.Item>
+        <Form.Item label="甲方签章定位关键字" help="关键字为合同文件中的文字内容（能被ctrl+f 查找功能检索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均可能会盖上指定用户的电子章，建议关键字在合同中保持唯一。">
+          {getFieldDecorator('signatoryKeywords', {
+            rules: [{ required: true, message: '请输入甲方签章定位关键字' }],
+          })(<Input maxLength={20} style={{width:'400px'}}/>)}
+        </Form.Item>
+        <Form.Item label="甲方关键字签章策略"> 
+          {getFieldDecorator('signatoryStrategy', {
+              rules: [{ required: true, message: '请选择甲方关键字签章策略' }],
+            })(<Select placeholder="甲方关键字签章策略" style={{ width: '400px' }}>
+            <Option value="last">最后一个关键字签章</Option>
+            <Option value="all">所有关键字签章</Option>
+            <Option value="first">第一给关键字签章</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item label="乙方签章定位关键字" help="关键字为合同文件中的文字内容（能被ctrl+f 查找功能检索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均可能会盖上指定用户的电子章，建议关键字在合同中保持唯一。">
+          {getFieldDecorator('customerKeywords', {
+            rules: [{ required: true, message: '请输入乙方签章定位关键字' }],
+          })(<Input maxLength={20} style={{width:'400px'}}/>)}
+        </Form.Item>
+        <Form.Item label="乙方关键字签章策略"> 
+          {getFieldDecorator('customerStrategy', {
+              rules: [{ required: true, message: '请选择乙方关键字签章策略' }],
+            })(<Select placeholder="乙方关键字签章策略" style={{ width: '400px' }}>
+            <Option value="last">最后一个关键字签章</Option>
+            <Option value="all">所有关键字签章</Option>
+            <Option value="first">第一给关键字签章</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item label="发布状态"> 
+          {getFieldDecorator('status', {
+              rules: [{ required: true, message: '请选择发布状态' }],
+            })(<Select placeholder="发布状态" style={{ width: '400px' }}>
+            <Option value='0'>否</Option>
+            <Option value='1'>是</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
+          <Button type="primary" htmlType="submit"style={{marginRight:'20px'}}>
+            确定
+          </Button>
+          <Button onClick={() => router.go(-1)}>
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/eContract/businessConfig/components/SelectCompany.jsx

@@ -1,11 +1,12 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col } from 'antd';
-import { apis, fetch } from '../../../../utils/request';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col,Icon } from 'antd';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import moment from 'moment';
 
 const { Column, ColumnGroup } = Table;
-const getH5List = fetch(apis.h5Activity.EffectiveList)
 const { Search } = Input;
-export default props => {
+const SelectContractTemp = props => {
   const {
     value,
     onChange,
@@ -14,43 +15,29 @@ export default props => {
 
   const [list, setList] = useState([]);
   const [visible, setVisible] = useState(false);
-  const [group, setGroup] = useState({ groupId: undefined, groupName: '合同标题' })
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '甲方企业' })
   const getGroupTitle = val => {
-    return (list.filter(x => x.drainageId == val)[0] || {}).name || '请选择'
+    return (list.filter(x => x.companyId == val)[0] || {}).companyName || '请选择'
   }
   const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
 
   const buildingId = props.buildingId
 
   useEffect(() => {
-    getH5List({
-      params: {
-        pageNum: 1,
-        pageSize: 999,
-        isMiniapp: 1,
-        status: 1,
-        buildingId,
-      },
-    }).then(data => {
+    getList({ pageNum: 1, pageSize: 10 })
+  }, [buildingId]);
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.taEcontract.taCompanyList, params: { ...params } }).then((data) => {
       setList(data.records || [])
 
       updateGroup(buildingId ? undefined : value);
     })
-  }, [buildingId]);
-  const searchH5 = (e) => {
-    getH5List({
-      params: {
-        pageNum: 1,
-        pageSize: 999,
-        isMiniapp: 1,
-        status: 1,
-        name: e
-      },
-    }).then(data => {
-      setList(data.records || [])
+  }
 
-      updateGroup(value ? undefined : value);
-    })
+  const searchContractTemp = (e) => {
+    getList({ pageNum: 1, pageSize: 10 })
   }
 
   if (value !== group.groupId) {
@@ -68,19 +55,61 @@ export default props => {
     props.onSuccess(val.name);
   }
 
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    e.stopPropagation();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, companyName: values.companyName, companyCode: values.companyCode })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset () {
+    props.form.resetFields();
+  }
+
   const clearVal = val => {
     onChange(val)
-    setVisible(false)
   }
 
   const columns = [
     {
-      title: '标题',
-      dataIndex: 'name',
-      key: 'drainageId',
+      title: '企业名称',
+      dataIndex: 'companyName',
+      key: 'companyName',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '企业编号',
+      dataIndex: 'companyCode',
+      key: 'companyCode',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '实名认证状态',
+      dataIndex: 'certifiedStatus',
+      key: 'certifiedStatus',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '印章数',
+      dataIndex: 'sealNum',
+      key: 'sealNum',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '自动签章授权状态',
+      dataIndex: 'authorizeStatus',
+      key: 'authorizeStatus',
       align: 'center',
       ellipsis: true,
-      render: text => <a>{text}</a>,
     },
     {
       title: '操作',
@@ -88,40 +117,57 @@ export default props => {
       width: '20%',
       render: (text, record) => (
         <span>
-          <a onClick={() => setData({id:record.drainageId, name:record.name})} style={{ color: 'blue' }}>选择</a>
+          <a onClick={() => setData({id:record.companyId, name:record.companyName})} style={{ color: 'blue' }}>选择</a>
         </span>
       ),
     },
   ];
 
+  const { getFieldDecorator } = props.form
+
   return (
     <div>
       <div>{group.groupName}<a style={{marginLeft:'30px', color: 'blue' }} onClick={() => setVisible(true)}>选择关联企业</a></div>
       <Modal
-        title="请选择"
+        title="选择关联企业"
         visible={visible}
         onCancel={() => setVisible(false)}
         footer={[]}
+        width={900}
       >
-        <Row>
-          <Col span={18}>
-            <Search
-              placeholder="请输入标题"
-              enterButton="搜索"
-              size="default"
-              allowClear="true"
-              onSearch={value => searchH5(value)}
-              style={{ marginBottom: '16px' }}
-            />
-          </Col>
-          <Col span={4} offset={1}>
-            <Button type="primary" onClick={()=>clearVal('')}>重置</Button>
-          </Col>
-        </Row>
-
-        <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} />
+        <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>
+          <Button type="primary" htmlType="submit" >
+                 搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                 重置
+          </Button>     
+        </Form.Item>
+      </Form>
+      <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} />
 
       </Modal>
     </div>
   )
 }
+
+const WrappedHeader = Form.create({ name: 'SelectContractTemp' })(SelectContractTemp);
+
+export default WrappedHeader

src/pages/eContract/businessConfig/components/SelectContractTemp.jsx

@@ -1,11 +1,12 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col } from 'antd';
-import { apis, fetch } from '../../../../utils/request';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col,Icon } from 'antd';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import moment from 'moment';
 
 const { Column, ColumnGroup } = Table;
-const getH5List = fetch(apis.h5Activity.EffectiveList)
 const { Search } = Input;
-export default props => {
+const SelectContractTemp = props => {
   const {
     value,
     onChange,
@@ -16,41 +17,27 @@ export default props => {
   const [visible, setVisible] = useState(false);
   const [group, setGroup] = useState({ groupId: undefined, groupName: '合同标题' })
   const getGroupTitle = val => {
-    return (list.filter(x => x.drainageId == val)[0] || {}).name || '请选择'
+    return (list.filter(x => x.contractTemplateId == val)[0] || {}).contractTemplateName || '请选择'
   }
   const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
 
   const buildingId = props.buildingId
 
   useEffect(() => {
-    getH5List({
-      params: {
-        pageNum: 1,
-        pageSize: 999,
-        isMiniapp: 1,
-        status: 1,
-        buildingId,
-      },
-    }).then(data => {
+    getList({ pageNum: 1, pageSize: 10 })
+  }, [buildingId]);
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.taEcontract.taContractTemplateList, params: { ...params } }).then((data) => {
       setList(data.records || [])
 
       updateGroup(buildingId ? undefined : value);
     })
-  }, [buildingId]);
-  const searchH5 = (e) => {
-    getH5List({
-      params: {
-        pageNum: 1,
-        pageSize: 999,
-        isMiniapp: 1,
-        status: 1,
-        name: e
-      },
-    }).then(data => {
-      setList(data.records || [])
+  }
 
-      updateGroup(value ? undefined : value);
-    })
+  const searchContractTemp = (e) => {
+    getList({ pageNum: 1, pageSize: 10 })
   }
 
   if (value !== group.groupId) {
@@ -65,22 +52,51 @@ export default props => {
     updateGroup(val.id)
     onChange(val.id)
     setVisible(false)
-    props.onSuccess(val.name);
+    props.onSuccess(val);
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    e.stopPropagation();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, contractTemplateName:values.contractTemplateName })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset () {
+    props.form.resetFields();
   }
 
   const clearVal = val => {
     onChange(val)
-    setVisible(false)
   }
 
   const columns = [
     {
-      title: '标题',
-      dataIndex: 'name',
-      key: 'drainageId',
+      title: '合同编号',
+      dataIndex: 'contractTemplateId',
+      key: 'contractTemplateId',
       align: 'center',
       ellipsis: true,
-      render: text => <a>{text}</a>,
+    },
+    {
+      title: '合同标题',
+      dataIndex: 'contractTemplateName',
+      key: 'contractTemplateName',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '新增时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      ellipsis: true,
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
     },
     {
       title: '操作',
@@ -88,40 +104,48 @@ export default props => {
       width: '20%',
       render: (text, record) => (
         <span>
-          <a onClick={() => setData({id:record.drainageId, name:record.name})} style={{ color: 'blue' }}>选择</a>
+          <a onClick={() => setData({id:record.contractTemplateId, name:record.contractTemplateName})} style={{ color: 'blue' }}>选择</a>
         </span>
       ),
     },
   ];
 
+  const { getFieldDecorator } = props.form
+
   return (
     <div>
       <div>{group.groupName}<a style={{marginLeft:'30px', color: 'blue' }} onClick={() => setVisible(true)}>选择合同模板</a></div>
       <Modal
-        title="请选择"
+        title="选择合同模板"
         visible={visible}
         onCancel={() => setVisible(false)}
         footer={[]}
       >
-        <Row>
-          <Col span={18}>
-            <Search
-              placeholder="请输入标题"
-              enterButton="搜索"
-              size="default"
-              allowClear="true"
-              onSearch={value => searchH5(value)}
-              style={{ marginBottom: '16px' }}
-            />
-          </Col>
-          <Col span={4} offset={1}>
-            <Button type="primary" onClick={()=>clearVal('')}>重置</Button>
-          </Col>
-        </Row>
-
-        <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} />
+        <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('contractTemplateName')(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="合同标题"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" >
+                 搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                 重置
+          </Button>     
+        </Form.Item>
+      </Form>
+      <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} />
 
       </Modal>
     </div>
   )
 }
+
+const WrappedHeader = Form.create({ name: 'SelectContractTemp' })(SelectContractTemp);
+
+export default WrappedHeader

src/pages/eContract/businessConfig/components/SelectRaise.jsx

@@ -1,11 +1,13 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col } from 'antd';
-import { apis, fetch } from '../../../../utils/request';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col,Icon } from 'antd';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import BuildSelect from '../../../../components/SelectButton/BuildSelect'
+import moment from 'moment';
 
 const { Column, ColumnGroup } = Table;
-const getH5List = fetch(apis.h5Activity.EffectiveList)
 const { Search } = Input;
-export default props => {
+const SelectContractTemp = props => {
   const {
     value,
     onChange,
@@ -14,43 +16,29 @@ export default props => {
 
   const [list, setList] = useState([]);
   const [visible, setVisible] = useState(false);
-  const [group, setGroup] = useState({ groupId: undefined, groupName: '合同标题' })
+  const [group, setGroup] = useState({ groupId: undefined, groupName: '关联业务' })
   const getGroupTitle = val => {
-    return (list.filter(x => x.drainageId == val)[0] || {}).name || '请选择'
+    return (list.filter(x => x.raiseId == val)[0] || {}).salesBatchName || '请选择'
   }
   const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
 
   const buildingId = props.buildingId
 
   useEffect(() => {
-    getH5List({
-      params: {
-        pageNum: 1,
-        pageSize: 999,
-        isMiniapp: 1,
-        status: 1,
-        buildingId,
-      },
-    }).then(data => {
+    getList({ pageNum: 1, pageSize: 10 })
+  }, [buildingId]);
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.house.taRaiseList, params: { ...params } }).then((data) => {
       setList(data.records || [])
 
       updateGroup(buildingId ? undefined : value);
     })
-  }, [buildingId]);
-  const searchH5 = (e) => {
-    getH5List({
-      params: {
-        pageNum: 1,
-        pageSize: 999,
-        isMiniapp: 1,
-        status: 1,
-        name: e
-      },
-    }).then(data => {
-      setList(data.records || [])
+  }
 
-      updateGroup(value ? undefined : value);
-    })
+  const searchContractTemp = (e) => {
+    getList({ pageNum: 1, pageSize: 10 })
   }
 
   if (value !== group.groupId) {
@@ -68,19 +56,66 @@ export default props => {
     props.onSuccess(val.name);
   }
 
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    e.stopPropagation();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, buildingId:values.buildingId, salesBatchName:values.salesBatchName })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset () {
+    props.form.resetFields();
+  }
+
   const clearVal = val => {
     onChange(val)
-    setVisible(false)
   }
 
   const columns = [
     {
-      title: '标题',
-      dataIndex: 'name',
-      key: 'drainageId',
+      title: '销售批次名',
+      dataIndex: 'salesBatchName',
+      key: 'salesBatchName',
       align: 'center',
-      ellipsis: true,
-      render: text => <a>{text}</a>,
+    },
+    {
+      title: '楼盘名称',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+    },
+    {
+      title: '认筹开始时间',
+      dataIndex: 'raiseStartTime',
+      key: 'raiseStartTime',
+      align: 'center',
+      render: (x, row) => <><span>{`${moment(row.raiseStartTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    },
+    {
+      title: '认筹结束时间',
+      dataIndex: 'raiseEndTime',
+      key: 'raiseEndTime',
+      align: 'center',
+      render: (x, row) => <><span>{`${moment(row.raiseEndTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+    },
+    {
+      title: '锁房方式',
+      dataIndex: 'houseLockingType',
+      key: 'houseLockingType',
+      align: 'center',
+      render: (x, row) => <><span>{row.houseLockingType == 'auto' ? "自动锁房" : "手动锁房"}</span></>,
+    },
+    {
+      title: '缴费方式',
+      dataIndex: 'payType',
+      key: 'payType',
+      align: 'center',
+      render: (x, row) => <><span>{row.payType == 'offLine' ? "线下缴费" : row.payType == 'onLine' ? "线上缴费" : "线上缴费，线下缴费"}</span></>,
     },
     {
       title: '操作',
@@ -88,40 +123,54 @@ export default props => {
       width: '20%',
       render: (text, record) => (
         <span>
-          <a onClick={() => setData({id:record.drainageId, name:record.name})} style={{ color: 'blue' }}>选择</a>
+          <a onClick={() => setData({id:record.raiseId, name:record.salesBatchName})} style={{ color: 'blue' }}>选择</a>
         </span>
       ),
     },
   ];
 
+  const { getFieldDecorator } = props.form
+
   return (
     <div>
       <div>{group.groupName}<a style={{marginLeft:'30px', color: 'blue' }} onClick={() => setVisible(true)}>选择关联业务</a></div>
       <Modal
-        title="请选择"
+        title="选择关联业务"
         visible={visible}
         onCancel={() => setVisible(false)}
         footer={[]}
+        width={900}
       >
-        <Row>
-          <Col span={18}>
-            <Search
-              placeholder="请输入标题"
-              enterButton="搜索"
-              size="default"
-              allowClear="true"
-              onSearch={value => searchH5(value)}
-              style={{ marginBottom: '16px' }}
-            />
-          </Col>
-          <Col span={4} offset={1}>
-            <Button type="primary" onClick={()=>clearVal('')}>重置</Button>
-          </Col>
-        </Row>
-
-        <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} />
+        <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('salesBatchName')(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="销售批次名"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" >
+                 搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                 重置
+          </Button>     
+        </Form.Item>
+      </Form>
+      <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} />
 
       </Modal>
     </div>
   )
 }
+
+const WrappedHeader = Form.create({ name: 'SelectContractTemp' })(SelectContractTemp);
+
+export default WrappedHeader

src/pages/eContract/businessConfig/components/SelectSeal.jsx

@@ -1,11 +1,12 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col } from 'antd';
-import { apis, fetch } from '../../../../utils/request';
+import { Form, Select, Modal, Button, Table, Divider, Tag, Input,Row,Col,Icon, Avatar } from 'antd';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import moment from 'moment';
 
 const { Column, ColumnGroup } = Table;
-const getH5List = fetch(apis.h5Activity.EffectiveList)
 const { Search } = Input;
-export default props => {
+const SelectContractTemp = props => {
   const {
     value,
     onChange,
@@ -16,41 +17,27 @@ export default props => {
   const [visible, setVisible] = useState(false);
   const [group, setGroup] = useState({ groupId: undefined, groupName: '合同标题' })
   const getGroupTitle = val => {
-    return (list.filter(x => x.drainageId == val)[0] || {}).name || '请选择'
+    return (list.filter(x => x.sealId == val)[0] || {}).sealImg || '请选择'
   }
   const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
 
   const buildingId = props.buildingId
 
   useEffect(() => {
-    getH5List({
-      params: {
-        pageNum: 1,
-        pageSize: 999,
-        isMiniapp: 1,
-        status: 1,
-        buildingId,
-      },
-    }).then(data => {
+    getList({ pageNum: 1, pageSize: 10 })
+  }, [buildingId]);
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.taEcontract.taCompanySealList, params: { ...params } }).then((data) => {
       setList(data.records || [])
 
       updateGroup(buildingId ? undefined : value);
     })
-  }, [buildingId]);
-  const searchH5 = (e) => {
-    getH5List({
-      params: {
-        pageNum: 1,
-        pageSize: 999,
-        isMiniapp: 1,
-        status: 1,
-        name: e
-      },
-    }).then(data => {
-      setList(data.records || [])
+  }
 
-      updateGroup(value ? undefined : value);
-    })
+  const searchContractTemp = (e) => {
+    getList({ pageNum: 1, pageSize: 10 })
   }
 
   if (value !== group.groupId) {
@@ -68,19 +55,56 @@ export default props => {
     props.onSuccess(val.name);
   }
 
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    e.stopPropagation();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, sealName:values.sealName })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset () {
+    props.form.resetFields();
+  }
+
   const clearVal = val => {
     onChange(val)
-    setVisible(false)
   }
 
   const columns = [
     {
-      title: '标题',
-      dataIndex: 'name',
-      key: 'drainageId',
+      title: '印章编号',
+      dataIndex: 'sealId',
+      key: 'sealId',
+      align: 'center',
+      ellipsis: true,
+    },
+    {
+      title: '印章名称',
+      dataIndex: 'sealName',
+      key: 'sealName',
       align: 'center',
       ellipsis: true,
-      render: text => <a>{text}</a>,
+    },
+    {
+      title: '印章图',
+      dataIndex: 'sealImg',
+      key: 'sealImg',
+      align: 'center',
+      ellipsis: true,
+      render: (_, record) => <Avatar shape="square" style={{color: 'blue',cursor: 'pointer'}} src={record.sealImg} size={64} icon="user" />,
+    },
+    {
+      title: '印章上传时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      ellipsis: true,
+      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
     },
     {
       title: '操作',
@@ -88,40 +112,52 @@ export default props => {
       width: '20%',
       render: (text, record) => (
         <span>
-          <a onClick={() => setData({id:record.drainageId, name:record.name})} style={{ color: 'blue' }}>选择</a>
+          <a onClick={() => setData({id:record.sealId, name:record.sealName})} style={{ color: 'blue' }}>选择</a>
         </span>
       ),
     },
   ];
 
+  const { getFieldDecorator } = props.form
+
   return (
     <div>
-      <div>{group.groupName}<a style={{marginLeft:'30px', color: 'blue' }} onClick={() => setVisible(true)}>选择企业印章</a></div>
+      <div>
+        <Avatar shape="square" style={{color: 'blue',cursor: 'pointer'}} src={group.groupName} size={54} icon="user" />
+        <a style={{marginLeft:'30px', color: 'blue' }} onClick={() => setVisible(true)}>选择企业印章</a>
+      </div>
       <Modal
-        title="请选择"
+        title="选择企业印章"
         visible={visible}
         onCancel={() => setVisible(false)}
         footer={[]}
+        width={900}
       >
-        <Row>
-          <Col span={18}>
-            <Search
-              placeholder="请输入标题"
-              enterButton="搜索"
-              size="default"
-              allowClear="true"
-              onSearch={value => searchH5(value)}
-              style={{ marginBottom: '16px' }}
-            />
-          </Col>
-          <Col span={4} offset={1}>
-            <Button type="primary" onClick={()=>clearVal('')}>重置</Button>
-          </Col>
-        </Row>
-
-        <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} />
+        <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('sealName')(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="印章名称"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" >
+                 搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                 重置
+          </Button>     
+        </Form.Item>
+      </Form>
+      <Table rowKey={list => list.drainageId} columns={columns} dataSource={list} />
 
       </Modal>
     </div>
   )
 }
+
+const WrappedHeader = Form.create({ name: 'SelectContractTemp' })(SelectContractTemp);
+
+export default WrappedHeader

src/pages/eContract/businessConfig/detail.jsx

@@ -20,28 +20,46 @@ import SelectSeal from './components/SelectSeal';
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
-let cityId = ''
 
 const header = props => {
-  const { salesBatchId } = props.location.query
-  const [ saleBatchData, setSaleBatchData ] = useState({})
-  const [showHelp, setShowHelp] = useState(false)
+  const contractBusinessId = props.location.query.id
+  const [ contractBusinessData, setContractBusinessData ] = useState({})
 
   const [targetName, setTargetName] = useState({})
   const [companyName, setCompanyName] = useState({})
   const [contractTemplateName, setContractTemplateName] = useState({})
-  // const [targetName, setTargetName] = useState({})
+  const [contractTemplateLink, setContractTemplateLink] = useState('')
+
+  if(contractBusinessId){
+    useEffect(() => {
+      getContractBusinessData(contractBusinessId);
+    },[])
+
+  // 查询列表
+  const getContractBusinessData = (contractBusinessId) => {
+    request({ ...apis.taEcontract.taContractBusinessById, urlData: {id: contractBusinessId} }).then((data) => {
+        setContractBusinessData(data)
+        request({ ...apis.taEcontract.taContractTemplateById, urlData: {id: data.contractTemplateId} }).then((data) => {
+          setContractTemplateLink(data.contractTemplateAddress)
+        })
+    }) 
+  }
+  }
+
 
   const cancelPage = () =>{
     router.push({
-      pathname: '/activity/liveActivity/list',
+      pathname: '/eContract/businessConfig/list',
     });
   }
 
    //打开新页面
    const openIndexImg = () => {
-    const newWin=window.open('about:blank');
-    newWin.location.href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%95%99%E7%A8%8B.png"
+     if(contractTemplateLink){
+      window.open(contractTemplateLink);
+     }else{
+       message.info('请选择合同模板');
+     }
   }
 
   function highlightsTypeChange(e) {
@@ -49,7 +67,6 @@ const header = props => {
   }
 
   function disabledDate(current) {
-    // Can not select days before today and today
     return current && current < moment().endOf('day');
   }
 
@@ -60,7 +77,11 @@ const header = props => {
 
   function contractOnSuccess(e){
     console.log('contractOnSuccess', e)
-    setContractTemplateName(e)
+    setContractTemplateName(e.name)
+    request({ ...apis.taEcontract.taContractTemplateById, urlData: {id: e.id} }).then((data) => {
+      setContractTemplateLink(data.contractTemplateAddress)
+      console.log(contractTemplateLink,'dddddddddd')
+    })
   }
 
   function targetOnSuccess(e){
@@ -76,10 +97,10 @@ const header = props => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err){
-        request({ ...apis.taEcontract.addTaContractBusiness, data: { ...values },}).then((data) => {
+        request({ ...apis.taEcontract.updateTaContractBusinessById, urlData: {id: contractBusinessId}, data: { ...values },}).then((data) => {
           message.info("保存成功")
           router.push({
-            pathname: '/activity/liveActivity/list/index',
+            pathname: '/eContract/businessConfig/list',
           });
         }).catch((err) => {
           message.info(err.msg || err.message)
@@ -94,10 +115,10 @@ const header = props => {
     <>
       <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
         <Form.Item label="合同标题">
-          {getFieldDecorator('contractTemplateId', {
+          {getFieldDecorator('contractTemplateId', {initialValue:contractBusinessData.contractTemplateId,
             rules: [{ required: true, message: ' 请选择合同模板' }],
           })(<SelectContractTemp  onSuccess={e => contractOnSuccess(e)}/>)}
-          {getFieldDecorator('contractTemplateName', {initialValue:contractTemplateName,
+          {getFieldDecorator('contractTemplateName', {initialValue:contractBusinessData.contractTemplateName,
             rules: [{ required: true, message: ' 请选择关联业务' }],
           })(<Input  hidden={true}/>)}
         </Form.Item>
@@ -105,40 +126,40 @@ const header = props => {
           {getFieldDecorator('contractTemplateId')}<Button type="danger" style={{marginRight:'20px'}} onClick={openIndexImg}>查看文件</Button>
         </Form.Item>
         <Form.Item label="关联业务类型"> 
-          {getFieldDecorator('targetType', {
+          {getFieldDecorator('targetType', {initialValue:contractBusinessData.targetType,
               rules: [{ required: true, message: '请选择发布状态' }],
             })(<Select placeholder="关联业务类型" style={{ width: '400px' }}>
             <Option value="raise">房源认筹</Option>
           </Select>)}
         </Form.Item>
         <Form.Item label="关联业务">
-          {getFieldDecorator('targetId', {
+          {getFieldDecorator('targetId', {initialValue:contractBusinessData.targetId,
             rules: [{ required: true, message: ' 请选择关联业务' }],
           })(<SelectRaise onSuccess={e => targetOnSuccess(e)}/>)}
-          {getFieldDecorator('targetName', {initialValue:targetName,
+          {getFieldDecorator('targetName', {initialValue:contractBusinessData.targetName,
             rules: [{ required: true, message: ' 请选择关联业务' }],
           })(<Input  hidden={true}/>)}
         </Form.Item>
         <Form.Item label="甲方" help="系统会在业务需要时自动签所选企业印章，比如用户在签署认筹合同前系统会自动签署企业印章。">
-          {getFieldDecorator('companyId', {
+          {getFieldDecorator('companyId', {initialValue:contractBusinessData.companyId,
             rules: [{ required: true, message: ' 请选择关联企业' }],
           })(<SelectCompany onSuccess={e => companyOnSuccess(e)}/>)}
-          {getFieldDecorator('companyName', {initialValue:companyName,
+          {getFieldDecorator('companyName', {initialValue:contractBusinessData.companyName,
             rules: [{ required: true, message: ' 请选择关联业务' }],
           })(<Input  hidden={true}/>)}
         </Form.Item>
         <Form.Item label="甲方印章" >
-          {getFieldDecorator('sealId', {
+          {getFieldDecorator('sealId', {initialValue:contractBusinessData.sealId,
             rules: [{ required: true, message: ' 请选择企业印章' }],
           })(<SelectSeal onSuccess={e => sealOnSuccess(e)}/>)}
         </Form.Item>
         <Form.Item label="甲方签章定位关键字" help="关键字为合同文件中的文字内容（能被ctrl+f 查找功能检索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均可能会盖上指定用户的电子章，建议关键字在合同中保持唯一。">
-          {getFieldDecorator('signatoryKeywords', {
+          {getFieldDecorator('signatoryKeywords', {initialValue:contractBusinessData.signatoryKeywords,
             rules: [{ required: true, message: '请输入甲方签章定位关键字' }],
           })(<Input maxLength={20} style={{width:'400px'}}/>)}
         </Form.Item>
         <Form.Item label="甲方关键字签章策略"> 
-          {getFieldDecorator('signatoryStrategy', {
+          {getFieldDecorator('signatoryStrategy', {initialValue:contractBusinessData.signatoryStrategy,
               rules: [{ required: true, message: '请选择甲方关键字签章策略' }],
             })(<Select placeholder="甲方关键字签章策略" style={{ width: '400px' }}>
             <Option value="last">最后一个关键字签章</Option>
@@ -147,12 +168,12 @@ const header = props => {
           </Select>)}
         </Form.Item>
         <Form.Item label="乙方签章定位关键字" help="关键字为合同文件中的文字内容（能被ctrl+f 查找功能检索到）。法大大按此关键字进行签章位置的定位，将电子章盖在这个关键字上面。凡出现关键字的地方均可能会盖上指定用户的电子章，建议关键字在合同中保持唯一。">
-          {getFieldDecorator('customerKeywords', {
+          {getFieldDecorator('customerKeywords', {initialValue:contractBusinessData.customerKeywords,
             rules: [{ required: true, message: '请输入乙方签章定位关键字' }],
           })(<Input maxLength={20} style={{width:'400px'}}/>)}
         </Form.Item>
         <Form.Item label="乙方关键字签章策略"> 
-          {getFieldDecorator('customerStrategy', {
+          {getFieldDecorator('customerStrategy', {initialValue:contractBusinessData.customerStrategy,
               rules: [{ required: true, message: '请选择乙方关键字签章策略' }],
             })(<Select placeholder="乙方关键字签章策略" style={{ width: '400px' }}>
             <Option value="last">最后一个关键字签章</Option>
@@ -160,12 +181,12 @@ const header = props => {
             <Option value="first">第一给关键字签章</Option>
           </Select>)}
         </Form.Item>
-        <Form.Item label="发布状态"> 
-          {getFieldDecorator('status', {
+        <Form.Item label="发布状态">
+          {getFieldDecorator('status', {initialValue:contractBusinessData.status,
               rules: [{ required: true, message: '请选择发布状态' }],
-            })(<Select placeholder="发布状态" style={{ width: '400px' }}>
-            <Option value='0'>否</Option>
-            <Option value='1'>是</Option>
+            })(<Select placeholder="发布状态" style={{ width: '300px' }}>
+            <Option value={0}>否</Option>
+            <Option value={1}>是</Option>
           </Select>)}
         </Form.Item>
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>

src/pages/eContract/businessConfig/list.jsx

@@ -46,7 +46,7 @@ const header = props => {
       router.push({
       pathname: '/eContract/businessConfig/detail',
       query: {
-        id: rowData.demandId,
+        id: rowData.contractBusinessId,
       },
     });
       return
@@ -72,7 +72,7 @@ const header = props => {
       dataIndex: 'targetType',
       key: 'targetType',
       align: 'center',
-      
+      render: (x, row) => <><span>{row.targetType === 'raise' ? '房源认筹' : ''}</span></>
     },
     {
       title: '关联业务标题',
@@ -162,8 +162,10 @@ const header = props => {
     }
   }
 
-  function addDemandInfo(e){
-    setAddDemand(e);
+  function addContractManage(){
+    router.push({
+      pathname: '/eContract/businessConfig/add',
+    });
   }
 
   const { getFieldDecorator } = props.form
@@ -227,7 +229,7 @@ const header = props => {
         </Form.Item>
       </Form>
       <AuthButton name="admin.h5Demand.add.post" noRight={null}>
-        <Button type="danger" onClick={() => addDemandInfo({visable:true})} className={styles.addBtn}>新增</Button>
+        <Button type="danger" onClick={() => addContractManage()} className={styles.addBtn}>新增</Button>
       </AuthButton>
       <AuthButton name="admin.h5Demand.del" noRight={null}>
         <Button type="primary" onClick={() => showBatchDel({visable:true, demandIds: demandIds})} className={styles.addBtn} style={{marginLeft:'30px'}}>删除</Button>

src/services/apis.js

@@ -1502,6 +1502,30 @@ export default {
       url: `${prefix}/taContractTemplate/:id`,
       action: 'admin.getContractTemplate.get',
     },
-    
+    listContractTemplate: {
+      method: 'GET',
+      url: `${prefix}/taContractTemplate`,
+      action: 'admin.listContractTemplate.get',
+    },
+    addContractTemplate: {
+      method: 'post',
+      url: `${prefix}/contract/template/add`,
+      action: 'admin.addContractTemplate.post',
+    },
+    batchDeleteContractTemplate: {
+      method: 'put',
+      url: `${prefix}/contract/template/batchDelete`,
+      action: 'admin.batchDeleteContractTemplate.put',
+    },
+    updateContractTemplate: {
+      method: 'put',
+      url: `${prefix}/contract/template/update/:id`,
+      action: 'admin.updateContractTemplate.put',
+    },
+    getContractTemplate: {
+      method: 'get',
+      url: `${prefix}/taContractTemplate/:id`,
+      action: 'admin.getContractTemplate.get',
+    },
   },
 }