zls

src/pages/eContract/company/edit.jsx

@@ -6,230 +6,235 @@ import router from 'umi/router';
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import Wangedit from '../../../components/Wangedit/Wangedit'
+import Styles from './style.less';
 import moment from 'moment';
 
 const { TabPane } = Tabs;
 
 const header = props => {
-    const companyId = props.location.query.id
-  
-    const [ data, setData ] = useState({})
-    if(companyId){
-      useEffect(() => {
-        getCompanyData(companyId);
-      },[])
-    
-      // 查询列表
-      const getCompanyData = (companyId) => {
-        request({
-            ...apis.company.get,
-            urlData: { id: companyId }
-        }).then((data) => {
-          if(data.certifiedStatus === 'registered'){
-            router.push({
-              pathname: '/eContract/company/add',
-              query: {
-                id: companyId
-              },
-            });
-            return
-          }
-          setData(data)
-        }).catch((err) => {
-          message.error(err.msg || err.message)
-        })
-      }
-    }else{
-      //第一次进入就创建新的企业
-      useEffect(() => {
-        addCompanyData();
-      },[])
-
-      // 添加
-      const addCompanyData = () => {
-        request({
-            ...apis.company.add,
-        }).then((data) => {
-          setData(data)
-        }).catch((err) => {
-          message.error(err.msg || err.message)
-        })
-      }
-    }
+  const companyId = props.location.query.id
+
+  const [data, setData] = useState({})
+  if (companyId) {
+    useEffect(() => {
+      getCompanyData(companyId);
+    }, [])
 
-    const openFddUrl = () => {
-      window.open(data.certifiedAddress)
+    // 查询列表
+    const getCompanyData = (companyId) => {
+      request({
+        ...apis.company.get,
+        urlData: { id: companyId }
+      }).then((data) => {
+        if (data.certifiedStatus === 'registered') {
+          router.push({
+            pathname: '/eContract/company/add',
+            query: {
+              id: companyId
+            },
+          });
+          return
+        }
+        setData(data)
+      }).catch((err) => {
+        message.error(err.msg || err.message)
+      })
     }
+  } else {
+    //第一次进入就创建新的企业
+    useEffect(() => {
+      addCompanyData();
+    }, [])
 
-    const getCompanyInfo = () => {
+    // 添加
+    const addCompanyData = () => {
       request({
-          ...apis.company.refresh,urlData: { id: data.companyId }
+        ...apis.company.add,
       }).then((data) => {
         setData(data)
       }).catch((err) => {
         message.error(err.msg || err.message)
       })
     }
-  
-    return (
-      <Tabs type="card">
-        <TabPane tab="基本信息" key="1">
-            <Row>
-              <Col span={8}></Col>
-              <Col span={4}>企业编号</Col>
-              <Col span={4}>{data.companyCode}</Col>
-              <Col span={8}></Col>
-            </Row>
-            <Row>
-              <Col span={8}></Col>
-              <Col span={4}>法大大客户编号</Col>
-              <Col span={4}>{data.fadadaCode}</Col>
-              <Col span={8}></Col>
-            </Row>
-            <Row>
-              <Col span={8}></Col>
-              <Col span={4}>企业管理员身份</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.certifiedSerialNumber}</Col>
-              <Col span={8}></Col>
-            </Row>
-            <Row>
-              <Col span={8}></Col>
-              <Col span={4}>实名认证地址</Col>
-              <Col span={4}><a onClick={openFddUrl}>{data.certifiedAddress}</a></Col>
-              <Col span={8}></Col>
-            </Row>
-            <Row>
-              <Col span={8}></Col>
-              <Col span={4}>实名认证状态</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" onClick={getCompanyInfo}>更新认证状态</Button>
-              </Col>
-              <Col span={4}>
-                <Button type="danger" onClick={() => router.go(-1)}>返回</Button>
-              </Col>
-              <Col span={8}></Col>
-            </Row>
-        </TabPane>
-        <TabPane tab="企业认证信息" key="2">
-        <Row>
-              <Col span={8}></Col>
-              <Col span={4}>认证状态</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.reason}</Col>
-              <Col span={8}></Col>
-            </Row>
-            <Row>
-              <Col span={8}></Col>
-              <Col span={4}>审核时间</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.certifiedType === 0 ? "银行卡认证" : data.certifiedType === 1 ? "纸质审核认证" : ""}</Col>
-              <Col span={8}></Col>
-            </Row>
-            <Row>
-              <Col span={8}></Col>
-              <Col span={4}>企业信息</Col>
-              <Col span={4}></Col>
-              <Col span={8}></Col>
-            </Row>
-            <Row>
-              <Col span={8}></Col>
-              <Col span={4}>企业名称</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.creditCode}</Col>
-              <Col span={8}></Col>
-            </Row>
+  }
 
