zls

src/pages/eContract/businessConfig/list.jsx

@@ -1,14 +1,17 @@
 import React, { useState, useEffect } from 'react';
 import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../../style/GoodsList.less';
 import router from 'umi/router';
 import moment from 'moment';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import styles from '../../style/GoodsList.less';
 import SelectCity from '../../../components/SelectButton/CitySelect'
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
-import AuthButton from '@/components/AuthButton';
+
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -116,11 +119,12 @@ const header = props => {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (text, record) => (
+      render: withActions((text, record) => [
         <AuthButton name="admin.eContractBusiness.detail.get" noRight={null}>
-          <a style={{ color: '#66B3FF' }} onClick={toDetail(record)} >查看详情</a>
-        </AuthButton>
-      ),
+           <EditIcon text="查看详情" type="look" onClick={toDetail(record)} />
+          {/* <a style={{ color: '#66B3FF' }} onClick={toDetail(record)} >查看详情</a> */}
+        </AuthButton>,
+      ])
     },
   ];
   

src/pages/eContract/manage/list.jsx

@@ -1,30 +1,22 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../../style/GoodsList.less';
+import { Form, Input, Button, Icon, Select, Table, Pagination, DatePicker } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
-import SelectCity from '../../../components/SelectButton/CitySelect'
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import AuthButton from '@/components/AuthButton';
+import styles from '../../style/GoodsList.less';
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 
 
-import AuthButton from '@/components/AuthButton';
-
-const { Option } = Select;
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { RangePicker } = DatePicker;
 
 const header = props => {
-
   const [data, setData] = useState({})
 
-
   useEffect(() => {
-
     getList({ pageNum: 1, pageSize: 10 });
-
-
   }, [])
 
   // 查询列表
@@ -41,10 +33,10 @@ const header = props => {
       router.push({
         pathname: '/eContract/manage/edit',
         query: {
-          id: id,
+          id,
         },
       });
-      return
+
     }
   }
 
@@ -121,11 +113,11 @@ const header = props => {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (text, row) => (
+      render: withActions((text, record) => [
         <AuthButton name="admin.eContractManager.detail.get" noRight={null}>
-          <a style={{ color: '#66B3FF' }} onClick={toDetail(row.contractId)} >查看详情</a>
-        </AuthButton>
-      ),
+          <EditIcon text="查看详情" type="look" onClick={toDetail(record.contractId)} />
+        </AuthButton>,
+      ]),
     },
   ];
 
@@ -145,26 +137,25 @@ const header = props => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        let {archivesDate, ...submitValue} = values
-        if(null != archivesDate && archivesDate.length > 0){
+        const { archivesDate, ...submitValue } = values
+        if (null != archivesDate && archivesDate.length > 0) {
           const [archivesStartDate, archivesEndDate] = archivesDate
           submitValue.archivesStartDate = moment(archivesStartDate).format('YYYY-MM-DD');
           submitValue.archivesEndDate = moment(archivesEndDate).format('YYYY-MM-DD');
-        }   
+        }
         console.log(submitValue)
         getList({ pageNum: 1, pageSize: 10, ...submitValue })
       }
     });
   }
 
-  //重置搜索
+  // 重置搜索
   function handleReset() {
     props.form.resetFields();
     getList({ pageNum: 1, pageSize: 10 })
   }
 
 
-
   const { getFieldDecorator } = props.form
   return (
 
@@ -200,8 +191,7 @@ const header = props => {
               <option value="">全部</option>
               <option value="1">是</option>
               <option value="0">否</option>
-
-            </Select>
+            </Select>,
           )}
         </Form.Item>
         <Form.Item>
@@ -210,7 +200,7 @@ const header = props => {
               <option value="">全部</option>
               <option value="1">是</option>
               <option value="0">否</option>
-            </Select>
+            </Select>,
           )}
         </Form.Item>
         <Form.Item>
@@ -219,14 +209,14 @@ const header = props => {
               <option value="">全部</option>
               <option value="1">是</option>
               <option value="0">否</option>
-            </Select>
+            </Select>,
           )}
         </Form.Item>
 
         <Form.Item>
-        
+
           {getFieldDecorator('archivesDate')(
-            <RangePicker placeholder={['归档开始时间', '归档结束时间']} />
+            <RangePicker placeholder={['归档开始时间', '归档结束时间']} />,
           )}
         </Form.Item>
         <Form.Item>
@@ -242,9 +232,9 @@ const header = props => {
           </AuthButton>
         </Form.Item>
       </Form>
-  
-    
-         <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
+
+
+      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
       </div>