MES-WEB-LayUI.git

			@@ -34,11 +34,16 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¹å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" id="HICMOBillNo" style="width:190px;">
			<label class="layui-form-label">ç¶æ</label>
			<div class="layui-input-block" style="margin-left: 120px;width: 184px;">
			<select name="HState" lay-verify="HState" id="HState">
			<option value="0" selected="selected">å¨é¨</option>
			<option value="1">æªå¼å·¥</option>
			<option value="3">å·²å¥åº</option>
			</select>
			</div>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label">ä¸è¾¾æ¥æ</label>
			<div class="layui-input-block">
			@@ -55,48 +60,140 @@
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</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-inline">
			<div style="padding-left: 10px;">
			<input type="checkbox" name="checkWRuku" id="checkWRuku" lay-skin="primary" lay-filter="checkWRuku" title="æªä¸æ¨åå·²å¥åº">
			</div>
			</div>
			<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
			<div class="layui-row" style="margin-top:10px;">
			<!--å¶ä»æ¡ä»¶-->
			<div class="layui-inline">
			<label class="layui-form-label">ç©æä»£ç </label>
			<div class="layui-input-inline">
			<input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0">
			<input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			<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="HMaterNumber" id="HMaterNumber">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç©æåç§°</label>
			<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="HMaterName" id="HMaterName" style="background-color:#efefef4d;" readonly>
			<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="HModel" id="HModel" style="background-color:#efefef4d;" readonly>
			<label class="layui-form-label">çäº§è½¦é´</label>
			<div class="layui-input-block">
			<select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">

			<!--å¨ææ¸²æè½¦é´-->
			</select>
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin: 10px 0 10px;">
			<div class="layui-inline">
			<label class="layui-form-label">çç»</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HWorkShopList" id="HWorkShopList" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			<label class="layui-form-label" style="width: 85px;">å¯ä¸ID</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="F_BSV_WYID" id="F_BSV_WYID">
			</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="HSeOrderBillNo" id="HSeOrderBillNo">
			<label class="layui-form-label">æ¹å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" id="HICMOBillNo" style="width:190px;">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çäº§è®¢åç¶æ</label>
			<div class="layui-input-block" style="margin-left: 120px;width: 184px;">
			<select name="HSTATUS" lay-verify="HSTATUS" id="HSTATUS">
			<option value="0">å¨é¨</option>
			<option value="4" selected="selected">å¼å·¥</option>
			<option value="6">ç»æ¡</option>
			</select>
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin: 10px 0 10px">
			<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 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 class="layui-inline">
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" 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 class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent1" id="ColContent1">
			</div>
			</div>

			<div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			<select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<select name="Comparator2" id="Comparator2" class="ForFilteringSchemes" lay-filter="Comparator2" 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 class="layui-inline">
			<input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
			</div>
			</div>
			</div>
			@@ -205,10 +302,10 @@
			});
			});

			//ç©æ
			form.on('submit(btnHMaterID)', function (data) {//éæ©ä»ä½
			get_btnHMaterID();
			});
			////ç©æ
			//form.on('submit(btnHMaterID)', function (data) {
			// get_btnHMaterID();
			//});

			//#endregion

			@@ -216,8 +313,9 @@

			//åå§åçé¢
			function set_ClearBill() {
			get_Dept();
			//åå§åæ¶é´
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			//åå§åè¡¨æ ¼
			set_InitGrid();
			@@ -233,21 +331,23 @@
			, toolbar: '#toolbarDemo'
			, cellMinWidth: 120
			, limit: Number.MAX_VALUE // æ°æ®è¡¨æ ¼é»è®¤å¨é¨æ¾ç¤º
			, totalRow: true
			, height: 'full-70'
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			, { field: 'æµè½¬å¡å·', title: 'æµè½¬å¡å·', width: 160 }
			, { field: 'å¯ä¸ID', title: 'å¯ä¸ID', width: 160 }
			, { field: 'çäº§è®¢åå·', title: 'æ¹å·', width: 160 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 160 }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 160 }
			, { field: 'å¼å·¥æ¥æ', title: 'ä¸è¾¾æ¥æ', width: 160, templet: "<div>{{d.å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å¼å·¥æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'è¦æ±å®å·¥', title: 'è¦æ±å®å·¥', width: 160, templet: "<div>{{d.è¦æ±å®å·¥ ==null ?'':layui.util.toDateString(d.è¦æ±å®å·¥, 'yyyy-MM-dd')}}</div>" }
			, { field: 'æ´æ¹', title: 'æ´æ¹', width: 160 }
			, { field: 'æ¥åºæ°é', title: 'æ¥åº', width: 160 }
			, { field: 'å¼å·¥æ¥æ', title: 'ä¸è¾¾æ¥æ', width: 160, templet: "<div>{{d.å¼å·¥æ¥æ ==null ?'':layui.util.toDateString(d.å¼å·¥æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'è¦æ±å®å·¥', title: 'è¦æ±å®å·¥', width: 160, templet: "<div>{{d.è¦æ±å®å·¥ ==null ?'':layui.util.toDateString(d.è¦æ±å®å·¥, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'åè£æ è¯', title: 'åè£æ è¯', width: 200 }
			, { field: 'æ´æ¹', title: 'æ´æ¹', width: 160, totalRow: true }
			, { field: 'æ¥åºæ°é', title: 'æ¥åº', width: 160, totalRow: true}
			, { field: 'æ±æ¥åæ°é', title: 'æ±æ¥åæ°é', width: 160 }
			, { field: 'å¥åº', title: 'å¥åº', width: 200 }
			, { field: 'å¨å¶', title: 'å¨å¶', width: 200 }
			, { field: 'å¥åº', title: 'å¥åº', width: 200, totalRow: true}
			, { field: 'å¨å¶', title: 'å¨å¶', width: 200, totalRow: true }
			, { field: 'å·¥åº', title: 'å·¥åº', width: 200 }
			, { field: 'çç»', title: 'çç»', width: 200 }
			, { field: 'ç¶æ', title: 'ç¶æ', width: 200 }
			@@ -256,6 +356,25 @@
			, { field: 'éå®è®¢åå·', title: 'éå®åå·', width: 160 }
			, { field: 'ççº§', title: 'ççº§', width: 160 }
			]]
			,done: function (res) {
			var count = 0;
			var OnlyID = -1;
			for (var i = 0; i < res.data.length; i++) {
			if (res.data[i]["å¯ä¸ID"] != OnlyID) {
			count += res.data[i]["æ´æ¹"];
			OnlyID = res.data[i]["å¯ä¸ID"];
			}
			}
			var divArr = $(".layui-table-total div.layui-table-cell");
			$.each(divArr, function (index, item) {
			var _div = $(item);
			var content = _div.html();
			if (index == 9) {
			content = count;
			}
			_div.html(content);
			});
			}
			};
			}

			@@ -268,8 +387,23 @@
			data: { "sWhere": sWhere },
			success: function (data1) {
			if (data1.count == 1) {
			DataList = data1.data;
			option.data = data1.data;
			//var num = 0;
			//for (let i = 0; i < data1.data.length; i++) {
			// for (let j = i + 1; j < data1.data.length; j++) {
			// if (data1.data[i].æµè½¬å¡å· === data1.data[j].æµè½¬å¡å·) {
			// //num += data1.data[i].æ´æ¹;
			// //data1.data[i].filter(() => {
			// // return
			// //})
			// data1.data[j].æ´æ¹ = '';
			// }
			// }
			//}

			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			table.render(option);
			layer.close(wait);
			} else {
			@@ -283,24 +417,148 @@
			});
			}

			//çäº§è½¦é´
			function get_Dept() {
			//è·åè½¦é´å
			var HDeptName = '<option value="0" style="color:red;" selected>å¨é¨è½¦é´</option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
			async: false,
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			if (sessionStorage["OrganizationID"] == 100014) {
			HDeptName += '<option style="color:blue;" value="2679633" >æ°´ç®±ä¸æ¡æµ</option>';
			HDeptName += '<option style="color:blue;" value="1592361" >é¨ä»¶æ²¹å·å¨å·´</option>';
			HDeptName += '<option style="color:blue;" value="1592371" >å°è½¦è£è¯å·´</option>';
			HDeptName += '<option style="color:blue;" value="1592374" >å°è½¦æ»æå·´</option>';
			HDeptName += '<option style="color:blue;" value="1743766" >å¡è½¦è£è¯å·´</option>';
			HDeptName += '<option style="color:blue;" value="1743767" >å¡è½¦æ»æå·´</option>';
			HDeptName += '<option style="color:blue;" value="2679647" >å¡è½¦æ°´ç®±ä¸æ¡æµ</option>';
			} else {
			for (var i = 0; i < data.length; i++) {
			HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
			}
			}

			$("#HDeptName").append(HDeptName);
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}

			//å¿«éè¿æ»¤
			function get_FastQuery() {
			var HBeginDate = $("#HBeginDate").val();//ä¸è¾¾æ¥æ å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val();//æµè½¬å¡å·
			var HICMOBillNo = $("#HICMOBillNo").val(); //æ¹å·
			var HWorkShopID = $("#HWorkShopID").val();//çç»
			var HSeOrderBillNo = $("#HSeOrderBillNo").val();//éå®åå·
			var HWorkShopID = $("#HDeptName").val();//è½¦é´
			var F_BSV_WYID = $("#F_BSV_WYID").val();//å¯ä¸ID
			var HMaterNumber = $("#HMaterNumber").val();//ç©æä»£ç
			var HState = $("#HState").val();//ç¶æ
			var HSTATUS = $("#HSTATUS").val();//çäº§è®¢åç¶æ
			var HOrgID = sessionStorage["OrganizationID"];
			var checkWRuku = $("input[name='checkWRuku']").prop("checked");//å¤éæ¡
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			var ColName1 = $("#ColName1").val();//å¤éæ¡
			var Comparator1 = $("#Comparator1").val()
			var ColContent1 = $("#ColContent1").val();
			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();
			var sWhere1 = "";
			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;
			}
			sWhere1 += " and " + ColName + " " + com;
			}

			if (ColName1 != 0 && Comparator1 != 0) {
			var com1 = "";
			switch (Comparator1) {
			case "7":
			com1 = "like'%" + ColContent1 + "%'";
			break;
			case "8":
			com1 = "like'%" + ColContent1 + "'";
			break;
			case "9":
			com1 = "like'" + ColContent1 + "%'";
			break;
			case "10":
			com1 = "not like'%" + ColContent1 + "%'";
			break;
			default:
			com1 = "" + Comparator1 + "'" + ColContent1 + "'";
			break;
			}
			com1 = " and (" + ColName1 + " " + com1 + ")";
			}

			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			break;
			case "8":
			com2 = "like'%" + ColContent2 + "'";
			break;
			case "9":
			com2 = "like'" + ColContent2 + "%'";
			break;
			case "10":
			com2 = "not like'%" + ColContent2 + "%'";
			break;
			default:
			com2 = "" + Comparator + "'" + ColContent + "'";
			break;
			}
			com2 = " and (" + ColName2 + " " + com2 + ")";
			}
			sWhere1 += sWhere1 + com1 + com2;
			if (checkWRuku) {
			checkWRuku = 1;
			} else {
			checkWRuku = 0;
			}

			sWhere = {
			HBeginDate: HBeginDate
			, HEndDate: HEndDate
			, HICMOBillNo: HICMOBillNo
			, HWorkShopID: HWorkShopID
			, HSeOrderBillNo: HSeOrderBillNo
			, F_BSV_WYID: F_BSV_WYID
			, HMaterNumber: HMaterNumber
			, HOrgID: HOrgID
			, HBillNo: HBillNo
			, IsTrue: checkWRuku
			, HState: HState
			, HSTATUS: HSTATUS
			, sWhere1: sWhere1
			}

			get_Display(JSON.stringify(sWhere));
			@@ -309,13 +567,27 @@
			}
			//éç½®è¿æ»¤æ¡ä»¶
			function set_ClearQuery() {
			$("#HBeginDate").val("");
			$("#HEndDate").val("");
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			$("#HICMOBillNo").val("");
			$("#HProcExchBillNo").val("");
			$("#HName").val("");
			sWhere = " where 1 = 1 ";
			get_Display(sWhere);
			$("#HBillNo").val("");
			$("#HMaterNumber").val("");
			$("#F_BSV_WYID").val("");
			$("#HState").val("0")
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("input[name='checkWRuku']").prop("checked", false);
			form.render()
			sWhere = "";
			}

			//ç©æ
			@@ -338,9 +610,7 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HMaterID").val(checkStatus.data[0].HItemID);
			$("#HMaterName").val(checkStatus.data[0].HName);
			$("#HMaterNumber").val(checkStatus.data[0].HNumber);
			$("#HModel").val(checkStatus.data[0].HModel);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			})
			@@ -388,7 +658,9 @@
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			@@ -449,6 +721,22 @@
			})
			}

			//åææ¾ç¤ºä¸ææ¡
			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").empty();
			$("#ColName").append(Organization);
			$("#ColName1").empty();
			$("#ColName1").append(Organization); $("#ColName2").empty();
			$("#ColName2").append(Organization);
			form.render('select');
			}


			//#endregion
			});