魏超 5 years ago
parent
commit
30dbc17e3c

+ 0
- 5
src/pages/eContract/relatedOrganization/add.jsx View File

@@ -16,8 +16,6 @@ let ent = null
16 16
 
17 17
 function header(props) {
18 18
 
19
-  console.log(props, 'props')
20
-
21 19
   const [current, setCurrent] = useState()
22 20
   const [status, setStatus] = useState({})
23 21
 
@@ -51,7 +49,6 @@ function header(props) {
51 49
     ent = value.companyId
52 50
     setCurrent(1)
53 51
     setStatus({
54
-      // enttitle: "选择已认证企业",
55 52
       ent: "finish",
56 53
       org: "process",
57 54
       disabled: false,
@@ -59,8 +56,6 @@ function header(props) {
59 56
   };
60 57
 
61 58
   const onChoiceOrg = (value) => {
62
-    console.log("onChoiceOrg", value);
63
-    console.log("ent", ent);
64 59
     relation(value.orgId,ent )
65 60
 
66 61
 

+ 3
- 0
src/pages/eContract/relatedOrganization/components/enterprise.jsx View File

@@ -124,6 +124,9 @@ function header(props, ref) {
124 124
                         />,
125 125
                     )}
126 126
                 </Form.Item>
127
+                <Form.Item>
128
+                    <span style={{color:'#999'}}>列表仅显示实名认证状态为审核通过的企业。</span>
129
+                </Form.Item>
127 130
                 <Form.Item>
128 131
                     <Button type="primary" htmlType="submit" className={styles.searchBtn}>搜索</Button>
129 132
                     <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>

+ 7
- 7
src/pages/eContract/relatedOrganization/index.jsx View File

@@ -183,13 +183,13 @@ function header(props) {
183 183
                             <Select.Option value="3">已提交待审核</Select.Option>
184 184
                             <Select.Option value="4">审核不通过</Select.Option> */}
185 185
                             <Select.Option value="">全部</Select.Option>
186
-                            <Select.Option value="0">未认证</Select.Option>
187
-                            <Select.Option value="1">管理员资料已提交</Select.Option>
188
-                            <Select.Option value="2">企业基本资料(没有申请表)已提交</Select.Option>
189
-                            <Select.Option value="3">已提交待审核</Select.Option>
190
-                            <Select.Option value="4">审核通过</Select.Option>
191
-                            <Select.Option value="5">审核不通过</Select.Option>
192
-                            <Select.Option value="6">人工初核通过</Select.Option>
186
+                            <Select.Option value='0'>未认证</Select.Option>
187
+                            <Select.Option value='1'>管理员资料已提交</Select.Option>
188
+                            <Select.Option value='2'>企业基本资料(没有申请表)已提交</Select.Option>
189
+                            <Select.Option value='3'>已提交待审核</Select.Option>
190
+                            <Select.Option value='4'>审核通过</Select.Option>
191
+                            <Select.Option value='5'>审核不通过</Select.Option>
192
+                            <Select.Option value='6'>人工初核通过</Select.Option>
193 193
                         </Select>,
194 194
                     )}
195 195
                 </Form.Item>

+ 0
- 1
src/pages/eContract/seal/components/AuthRes.jsx View File

@@ -6,7 +6,6 @@ import apis from '../../../../services/apis';
6 6
 
7 7
 const AuthRes = props => {
8 8
   const authRes = props.authInfo
9
-  console.log(authRes, 'authRes')
10 9
 
11 10
   return (
12 11
     <Modal footer={null} title="授权信息" visible={props.visable} onCancel={props.onCancel} width={800}>

+ 5
- 7
src/pages/eContract/seal/components/Authorize.jsx View File

@@ -67,12 +67,10 @@ const header = props => {
67 67
     }
68 68
 
69 69
     function queryAuth(e){
70
-      console.log(e, 'eeadssa')
71 70
       setAuthRes({visable:e.visable, data: authData})
72 71
     }
73 72
 
74 73
     function closeAuth(e){
75
-      console.log(e, '1111111')
76 74
       setAuthRes({visable:e.visable, data: ''})
77 75
     }
78 76
     return (
@@ -85,22 +83,22 @@ const header = props => {
85 83
           <span>{data.authorizeTransactionId}</span>
86 84
         </Form.Item>
87 85
         <Form.Item label="授权签署地址">
88
-        <span><a onClick={(e) => openIndexImg(data.authorizeAddress)} style={{ color: 'blue' }}> {data.authorizeAddress}</a></span>
86
+        <span style={{wordWrap: 'break-word'}}><a onClick={(e) => openIndexImg(data.authorizeAddress)} style={{ color: 'blue' }}> {data.authorizeAddress}</a></span>
89 87
         </Form.Item>
90 88
         <Form.Item label="合同编号">
91 89
         <span>{data.contractId}</span>
92 90
         </Form.Item>
93 91
         <Form.Item label="签章结果">
94
-        <span>{data.authorizeStatus === '3000' ? '签章成功':'签章失败'}</span>
92
+        <span>{data.authorizeStatus === '3000' ? '签章成功': data.authorizeStatus === '3001'? '签章失败' :''}</span>
95 93
         </Form.Item>
96 94
         <Form.Item label="签章结果描述">
97 95
         <span>{data.authorizeDescription}</span>
98 96
         </Form.Item>
99 97
         <Form.Item label="下载地址">
100
-        <span>{data.authorizeDownloadUrl}</span>
98
+        <span style={{wordWrap: 'break-word'}}>{data.authorizeDownloadUrl}</span>
101 99
         </Form.Item>
102 100
         <Form.Item label="查看地址">
103
-        <span>{data.authorizeViewUrl}</span>
101
+        <span style={{wordWrap: 'break-word'}}>{data.authorizeViewUrl}</span>
104 102
         </Form.Item>
105 103
         {data.authorizeStatus === '3000' &&
106 104
         <Form.Item label="授权状态">
@@ -124,7 +122,7 @@ const header = props => {
124 122
         <Button style={{margin:'20px 10px'}} onClick={(e) => queryAuth({visable:true})}>查看授权</Button>
125 123
         <Button style={{margin:'20px 10px'}} onClick={() => back()} >返回</Button>
126 124
       </div>
127
-      <AuthRes visable={authRes.visable} authInfo={authRes.data} onCancel={() => closeAuth({visable:false, data:''})}></AuthRes>
125
+      <AuthRes visable={authRes.visable} authInfo={authRes.data} onCancel={() => closeAuth({visable:false})}></AuthRes>
128 126
       </>
129 127
     )
130 128
   }

+ 9
- 1
src/pages/eContract/seal/components/SealList.jsx View File

@@ -1,5 +1,5 @@
1 1
 import React, { useState, useEffect } from 'react';
2
-import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert, Tabs, Row, Col, Radio, tab, Avatar, Modal } from 'antd';
2
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert, Tabs, Row, Col, Radio, tab, Avatar, Modal, Pagination } from 'antd';
3 3
 import { FormattedMessage } from 'umi-plugin-react/locale';
4 4
 import XForm, { FieldTypes } from '../../../../components/XForm';
5 5
 import router from 'umi/router';
@@ -33,6 +33,11 @@ const header = props => {
33 33
       })
34 34
     }  
35 35
 
36
+    const changePageNum = (pageNumber) => {
37
+      let values  = props.form.getFieldsValue()
38
+      getCompanyData({ pageNum: pageNumber, pageSize: 10, ...values, companyId: companyId })
39
+    }
40
+
36 41
     const openFddUrl = () => {
37 42
       window.open(data.certifiedAddress)
38 43
     }
@@ -165,6 +170,9 @@ const header = props => {
165 170
         <AddSeal visible={sealInfo.visable} companyId={sealInfo.companyId} onCancel={e => setSealInfo(e)} onSuccess={e => getList(e)}/>  
166 171
         <UpdateSeal visible={updateSeal.visable} sealId={updateSeal.sealId} companyId={updateSeal.companyId} onCancel={e => updateOnCancel(e)} onSuccess={e => updateOnSuccess(e)}/>  
167 172
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
173
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
174
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
175
+      </div>
168 176
       </>
169 177
     )
170 178
   }

+ 1
- 1
src/pages/eContract/seal/list.jsx View File

@@ -174,7 +174,7 @@ function header(props) {
174 174
         </Form.Item>
175 175
         <Form.Item>
176 176
           {getFieldDecorator('status')(
177
-            <Select style={{ width: '180px' }} placeholder="实名认证状态">
177
+            <Select style={{ width: '270px' }} placeholder="实名认证状态">
178 178
               <Select.Option value="0">未认证</Select.Option>
179 179
               <Select.Option value="1">管理员资料已提交</Select.Option>
180 180
               <Select.Option value="2">企业基本资料(没有申请表)已提交</Select.Option>