提交 2eb3d080 authored 作者: chengye's avatar chengye

调整账单查询条件

上级 f96967ac
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php"> <entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="384"> <state relative-caret-position="322">
<caret line="67" column="50" selection-start-line="67" selection-start-column="50" selection-end-line="67" selection-end-column="50" /> <caret line="65" column="8" selection-start-line="65" selection-start-column="8" selection-end-line="65" selection-end-column="8" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -150,12 +150,12 @@ ...@@ -150,12 +150,12 @@
<workItem from="1578900535997" duration="5097000" /> <workItem from="1578900535997" duration="5097000" />
<workItem from="1578907167448" duration="144000" /> <workItem from="1578907167448" duration="144000" />
<workItem from="1578972376079" duration="6515000" /> <workItem from="1578972376079" duration="6515000" />
<workItem from="1579067299817" duration="3007000" /> <workItem from="1579067299817" duration="3052000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="15469000" /> <option name="totallyTimeSpent" value="15514000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1358" y="-125" width="1936" height="1056" extended-state="6" /> <frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
...@@ -428,8 +428,8 @@ ...@@ -428,8 +428,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php"> <entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="384"> <state relative-caret-position="322">
<caret line="67" column="50" selection-start-line="67" selection-start-column="50" selection-end-line="67" selection-end-column="50" /> <caret line="65" column="8" selection-start-line="65" selection-start-column="8" selection-end-line="65" selection-end-column="8" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -63,9 +63,9 @@ class Invoice extends Base ...@@ -63,9 +63,9 @@ class Invoice extends Base
foreach ( $data as $key => &$v) { foreach ( $data as $key => &$v) {
$v['status']=parseStatus($v['status']); $v['status']=parseStatus($v['status']);
} }
//$InvoiceCount = (new EmInvoice)->getInvoiceCount($map); $InvoiceCount = (new EmInvoice)->getInvoiceCount($map);
if(Request::param('page')){ if(Request::param('page')){
return ['code'=>0,'msg'=>'','count'=>0,'data'=>$data]; return ['code'=>0,'msg'=>'','count'=>$InvoiceCount,'data'=>$data];
} }
return $this->fetch(); return $this->fetch();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论