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

test

上级 207dfe31
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php"> <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="213"> <state relative-caret-position="120">
<caret line="31" column="34" selection-start-line="31" selection-start-column="20" selection-end-line="31" selection-end-column="34" /> <caret line="49" column="53" selection-start-line="49" selection-start-column="53" selection-end-line="49" selection-end-column="53" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,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="299"> <state relative-caret-position="186">
<caret line="67" column="52" selection-start-line="67" selection-start-column="52" selection-end-line="67" selection-end-column="52" /> <caret line="39" column="35" selection-start-line="39" selection-start-column="35" selection-end-line="39" selection-end-column="35" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
<find>$sm</find> <find>$sm</find>
<find>/invoice</find> <find>/invoice</find>
<find>getInvoiceList</find> <find>getInvoiceList</find>
<find>getInvoiceCount</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
...@@ -220,12 +221,12 @@ ...@@ -220,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="3818000" /> <workItem from="1578972376079" duration="4170000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="9765000" /> <option name="totallyTimeSpent" value="10117000" />
</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" />
...@@ -491,15 +492,15 @@ ...@@ -491,15 +492,15 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php"> <entry file="file://$PROJECT_DIR$/application/em/model/EmInvoice.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="213"> <state relative-caret-position="120">
<caret line="31" column="34" selection-start-line="31" selection-start-column="20" selection-end-line="31" selection-end-column="34" /> <caret line="49" column="53" selection-start-line="49" selection-start-column="53" selection-end-line="49" selection-end-column="53" />
</state> </state>
</provider> </provider>
</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="299"> <state relative-caret-position="186">
<caret line="67" column="52" selection-start-line="67" selection-start-column="52" selection-end-line="67" selection-end-column="52" /> <caret line="39" column="35" selection-start-line="39" selection-start-column="35" selection-end-line="39" selection-end-column="35" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -36,6 +36,8 @@ class Invoice extends Base ...@@ -36,6 +36,8 @@ class Invoice extends Base
$search_text = Request::get('search_text'); $search_text = Request::get('search_text');
$search_type = Request::get('search_type'); $search_type = Request::get('search_type');
if($search_text){ if($search_text){
var_dump($search_text);
switch ($search_type) { switch ($search_type) {
case '1': case '1':
$this->assign('search_text',$search_text); $this->assign('search_text',$search_text);
...@@ -60,12 +62,12 @@ class Invoice extends Base ...@@ -60,12 +62,12 @@ class Invoice extends Base
$page =Request::param('page')?Request::param('page'):1; $page =Request::param('page')?Request::param('page'):1;
$limit = Request::param('limit')?Request::param('limit'):10; $limit = Request::param('limit')?Request::param('limit'):10;
$data = (new EmInvoice)->getInvoiceList($map,$page,$limit); $data = (new EmInvoice)->getInvoiceList($map,$page,$limit);
// 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'=>100,'data'=>$data]; return ['code'=>0,'msg'=>'','count'=>$InvoiceCount,'data'=>$data];
} }
return $this->fetch(); return $this->fetch();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论