wupengfei 2 سال پیش
والد
کامیت
d744ab9153
2فایلهای تغییر یافته به همراه4 افزوده شده و 3 حذف شده
  1. 2 3
      .idea/workspace.xml
  2. 2 0
      application/operate/controller/SupplierGoods.php

+ 2 - 3
.idea/workspace.xml

@@ -3,8 +3,7 @@
   <component name="ChangeListManager">
     <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/operate/view/supplier_classify/second.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier_classify/second.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/operate/view/supplier_goods/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier_goods/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -292,7 +291,7 @@
       <workItem from="1681348081818" duration="22448000" />
       <workItem from="1681434523223" duration="19578000" />
       <workItem from="1681463431612" duration="3188000" />
-      <workItem from="1681692707179" duration="14708000" />
+      <workItem from="1681692707179" duration="14760000" />
     </task>
     <servers />
   </component>

+ 2 - 0
application/operate/controller/SupplierGoods.php

@@ -33,6 +33,7 @@ class SupplierGoods extends Controller
         $this->title = '供货商商品列表';
         $supplier_id = input('get.supplier_id');
         $company_id = input('get.company_id');
+        $third_classify = input('get.third_classify');
         $this->supplier_id = $supplier_id;
         $this->supplier_list = \app\common\model\Supplier::getSupplierName();
         $this->company_list = \app\common\model\Company::getCompanyName();
@@ -40,6 +41,7 @@ class SupplierGoods extends Controller
         $where[] = ['a.is_deleted','=',0];
         if($supplier_id)$where[] = ['a.supplier_id','=',$supplier_id];
         if($company_id)$where[] = ['a.company_id','=',$company_id];
+        if($third_classify)$where[] = ['a.third_classify','=',$third_classify];
         $query = $this->_query($this->table)->where($where)->like('a.name')->alias('a')->field('a.*,b.title supplier_name ,c.title company_name');
         $query->leftJoin('Supplier b','b.id = a.supplier_id')->leftJoin('Company c','c.id = a.company_id');
         $query->order(' a.sort desc , a.id desc')->page();