wupengfei 2 jaren geleden
bovenliggende
commit
b3d33ed5ca

+ 5 - 4
.idea/workspace.xml

@@ -2,8 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/application/synth/view/bill_header/index_search.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/synth/view/bill_header/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/view/bill_header/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/synth/controller/BillHeader.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/controller/BillHeader.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -121,7 +122,7 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/application/synth/view" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/application/synth/view/bill_header" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -137,11 +138,11 @@
       <recent name="D:\zs\gaoyixia\application\api\controller" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\zs\gaoyixia\application\synth\view\bill_header" />
       <recent name="D:\zs\gaoyixia\application\synth\view" />
       <recent name="D:\zs\gaoyixia\application\synth\controller" />
       <recent name="D:\zs\gaoyixia\application\common\model" />
       <recent name="D:\zs\gaoyixia\application\common\validate" />
-      <recent name="D:\zs\gaoyixia\application\synth\view\bill_type" />
     </key>
   </component>
   <component name="SvnConfiguration">
@@ -210,7 +211,7 @@
       <workItem from="1672793409629" duration="408000" />
       <workItem from="1672793834653" duration="24306000" />
       <workItem from="1672880479757" duration="22897000" />
-      <workItem from="1672966192005" duration="13728000" />
+      <workItem from="1672966192005" duration="13999000" />
     </task>
     <servers />
   </component>

+ 2 - 0
application/synth/controller/BillHeader.php

@@ -22,10 +22,12 @@ class BillHeader extends Controller
     {
         $this->title = '收货地址列表';
         $query = $this->_query($this->table);
+        $this->type_arr = \app\common\model\BillType::getType();
         $where= [];
         $were[] = ['i.is_deleted','=',0];
         if($this->request->request('user_name'))    $where[]= ['m.name','like','%'.$this->request->request('user_name').'%'];
         if($this->request->request('title'))         $where[]= ['i.title','like','%'.$this->request->request('title').'%'];
+        if($this->request->request('type'))         $where[]= ['i.type','=',$this->request->request('type')];
         $query->alias('i')->field('i.* ,b.title type_name,m.headimg,m.name as user_name,m.phone')
             ->join('store_member m',' m.id = i.user_id ','LEFT')
             ->join('bill_type b',' b.id = i.type ','LEFT');

+ 36 - 0
application/synth/view/bill_header/index_search.html

@@ -0,0 +1,36 @@
+<fieldset>
+    <legend>条件搜索</legend>
+    <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
+
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">会员名称</label>
+            <div class="layui-input-inline">
+                <input name="user_name" value="{$Think.get.user_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="type">
+                    <option value="0">全部</option>
+                    {foreach $type_arr as $k=>$v}
+                        {if $Think.get.type eq $v['id']}
+                        <option selected value="{$v.id}">{$v.title}</option>
+                        {else}
+                        <option  value="{$v.id}">{$v.title}</option>
+                        {/if}
+                    {/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>
+    </form>
+    <script>
+        form.render();
+        laydate.render({elem: '[name="sel_time"]'})
+    </script>
+</fieldset>