Merge branch 'dev'

chenhaozhe

2025-07-03 d55da67a8b4bda5b9c8dc9e8d0313272c89c620c

 WebTM/views/²Ö´æ¹ÜÀí/×°Ïäµ¥/Sc_PackUnionBillMain_Packing.html

@@ -96,11 +96,11 @@
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<=">
                                                    <=< /option>
                                                    &lt;= </option>
                                                <option value="<">
                                                    << /option>
                                                    &lt; </option>
                                                <option value="<>">
                                                    <>
                                                    &lt;>
                                                </option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
@@ -130,11 +130,11 @@
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<=">
                                                    <=< /option>
                                                    &lt;= </option>
                                                <option value="<">
                                                    << /option>
                                                    &lt; </option>
                                                <option value="<>">
                                                    <>
                                                    &lt;>
                                                </option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
@@ -164,11 +164,11 @@
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<=">
                                                    <= </option>
                                                    &lt;= </option>
                                                <option value="<">
                                                    << /option>
                                                    &lt; </option>
                                                <option value="<>">
                                                    <>
                                                    &lt;>
                                                </option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
@@ -735,12 +735,13 @@
            function set_ClearQuery() {
                $("#HBillNo").val("");
                $('#HStatus').find("option[value='-1']").attr("selected", true);
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HBeginDate").val(util.toDateString(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(util.toDateString(new Date(), "yyyy-MM-dd"));
                $("#HOrgID").val(sessionStorage["OrganizationID"]);
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0"); $("#ColContent2").val("");
                $("#Comparator").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                $("#ColContent1").val("");