wupengfei 2 years ago
parent
commit
a1f70429eb

+ 4 - 2
.idea/workspace.xml

@@ -3,7 +3,9 @@
   <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/nutrition/view/series_article/index_search.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/series_article/index_search.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/controller/SeriesDatum.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/controller/SeriesDatum.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/series_datum/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/series_datum/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/nutrition/view/series_datum/index_search.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/nutrition/view/series_datum/index_search.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -267,7 +269,7 @@
       <workItem from="1679014817602" duration="22183000" />
       <workItem from="1679287382176" duration="14525000" />
       <workItem from="1679359715116" duration="25702000" />
-      <workItem from="1679532313623" duration="18382000" />
+      <workItem from="1679532313623" duration="18501000" />
     </task>
     <servers />
   </component>

+ 1 - 0
application/nutrition/controller/SeriesDatum.php

@@ -42,6 +42,7 @@ class SeriesDatum extends Controller
         $sel_where = [];
         $sel_where[] = ['is_deleted','=',0];
         $sel_where[] = ['type','=',2];
+        if($id = $this->request->get('id')) $sel_where[] = ['id','=',$id];
         if($title = $this->request->get('title')) $sel_where[] = ['title','like','%'.$title.'%'];
         $query = $this->_query($this->table);
         $query->where($sel_where)->order('sort desc,id asc')->page();

+ 1 - 0
application/nutrition/view/series_datum/index.html

@@ -4,6 +4,7 @@
 {/block}
 {block name="content"}
 <div class="think-box-shadow">
+    {include file='series_datum/index_search'}
     <table class="layui-table margin-top-20" lay-skin="line">
         <thead>
         <tr>

+ 9 - 2
application/nutrition/view/series_datum/index_search.html

@@ -1,10 +1,17 @@
 <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">ID</label>
+            <div class="layui-input-inline">
+                <input name="id" maxlength="60"  value='{$vo.id|default=""}' placeholder="请输入ID" class="layui-input">
+            </div>
+        </div>
         <div class="layui-form-item layui-inline">
-            <label class="layui-form-label">目录名称</label>
+            <label class="layui-form-label">标题</label>
             <div class="layui-input-inline">
-                <input name="title" value="{$Think.get.title|default=''}" placeholder="请输入目录名称" class="layui-input">
+                <input name="title" value="{$Think.get.title|default=''}" placeholder="请输入标题" class="layui-input">
             </div>
         </div>