MES-WEB-LayUI.git

parent: 9e789f4b | 补丁 | 提交 | ignore whitespace

yangle

2022-09-22 43102c3eb398b9130eb5cd4b7bc5a1fbe0622bd6

过滤  工序 进出 站

2个文件已修改

	WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html	63 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html	108 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -90,19 +90,19 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">è¿æ»¤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" lay-filter="ColName" style="width:190px;">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" lay-filter="Comparator" style="width:190px;">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="1">=</option>
                                                <option value="2=">>=</option>
                                                <option value="3">></option>
                                                <option value="4">=</option>
                                                <option value="5"><</option>
                                                <option value="6"><></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">åå«</option>
                                                <option value="8">å·¦åå«</option>
                                                <option value="9">å³åå«</option>
@@ -110,7 +110,7 @@
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" name="ColContent" id="ColContent">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
@@ -264,6 +264,7 @@
                };
                set_ClearQuery();
                get_FastQuery();
               
            }

            //åè½æé®æ¯å¦ç¦ç¨æ¹æ³ï¼æ¯æ¬¡å è½½è¡¨æ ¼é½è¦è°ç¨
@@ -578,6 +579,10 @@
                $("#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("");
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                form.render('select');
            }

            //å¿«éè¿æ»¤
@@ -589,6 +594,31 @@
                var HBillNo = $("#HBillNo").val();
                var HProcExchBillNo = $("#HProcExchBillNo").val();
                var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//å¤éæ¡
                var ColName = $("#ColName").val();//å¤éæ¡
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName+    " "+ com;
                }

                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),åºç«æ¶é´, 23) >= '" + HBeginDate + "'";
@@ -611,6 +641,9 @@
                if (checkHWasterQty) {
                    sWhere += "  and æ¥åºæ°é>0 ";
                }



                if (HStatus) {
                    switch (HStatus) {
                        case '-1':   //å¨é¨
@@ -648,6 +681,9 @@
                        }
                        table.render(option);
                        btnIs();
                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();
                        }
                        layer.close(wait);
                    }, error: function () {
                        layer.close(wait);
@@ -695,7 +731,14 @@

            //åææ¾ç¤ºä¸ææ¡
            function ColFilter() {

                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").append(Organization);
                form.render('select');
            }

            //ä»¥ä¸æ¯layuiæ¨¡å

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

@@ -57,31 +57,60 @@
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
                                <div class="layui-colla-content">
                                    <div class="layui-inline">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <span>å¶ä»æ¡ä»¶></span>
                                            <div class="layui-inline">
                                                <span>å¶ä»æ¡ä»¶></span>
                                            </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="HWorkBillNo" id="HWorkBillNo">
                                            </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="HBillNo" id="HBillNo">
                                            </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="å·¥åºæµè½¬å¡å·" id="å·¥åºæµè½¬å¡å·">
                                            </div>
                                        </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="HWorkBillNo" id="HWorkBillNo">
                                    <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;">
                                                </select>
                                            </div>
                                        </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="HBillNo" id="HBillNo">
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">åå«</option>
                                                <option value="8">å·¦åå«</option>
                                                <option value="9">å³åå«</option>
                                                <option value="10">ä¸åå«</option>
                                            </select>
                                        </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="å·¥åºæµè½¬å¡å·" id="å·¥åºæµè½¬å¡å·">
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                </div>
                            </div>
                                </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
@@ -344,6 +373,9 @@
                        }
                        table.render(option);
                        btnIs();
                        if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                            ColFilter();
                        }
                        layer.close(wait);
                    }, error: function () {
                        layer.close(wait);
@@ -360,6 +392,32 @@
                var HBillNo = $("#HBillNo").val();  //åæ®å·
                var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
                var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
                var ColName = $("#ColName").val();//å¤éæ¡
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }

                if (å·¥åºæµè½¬å¡å·) {
                    sWhere += " and å·¥åºæµè½¬å¡å· like '%" + å·¥åºæµè½¬å¡å· + "%'";
                }
@@ -402,6 +460,10 @@
                $("#å·¥åºæµè½¬å¡å·").val("");
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                form.render('select');
            }

            //ç¼è¾åæ®
