feats

src/pages/property/bill/info/Add.jsx

@@ -30,10 +30,10 @@ export default props => {
   )
 
   const handleAdd = (vals, callback) => {
-    addTempBillInvoice({
+    addTempBillInvoice({data: {
       billId: id,
       ...vals,
-    }).then(res => {
+    }}).then(res => {
       callback()
       getListData()
       setShowAdd(false)

src/pages/property/bill/info/components/AddOne.jsx

@@ -64,7 +64,8 @@ export default Form.create()(props => {
   const handleSubmit = e => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
-      if (!err && !phaseId && !buildingId && !unitId && !levelId && !roomNoId) {
+      // console.log(values, !phaseId && !buildingId && !unitId && !levelId && !roomNoId)
+      if (!err && phaseId && buildingId && unitId && levelId && roomNoId) {
         props.onSubmit({
           phaseId,
           buildingId,

src/pages/property/bill/info/components/Edit.jsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { Modal, Form, Input, DatePicker, Button } from 'antd'
+import moment from 'moment'
 
 const formItemLayout = {
   labelCol: {
@@ -30,13 +31,16 @@ export default Form.create()(props => {
     e.preventDefault()
     props.form.validateFields((err, values) => {
       if (!err && props.onSubmit) {
-        props.onSubmit(values)
+        const endDate = values.endDate ? moment(values.endDate).toDate() : undefined
+        props.onSubmit({...values, endDate})
       }
     })
   }
 
   useEffect(() => {
-    props.form.setFieldsValue(props.initialData || {})
+    const vals = props.initialData || {}
+    const endDate = vals.endDate ? moment(vals.endDate) : undefined
+    props.form.setFieldsValue({...vals, endDate})
   }, [props.initialData])
 
   return (

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

@@ -1,5 +1,5 @@
 import React, { useEffect, useRef, useState } from 'react'
-import { PageHeader, Button, Descriptions, Typography, Select, Icon, Table, Modal, Form, Input, notification } from 'antd'
+import { PageHeader, Button, Descriptions, Typography, Select, Icon, Table, Modal, Form, Input, Popconfirm, Divider, notification } from 'antd'
 import { fetch, fetchList, apis } from '@/utils/request'
 import NavLink from 'umi/navlink'
 import Prompt from '@/components/Prompt'
@@ -295,7 +295,7 @@ export default props => {
       </div>
 
       <div style={{margin: '24px 0'}}>
-        <NavLink to="/property/bill/management/info/add"><Button type="primary"><Icon type="plus" />添加更多收费单</Button></NavLink>
+        <NavLink to={`/property/bill/management/info/add?id=${id}`}><Button type="primary"><Icon type="plus" />添加更多收费单</Button></NavLink>
         <Button type="link" onClick={exportExcel}><Icon type="export" />导出数据</Button>
         <div style={{height: '40px', lineHeight: '40px', marginLeft: '10px', fontSize: '14px', color: '#888' }}>未缴户主费用可以直接点击 收费金额数字 修改，已缴费户主无法修改，需要线下多退少补</div>
       </div>

src/pages/property/proprietor/index.jsx

@@ -203,11 +203,11 @@ export default props => {
           dataIndex="ownerName"
           key="ownerName"
           render={(_, row) => {
-            return (
+            return row.userVerifyId ? (
               <NavLink to={`/property/proprietor/detail?id=${row.userVerifyId}`}>
                 <Button type="link">{row.ownerName}</Button>
               </NavLink>
-            )
+            ) : row.ownerName
           }}
         />
         <Table.Column title="手机号" dataIndex="ownerTel" key="ownerTel" />

src/services/bill_api.js

@@ -148,7 +148,7 @@ export default prefix => ({
 
   // 由前台批量添加收费单, 进行统一的提交, 修改为有效
   updateBillInvoiceStatus: {
-    url: '/bill/invoice/updateBillInvoiceStatus',
+    url: `${prefix}/bill/invoice/updateBillInvoiceStatus`,
     method: 'post',
     action: 'admin.bill-invoice.updateStatus'
   }