bug

src/pages/activity/ActivityList.jsx

@@ -159,12 +159,12 @@ const header = props => {
       align: 'center',
       render: activityStatus => (activityStatus == 0 ? '进行中' : activityStatus == 1 ? '未开始' : '已结束'),
     },
-    {
-      title: '权重',
-      dataIndex: 'heavy',
-      key: 'heavy',
-      align: 'center',
-    },
+    // {
+    //   title: '权重',
+    //   dataIndex: 'heavy',
+    //   key: 'heavy',
+    //   align: 'center',
+    // },
     {
       title: '操作',
       dataIndex: 'handle',

src/pages/activity/detailActivity.jsx

@@ -161,9 +161,9 @@ const BasicForm = props => {
         <Form.Item label="报名时间">
           <span>{`${moment(detailData.enlistStart).format('YYYY-MM-DD HH:mm')} —— ${moment(detailData.enlistEnd).format('YYYY-MM-DD HH:mm')}`}</span>
         </Form.Item>
-        <Form.Item label="权重">
+        {/* <Form.Item label="权重">
           <span>{detailData.heavy}</span>
-        </Form.Item>
+        </Form.Item> */}
       </Form>
     </>
   )

src/pages/activity/editActivity.jsx

@@ -275,7 +275,7 @@ const BasicForm = props => {
             ],
           })(<RangePicker format="YYYY-MM-DD HH:mm" onChange={changeTime} />)}
         </Form.Item>
-        <Form.Item label="权重">
+        {/* <Form.Item label="权重">
           {getFieldDecorator('heavy', {
 
             rules: [
@@ -285,7 +285,7 @@ const BasicForm = props => {
               },
             ],
           })(<Input type="number" style={{ width: 80 }} />)}<span style={{ marginLeft: 30, color: 'grey' }}>数字越大越靠前</span>
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
           <Button type="primary" htmlType="submit">
             确认

src/pages/property/bill/list/index.jsx

@@ -150,6 +150,15 @@ const TableList = props => {
             >
               <Button type="link" size="small">删除</Button>
             </Popconfirm>
+            <Divider type="vertical" />
+            <Popconfirm
+              title="确认催缴当前记录?"
+              onConfirm={() => props.onCollection(row)}
+              okText="Yes"
+              cancelText="No"
+            >
+              <Button type="link" size="small">{row.billStatus == 0 ? "催缴" : ""}</Button>
+            </Popconfirm>
           </span>
         )
       }
@@ -167,6 +176,7 @@ const TableList = props => {
 
 const FetchBillList = fetchList(apis.bill.fetchBillList)
 const deleteBillBeach = fetch(apis.bill.deleteBillBeach)
+const collectionBillList = fetch(apis.bill.collectionBill)
 
 export default props => {
   const [loading, setLoading] = useState(false)
@@ -199,6 +209,13 @@ export default props => {
     }
   }
 
+  const collectionBill = row => {
+    console.log(row,"-----------")
+    collectionBillList({ data: {billId: row.id}}).then(res => {
+      console.log(res,"222222")
+    })
+  }
+
   const handleDeleteRow = row => {
     setLoading(true)
     deleteBillBeach({ data: [row.id] }).then(res => {
@@ -233,6 +250,7 @@ export default props => {
           pagination={pagination}
           onPageChange={handlePageChange}
           onDetail={handleDetail}
+          onCollection={collectionBill}
           onDeleteRow={handleDeleteRow}
         />
       </Spin>

src/services/bill_api.js

@@ -27,6 +27,13 @@ export default prefix => ({
     action: 'admin.bill.delete'
   },
 
+  //  催缴
+  collectionBill: {
+    url: `${prefix}/bill/invoice/collection`,
+    method: 'post',
+    action: 'admin.bill.invoice/collection'
+  },
+
   // 下载excel模板
   billDownloadExcel: {
     url: `${prefix}/bill/downloadExcel`,