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

src/pages/eContract/relatedOrganization/add.jsx

@@ -51,7 +51,7 @@ function header(props) {
     ent = value.companyId
     setCurrent(1)
     setStatus({
-      enttitle: "选择已认证企业",
+      // enttitle: "选择已认证企业",
       ent: "finish",
       org: "process",
       disabled: false,
@@ -74,7 +74,7 @@ function header(props) {
         onChange={onChange}
         className="site-navigation-steps"
       >
-        <Step status={status.ent} title="选择已认证企业" disabled />
+        <Step status={status.ent} title="选择已认证企业"  />
         <Step status={status.org} title="选择关联的组织" disabled />
       </Steps>
 

src/pages/eContract/seal/components/AuthRes.jsx

@@ -6,6 +6,7 @@ import apis from '../../../../services/apis';
 
 const AuthRes = props => {
   const authRes = props.authInfo
+  console.log(authRes, 'authRes')
 
   return (
     <Modal footer={null} title="授权信息" visible={props.visable} onCancel={props.onCancel} width={800}>
@@ -14,7 +15,7 @@ const AuthRes = props => {
           <span>{authRes.status === 1 ? '已授权':'未授权'}</span>
         </Form.Item>
         <Form.Item label="授权类型">
-          <span>{authRes.authType === 'onLine' ? '接口线上授权': authRes.authType === 'offLine' ? '线下管理员授权' : ''}</span>
+          <span>{authRes.authType === 1 ? '接口线上授权': authRes.authType === 2 ? '线下管理员授权' : ''}</span>
         </Form.Item>
         <Form.Item label="授权流水号">
         <span>{authRes.transactionId}</span>

src/pages/eContract/seal/components/Authorize.jsx

@@ -42,6 +42,12 @@ const header = props => {
       })
     }
 
+     //打开新页面
+   const openIndexImg = (e) => {
+    const newWin=window.open('about:blank');
+    newWin.location.href = e
+  }
+  
     const openFddUrl = (data) => {
       window.open(data)
     }
@@ -79,7 +85,7 @@ const header = props => {
           <span>{data.authorizeTransactionId}</span>
         </Form.Item>
         <Form.Item label="授权签署地址">
-        <span>{data.authorizeAddress}</span>
+        <span><a onClick={(e) => openIndexImg(data.authorizeAddress)} style={{ color: 'blue' }}> {data.authorizeAddress}</a></span>
         </Form.Item>
         <Form.Item label="合同编号">
         <span>{data.contractId}</span>

src/pages/eContract/seal/list.jsx

@@ -23,7 +23,7 @@ function header(props) {
 
   // 查询列表
   const getList = (params) => {
-    request({ ...apis.company.list, params: { ...params } }).then((data) => {
+    request({ ...apis.company.taCompanyList, params: { ...params } }).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -115,12 +115,11 @@ function header(props) {
     },
     {
       title: '实名认证状态',
-      dataIndex: 'certifiedStatus',
-      key: 'certifiedStatus',
+      dataIndex: 'status',
+      key: 'status',
       align: 'center',
-      render: (x, row) => {
-        if(row.certifiedStatus === 'certification'){return '审核通过'}
-      },
+      render: (status) => <span>{status === 0 ? '未认证' : status === 1 ? "管理员资料已提交" : status === 2 ? "企业基本资料（没有申请表）已提交" : status === 3 ? "已提交待审核" : 
+      status === 4 ? '审核通过' : status === 5 ? "审核不通过" : status === 6 ? "人工初审通过" : "" }</span>,
     },
     {
       title: '印章数',
@@ -133,9 +132,7 @@ function header(props) {
       dataIndex: 'authorizeStatus',
       key: 'authorizeStatus',
       align: 'center',
-      render: (x, row) => {
-        if(row.authorizeStatus === 'certification'){return '审核通过'}
-      },
+      render: (authorizeStatus) => <span>{authorizeStatus === '3000' ? '已授权' : '未授权' }</span>,
     },
     {
       title: '操作',
@@ -176,28 +173,23 @@ 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>
         <Form.Item>
           {getFieldDecorator('authorizeStatus')(
             <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="3000">已授权</Select.Option>
+              <Select.Option value="3001">未授权</Select.Option>
             </Select>,
           )}
         </Form.Item>

src/pages/eContract/signedContract/index.jsx

@@ -125,8 +125,8 @@ function header(props) {
         },
         {
             title: '企业编号',
-            dataIndex: 'companyNumber',
-            key: 'companyNumber',
+            dataIndex: 'companyCode',
+            key: 'companyCode',
             align: 'center',
 
         },
@@ -233,7 +233,7 @@ function header(props) {
                     )}
                 </Form.Item>
                 <Form.Item>
-                    {getFieldDecorator('companyNumber')(
+                    {getFieldDecorator('companyCode')(
                         <Input
                             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                             placeholder="企业编号 "

src/services/apis.js

@@ -274,6 +274,11 @@ const apis = {
       url: `${prefix}/company/getAuthStatus/:id`,
       method: 'GET',
       action: 'channel',
+    },
+    taCompanyList: {
+      url: `${prefix}/taCompanyList`,
+      method: 'GET',
+      action: 'channel',
     }
   },
 
@@ -299,8 +304,10 @@ const apis = {
       action: 'channel',
     },
     delSealById: {
-      url: `${prefix}/delCompanySeal/:id`,
+      url: `${prefix}/deleteCompanySeal/:id`,
       method: 'PUT',
+      action: 'channel',
+    },
     refresh: {
       url: `${prefix}/company/fdd/:id`,
       method: 'GET',
@@ -311,7 +318,6 @@ const apis = {
       method: 'DELETE',
       action: 'channel',
     }
-  }
   }  
 }