-            <Row>
-              <Col span={8}></Col>
-              <Col span={4}><span>对公账号信息</span></Col>
-              <Col span={4}></Col>
-              <Col span={8}></Col>
-            </Row>
-            <Row>
-              <Col span={8}></Col>
-              <Col span={4}>银行名称</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.bankAccount}</Col>
-              <Col span={8}></Col>
-            </Row>
-            <Row>
-              <Col span={8}></Col>
-              <Col span={4}>开户支行名称</Col>
-              <Col span={4}>{data.subbranchName}</Col>
-              <Col span={8}></Col>
-            </Row>
+  const openFddUrl = () => {
+    window.open(data.certifiedAddress)
+  }
 
-            <Row>
-              <Col span={8}></Col>
-              <Col span={4}>企业管理员身份</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.userName}</Col>
-              <Col span={8}></Col>
-            </Row>
-            <Row>
-              <Col span={8}></Col>
-              <Col span={4}>手机号</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.idCard}</Col>
-              <Col span={8}></Col>
-            </Row>
-            <Row>
-              <Col span={8}></Col>
-              <Col span={4}>
-                <Button type="danger" onClick={getCompanyInfo}>更新企业认证信息</Button>
+  const getCompanyInfo = () => {
+    request({
+      ...apis.company.refresh, urlData: { id: data.companyId }
+    }).then((data) => {
+      setData(data)
+    }).catch((err) => {
+      message.error(err.msg || err.message)
+    })
+  }
+
+
+  const datas1 = [
+    {
+      name: "企业编号",
+      value: data.companyCode
+    },
+    {
+      name: "法大大客户编号",
+      value: data.fadadaCode
+    },
+    {
+      name: "企业管理员身份",
+      render: <><span>{data.companyManagerType === 'legal' ? '法人' : data.companyManagerType === 'agent' ? "代理人" : ""}</span></>
+    },
+    {
+      name: "认证序列号",
+      value: data.certifiedSerialNumber
+    },
+    {
+      name: "实名认证地址",
+      render: <a onClick={openFddUrl}>{data.certifiedAddress}</a>
+    },
+    {
+      name: "实名认证状态",
+      render: <><span>{data.status === 0 ? '未认证' : data.status === 1 ? "管理员资料已提交" : data.status === 2 ? "企业基本资料（没有申请表）已提交" : data.status === 3 ? "已提交待审核" :
+        data.status === 4 ? '审核通过' : data.status === 5 ? "审核不通过" : data.status === 6 ? "人工初审通过" : ""}</span></>
+    },
+  ]
+
+
+  const datas2 = [
+    {
+      name: <><span style={{ fontWeight: '800' }}>认证状态</span></>,
+      render: <><span style={{ fontWeight: '800' }}>{data.status === 0 ? '未认证' : data.status === 1 ? "管理员资料已提交" : data.status === 2 ? "企业基本资料（没有申请表）已提交" : data.status === 3 ? "已提交待审核" :
+        data.status === 4 ? '审核通过' : data.status === 5 ? "审核不通过" : data.status === 6 ? "人工初审通过" : ""}</span></>
+    },
+    {
+      name: "不通过原因",
+      value: data.reason
+    },
+    {
+      name: "审核时间",
+      value: data.verifyTime
+    },
+    {
+      name: "认证方式",
+      render: <><span>{data.certifiedType === 0 ? "银行卡认证" : data.certifiedType === 1 ? "纸质审核认证" : ""}</span></>
+    },
+
+    {
+      name: <><span style={{ fontWeight: '800' }}>企业信息</span></>,
+      style: { marginTop: '50px' }
+    },
+    {
+      name: "企业名称",
+      value: data.companyName
+    },
+    {
+      name: "统一社会信用代码",
+      value: data.creditCode
+    },
+    {
+      name: <><span style={{ fontWeight: '800' }}>对公账号信息</span></>,
+      style: { marginTop: '50px' }
+    },
+    {
+      name: "银行名称",
+      value: data.bankName
+    },
+    {
+      name: "银行帐号",
+      value: data.bankAccount
+    },
+    {
+      name: "开户支行名称",
+      value: data.subbranchName
+    },
+    {
+      name: <><span style={{ fontWeight: '800' }}>企业管理员身份</span></>,
+      render: <><span>{data.companyManagerType === 'legal' ? '法人' : data.companyManagerType === 'agent' ? "代理人" : ""}</span></>,
+      style: { marginTop: '50px' }
+    },
+    {
+      name: "姓名",
+      value: data.userName
+    },
+    {
+      name: "手机号",
+      value: data.tel
+    },
+    {
+      name: "身份证号码",
+      value: data.idCard
+    },
+  ]
+
+  return (
+    <Tabs type="card">
+      <TabPane tab="基本信息" key="1">
+        <div>
+          {datas1.map((x) => {
+            return <Row style={x.style || { margin: '20px 0' }}>
+              <Col span={8}></Col>
+              <Col span={4} className={Styles.title}>
+                {x.name}
               </Col>
-              <Col span={4}>
-                <Button type="danger" onClick={() => router.go(-1)}>返回</Button>
+              <Col span={4} className={Styles.text}>
+                {
+                  x.render ? typeof x.render === 'function' ? x.render(props) : x.render : x.value
+                }
+              </Col>
+              <Col span={8} >
               </Col>
-              <Col span={8}></Col>
             </Row>
-        </TabPane>
-      </Tabs> 
-    )
-  }
-  
-  const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
-  export default WrappedNormalLoginForm
+
+          })}
+          <Row style={{ margin: '40px 0' }}>
+            <Col span={8}></Col>
+            <Col span={4}>
+              <Button type="danger" style={{ height: ' 45px', fontSize: '20px', lineHeight: ' 45px' }} onClick={getCompanyInfo}>更新认证状态</Button>
+            </Col>
+            <Col span={4}>
+              <Button type="danger" style={{ height: ' 45px', fontSize: '20px', lineHeight: ' 45px' }} onClick={() => router.go(-1)}>返回</Button>
+            </Col>
+            <Col span={8}></Col>
+          </Row>
+        </div>
+
+      </TabPane>
+      <TabPane tab="企业认证信息" key="2">
+
+        {datas2.map((x) => {
+          return <Row style={x.style || { margin: '20px 0' }}>
+            <Col span={8}></Col>
+            <Col span={4} className={Styles.title} >
+              {x.name}
+            </Col>
+            <Col span={4} className={Styles.text}>
+              {
+                x.render ? typeof x.render === 'function' ? x.render(props) : x.render : x.value
+              }
+            </Col>
+            <Col span={8} >
+            </Col>
+          </Row>
+
+        })}
+
+        <Row style={{ margin: '40px 0' }}>
+          <Col span={8}></Col>
+          <Col span={4}>
+            <Button type="danger" style={{ height: ' 45px', fontSize: '20px', lineHeight: ' 45px' }} onClick={getCompanyInfo}>更新企业认证信息</Button>
+          </Col>
+          <Col span={4}>
+            <Button type="danger" style={{ height: ' 45px', fontSize: '20px', lineHeight: ' 45px' }} onClick={() => router.go(-1)}>返回</Button>
+          </Col>
+          <Col span={8}></Col>
+        </Row>
+
+      </TabPane>
+    </Tabs>
+  )
+}
+
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedNormalLoginForm

