提交 207dfe31 authored 作者: chengye's avatar chengye

test

上级 8aff41ce
......@@ -3,7 +3,6 @@
<component name="ChangeListManager">
<list default="true" id="f51c1393-9404-4c81-be85-d91ed40531b3" name="默认更改列表" comment="">
<change beforePath="$PROJECT_DIR$/application/em/controller/Invoice.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/em/controller/Invoice.php" 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" />
<option name="SHOW_DIALOG" value="false" />
......@@ -68,7 +67,7 @@
<entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="64" column="11" lean-forward="true" selection-start-line="64" selection-start-column="11" selection-end-line="64" selection-end-column="11" />
<caret line="67" column="52" selection-start-line="67" selection-start-column="52" selection-end-line="67" selection-end-column="52" />
</state>
</provider>
</entry>
......@@ -221,12 +220,12 @@
<workItem from="1578817951649" duration="618000" />
<workItem from="1578900535997" duration="5097000" />
<workItem from="1578907167448" duration="144000" />
<workItem from="1578972376079" duration="3749000" />
<workItem from="1578972376079" duration="3818000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="9696000" />
<option name="totallyTimeSpent" value="9765000" />
</component>
<component name="ToolWindowManager">
<frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
......@@ -500,7 +499,7 @@
<entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="64" column="11" lean-forward="true" selection-start-line="64" selection-start-column="11" selection-end-line="64" selection-end-column="11" />
<caret line="67" column="52" selection-start-line="67" selection-start-column="52" selection-end-line="67" selection-end-column="52" />
</state>
</provider>
</entry>
......
......@@ -63,9 +63,9 @@ class Invoice extends Base
// foreach ( $data as $key => &$v) {
// $v['status']=parseStatus($v['status']);
// }
$InvoiceCount = (new EmInvoice)->getInvoiceCount($map);
//$InvoiceCount = (new EmInvoice)->getInvoiceCount($map);
if(Request::param('page')){
return ['code'=>0,'msg'=>'','count'=>$InvoiceCount,'data'=>$data];
return ['code'=>0,'msg'=>'','count'=>100,'data'=>$data];
}
return $this->fetch();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论