Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yusijie

2024-11-02 6ef89c7ecf836c80d64b16a33478032e5c854be8

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_BarCodeBillList.html

@@ -321,7 +321,7 @@
                        $("#HSourceBillNo").val("");
                        $("#HMaterNumber").val("");
                        sWhere = "";
                        get_Display(sWhere);
                        get_DisplayPage(sWhere);

                        break;
                    //作废按钮
@@ -607,7 +607,8 @@
                            //do something
                            page = obj.curr;
                            size = obj.limit;
                            get_DisplayPage("");
                            // å‡è®¾æŒ‰é’®æœ‰ä¸€ä¸ªID为"myButton"
                            $("#btnSearch").trigger("click");
                        }
                    }
                }