MES-WEB-LayUI.git

			@@ -33,7 +33,7 @@
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
			</div>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">部门</label>
			<div class="layui-input-block">
			@@ -44,11 +44,17 @@
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">部门</label>
			<label class="layui-form-label">部门</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width:190px;">
			</div>
			</div>-->
			<div class="layui-inline" id="HProcExchBillNoHidden" style="display:none;">
			<label class="layui-form-label">流转卡号</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDeptName" id="HDeptName" style="width:190px;">
			<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="width:190px;">
			</div>
			</div>-->
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">物料名称</label>
			<div class="layui-input-block">
			@@ -134,7 +140,7 @@
			var OperationType = 1;//操作类型
			} else {
			var OperationType = params[params[0]];//操作类型
			var linterid = params[params[1]];//源单id
			var HOrgID = params[params[1]];//源单id
			var HSouceBillType = decodeURI(params[params[2]]);//源单类型
			}
			var cols_arr = []; //存储表格头的数组
			@@ -161,10 +167,6 @@
			var option = [];
			var titleData = [];//不需要显示的字段可扩展

			var HDeptID = 0;

			var params = getUrlVars();
			var HDeptID = params[params[0]];
			//#endregion

			//#region 进入页面即加载
			@@ -186,6 +188,7 @@
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
			data: { "HOrgID": HOrgID },
			success: function (result) {
			if (result.count == 1) { // 说明验证成功了，
			var data = result.data;
			@@ -197,9 +200,6 @@

			}
			$("#HDeptName").append(HDeptName);
			if (!isNaN(HDeptID)) {
			$("#HDeptName").val(HDeptID);
			}
			form.render('select');
			}
			layer.closeAll("loading");
			@@ -277,6 +277,19 @@
			case '委外订单':
			HModName = "WW_EntrustOrderBill_1601";
			break;
			case '生产入库单':
			$("#HProcExchBillNoHidden").show();
			HModName = "ProductInBill_1202";
			break;
			case '采购入库':
			HModName = "POStockInBill_1201";
			break;
			case '销售退货':
			HModName = "SellOutBackBill_1247";
			break;
			case '生产退料':
			HModName = "MateOutBackBill_1244";
			break;
			}
			//初始查询
			get_Display(sWhere, HSouceBillType);
			@@ -292,7 +305,7 @@
			$.ajax({
			url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
			type: "GET",
			data: { "page": 1, "limit": 50, "sWhere": sWhere, "HSouceBillType": HSouceBillType, "HOrgID": linterid },
			data: { "page": 1, "limit": 50, "sWhere": sWhere, "HSouceBillType": HSouceBillType, "HOrgID": HOrgID },
			async: false,
			dataType: "json",//数据类型可以为 text xml json script jsonp
			success: function (data1) {
			@@ -371,6 +384,7 @@
			var PartNumber = $("#PartNumber").val();//物料编码
			var PartName = $("#PartName").val();//物料名称
			var HDeptName = $("#HDeptName").val();//部门
			var HProcExchBillNo = $("#HProcExchBillNo").val();//流转卡
			var ColName = $("#ColName").val();//复选框
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			@@ -395,10 +409,7 @@
			}
			sWhere += " and " + ColName + " " + com;
			}
			//传递的参数不为NAN
			if (!isNaN(HDeptID) && HDeptName == 0) {
			HDeptName = HDeptID;
			}

			switch (HSouceBillType) {
			case '生产订单':
			if (HBillNo) {
			@@ -475,6 +486,24 @@
			}
			return sWhere;
			break;
			case '生产入库单':
			if (HBillNo) {
			sWhere += " and 单据号 like '%" + HBillNo + "%'";
			}
			if (PartNumber) {
			sWhere += " and 物料代码 like '%" + PartNumber + "%'";
			}
			if (PartName) {
			sWhere += " and 物料名称 like '%" + PartName + "%'";
			}
			if (HDeptName && HDeptName != 0) {
			sWhere += " and HDeptID = '" + HDeptName + "'";
			}
			if (HProcExchBillNo!="") {
			sWhere += " and 流转卡号 like '" + HProcExchBillNo + "%'";
			}
			return sWhere;
			break;
			case '退货通知单':
			return sWhere;
			break;