傅行帆 4 年之前
父節點
當前提交
2650c64665

+ 6
- 6
src/pages/activity/ActivityList.jsx 查看文件

159
       align: 'center',
159
       align: 'center',
160
       render: activityStatus => (activityStatus == 0 ? '进行中' : activityStatus == 1 ? '未开始' : '已结束'),
160
       render: activityStatus => (activityStatus == 0 ? '进行中' : activityStatus == 1 ? '未开始' : '已结束'),
161
     },
161
     },
162
-    {
163
-      title: '权重',
164
-      dataIndex: 'heavy',
165
-      key: 'heavy',
166
-      align: 'center',
167
-    },
162
+    // {
163
+    //   title: '权重',
164
+    //   dataIndex: 'heavy',
165
+    //   key: 'heavy',
166
+    //   align: 'center',
167
+    // },
168
     {
168
     {
169
       title: '操作',
169
       title: '操作',
170
       dataIndex: 'handle',
170
       dataIndex: 'handle',

+ 2
- 2
src/pages/activity/detailActivity.jsx 查看文件

161
         <Form.Item label="报名时间">
161
         <Form.Item label="报名时间">
162
           <span>{`${moment(detailData.enlistStart).format('YYYY-MM-DD HH:mm')} —— ${moment(detailData.enlistEnd).format('YYYY-MM-DD HH:mm')}`}</span>
162
           <span>{`${moment(detailData.enlistStart).format('YYYY-MM-DD HH:mm')} —— ${moment(detailData.enlistEnd).format('YYYY-MM-DD HH:mm')}`}</span>
163
         </Form.Item>
163
         </Form.Item>
164
-        <Form.Item label="权重">
164
+        {/* <Form.Item label="权重">
165
           <span>{detailData.heavy}</span>
165
           <span>{detailData.heavy}</span>
166
-        </Form.Item>
166
+        </Form.Item> */}
167
       </Form>
167
       </Form>
168
     </>
168
     </>
169
   )
169
   )

+ 2
- 2
src/pages/activity/editActivity.jsx 查看文件

275
             ],
275
             ],
276
           })(<RangePicker format="YYYY-MM-DD HH:mm" onChange={changeTime} />)}
276
           })(<RangePicker format="YYYY-MM-DD HH:mm" onChange={changeTime} />)}
277
         </Form.Item>
277
         </Form.Item>
278
-        <Form.Item label="权重">
278
+        {/* <Form.Item label="权重">
279
           {getFieldDecorator('heavy', {
279
           {getFieldDecorator('heavy', {
280
 
280
 
281
             rules: [
281
             rules: [
285
               },
285
               },
286
             ],
286
             ],
287
           })(<Input type="number" style={{ width: 80 }} />)}<span style={{ marginLeft: 30, color: 'grey' }}>数字越大越靠前</span>
287
           })(<Input type="number" style={{ width: 80 }} />)}<span style={{ marginLeft: 30, color: 'grey' }}>数字越大越靠前</span>
288
-        </Form.Item>
288
+        </Form.Item> */}
289
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
289
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
290
           <Button type="primary" htmlType="submit">
290
           <Button type="primary" htmlType="submit">
291
             确认
291
             确认

+ 18
- 0
src/pages/property/bill/list/index.jsx 查看文件

150
             >
150
             >
151
               <Button type="link" size="small">删除</Button>
151
               <Button type="link" size="small">删除</Button>
152
             </Popconfirm>
152
             </Popconfirm>
153
+            <Divider type="vertical" />
154
+            <Popconfirm
155
+              title="确认催缴当前记录?"
156
+              onConfirm={() => props.onCollection(row)}
157
+              okText="Yes"
158
+              cancelText="No"
159
+            >
160
+              <Button type="link" size="small">{row.billStatus == 0 ? "催缴" : ""}</Button>
161
+            </Popconfirm>
153
           </span>
162
           </span>
154
         )
163
         )
155
       }
164
       }
167
 
176
 
168
 const FetchBillList = fetchList(apis.bill.fetchBillList)
177
 const FetchBillList = fetchList(apis.bill.fetchBillList)
169
 const deleteBillBeach = fetch(apis.bill.deleteBillBeach)
178
 const deleteBillBeach = fetch(apis.bill.deleteBillBeach)
179
+const collectionBillList = fetch(apis.bill.collectionBill)
170
 
180
 
171
 export default props => {
181
 export default props => {
172
   const [loading, setLoading] = useState(false)
182
   const [loading, setLoading] = useState(false)
199
     }
209
     }
200
   }
210
   }
201
 
211
 
212
+  const collectionBill = row => {
213
+    console.log(row,"-----------")
214
+    collectionBillList({ data: {billId: row.id}}).then(res => {
215
+      console.log(res,"222222")
216
+    })
217
+  }
218
+
202
   const handleDeleteRow = row => {
219
   const handleDeleteRow = row => {
203
     setLoading(true)
220
     setLoading(true)
204
     deleteBillBeach({ data: [row.id] }).then(res => {
221
     deleteBillBeach({ data: [row.id] }).then(res => {
233
           pagination={pagination}
250
           pagination={pagination}
234
           onPageChange={handlePageChange}
251
           onPageChange={handlePageChange}
235
           onDetail={handleDetail}
252
           onDetail={handleDetail}
253
+          onCollection={collectionBill}
236
           onDeleteRow={handleDeleteRow}
254
           onDeleteRow={handleDeleteRow}
237
         />
255
         />
238
       </Spin>
256
       </Spin>

+ 7
- 0
src/services/bill_api.js 查看文件

27
     action: 'admin.bill.delete'
27
     action: 'admin.bill.delete'
28
   },
28
   },
29
 
29
 
30
+  //  催缴
31
+  collectionBill: {
32
+    url: `${prefix}/bill/invoice/collection`,
33
+    method: 'post',
34
+    action: 'admin.bill.invoice/collection'
35
+  },
36
+
30
   // 下载excel模板
37
   // 下载excel模板
31
   billDownloadExcel: {
38
   billDownloadExcel: {
32
     url: `${prefix}/bill/downloadExcel`,
39
     url: `${prefix}/bill/downloadExcel`,