MES-WEB-LayUI.git

parent: fe50d723 | 补丁 | 提交 | ignore whitespace

chenhaozhe

2025-07-03 d55da67a8b4bda5b9c8dc9e8d0313272c89c620c

Merge branch 'dev'

2个文件已修改

	WebTM/views/仓存管理/组托单/Sc_PackUnionBillMain_Setto.html	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/仓存管理/装箱单/Sc_PackUnionBillMain_Packing.html	25 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/²Ö´æ¹ÜÀí/×éÍÐµ¥/Sc_PackUnionBillMain_Setto.html

@@ -98,11 +98,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>
@@ -132,11 +132,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>
@@ -166,11 +166,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>
@@ -736,13 +736,15 @@

            //#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
            function set_ClearQuery() {
                debugger
                $("#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"));
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0"); $("#ColContent2").val("");
                $("#Comparator").val("0"); 
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                $("#ColContent1").val("");

 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("");

			@@ -98,11 +98,11 @@
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<=">
			<=< /option>
			<= </option>
			<option value="<">
			<< /option>
			< </option>
			<option value="<>">
			<>
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			@@ -132,11 +132,11 @@
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<=">
			<=< /option>
			<= </option>
			<option value="<">
			<< /option>
			< </option>
			<option value="<>">
			<>
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			@@ -166,11 +166,11 @@
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<=">
			<= </option>
			<= </option>
			<option value="<">
			<< /option>
			< </option>
			<option value="<>">
			<>
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			@@ -736,13 +736,15 @@

			//#region éç½®è¿æ»¤æ¡ä»¶æ¹æ³
			function set_ClearQuery() {
			debugger
			$("#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"));
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0"); $("#ColContent2").val("");
			$("#Comparator").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#ColContent1").val("");

			@@ -96,11 +96,11 @@
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<=">
			<=< /option>
			<= </option>
			<option value="<">
			<< /option>
			< </option>
			<option value="<>">
			<>
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			@@ -130,11 +130,11 @@
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<=">
			<=< /option>
			<= </option>
			<option value="<">
			<< /option>
			< </option>
			<option value="<>">
			<>
			<>
			</option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			@@ -164,11 +164,11 @@
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<=">
			<= </option>
			<= </option>
			<option value="<">
			<< /option>
			< </option>
			<option value="<>">
			<>
			<>
			</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("");