wupengfei 2 anos atrás
pai
commit
5971118c5d

+ 2 - 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" />
@@ -291,7 +292,7 @@
       <workItem from="1681348081818" duration="22448000" />
       <workItem from="1681434523223" duration="19578000" />
       <workItem from="1681463431612" duration="3188000" />
-      <workItem from="1681692707179" duration="14760000" />
+      <workItem from="1681692707179" duration="14816000" />
     </task>
     <servers />
   </component>

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

@@ -36,7 +36,7 @@ class SupplierGoods extends Controller
         $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();
+        //$this->company_list = \app\common\model\Company::getCompanyName();
         $where = [];
         $where[] = ['a.is_deleted','=',0];
         if($supplier_id)$where[] = ['a.supplier_id','=',$supplier_id];
@@ -169,7 +169,7 @@ class SupplierGoods extends Controller
             ->select()->toArray();
         $data['create_at'] = date('Y-m-d H:i:s');
         $this->supplier_list = \app\common\model\Supplier::getSupplierName();
-        $this->company_list = \app\common\model\Company::getCompanyName();
+       // $this->company_list = \app\common\model\Company::getCompanyName();
         $this->assign('waitSecond','1');
         $this->assign("jumpUrl",$_SERVER["HTTP_REFERER"]);
     }

+ 0 - 12
application/operate/view/supplier_goods/index_search.html

@@ -20,18 +20,6 @@
             </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.title}</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>