提交 8e62c899 authored 作者: chengye's avatar chengye

调整账单附件显示错误

上级 c8d911a7
......@@ -2,7 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f51c1393-9404-4c81-be85-d91ed40531b3" name="默认更改列表" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/em/model/EmInvoice.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/em/model/EmInvoice.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -19,8 +18,8 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="496">
<caret line="97" column="9" lean-forward="true" selection-start-line="97" selection-start-column="9" selection-end-line="97" selection-end-column="9" />
<state relative-caret-position="341">
<caret line="149" column="23" lean-forward="true" selection-start-line="148" selection-end-line="149" selection-end-column="23" />
</state>
</provider>
</entry>
......@@ -170,18 +169,18 @@
<workItem from="1578900535997" duration="5097000" />
<workItem from="1578907167448" duration="144000" />
<workItem from="1578972376079" duration="6515000" />
<workItem from="1579067299817" duration="6800000" />
<workItem from="1579067299817" duration="6924000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="19262000" />
<option name="totallyTimeSpent" value="19386000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15282215" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15282215" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
......@@ -194,7 +193,7 @@
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" />
<window_info anchor="bottom" id="Version Control" order="9" />
<window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.17934783" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.23695652" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
......@@ -465,8 +464,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="496">
<caret line="97" column="9" lean-forward="true" selection-start-line="97" selection-start-column="9" selection-end-line="97" selection-end-column="9" />
<state relative-caret-position="341">
<caret line="149" column="23" lean-forward="true" selection-start-line="148" selection-end-line="149" selection-end-column="23" />
</state>
</provider>
</entry>
......
......@@ -144,7 +144,7 @@ class EmInvoice extends Base
$totle['current_numb'] = 0;
$totle['repo_numb'] = 0;
$totle['amount'] = $totle['settle_amount'] = 0;
$totle['settle_price'] = $inv->em->emr->settle_price * $inv->em->rate;
$totle['settle_price'] = ($inv->em->emr->settle_price?:0) * $inv->em->rate;
$totle['settle_status'] = parseStatus($inv->status,2);
//峰谷表与普通抄表
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论