Merge branch 'Router' of 192.168.5.250:shangchao_server/pms_changjian…

…g_react into Router
didilinkin · Sep 21, 2017 · a24a0a9 · a24a0a9
2 parents 2330c66 + a97f4ea
commit a24a0a9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -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>