wupengfei 2 years ago
parent
commit
8931ebefb6

+ 3 - 1
.idea/workspace.xml

@@ -3,6 +3,8 @@
   <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/controller/SupplierGoods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/SupplierGoods.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/operate/view/supplier/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/supplier/form.html" 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" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -291,7 +293,7 @@
       <workItem from="1681348081818" duration="22448000" />
       <workItem from="1681434523223" duration="19578000" />
       <workItem from="1681463431612" duration="3188000" />
-      <workItem from="1681692707179" duration="15813000" />
+      <workItem from="1681692707179" duration="16078000" />
     </task>
     <servers />
   </component>

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

@@ -170,6 +170,8 @@ class SupplierGoods extends Controller
         $data['create_at'] = date('Y-m-d H:i:s');
         $this->supplier_list = \app\common\model\Supplier::getSupplierName(0);
        // $this->company_list = \app\common\model\Company::getCompanyName();
+        $all_cate  = \app\common\model\SupplierCate::where(['is_deleted'=>0])->order('sort desc ,id desc')->select();
+        $this->cate_tree = make_tree($all_cate);
         $this->assign('waitSecond','1');
         $this->assign("jumpUrl",$_SERVER["HTTP_REFERER"]);
     }

+ 42 - 0
application/operate/view/supplier/form.html

@@ -35,6 +35,48 @@
                     </div>
 
 
+                    <div class="layui-form-item layui-row layui-col-space15">
+                        <label class="layui-col-xs9 relative">
+                            <span class="color-green">分类</span>
+                        </label>
+                        <div class="layui-inline" style="top: -15px;margin-bottom: -25px">
+                            <div class="layui-input-inline">
+                                <select name="first_classify" lay-filter ="first_classify">
+                                    <option value="0">请选择</option>
+                                    {if !empty($cate_tree)}
+                                    {foreach $cate_tree as $ck=>$cv}
+                                    {if  isset($vo.first_classify) && $vo.first_classify == $cv['id'] }
+                                    <option selected data-cl_key="{$ck}" value="{$cv['id']}">{$cv['title']}</option>
+                                    {else}
+                                    <option data-cl_key="{$ck}" value="{$cv['id']}">{$cv['title']}</option>
+                                    {/if}
+                                    {/foreach}
+                                    {/if}
+                                </select>
+                            </div>
+                            <div class="layui-input-inline">
+                                <select name="second_classify" lay-filter ="second_classify">
+                                    <option value="0">请选择</option>
+                                    {if !empty($cate_tree)}
+                                    {foreach $cate_tree as $ck=>$cv}
+                                    {if isset($vo.first_classify) && $vo.first_classify == $cv['id'] }
+                                    {if isset($cv['children'])}
+                                    {foreach $cv['children'] as $cln}
+                                    {if isset($vo.second_classify) && $vo.second_classify == $cln['id'] }
+                                    <option selected  value="{$cln['id']}">{$cln['title']}</option>
+                                    {else}
+                                    <option  value="{$cln['id']}">{$cln['title']}</option>
+                                    {/if}
+                                    {/foreach}
+                                    {/if}
+                                    {/if}
+                                    {/foreach}
+                                    {/if}
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+
 
                     <div class="layui-form-item layui-row layui-col-space15">
                         <label class="layui-col-xs9 relative">

+ 62 - 1
application/operate/view/supplier_goods/form.html

@@ -40,6 +40,50 @@
                         </label>
                     </div>
 
+                    <div class="layui-form-item layui-row layui-col-space15">
+                        <label class="layui-col-xs9 relative">
+                            <span class="color-green">分类</span>
+                        </label>
+                        <div class="layui-inline" style="top: -15px;margin-bottom: -25px">
+                            <div class="layui-input-inline">
+                                <select name="first_classify" lay-filter ="first_classify">
+                                    <option value="0">请选择</option>
+                                    {if !empty($cate_tree)}
+                                    {foreach $cate_tree as $ck=>$cv}
+                                    {if  isset($vo.first_classify) && $vo.first_classify == $cv['id'] }
+                                    <option selected data-cl_key="{$ck}" value="{$cv['id']}">{$cv['title']}</option>
+                                    {else}
+                                    <option data-cl_key="{$ck}" value="{$cv['id']}">{$cv['title']}</option>
+                                    {/if}
+                                    {/foreach}
+                                    {/if}
+                                </select>
+                            </div>
+                            <div class="layui-input-inline">
+                                <select name="second_classify" lay-filter ="second_classify">
+                                    <option value="0">请选择</option>
+                                    {if !empty($cate_tree)}
+                                    {foreach $cate_tree as $ck=>$cv}
+                                    {if isset($vo.first_classify) && $vo.first_classify == $cv['id'] }
+                                    {if isset($cv['children'])}
+                                    {foreach $cv['children'] as $cln}
+                                    {if isset($vo.second_classify) && $vo.second_classify == $cln['id'] }
+                                    <option selected  value="{$cln['id']}">{$cln['title']}</option>
+                                    {else}
+                                    <option  value="{$cln['id']}">{$cln['title']}</option>
+                                    {/if}
+                                    {/foreach}
+                                    {/if}
+                                    {/if}
+                                    {/foreach}
+                                    {/if}
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+
+
+
 
                     <div class="layui-form-item layui-row layui-col-space15" >
                         <label class="layui-col-xs9 relative">
@@ -58,7 +102,6 @@
                     </div>
 
 
-
                     <div class="layui-form-item layui-row layui-col-space15">
                         <label class="layui-col-xs9 relative">
                             <span class="color-green">关联资料</span>
@@ -300,5 +343,23 @@
         window.form.render();
     });
 
+
+    // 分类选择监听
+    form.on('select(first_classify)', function(data){
+        var cl_html = '<option value="0">请选择</option>';
+        if(data.value == 0) {
+            $("select[name='second_classify']").html(cl_html);
+        }else{
+            var cl_key =  data.elem[data.elem.selectedIndex].dataset.cl_key;
+            var goods_spec = {:json_encode($cate_tree)};
+            $.each(goods_spec[cl_key]['children'],function (ck,cv) {
+                cl_html +='<option value="'+cv.id+'">'+cv.title+'</option>';
+            })
+            $("select[name='second_classify']").html(cl_html);
+        }
+        window.form.render();
+    });
+
+
 </script>
 {/block}