@@ -563,6 +625,18 @@
                }
            }

            //åææ¾ç¤ºä¸ææ¡
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").append(Organization);
                form.render('select');
            }

            //ä»¥ä¸æ¯layuiæ¨¡å
        });

			@@ -90,19 +90,19 @@
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName" lay-filter="ColName" style="width:190px;">
			<select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator" lay-filter="Comparator" style="width:190px;">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="1">=</option>
			<option value="2=">>=</option>
			<option value="3">></option>
			<option value="4">=</option>
			<option value="5"><</option>
			<option value="6"><></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			@@ -110,7 +110,7 @@
			</select>
			</div>
			<div class="layui-inline">
			<input type="text" class="layui-input" name="ColContent" id="ColContent">
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			</div>
			@@ -264,6 +264,7 @@
			};
			set_ClearQuery();
			get_FastQuery();

			}

			//åè½æé®æ¯å¦ç¦ç¨æ¹æ³ï¼æ¯æ¬¡å è½½è¡¨æ ¼é½è¦è°ç¨
			@@ -578,6 +579,10 @@
			$("#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("");
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			form.render('select');
			}

			//å¿«éè¿æ»¤
			@@ -589,6 +594,31 @@
			var HBillNo = $("#HBillNo").val();
			var HProcExchBillNo = $("#HProcExchBillNo").val();
			var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//å¤éæ¡
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName+ " "+ com;
			}

			if (HBeginDate) {
			sWhere += " and CONVERT(varchar(100),åºç«æ¶é´, 23) >= '" + HBeginDate + "'";
			@@ -611,6 +641,9 @@
			if (checkHWasterQty) {
			sWhere += " and æ¥åºæ°é>0 ";
			}



			if (HStatus) {
			switch (HStatus) {
			case '-1': //å¨é¨
			@@ -648,6 +681,9 @@
			}
			table.render(option);
			btnIs();
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			layer.close(wait);
			}, error: function () {
			layer.close(wait);
			@@ -695,7 +731,14 @@

			//åææ¾ç¤ºä¸ææ¡
			function ColFilter() {

			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			}
			$("#ColName").append(Organization);
			form.render('select');
			}

			//ä»¥ä¸æ¯layuiæ¨¡å

			@@ -57,31 +57,60 @@
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-colla-content">
			<div class="layui-inline">
			<div class="layui-row">
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			</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="HWorkBillNo" id="HWorkBillNo">
			</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="HBillNo" id="HBillNo">
			</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="å·¥åºæµè½¬å¡å·" id="å·¥åºæµè½¬å¡å·">
			</div>
			</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="HWorkBillNo" id="HWorkBillNo">
			<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;">
			</select>
			</div>
			</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="HBillNo" id="HBillNo">
			<div class="layui-inline">
			<select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
			<option value="0" selected="selected"></option>
			<option value="=">=</option>
			<option value=">=">>=</option>
			<option value=">">></option>
			<option value="<="><=</option>
			<option value="<"><</option>
			<option value="<>"><></option>
			<option value="7">åå«</option>
			<option value="8">å·¦åå«</option>
			<option value="9">å³åå«</option>
			<option value="10">ä¸åå«</option>
			</select>
			</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="å·¥åºæµè½¬å¡å·" id="å·¥åºæµè½¬å¡å·">
			<div class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			</div>
			</div>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			@@ -344,6 +373,9 @@
			}
			table.render(option);
			btnIs();
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			layer.close(wait);
			}, error: function () {
			layer.close(wait);
			@@ -360,6 +392,32 @@
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			case "7":
			com = "like'%" + ColContent + "%'";
			break;
			case "8":
			com = "like'%" + ColContent + "'";
			break;
			case "9":
			com = "like'" + ColContent + "%'";
			break;
			case "10":
			com = "not like'%" + ColContent + "%'";
			break;
			default:
			com = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			sWhere += " and " + ColName + " " + com;
			}

			if (å·¥åºæµè½¬å¡å·) {
			sWhere += " and å·¥åºæµè½¬å¡å· like '%" + å·¥åºæµè½¬å¡å· + "%'";
			}
			@@ -402,6 +460,10 @@
			$("#å·¥åºæµè½¬å¡å·").val("");
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			form.render('select');
			}

			//ç¼è¾åæ®
			@@ -563,6 +625,18 @@
			}
			}

			//åææ¾ç¤ºä¸ææ¡
			function ColFilter() {
			var Organization = '<option value="0" selected="selected" ></option>';
			for (var i = 1; i < option.cols[0].length; i++) {
			if (option.cols[0][i].hide != true) {
			Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
			}
			}
			$("#ColName").append(Organization);
			form.render('select');
			}

			//ä»¥ä¸æ¯layuiæ¨¡å
			});