test

.idea/workspace.xml

@@ -66,8 +66,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="372">
-              <caret line="69" column="50" selection-start-line="69" selection-start-column="50" selection-end-line="69" selection-end-column="50" />
+            <state relative-caret-position="216">
+              <caret line="65" column="10" selection-start-line="65" selection-start-column="10" selection-end-line="65" selection-end-column="10" />
             </state>
           </provider>
         </entry>
@@ -221,12 +221,12 @@
       <workItem from="1578817951649" duration="618000" />
       <workItem from="1578900535997" duration="5097000" />
       <workItem from="1578907167448" duration="144000" />
-      <workItem from="1578972376079" duration="4436000" />
+      <workItem from="1578972376079" duration="4482000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10383000" />
+    <option name="totallyTimeSpent" value="10429000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1358" y="-125" width="1936" height="1056" extended-state="6" />
@@ -499,8 +499,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/em/controller/Invoice.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="372">
-          <caret line="69" column="50" selection-start-line="69" selection-start-column="50" selection-end-line="69" selection-end-column="50" />
+        <state relative-caret-position="216">
+          <caret line="65" column="10" selection-start-line="65" selection-start-column="10" selection-end-line="65" selection-end-column="10" />
         </state>
       </provider>
     </entry>

application/em/controller/Invoice.php

@@ -36,7 +36,6 @@ class Invoice extends Base
         $search_text = Request::get('search_text');
         $search_type = Request::get('search_type');
         if($search_text){
-
             switch ($search_type) {
                 case '1':
                     $this->assign('search_text',$search_text);
@@ -60,11 +59,10 @@ class Invoice extends Base
         }
         $page =Request::param('page')?Request::param('page'):1;
         $limit = Request::param('limit')?Request::param('limit'):10;
-//        $data = (new EmInvoice)->getInvoiceList($map,$page,$limit);
-//        foreach ( $data as $key => &$v) {
-//            $v['status']=parseStatus($v['status']);
-//        }
-        $data = [];
+        $data = (new EmInvoice)->getInvoiceList($map,$page,$limit);
+        foreach ( $data as $key => &$v) {
+            $v['status']=parseStatus($v['status']);
+        }
         //$InvoiceCount = (new EmInvoice)->getInvoiceCount($map);
         if(Request::param('page')){
             return ['code'=>0,'msg'=>'','count'=>0,'data'=>$data];
@@ -72,6 +70,16 @@ class Invoice extends Base
 
         return $this->fetch();
 
+
+
+
+//        $data = (new EmInvoice)->getList();
+//
+//        $page = $data->render();
+//
+//        $this->assign('data',$data);
+//        $this->assign('page',$page);
+//        return $this->fetch();
     }
 
     //查看账单信息