1

.idea/workspace.xml

@@ -3,7 +3,10 @@
   <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_goods/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier_goods/form.html" 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/company/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/company/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/operate/view/supplier/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier/index.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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -289,7 +292,7 @@
       <workItem from="1681174490906" duration="23334000" />
       <workItem from="1681260946292" duration="27381000" />
       <workItem from="1681348081818" duration="22448000" />
-      <workItem from="1681434523223" duration="16046000" />
+      <workItem from="1681434523223" duration="16493000" />
     </task>
     <servers />
   </component>

application/operate/controller/SupplierGoods.php

@@ -31,7 +31,7 @@ class SupplierGoods extends Controller
     public function index()
     {
         $this->title = '供货商商品列表';
-        $supplier_id = input('get.id');
+        $supplier_id = input('get.supplier_id');
         $company_id = input('get.company_id');
         $this->supplier_id = $supplier_id;
         $where = [];

application/operate/view/company/index.html

@@ -31,7 +31,7 @@
             <td class='text-left'>{$vo.create_at|default='--'}</td>
             <td class='text-left' style="width: 20%">
                 <a data-title="编辑" class="layui-btn layui-btn-sm" data-open='{:url("edit")}?id={$vo.id}'>编 辑</a>
-                <a data-title="产品合集" class="layui-btn layui-btn-sm" data-open='{:url("/operate/supplier_goods/index")}?company_id={$vo.id}'>产品合集</a>
+                <a data-title="产品合集" class="layui-btn layui-btn-sm" data-open='{:url("/operate/supplier_goods/index")}?company_id={$vo.id}source=2'>产品合集</a>
                 <span class="layui-btn layui-btn-sm layui-btn-danger" onclick="btn_confirm('删除','del','{$vo.id}');">删 除</span>
             </td>
         </tr>

application/operate/view/supplier/index.html

@@ -1,7 +1,7 @@
 {extend name='admin@main'}
 
 {block name="button"}
-<button data-open='{:url("add")}' data-title="添加" class='layui-btn layui-btn-sm layui-btn-primary'>添加</button>
+<button data-open='{:url("add")}?suppe' data-title="添加" class='layui-btn layui-btn-sm layui-btn-primary'>添加</button>
 {/block}
 {block name="content"}
 <div class="think-box-shadow">
@@ -31,7 +31,7 @@
             <td class='text-left'>{$vo.create_at|default='--'}</td>
             <td class='text-left' style="width: 20%">
                 <a data-title="编辑" class="layui-btn layui-btn-sm" data-open='{:url("edit")}?id={$vo.id}'>编 辑</a>
-                <a data-title="产品合集" class="layui-btn layui-btn-sm" data-open='{:url("/operate/supplier_goods/index")}?id={$vo.id}'>产品合集</a>
+                <a data-title="产品合集" class="layui-btn layui-btn-sm" data-open='{:url("/operate/supplier_goods/index")}?supplier_id={$vo.id}&source=1'>产品合集</a>
                 <span class="layui-btn layui-btn-sm layui-btn-danger" onclick="btn_confirm('删除','del','{$vo.id}');">删 除</span>
             </td>
         </tr>

application/operate/view/supplier_goods/index.html

@@ -24,7 +24,8 @@
             <td class='text-left nowrap'>{$vo.name|default=''}</td>
 
             <td class='text-left' style="width: 20%">
-                <a data-title="编 辑" class="layui-btn layui-btn-sm" data-open='{:url("edit")}?id={$vo.id}&supplier_id={$vo.supplier_id}'>编 辑</a>
+
+                <a data-title="编 辑" class="layui-btn layui-btn-sm" data-open='{:url("edit")}?id={$vo.id}&supplier_id={$vo.supplier_id}&source={$Think.get.source}'>编 辑</a>
                 <span class="layui-btn layui-btn-sm layui-btn-danger" onclick="btn_confirm('删除','del','{$vo.id}');">删 除</span>
             </td>
         </tr>