Merge branch 'master' of http://60.12.218.120:8083/wufan/ERP

TradeManageNew/Huowu/HW_GoodsDetailList2TemuSku.aspx

@@ -160,8 +160,8 @@
             var param = {
                 PageSize: datagrid1.Get_PageSize(),
                 PageIndex: datagrid1.Get_PageIndex(),
+                GoodsCode: $('#txt_GoodsCode').val() || null,
             }
-
             WindowLoadModel.Show();
             $.ajax({
                 url: "../OuterService/ShageService.ashx?UserCode=cs&Ver=1.0&Method=GetTemuSKUData&DeviceNo=HTTP/1.1",
@@ -174,6 +174,12 @@
                 }
             });
         }
+        //#endregion
+
+        //#region 读取数据
+        function ExportData(){
+        }
+        //#endregion
     </script>
 
 </head>
@@ -183,6 +189,16 @@
     </div>
 
     <table id="tb1" class="tableAll" style="width: 100%;">
+        <tr>
+            <td class="f1" style="width: 10%;">SKU：</td>
+            <td width="15%">
+                <input id="txt_GoodsCode" class="editTextbox" style="width: 150px;" type="text" />
+            </td>
+            <td>
+                <input id="btn_sch" class="btnClass btnClassFind" type="button" value="查询" onclick="ReadData();" />&nbsp&nbsp
+                <%--<input id="btn_dc3" onclick="ExportData();" class="btnClass btnClassExcelTemplate" type="button" value="导出" />--%>
+             </td>
+        </tr>
         <tr>
             <td valign="top" colspan="7">
                 <div id="DataGrid1" class="DataGridStyle"></div>