src/pages/eContract/company/index.jsx

@@ -196,10 +196,10 @@ function header(props) {
         </Form.Item>
       </Form>
       <AuthButton name="admin.taNewsType.post" noRight={null}>
-        <Button type="danger" className={styles.addBtn} onClick={toAddCompany}>新增</Button>
+        <Button type="danger" className={styles.addBtn} style={{ marginTop: '30px' }} onClick={toAddCompany}>新增</Button>
       </AuthButton>
       <AuthButton name="admin.taNewsType.post" noRight={null}>
-        <Button type="danger" style={{ marginLeft: 15 }} onClick={changeStatus}>删除</Button>
+        <Button type="danger" className={styles.addBtn} style={{ marginLeft: 15 }} onClick={changeStatus}>删除</Button>
       </AuthButton>
       <Table rowSelection={rowSelection} rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/pages/eContract/company/style.less

@@ -20,3 +20,24 @@
   height: 0;
   padding-bottom : 80%;
 }
+
+.addBtn {
+  padding: 0 40px;
+  height: 36px;
+  margin: 30px 0;
+}
+
+.title {
+  height     : 45px;
+  font-size  : 20px;
+  font-weight: 400;
+  color      : rgba(102, 102, 102, 1);
+  line-height: 45px;
+ 
+}
+.text {
+  font-size  : 18px;
+  font-weight: 400;
+  color      : rgba(51, 51, 51, 1);
+  line-height: 45px;
+}

src/pages/eContract/relatedOrganization/index.jsx

@@ -87,6 +87,11 @@ function header(props) {
             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 === 0 && <span>未认证</span>}
                 {companyStatus === 1 && <span>管理员资料已提交</span>}
                 {companyStatus === 2 && <span>企业基本资料（没有申请表）已提交</span>}
@@ -171,6 +176,12 @@ function header(props) {
                 <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="">全部</Select.Option>
                             <Select.Option value="0">未认证</Select.Option>
                             <Select.Option value="1">管理员资料已提交</Select.Option>

src/pages/eContract/signedContract/index.jsx

@@ -151,9 +151,9 @@ function header(props) {
 
         },
         {
-            title: '合同编号',
-            dataIndex: 'contractId',
-            key: 'contractId',
+            title: '合同标题',
+            dataIndex: 'contractName',
+            key: 'contractName',
             align: 'center',
 
         },
@@ -182,7 +182,6 @@ function header(props) {
             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></>
         },
     ];