提交 d62327e2 authored 作者: chengye's avatar chengye

test

上级 2526293d
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<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="372"> <state relative-caret-position="372">
<caret line="66" column="19" selection-start-line="66" selection-start-column="19" selection-end-line="66" selection-end-column="19" /> <caret line="69" column="50" selection-start-line="69" selection-start-column="50" selection-end-line="69" selection-end-column="50" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -221,12 +221,12 @@ ...@@ -221,12 +221,12 @@
<workItem from="1578817951649" duration="618000" /> <workItem from="1578817951649" duration="618000" />
<workItem from="1578900535997" duration="5097000" /> <workItem from="1578900535997" duration="5097000" />
<workItem from="1578907167448" duration="144000" /> <workItem from="1578907167448" duration="144000" />
<workItem from="1578972376079" duration="4378000" /> <workItem from="1578972376079" duration="4436000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="10325000" /> <option name="totallyTimeSpent" value="10383000" />
</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" />
...@@ -500,7 +500,7 @@ ...@@ -500,7 +500,7 @@
<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="372"> <state relative-caret-position="372">
<caret line="66" column="19" selection-start-line="66" selection-start-column="19" selection-end-line="66" selection-end-column="19" /> <caret line="69" column="50" selection-start-line="69" selection-start-column="50" selection-end-line="69" selection-end-column="50" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -65,9 +65,9 @@ class Invoice extends Base ...@@ -65,9 +65,9 @@ class Invoice extends Base
// $v['status']=parseStatus($v['status']); // $v['status']=parseStatus($v['status']);
// } // }
$data = []; $data = [];
$InvoiceCount = (new EmInvoice)->getInvoiceCount($map); //$InvoiceCount = (new EmInvoice)->getInvoiceCount($map);
if(Request::param('page')){ if(Request::param('page')){
return ['code'=>0,'msg'=>'','count'=>$InvoiceCount,'data'=>$data]; return ['code'=>0,'msg'=>'','count'=>0,'data'=>$data];
} }
return $this->fetch(); return $this->fetch();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论