优化报表的查询条件

erp_web/pages/reports/in_material_count.html

@@ -34,6 +34,12 @@
                 <select name="searchProjectId" id="searchProjectId" style="width:100px;height: 30px;border: 1px solid #d3d3d3;border-radius:5px;"></select>
             </div>
         </div>
+        <div class="form-group">
+            <label class="control-label">商品信息：</label>
+            <div class="control-inline">
+                <input type="text" id="searchMaterial" name="searchMaterial" data-options="prompt:'名称、规格、型号'" class="easyui-textbox width-120"/>
+            </div>
+        </div>
         <div class="form-group">
             <label class="control-label">单据日期：</label>
             <div class="control-inline">
@@ -271,6 +277,7 @@
                 currentPage: pageNo,
                 pageSize: pageSize,
                 organId: $('#OrganId').combobox('getValue'),
+                materialParam: $.trim($("#searchMaterial").val()),
                 projectId: $.trim($("#searchProjectId").val()),
                 depotIds: depotString,
                 beginTime: $("#searchBeginTime").val(),