MES-WEB-LayUI.git

parent: 134442a3 | 补丁 | 提交 | ignore whitespace

yusijie

2022-10-14 68226c5ac39b6154a6956f627b45e8663f9982fa

表头增加 物料编码、当前工序 的筛选条件（进站、出站、委外发出、委外接收）

4个文件已修改

	WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBillList.html	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBillList.html	24 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html	36 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/³µ¼ä¹ÜÀí/Î¯Íâ¹¤Ðò·¢³öµ¥/Cj_StationEntrustInBillList.html

@@ -79,6 +79,20 @@
                                            <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">äº§åä»£ç </label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">å½åå·¥åº</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HName" id="HName">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
@@ -214,6 +228,8 @@
                $("#HBillNo").val("");
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HNumber").val("");
                $("#HName").val("");
            }


@@ -223,9 +239,17 @@
                var HBillNo = $("#HBillNo").val();
                var HICMOBillNo = $("#HICMOBillNo").val();
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                var HNumber = $("#HNumber").val(); //äº§åä»£ç  å³ç©æç¼ç 
                var HName = $("#HName").val(); //å½åå·¥åº
                if (HBillNo) {
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'";
                }
                if (HNumber) {
                    sWhere += " and äº§åä»£ç  like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and å·¥åº like '%" + HName + "%'";
                }
                if (HStatus) {
                    switch (HStatus) {
                        case '-1':   //å¨é¨

 WebTM/views/³µ¼ä¹ÜÀí/Î¯Íâ¹¤Ðò½ÓÊÕµ¥/Cj_StationEntrustOutBillList.html

@@ -79,6 +79,20 @@
                                            <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">äº§åä»£ç </label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">å½åå·¥åº</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HName" id="HName">
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
@@ -221,6 +235,8 @@
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HProcExchBillNo").val("");
                $("#HNumber").val("");
                $("#HName").val("");
            }

            //å¿«éè¿æ»¤
@@ -229,9 +245,17 @@
                var HBillNo = $("#HBillNo").val();
                var HICMOBillNo = $("#HICMOBillNo").val();
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                var HNumber = $("#HNumber").val(); //äº§åä»£ç  å³ç©æç¼ç 
                var HName = $("#HName").val(); //å½åå·¥åº
                if (HBillNo) {
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'";
                }
                if (HNumber) {
                    sWhere += " and äº§åä»£ç  like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and å·¥åº like '%" + HName + "%'";
                }
                if (HStatus) {
                    switch (HStatus) {
                        case '-1':   //å¨é¨

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -81,12 +81,26 @@
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px;">
                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">äº§åä»£ç </label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">å½åå·¥åº</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HName" id="HName">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <div class="layui-input-block">
                                                <input type="checkbox" name="checkHWasterQty" id="checkHWasterQty" lay-skin="primary" lay-filter="checkHWasterQty" title="æ¥åºæ°éä¸ä¸º0">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">è¿æ»¤</label>
                                            <div class="layui-input-block">
@@ -575,7 +589,7 @@

            //éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HWorkBillNo").val();
                $("#HWorkBillNo").val("");
                $("#HBillNo").val("");
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -583,7 +597,10 @@
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#HNumber").val("");
                $("#HName").val("");
                form.render('select');
                sWhere = "";
            }

            //å¿«éè¿æ»¤
@@ -596,8 +613,10 @@
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//å¤éæ¡
                var ColName = $("#ColName").val();//å¤éæ¡
                var Comparator = $("#Comparator").val()
                var Comparator = $("#Comparator").val();
                var ColContent = $("#ColContent").val();
                var HNumber = $("#HNumber").val(); //äº§åä»£ç  å³ç©æç¼ç 
                var HName = $("#HName").val(); //å½åå·¥åº

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
@@ -642,8 +661,12 @@
                if (checkHWasterQty) {
                    sWhere += "  and æ¥åºæ°é>0 ";
                }


                if (HNumber) {
                    sWhere += " and äº§åä»£ç  like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and å½åå·¥åº like '%" + HName + "%'";
                }

                if (HStatus) {
                    switch (HStatus) {
@@ -736,6 +759,9 @@
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                            //layer.alert("æ¥è¯¢æå", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBillList.html

@@ -84,6 +84,20 @@
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">äº§åä»£ç </label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">å½åå·¥åº</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HName" id="HName">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">è¿æ»¤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
@@ -416,6 +430,9 @@
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }
                            //layer.alert("æ¥è¯¢æå", { icon: 1 });
                        } else {
                            layer.close(ajaxLoad);
@@ -440,6 +457,8 @@
                var ColName = $("#ColName").val();//å¤éæ¡
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                var HNumber = $("#HNumber").val(); //äº§åä»£ç  å³ç©æç¼ç 
                var HName = $("#HName").val(); //å½åå·¥åº

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
@@ -478,6 +497,12 @@
                if (HBillNo) {
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'";
                }
                if (HNumber) {
                    sWhere += " and äº§åä»£ç  like '%" + HNumber + "%'";
                }
                if (HName) {
                    sWhere += " and å½åå·¥åº like '%" + HName + "%'";
                }
                if (HStatus) {
                    switch (HStatus) {
                        case '-1':   //å¨é¨
@@ -500,7 +525,7 @@

            //éç½®è¿æ»¤æ¡ä»¶
            function set_ClearQuery() {
                $("#HWorkBillNo").val();
                $("#HWorkBillNo").val("");
                $("#HBillNo").val("");
                $("#å·¥åºæµè½¬å¡å·").val("");
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
@@ -508,6 +533,8 @@
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#HNumber").val("");
                $("#HName").val("");
                form.render('select');
                sWhere = "";
            }

			@@ -79,6 +79,20 @@
			<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
			</div>
			</div>
			<div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">äº§åä»£ç </label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HNumber" id="HNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å½åå·¥åº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HName" id="HName">
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -214,6 +228,8 @@
			$("#HBillNo").val("");
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HNumber").val("");
			$("#HName").val("");
			}


			@@ -223,9 +239,17 @@
			var HBillNo = $("#HBillNo").val();
			var HICMOBillNo = $("#HICMOBillNo").val();
			var HProcExchBillNo = $("#HProcExchBillNo").val();
			var HNumber = $("#HNumber").val(); //äº§åä»£ç å³ç©æç¼ç
			var HName = $("#HName").val(); //å½åå·¥åº
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (HNumber) {
			sWhere += " and äº§åä»£ç like '%" + HNumber + "%'";
			}
			if (HName) {
			sWhere += " and å·¥åº like '%" + HName + "%'";
			}
			if (HStatus) {
			switch (HStatus) {
			case '-1': //å¨é¨

			@@ -81,12 +81,26 @@
			</div>
			</div>
			</div>
			<div class="layui-row" style=" margin-top: 10px;">
			<div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">äº§åä»£ç </label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HNumber" id="HNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å½åå·¥åº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HName" id="HName">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-block">
			<input type="checkbox" name="checkHWasterQty" id="checkHWasterQty" lay-skin="primary" lay-filter="checkHWasterQty" title="æ¥åºæ°éä¸ä¸º0">
			</div>
			</div>
			</div>
			<div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			@@ -575,7 +589,7 @@

			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#HWorkBillNo").val();
			$("#HWorkBillNo").val("");
			$("#HBillNo").val("");
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			@@ -583,7 +597,10 @@
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#HNumber").val("");
			$("#HName").val("");
			form.render('select');
			sWhere = "";
			}

			//å¿«éè¿æ»¤
			@@ -596,8 +613,10 @@
			var HProcExchBillNo = $("#HProcExchBillNo").val();
			var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//å¤éæ¡
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var Comparator = $("#Comparator").val();
			var ColContent = $("#ColContent").val();
			var HNumber = $("#HNumber").val(); //äº§åä»£ç å³ç©æç¼ç
			var HName = $("#HName").val(); //å½åå·¥åº

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			@@ -642,8 +661,12 @@
			if (checkHWasterQty) {
			sWhere += " and æ¥åºæ°é>0 ";
			}


			if (HNumber) {
			sWhere += " and äº§åä»£ç like '%" + HNumber + "%'";
			}
			if (HName) {
			sWhere += " and å½åå·¥åº like '%" + HName + "%'";
			}

			if (HStatus) {
			switch (HStatus) {
			@@ -736,6 +759,9 @@
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);

			@@ -84,6 +84,20 @@
			</div>
			<div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">äº§åä»£ç </label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HNumber" id="HNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å½åå·¥åº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HName" id="HName">
			</div>
			</div>
			</div>
			<div class="layui-row" style=" margin-top: 10px; margin-left: 80px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			@@ -416,6 +430,9 @@
			DisPlay_HideColumn();

			layer.close(ajaxLoad);
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			@@ -440,6 +457,8 @@
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			var HNumber = $("#HNumber").val(); //äº§åä»£ç å³ç©æç¼ç
			var HName = $("#HName").val(); //å½åå·¥åº

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			@@ -478,6 +497,12 @@
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (HNumber) {
			sWhere += " and äº§åä»£ç like '%" + HNumber + "%'";
			}
			if (HName) {
			sWhere += " and å½åå·¥åº like '%" + HName + "%'";
			}
			if (HStatus) {
			switch (HStatus) {
			case '-1': //å¨é¨
			@@ -500,7 +525,7 @@

			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#HWorkBillNo").val();
			$("#HWorkBillNo").val("");
			$("#HBillNo").val("");
			$("#å·¥åºæµè½¬å¡å·").val("");
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			@@ -508,6 +533,8 @@
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#HNumber").val("");
			$("#HName").val("");
			form.render('select');
			sWhere = "";
			}