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

src/pages/fundManagement/AccountManagement.jsx

@@ -121,6 +121,24 @@ function header(props) {
         getList({ pageNum: 1, pageSize: 10 })
     }
 
+    // 导出
+    const exportList = () => {
+        let { LocalDate, ...submitValue } = props.form.getFieldsValue()
+        
+        request({ ...apis.fund.accountExport, params: { ...submitValue } }).then(data => {
+            if (!data) {
+                return
+            }
+            const url = window.URL.createObjectURL(new Blob([data]))
+            const link = document.createElement('a')
+            link.style.display = 'none'
+            link.href = url
+            link.setAttribute('download', '账户列表.xlsx')
+            document.body.append(link)
+            link.click()
+        }).catch()
+    }
+
     const toDeatil = (row) => {
         router.push({
             pathname: '/fundManagement/AccountDetail',
@@ -153,6 +171,9 @@ function header(props) {
                     </Button>
                 </Form.Item>
             </Form>
+            <div>
+                <Button type="danger" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={() => exportList()} >导出</Button>
+            </div>
             <Table rowKey={r => r.accountId} dataSource={data.records} columns={columns} pagination={false} />
             <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
                 <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />

src/pages/fundManagement/ConsumeOrder.jsx

@@ -96,6 +96,7 @@ function header(props) {
             dataIndex: 'consumeType',
             key: 'consumeType',
             align: 'center',
+            render: (x, row) => <><span>{row.consumeType == 'RedPacket' ? '红包' : ''}</span></>
         },
         {
             title: '活动名称',

src/pages/fundManagement/Finance.jsx

@@ -23,7 +23,7 @@ function header(props) {
 
     // 查询列表
     const getList = (params) => {
-        request({ ...apis.fund.contactList, params: { ...params } }).then((data) => {
+        request({ ...apis.fund.contactList, params: { ...params, contentType: 'finance' } }).then((data) => {
             console.log(data)
             setData(data)
         })

src/pages/fundManagement/components/SelectContact.jsx

@@ -105,8 +105,8 @@ const SelectContact = props => {
         },
         {
             title: '对外头衔',
-            dataIndex: 'job',
-            key: 'job',
+            dataIndex: 'appellation',
+            key: 'appellation',
             align: 'center',
             ellipsis: true,
         },
@@ -162,7 +162,7 @@ const SelectContact = props => {
                         )}
                     </Form.Item>
                     <Form.Item>
-                        {getFieldDecorator('job')(
+                        {getFieldDecorator('appellation')(
                             <Input
                                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
                                 placeholder="对外头衔"

src/services/apis.js

@@ -268,6 +268,11 @@ const apis = {
       method: 'GET',
       action: 'channel',
     },
+    accountExport: {
+      url: `${prefix}/taOrgAccount/taOrgAccountListExport`,
+      method: 'GET',
+      action: 'channel',
+    },
   },
   relatedOrganization: {
     get: {