1

.idea/workspace.xml

@@ -4,6 +4,7 @@
     <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/controller/SupplierGoods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/operate/view/supplier_goods/index_search.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier_goods/index_search.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -289,7 +290,7 @@
       <workItem from="1681174490906" duration="23334000" />
       <workItem from="1681260946292" duration="27381000" />
       <workItem from="1681348081818" duration="22448000" />
-      <workItem from="1681434523223" duration="18556000" />
+      <workItem from="1681434523223" duration="18773000" />
     </task>
     <servers />
   </component>

application/operate/controller/SupplierGoods.php

@@ -34,6 +34,8 @@ class SupplierGoods extends Controller
         $supplier_id = input('get.supplier_id');
         $company_id = input('get.company_id');
         $this->supplier_id = $supplier_id;
+        $this->supplier_list = \app\common\model\Supplier::getSupplierName();
+        $this->company_list = \app\common\model\Company::getCompanyName();
         $where = [];
         $where[] = ['a.is_deleted','=',0];
         if($supplier_id)$where[] = ['a.supplier_id','=',$supplier_id];

application/operate/view/supplier_goods/index_search.html

@@ -7,6 +7,32 @@
                 <input name="name" value="{$Think.get.name|default=''}" placeholder="名称" class="layui-input">
             </div>
         </div>
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">供应商</label>
+            <div class="layui-input-inline">
+                <select class="layui-select" name="supplier_id">
+                    <option  {if $Think.get.supplier_id eq 0}selected{/if} value="0">全部</option>
+                    {foreach $supplier_list as $lk=>$lv}
+                    <option {if $Think.get.supplier_id eq $lk}selected {/if}  value="{$lk}" >{$lv}</option>
+                    {/foreach}
+                </select>
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">公司</label>
+            <div class="layui-input-inline">
+                <select class="layui-select" name="company_id">
+                    <option  {if $Think.get.company_id eq 0}selected{/if} value="0">全部</option>
+                    {foreach $company_list as $lk=>$lv}
+                    <option {if $Think.get.company_id eq $lk}selected {/if}  value="{$lk}" >{$lv}</option>
+                    {/foreach}
+                </select>
+            </div>
+        </div>
+
+
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>