提交 9fbbf02b authored 作者: chengye's avatar chengye

调整账单查询条件

上级 402ecf8d
......@@ -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="279">
<caret line="87" column="17" selection-start-line="87" selection-start-column="17" selection-end-line="87" selection-end-column="17" />
<state relative-caret-position="310">
<caret line="88" column="15" selection-start-line="88" selection-start-column="15" selection-end-line="88" selection-end-column="15" />
</state>
</provider>
</entry>
......@@ -72,7 +71,7 @@
<path value="$PROJECT_DIR$/vendor/markbaker/matrix" />
</include_path>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="2078" />
<option name="y" value="-22" />
<option name="width" value="1222" />
......@@ -154,12 +153,12 @@
<workItem from="1578900535997" duration="5097000" />
<workItem from="1578907167448" duration="144000" />
<workItem from="1578972376079" duration="6515000" />
<workItem from="1579067299817" duration="6285000" />
<workItem from="1579067299817" duration="6318000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="18747000" />
<option name="totallyTimeSpent" value="18780000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
......@@ -442,8 +441,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="279">
<caret line="87" column="17" selection-start-line="87" selection-start-column="17" selection-end-line="87" selection-end-column="17" />
<state relative-caret-position="310">
<caret line="88" column="15" selection-start-line="88" selection-start-column="15" selection-end-line="88" selection-end-column="15" />
</state>
</provider>
</entry>
......
......@@ -85,8 +85,8 @@ class EmInvoice extends Base
->leftJoin(['receipt'=>'r'],'r.id = in.cert_id')
->get($id);
//查询抄表单ID
dd($inv);
$eiu = EmInvoiceUseage::where(['invoice_id'=>$inv->invoice_id])->find();
dd($eiu);
//查询抄表信息
$useage = Useage::with('photo')->get(['useage_id'=>$eiu->useage_id]);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论