提交 2526293d authored 作者: chengye's avatar chengye

test

上级 bcf7d592
...@@ -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="39" selection-start-line="39" selection-end-line="39" /> <caret line="66" column="19" selection-start-line="66" selection-start-column="19" selection-end-line="66" selection-end-column="19" />
</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="4238000" /> <workItem from="1578972376079" duration="4378000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="10185000" /> <option name="totallyTimeSpent" value="10325000" />
</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="39" selection-start-line="39" selection-end-line="39" /> <caret line="66" column="19" selection-start-line="66" selection-start-column="19" selection-end-line="66" selection-end-column="19" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -36,7 +36,6 @@ class Invoice extends Base ...@@ -36,7 +36,6 @@ 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':
...@@ -58,15 +57,14 @@ class Invoice extends Base ...@@ -58,15 +57,14 @@ class Invoice extends Base
}else{ }else{
$this->assign('search_type',''); $this->assign('search_type','');
$this->assign('search_text',''); $this->assign('search_text','');
var_dump('11221');
} }
$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']);
} // }
$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'=>$InvoiceCount,'data'=>$data];
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论