魏超 5 年前
父节点
当前提交
6bc205eaf7
共有 2 个文件被更改,包括 31 次插入22 次删除
  1. 10
    1
      src/pages/fundManagement/AccountDetail.jsx
  2. 21
    21
      src/pages/fundManagement/RechargeOrder.jsx

+ 10
- 1
src/pages/fundManagement/AccountDetail.jsx 查看文件

91
         },
91
         },
92
     ]
92
     ]
93
 
93
 
94
+    const getDetail = (row) => {
95
+        router.push({
96
+            pathname: '/fundManagement/AccountDetail',
97
+            query: {
98
+                id: row.orgId
99
+            },
100
+        });
101
+    }
102
+
94
 
103
 
95
     return (
104
     return (
96
 
105
 
109
                         <XForm buttonVisible={false} fields={fields}></XForm>
118
                         <XForm buttonVisible={false} fields={fields}></XForm>
110
                         <div style={{ paddingLeft: '30%', marginTop: '30px' }}>
119
                         <div style={{ paddingLeft: '30%', marginTop: '30px' }}>
111
                             <Button htmlType="submit" type="primary" style={{ marginRight: '10%' }}>
120
                             <Button htmlType="submit" type="primary" style={{ marginRight: '10%' }}>
112
-                                <Recharge orgId={newsData.orgId || ''} onClick={() => getDetail(orgId)} accountId={newsData.accountId || ''} />
121
+                                <Recharge orgId={newsData.orgId || ''} onClick={() => getDetail(newsData)} accountId={newsData.accountId || ''} />
113
                             </Button>
122
                             </Button>
114
                             <Button onClick={() => router.go(-1)}>返回</Button>
123
                             <Button onClick={() => router.go(-1)}>返回</Button>
115
                         </div>
124
                         </div>

+ 21
- 21
src/pages/fundManagement/RechargeOrder.jsx 查看文件

38
         e.preventDefault();
38
         e.preventDefault();
39
         props.form.validateFields((err, values) => {
39
         props.form.validateFields((err, values) => {
40
             if (!err) {
40
             if (!err) {
41
-                let { LocalDate, ...submitValue } = values
42
-                if (null != LocalDate && LocalDate.length > 0) {
43
-                    const [startDate, endDate] = LocalDate
44
-                    submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
45
-                    submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
41
+                let { payDate, ...submitValue } = values
42
+                if (null != payDate && payDate.length > 0) {
43
+                    const [payStartDate, payEndDate] = payDate
44
+                    submitValue.payStartDate = moment(payStartDate).format('YYYY-MM-DD');
45
+                    submitValue.payEndDate = moment(payEndDate).format('YYYY-MM-DD');
46
                 } else {
46
                 } else {
47
-                    submitValue.startDate = null
48
-                    submitValue.endDate = null
47
+                    submitValue.payStartDate = null
48
+                    submitValue.payEndDate = null
49
                 }
49
                 }
50
                 getList({ pageNum: 1, pageSize: 10, orderType: 'recharge', ...submitValue })
50
                 getList({ pageNum: 1, pageSize: 10, orderType: 'recharge', ...submitValue })
51
             }
51
             }
53
     }
53
     }
54
 
54
 
55
     const changePageNum = (pageNumber) => {
55
     const changePageNum = (pageNumber) => {
56
-        let { LocalDate, ...submitValue } = props.form.getFieldsValue()
57
-        if (null != LocalDate && LocalDate.length > 0) {
58
-            const [startDate, endDate] = LocalDate
59
-            submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
60
-            submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
56
+        let { payDate, ...submitValue } = props.form.getFieldsValue()
57
+        if (null != payDate && payDate.length > 0) {
58
+            const [payStartDate, payEndDate] = payDate
59
+            submitValue.payStartDate = moment(payStartDate).format('YYYY-MM-DD');
60
+            submitValue.payStartDate = moment(payEndDate).format('YYYY-MM-DD');
61
         } else {
61
         } else {
62
             submitValue.startDate = null
62
             submitValue.startDate = null
63
             submitValue.endDate = null
63
             submitValue.endDate = null
143
             dataIndex: 'payDate',
143
             dataIndex: 'payDate',
144
             key: 'payDate',
144
             key: 'payDate',
145
             align: 'center',
145
             align: 'center',
146
-            render: (x, row) => <><span>{row.payDate ? `${moment(row.payDate).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
146
+            render: (x, row) => <><span>{row.isOffline == 0 && row.payDate != null ? `${moment(row.payDate).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
147
         },
147
         },
148
 
148
 
149
     ];
149
     ];
153
     }
153
     }
154
     // 导出
154
     // 导出
155
     const exportList = () => {
155
     const exportList = () => {
156
-        let { LocalDate, ...submitValue } = props.form.getFieldsValue()
157
-        if (null != LocalDate && LocalDate.length > 0) {
158
-            const [startDate, endDate] = LocalDate
159
-            submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
160
-            submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
156
+        let { payDate, ...submitValue } = props.form.getFieldsValue()
157
+        if (null != payDate && payDate.length > 0) {
158
+            const [payStartDate, payEndDate] = payDate
159
+            submitValue.payStartDate = moment(payStartDate).format('YYYY-MM-DD');
160
+            submitValue.payEndDate = moment(payEndDate).format('YYYY-MM-DD');
161
         } else {
161
         } else {
162
-            submitValue.startDate = null
163
-            submitValue.endDate = null
162
+            submitValue.payStartDate = null
163
+            submitValue.payEndDate = null
164
         }
164
         }
165
         request({ ...apis.fund.rechargeOrderExport, params: { orderType: 'recharge', orgId, ...submitValue } }).then(data => {
165
         request({ ...apis.fund.rechargeOrderExport, params: { orderType: 'recharge', orgId, ...submitValue } }).then(data => {
166
             if (!data) {
166
             if (!data) {
199
                 </Form.Item>
199
                 </Form.Item>
200
                 <Form.Item>
200
                 <Form.Item>
201
                     <span style={{ marginRight: '10px' }}>支付时间段:</span>
201
                     <span style={{ marginRight: '10px' }}>支付时间段:</span>
202
-                    {getFieldDecorator('LocalDate')(
202
+                    {getFieldDecorator('payDate')(
203
                         <RangePicker placeholder={['开始时间', '结束时间']} />
203
                         <RangePicker placeholder={['开始时间', '结束时间']} />
204
                     )}
204
                     )}
205
                 </Form.Item>
205
                 </Form.Item>