wupengfei 2 vuotta sitten
vanhempi
commit
bed39ce0b9
2 muutettua tiedostoa jossa 2 lisäystä ja 3 poistoa
  1. 1 2
      .idea/workspace.xml
  2. 1 1
      application/synth/controller/BillHeader.php

+ 1 - 2
.idea/workspace.xml

@@ -4,7 +4,6 @@
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/synth/controller/BillHeader.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/controller/BillHeader.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/synth/view/bill_header/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/view/bill_header/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -211,7 +210,7 @@
       <workItem from="1672793409629" duration="408000" />
       <workItem from="1672793834653" duration="24306000" />
       <workItem from="1672880479757" duration="22897000" />
-      <workItem from="1672966192005" duration="13427000" />
+      <workItem from="1672966192005" duration="13442000" />
     </task>
     <servers />
   </component>

+ 1 - 1
application/synth/controller/BillHeader.php

@@ -26,7 +26,7 @@ class BillHeader extends Controller
         $were[] = ['i.is_deleted','=',0];
         if($this->request->request('user_name'))    $where[]= ['m.name','like','%'.$this->request->request('user_name').'%'];
         if($this->request->request('title'))         $where[]= ['i.title','like','%'.$this->request->request('title').'%'];
-        $query->alias('i')->field('i.* ,t.title type_name,m.headimg,m.name as user_name,m.phone')
+        $query->alias('i')->field('i.* ,b.title type_name,m.headimg,m.name as user_name,m.phone')
             ->join('store_member m',' m.id = i.user_id ','LEFT')
             ->join('bill_type b',' b.id = i.type ','LEFT');
         if(!empty($where)) $query->where($where);