diff --git a/src/modules/FINANCE/components/ElectricInfo/PowerBillHead.jsx b/src/modules/FINANCE/components/ElectricInfo/PowerBillHead.jsx
index b9664f4..1b41f05 100644
--- a/src/modules/FINANCE/components/ElectricInfo/PowerBillHead.jsx
+++ b/src/modules/FINANCE/components/ElectricInfo/PowerBillHead.jsx
@@ -90,19 +90,15 @@ class PowerBillHead extends React.Component {
                             </FormItem>
                         </Col>
                         <Col span={spanEight}>
-                            <FormItem label="房间编号" labelCol={{ span: 6 }}
-                                wrapperCol={{ span: 16 }}
-                            >
-                                {getFieldDecorator('roomNumber')(
+                            <FormItem label="客户名称" labelCol={{ span: 6 }} wrapperCol={{ span: 16 }}>
+                                {getFieldDecorator('clientName')(
                                     <Input placeholder="请输入" style={{ width: 200 }} />
                                 )}
                             </FormItem>
                         </Col>
                         <Col span={spanEight}>
-                            <FormItem label="客户名称" labelCol={{ span: 6 }}
-                                wrapperCol={{ span: 16 }}
-                            >
-                                {getFieldDecorator('clientName')(
+                            <FormItem label="房间编号" labelCol={{ span: 6 }} wrapperCol={{ span: 16 }}>
+                                {getFieldDecorator('roomNumber')(
                                     <Input placeholder="请输入" style={{ width: 200 }} />
                                 )}
                             </FormItem>
diff --git a/src/modules/FINANCE/components/WaterFee/WaterBillHead.jsx b/src/modules/FINANCE/components/WaterFee/WaterBillHead.jsx
index 81c15c8..339f5ee 100644
--- a/src/modules/FINANCE/components/WaterFee/WaterBillHead.jsx
+++ b/src/modules/FINANCE/components/WaterFee/WaterBillHead.jsx
@@ -113,19 +113,15 @@ class WaterBillHead extends React.Component {
                             </FormItem>
                         </Col>
                         <Col span={spanEight}>
-                            <FormItem label="房间编号" labelCol={{ span: 6 }}
-                                wrapperCol={{ span: 16 }}
-                            >
-                                {getFieldDecorator('roomNumber')(
+                            <FormItem label="客户名称" labelCol={{ span: 6 }} wrapperCol={{ span: 16 }}>
+                                {getFieldDecorator('clientSubletName')(
                                     <Input placeholder="请输入" style={{ width: 200 }} />
                                 )}
                             </FormItem>
                         </Col>
                         <Col span={spanEight}>
-                            <FormItem label="客户名称" labelCol={{ span: 6 }}
-                                wrapperCol={{ span: 16 }}
-                            >
-                                {getFieldDecorator('clientSubletName')(
+                            <FormItem label="房间编号" labelCol={{ span: 6 }} wrapperCol={{ span: 16 }}>
+                                {getFieldDecorator('roomNumber')(
                                     <Input placeholder="请输入" style={{ width: 200 }} />
                                 )}
                             </FormItem>
diff --git a/src/modules/FINANCE/containers/Electricity.jsx b/src/modules/FINANCE/containers/Electricity.jsx
index 8373cb4..70abff8 100644
--- a/src/modules/FINANCE/containers/Electricity.jsx
+++ b/src/modules/FINANCE/containers/Electricity.jsx
@@ -138,11 +138,11 @@ class Electricity extends React.Component {
             }, {
                 title: '收费类型',
                 dataIndex: 'wattHourType',
-                render: function (text, record, index) {
+                render: function (text) {
                     let dataIndex = '固定单价'
-                    if (record.wattHourType === 1) {
+                    if (text === 1) {
                         dataIndex = '差额单价'
-                    } else if (record.wattHourType === 2) {
+                    } else if (text === 2) {
                         dataIndex = '功峰平谷'
                     }
                     return (
diff --git a/src/modules/FINANCE/containers/details/ElectricCharge/ElectricChargeDetails.jsx b/src/modules/FINANCE/containers/details/ElectricCharge/ElectricChargeDetails.jsx
index a73c993..69f736d 100644
--- a/src/modules/FINANCE/containers/details/ElectricCharge/ElectricChargeDetails.jsx
+++ b/src/modules/FINANCE/containers/details/ElectricCharge/ElectricChargeDetails.jsx
@@ -151,7 +151,9 @@ class ElectricChargeDetails extends React.Component {
     }
     handleCancel = (e) => {
         this.setState({ visible: false,
-            isFirst: true})
+            isFirst: true,
+            collectMoney: false,
+            collectPenal: false})
         this.props.refresh({}, {}, {})
     }
     initialRemarks = async (nextProps) => {
@@ -376,7 +378,7 @@ class ElectricChargeDetails extends React.Component {
                                         <div>
                                             <span style={lightGrayStyle}>最后修改：</span>
                                             <span style={{marginLeft: '10px'}}>{feesInfo.createName}</span>
-                                            <span style={{marginLeft: '10px'}}>{feesInfo.updateDate ? feesInfo.updateDate : feesInfo.createDate}</span>
+                                            <span style={{marginLeft: '10px'}}>{feesInfo.createDate}</span>
                                         </div>
                                     </Col>
                                 </Row>
@@ -562,7 +564,7 @@ function ExamineSuccessState (props) {
                             pagination={false}
                         />
                     </div>
-                    {props.fees.defaultPaymentStatus !== 2 &&
+                    {props.fees.liquidatedDamages > 0 &&
                     <div>
                         <hr />
                         <div style={{
diff --git a/src/modules/PROPERTY/components/ElectricCharge/PowerAddUp.jsx b/src/modules/PROPERTY/components/ElectricCharge/PowerAddUp.jsx
index 9619b9c..4763cf0 100644
--- a/src/modules/PROPERTY/components/ElectricCharge/PowerAddUp.jsx
+++ b/src/modules/PROPERTY/components/ElectricCharge/PowerAddUp.jsx
@@ -516,6 +516,8 @@ class sumElectricityAddUp extends React.Component {
     }
     // 添加条目
     add = () => {
+        console.log('powerType : ' + this.state.powerType)
+
         this.deleteTotalColunm()
         let json = this.props.form.getFieldsValue()
         let jsonTwo = {}
@@ -545,12 +547,16 @@ class sumElectricityAddUp extends React.Component {
         let powerLossRatio = this.state.Contract.powerLossRatio ? this.state.Contract.powerLossRatio / 100 : 0
 
         if (this.state.powerType === 0) {
-            jsonTwo['electricLoss'] = 0
+            jsonTwo['electricLoss'] = 0 // 电损
             jsonTwo['sumElectricity'] = (jsonTwo.needElectricity * json.ratio) ? (json.needElectricity * json.ratio) : 0
         } else {
             jsonTwo['electricLoss'] = this.state.Contract.powerLossRatio ? jsonTwo.needElectricity * jsonTwo.ratio * powerLossRatio : 0
             jsonTwo['sumElectricity'] = jsonTwo.needElectricity * jsonTwo.ratio + jsonTwo['electricLoss']
         }
+
+        console.log('电量 : ' + jsonTwo.needElectricity)
+        console.log('变比 : ' + jsonTwo.ratio)
+        console.log('该用户电损百分比 : ' + powerLossRatio)
         jsonTwo['singleMoney'] = (jsonTwo.sumElectricity * jsonTwo.unitPrice) ? (jsonTwo.sumElectricity * jsonTwo.unitPrice) : 0
         let sumElectricityRecordlList = this.state.sumElectricityRecordlList
         sumElectricityRecordlList.push(jsonTwo)
@@ -638,28 +644,29 @@ class sumElectricityAddUp extends React.Component {
     }
     // 选择房间编号
     chooseRoomNumber = async (value) => {
-        console.log(value)
-        // 查询上次抄表数
-        this.setState({loading: true})
-        let lastTimeData = await apiPost(
-            '/ElectricityFees/LastTimeNumber',
-            {
-                roomNumberOne: value,
-                buildingIdOne: this.state.Contract.buildId
+        if (value) {
+            // 查询上次抄表数
+            this.setState({loading: true})
+            let lastTimeData = await apiPost(
+                '/ElectricityFees/LastTimeNumber',
+                {
+                    roomNumberOne: value,
+                    buildingIdOne: this.state.Contract.buildId
+                }
+            )
+            lastTimeData = lastTimeData.data
+            if (lastTimeData !== null && lastTimeData !== '' && typeof (lastTimeData) !== 'undefined') {
+                this.props.form.setFieldsValue({
+                    lastSurfaceNumber: this.props.id ? lastTimeData.lastSurfaceNumber : lastTimeData.surfaceNumber,
+                    electricCostName: this.state.powerType !== 2 ? value : ''
+                })
+            } else {
+                this.props.form.setFieldsValue({
+                    electricCostName: value
+                })
             }
-        )
-        lastTimeData = lastTimeData.data
-        if (lastTimeData !== null && lastTimeData !== '' && typeof (lastTimeData) !== 'undefined') {
-            this.props.form.setFieldsValue({
-                lastSurfaceNumber: this.props.id ? lastTimeData.lastSurfaceNumber : lastTimeData.surfaceNumber,
-                electricCostName: this.state.powerType !== 2 ? value : ''
-            })
-        } else {
-            this.props.form.setFieldsValue({
-                electricCostName: value
-            })
+            this.setState({loading: false})
         }
-        this.setState({loading: false})
     }
     handleConfirmPassword = (rule, value, callback) => {
         debugger
@@ -878,6 +885,7 @@ class sumElectricityAddUp extends React.Component {
                                         >{getFieldDecorator('roomNumberOne')(
                                                 <Select
                                                     showSearch
+                                                    allowClear
                                                     placeholder="请选择房间编号"
                                                     optionFilterProp="children"
                                                     onChange={this.chooseRoomNumber}
diff --git a/src/modules/PROPERTY/components/ElectricCharge/PowerBillHead.jsx b/src/modules/PROPERTY/components/ElectricCharge/PowerBillHead.jsx
index 8f8be35..ee08b38 100644
--- a/src/modules/PROPERTY/components/ElectricCharge/PowerBillHead.jsx
+++ b/src/modules/PROPERTY/components/ElectricCharge/PowerBillHead.jsx
@@ -111,19 +111,15 @@ class PowerBillHead extends React.Component {
                             </FormItem>
                         </Col>
                         <Col span={spanEight}>
-                            <FormItem label="房间编号" labelCol={{ span: 6 }}
-                                wrapperCol={{ span: 16 }}
-                            >
-                                {getFieldDecorator('roomNumber')(
+                            <FormItem label="客户名称" labelCol={{ span: 6 }} wrapperCol={{ span: 16 }}>
+                                {getFieldDecorator('clientName')(
                                     <Input placeholder="请输入" style={{ width: 200 }} />
                                 )}
                             </FormItem>
                         </Col>
                         <Col span={spanEight}>
-                            <FormItem label="客户名称" labelCol={{ span: 6 }}
-                                wrapperCol={{ span: 16 }}
-                            >
-                                {getFieldDecorator('clientName')(
+                            <FormItem label="房间编号" labelCol={{ span: 6 }} wrapperCol={{ span: 16 }}>
+                                {getFieldDecorator('roomNumber')(
                                     <Input placeholder="请输入" style={{ width: 200 }} />
                                 )}
                             </FormItem>
diff --git a/src/modules/PROPERTY/components/ElectricCharge/PowerInfomation.jsx b/src/modules/PROPERTY/components/ElectricCharge/PowerInfomation.jsx
index 328cf75..c747a0e 100644
--- a/src/modules/PROPERTY/components/ElectricCharge/PowerInfomation.jsx
+++ b/src/modules/PROPERTY/components/ElectricCharge/PowerInfomation.jsx
@@ -10,7 +10,8 @@ class PowerInfomation extends React.Component {
         list: [],
         isFirst: true,
         visible: false,
-        mainColumns: []
+        mainColumns: [],
+        value: 2
     }
     async initialRemarks (nextProps) {
         if (this.state.isFirst && nextProps.visible) {
@@ -338,7 +339,7 @@ class PowerInfomation extends React.Component {
                                         <div>
                                             <span style={lightGrayStyle}>最后修改：</span>
                                             <span style={{marginLeft: '10px'}}>{fees.createName}</span>
-                                            <span style={{marginLeft: '10px'}}>{fees.updateDate ? fees.updateDate : fees.createDate}</span>
+                                            <span style={{marginLeft: '10px'}}>{fees.createDate}</span>
                                         </div>
                                     </Col>
                                 </Row>
diff --git a/src/modules/PROPERTY/components/WaterCharge/WaterBillHead.jsx b/src/modules/PROPERTY/components/WaterCharge/WaterBillHead.jsx
index 4f59ba8..dcf3b01 100644
--- a/src/modules/PROPERTY/components/WaterCharge/WaterBillHead.jsx
+++ b/src/modules/PROPERTY/components/WaterCharge/WaterBillHead.jsx
@@ -122,19 +122,15 @@ class WaterBillHead extends React.Component {
                             </FormItem>
                         </Col>
                         <Col span={spanEight}>
-                            <FormItem label="房间编号" labelCol={{ span: 6 }}
-                                wrapperCol={{ span: 16 }}
-                            >
-                                {getFieldDecorator('roomNumber')(
+                            <FormItem label="客户名称" labelCol={{ span: 6 }} wrapperCol={{ span: 16 }}>
+                                {getFieldDecorator('clientSubletName')(
                                     <Input placeholder="请输入" style={{ width: 200 }} />
                                 )}
                             </FormItem>
                         </Col>
                         <Col span={spanEight}>
-                            <FormItem label="客户名称" labelCol={{ span: 6 }}
-                                wrapperCol={{ span: 16 }}
-                            >
-                                {getFieldDecorator('clientSubletName')(
+                            <FormItem label="房间编号" labelCol={{ span: 6 }} wrapperCol={{ span: 16 }}>
+                                {getFieldDecorator('roomNumber')(
                                     <Input placeholder="请输入" style={{ width: 200 }} />
                                 )}
                             </FormItem>
diff --git a/src/modules/PROPERTY/containers/ElectricCharge.jsx b/src/modules/PROPERTY/containers/ElectricCharge.jsx
index 81b4b14..70e5b47 100644
--- a/src/modules/PROPERTY/containers/ElectricCharge.jsx
+++ b/src/modules/PROPERTY/containers/ElectricCharge.jsx
@@ -197,17 +197,15 @@ class ElectricCharge extends React.Component {
                 title: '收费类型',
                 dataIndex: 'wattHourType',
                 render: function (text) {
-                    if (text) {
-                        let dataIndex = '固定单价'
-                        if (text === 1) {
-                            dataIndex = '差额单价'
-                        } else if (text === 2) {
-                            dataIndex = '功峰平谷'
-                        }
-                        return (
-                            <p>{dataIndex}</p>
-                        )
+                    let dataIndex = '固定单价'
+                    if (text === 1) {
+                        dataIndex = '差额单价'
+                    } else if (text === 2) {
+                        dataIndex = '功峰平谷'
                     }
+                    return (
+                        <p>{dataIndex}</p>
+                    )
                 }
             }, {
                 title: '本期电费周期',
@@ -280,7 +278,7 @@ class ElectricCharge extends React.Component {
             }, {
                 title: ' 操作',
                 fixed: 'right',
-                width: '80',
+                width: '150',
                 dataIndex: 'opt',
                 render: function (text, record) {
                     console.log(record)
diff --git a/src/modules/PROPERTY/containers/details/Contract/ContractDetail.jsx b/src/modules/PROPERTY/containers/details/Contract/ContractDetail.jsx
index b4e12d6..debf565 100644
--- a/src/modules/PROPERTY/containers/details/Contract/ContractDetail.jsx
+++ b/src/modules/PROPERTY/containers/details/Contract/ContractDetail.jsx
@@ -216,8 +216,12 @@ class ContractDetail extends React.Component {
                                 </em> 元/度
                                 <span style={{marginLeft: '20px'}}>
                                     变比
-                                    <em className="color1">{this.state.contract.powerRatio}</em> 电损比
-                                    <em className="color1">{this.state.contract.powerLossRatio}</em>%
+                                    <em className="color1">{this.state.contract.powerRatio}</em>
+                                    {this.state.contract.powerType !== 0 &&
+                                        <span>
+                                            电损比<em className="color1">{this.state.contract.powerLossRatio}</em>%
+                                        </span>
+                                    }
                                 </span>
                             </Col>
                         </Row>
diff --git a/src/modules/PROPERTY/containers/details/Contract/ElectricityDetail.jsx b/src/modules/PROPERTY/containers/details/Contract/ElectricityDetail.jsx
index 1b47fb9..c00e3bd 100644
--- a/src/modules/PROPERTY/containers/details/Contract/ElectricityDetail.jsx
+++ b/src/modules/PROPERTY/containers/details/Contract/ElectricityDetail.jsx
@@ -121,7 +121,11 @@ class ElectricityDetail extends React.Component {
                                 <em className="color1">
                                     功峰平谷
                                 </em>}
-                                单价 <em className="color1">{this.state.contract.powerUnitPrice}</em> 元/度  变比 <em className="color1">{this.state.contract.powerRatio}</em> 电损比 <em className="color1">{this.state.contract.powerLossRatio}</em>%</Col>
+                                单价 <em className="color1">{this.state.contract.powerUnitPrice}</em> 元/度  变比 <em className="color1">{this.state.contract.powerRatio}</em>
+                                {this.state.contract.powerType !== 0 &&
+                                    <span>电损比 <em className="color1">{this.state.contract.powerLossRatio}</em>%</span>
+                                }
+                            </Col>
                         </Row>
                         <Row>
                             <Col span={16}><b>水费收费方式：</b>