MES-WEB-LayUI.git

			@@ -351,6 +351,13 @@
			</select>
			</script>

			<!--å¤éæ¡ æ¯å¦å¿å½æ§å¶-->
			<script type="text/html" id="HIsRequired">
			<div class="layui-input-block" style="margin-left: 20px;">
			<input type="checkbox" name="HIsRequired" lay-filter="HIsRequired" id="HIsRequired{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			</div>
			</script>

			<script>
			//è·ååæ°
			var OptionData = [];
			@@ -371,19 +378,19 @@
			}


			var edit = function (data) {
			var edit = function (data) {
			HSourceInterID = data[0].HSourceInterID;
			HSourceEntryID = data[0].HSourceEntryID;
			HSourceBillNo = data[0].HSourceBillNo;
			HSourceBillType = data[0].HSourceBillType;

			}


			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'laydate', 'table', 'element','upload'], function () {
			}).use(['index', 'form', 'laydate', 'table', 'element', 'upload'], function () {
			//#region å¬å±åé
			var $ = layui.$
			, admin = layui.admin
			@@ -397,7 +404,7 @@
			var HMaker = sessionStorage["HUserName"]
			var HStockOrgID = sessionStorage["OrganizationID"] //ç»ç»ID
			var option = {};


			//#endregion

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			@@ -453,9 +460,35 @@
			//åå§åæ¥æãåå»ºäººãåå»ºæ¶é´
			$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
			$("#HMaker").val(HMaker);
			$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
			$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
			$("#HEmpID").val(sessionStorage["HEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½åID
			$("#HEmpName").val(sessionStorage["HEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HDeptID").val(sessionStorage["HDeptID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºè½¦é´ID
			$("#HDeptName").val(sessionStorage["HDept"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºè½¦é´
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»
			}
			else if (OperationType == 2) { //ç¼è¾
			else if (OperationType == 2) { //å¤å¶

			//ç¼è¾ç¶ææ¶ï¼æ ¹æ®åç ï¼è·åä¿¡æ¯å¹¶åå¥çé¢
			RoadBillMain(HInterID);
			//æä»¶éæ©åå§å
			PicUpload();
			getFile();
			//è·åæå¤§åæ®å·
			get_MAXNum();
			$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
			$("#HMaker").val(HMaker);
			$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
			$("#HEmpID").val(sessionStorage["HEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½åID
			$("#HEmpName").val(sessionStorage["HEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HDeptID").val(sessionStorage["HDeptID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºè½¦é´ID
			$("#HDeptName").val(sessionStorage["HDept"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºè½¦é´
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»
			OperationType = 1;
			}
			else if (OperationType == 3) { //ç¼è¾
			$("#HInterID").val(HInterID);//ä¿®æ¹æ¶ä¸»è¡¨ID
			//ç¼è¾ç¶ææ¶ï¼æ ¹æ®åç ï¼è·åä¿¡æ¯å¹¶åå¥çé¢
			RoadBillMain(HInterID);
			@@ -472,15 +505,21 @@
			$("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
			$("#HMaker").val(HMaker);
			$("#HMakeDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
			$("#HEmpID").val(sessionStorage["HEmpID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½åID
			$("#HEmpName").val(sessionStorage["HEmpName"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºæä½å
			$("#HDeptID").val(sessionStorage["HDeptID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºè½¦é´ID
			$("#HDeptName").val(sessionStorage["HDept"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºè½¦é´
			$("#HGroupID").val(sessionStorage["HGroupID"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»ID
			$("#HGroupName").val(sessionStorage["HGroup"]); //æ ¹æ®ç»å½ç¨æ·å¸¦åºçç»
			//å·¥åºæµè½¬å¡é¡µé¢ä¸æ¨
			if (HInterID == "") { //æ¥å·¥å°ä¸æ¨
			set_ProcessBill(HSourceInterID, HSourceEntryID);
			} else {
			set_ProcessBill(HInterID, HEntry);
			}


			OperationType = 1;
			}
			}
			else {
			layer.alert("æªç¥æä½ç±»åï¼", { icon: 5 });
			}
			@@ -521,7 +560,7 @@
			$('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
			}
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HBillNo": data.åæ®å·
			"HBillNo": OperationType == 2 ? '' : data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			, "HICMOInterID": data.HICMOInterID
			, "HICMOEntryID": data.HICMOEntryID
			@@ -570,7 +609,7 @@
			for (let i = 0; i < result.data.length; i++) {
			rowdata.push(
			{
			"HTechParamID": result.data[i].HTechParamID
			"HTechParamID": result.data[i].HTechParamID
			, "HTechParamNumber": result.data[i].HTechParamNumber
			, "HTechParamName": result.data[i].HTechParamName
			, 'HTechParamUnitID': result.data[i].HTechParamUnitID
			@@ -589,6 +628,7 @@
			, 'HMax': result.data[i].HMax
			, 'HMin': result.data[i].HMin
			, 'HResult': result.data[i].HResult
			, 'HIsRequired': result.data[i].HIsRequired
			, 'HRemark': result.data[i].HRemark
			}
			)
			@@ -634,16 +674,17 @@
			, { field: 'HTechParamUnitName', title: 'å·¥èºåæ°åä½åç§°', width: 130, style: 'background-color:#efefef4d;' }
			, { field: 'HSNO', title: 'å·¥èºæ¬¡åº', width: 110, style: 'background-color:#efefef4d;' }
			, { field: 'HTechParamIDStd', title: 'HTechParamIDStd', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { field: 'HTechParamIDStdName', title: 'è®¾å¤è®¾å®å¼å·¥èºåæ°', width: 130, edit: 'text', event: "HTechParamIDStdName" }
			, { field: 'HResultStd', title: 'è®¾å¤è®¾å®å¼', width: 130, edit: 'text' }
			, { field: 'HVaule', title: 'å·¥èºåæ°å¼', width: 100, edit: false, event: "HVaule" }
			, { field: 'HTechParamIDStdName', title: 'è®¾å¤è®¾å®å¼å·¥èºåæ°', hide: true, width: 130, edit: 'text', event: "HTechParamIDStdName" }
			, { field: 'HResultStd', title: 'è®¾å¤è®¾å®å¼', hide: true, width: 130, edit: 'text' }
			, { field: 'HVaule', title: 'å·¥èºåæ°å¼', width: 100, edit: false, event: "HVaule" }
			, { field: 'HStd', title: 'æ åå¼', width: 100, edit: 'text' }
			, { field: 'HMax', title: 'ä¸é', width: 100, edit: 'text' }
			, { field: 'HMin', title: 'ä¸é', width: 100, edit: 'text' }
			, { field: 'HResult', title: 'æ£æµç»æ', width: 100, templet: "#HResult" }
			, { field: 'HIsRequired', title: 'æ¯å¦å¿å½', width: 100, templet: "#HIsRequired" }
			, { field: 'HRemark', title: 'å¤æ³¨', width: 100, edit: 'text' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			// , { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			}

			var rowdata = [{
			@@ -653,18 +694,19 @@
			, "HTechParamID": "0"
			, "HTechParamNumber": ""
			, "HTechParamName": ""
			,"HSNO":"0"
			, "HSNO": "0"
			, "HTechParamUnitID": "0"
			, "HTechParamUnitNumber": ""
			, "HTechParamUnitName": ""
			, "HTechParamIDStd": "0"
			, "HTechParamIDStdName": ""
			,"HResultStd":""
			, "HResultStd": ""
			, "HVaule": ""
			, "HStd": ""
			, "HMax": ""
			, "HMin": ""
			, "HResult": "OK"
			, "HIsRequired": false
			, "HRemark": ""
			}];

			@@ -729,7 +771,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html', 'yes']
			, content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html?openType=2', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -787,7 +829,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html', 'yes']
			, content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html?Htype=&openType=2', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -845,7 +887,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -874,7 +916,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../è®¾å¤ç®¡ç/è®¾å¤æ¡£æ¡/Gy_EquipFileMainList.html', 'yes']
			, content: ['../../è®¾å¤ç®¡ç/è®¾å¤æ¡£æ¡/Gy_EquipFileMainList.html?openType=2', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -990,6 +1032,7 @@
			, "HMax": ""
			, "HMin": ""
			, "HResult": "OK"
			, "HIsRequired": false
			, "HRemark": ""
			};

			@@ -1284,17 +1327,47 @@
			var field = cell.data('field'); // è·ååæ®µ
			var rowIndex = cell.closest('tr').data('index'); // è·åå½åè¡æ°æ®ç´¢å¼

			// ä½¿ç¨ layui çè¡¨æ ¼æ¹æ³æ´æ°æ°æ®
			// ä½¿ç¨layuiçè¡¨æ ¼æ¹æ³æ´æ°æ°æ®
			var updatedData = table.cache['mainTable'].map(function (item) {
			if (item.LAY_TABLE_INDEX === rowIndex) { // ä½¿ç¨ numbers åç´¢å¼å®ä½
			if (item.LAY_TABLE_INDEX === rowIndex) { // ä½¿ç¨numbersåç´¢å¼å®ä½
			item[field] = newValue;
			}
			return item;
			});

			layui.table.reload('mainTable', {
			data: updatedData
			// è·åå½åè¡æ°æ®
			var currentRowData = table.cache['mainTable'].find(function (item) {
			return item.LAY_TABLE_INDEX === rowIndex;
			});

			// åè®¾è¿éè¦å¤æçåæ®µæ¯ 'HVaule'ï¼ä½ å¯ä»¥æ ¹æ®å®ééæ±ä¿®æ¹è¦å¤æçåæ®µå
			if (field === 'HVaule') {
			var valueToCheck = parseFloat(newValue);
			var lowerLimit = parseFloat(currentRowData.HMin);
			var upperLimit = parseFloat(currentRowData.HMax);

			// å¾ªç¯éåå½åè¡ä¸ä¸éæ°æ®å¹¶è¿è¡å¤æï¼è¿éå¶å®ä¸»è¦æ¯å¤æå½åè¡çä¸ä¸éä¸æ´æ°å¼çå³ç³»ï¼
			if (valueToCheck >= lowerLimit && valueToCheck <= upperLimit) {
			// æ´æ°å½åè¡çHResultä¸ºOK
			currentRowData.HResult = 'OK';
			} else {
			currentRowData.HResult = 'NG';
			}
			}

			checkRefresh();

			//// ä½¿ç¨ layui çè¡¨æ ¼æ¹æ³æ´æ°æ°æ®
			//var updatedData = table.cache['mainTable'].map(function (item) {
			// if (item.LAY_TABLE_INDEX === rowIndex) { // ä½¿ç¨ numbers åç´¢å¼å®ä½
			// item[field] = newValue; // æ´æ°åæ®µå¼
			// item.HResult = hResult; // æ´æ°æ£æµç»æ
			// }
			// return item;
			//});
			//layui.table.reload('mainTable', {
			// data: updatedData
			//});
			// åæ¶ç¼è¾ç¶æ
			cell.removeAttr('contenteditable');
			//åæ¶åæ³¡
			@@ -1413,13 +1486,29 @@
			});
			});

			//æ¯å¦ å¿å½æ§å¶
			form.on('checkbox(HIsRequired)', function (data) {
			//è·åä¸ææ¡éä¸çå¼
			var elem = data.othis.parents('tr');
			var dataindex = elem.attr("data-index");
			$.each(option.data, function (index, value) {
			if (value.LAY_TABLE_INDEX == dataindex) {
			value.HIsRequired = data.elem.checked;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			});
			});

			//è¡æ°æ® ä¸æå¤éæ¡ å·æ°è¡¨æ ¼
			function checkRefresh() {
			for (var i = 1; i <= option.data.length; i++) {
			//ç¶æ
			$('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").attr("selected", true);
			$('#HResult' + i + '').find("option[value='" + option.data[i - 1].HResult + "']").prop("selected", true);
			if (option.data[i - 1].HIsRequired) {
			$('#HIsRequired' + i + '').attr("checked", true);
			}
			}
			form.render('select');
			form.render('checkbox');
			}
			//#endregion

			@@ -1474,6 +1563,13 @@
			});
			var rowdata = [];
			for (var i = 0; i < result.data.length; i++) {
			// è·åå½åçæ°éå¼ãä¸éå¼åä¸éå¼ï¼å¹¶ç¡®ä¿å®ä»¬æ¯æ°å¼ç±»å
			var value = parseFloat(result.data[i]["æ°éå¼"]);
			var max = parseFloat(result.data[i]["ä¸éå¼"]);
			var min = parseFloat(result.data[i]["ä¸éå¼"]);

			// å¤æ HResult çå¼
			var hResult = (value <= max && value >= min) ? "OK" : "NG";
			rowdata.push(
			{
			"HTechParamClassID": result.data[i]["HTechParamClassID"] == null ? 0 : result.data[i]["HTechParamClassID"],
			@@ -1483,7 +1579,7 @@
			"HTechParamName": result.data[i]["å·¥èºåæ°åç§°"],
			"HTechParamUnitID": result.data[i]["HTechParamUnitID"] == null ? 0 : result.data[i]["HTechParamUnitID"],
			"HTechParamUnitNumber": result.data[i]["å·¥èºåæ°åä½ä»£ç "],
			"HTechParamUnitName": result.data[i]["å·¥èºåæ°åä½åç§°"] ,
			"HTechParamUnitName": result.data[i]["å·¥èºåæ°åä½åç§°"],
			"HSNO": result.data[i]["å·¥èºæ¬¡åº"] == null ? 0 : result.data[i]["å·¥èºæ¬¡åº"],
			"HTechParamIDStd": result.data[i]["HTechParamIDStd"] == null ? 0 : result.data[i]["HTechParamIDStd"],
			"HTechParamIDStdName": result.data[i]["å¯¹åºè®¾å®å¼å·¥èºåæ°"],
			@@ -1492,13 +1588,15 @@
			"HStd": result.data[i]["æ åå¼"],
			"HMax": result.data[i]["ä¸éå¼"],
			"HMin": result.data[i]["ä¸éå¼"],
			"HRemark": result.data[i]["ééæ¥æº"]
			"HRemark": result.data[i]["ééæ¥æº"],
			"HResult": hResult,
			"HIsRequired": result.data[i]["HIsRequired"]
			}
			);
			}
			option.data = rowdata;

			table.render(option);
			checkRefresh();
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			@@ -1511,7 +1609,7 @@
			})
			}
			//#endregion


			//#region åè½æ§ä»¶

			//#region æäº¤
			@@ -1555,6 +1653,12 @@
			if (data.count == 1) {
			layer.msg(data.Message, { icon: 1 });
			$('#btn_Save').addClass("layui-btn-disabled").attr("disabled", true);
			if (data.Verify == "Y") //èªå¨å®¡æ ¸
			{
			$("#HInterID").val(data.HInterID);//è·åæäº¤æåè¿åçåæ®ä¸»ID
			set_CheckBill(1); //å®¡æ ¸
			}
			layer.close(index);
			layer.close(index);
			}
			else {
			@@ -1573,11 +1677,39 @@

			//#endregion


			//#region å®¡æ ¸ï¼num=1ï¼/åå®¡æ ¸ï¼num=2ï¼
			function set_CheckBill(num) {
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/SB_EquipICMOTechParamBillController/GetSB_EquipICMOTechParamBill_Check_Json",
			async: false, //asyncç¨äºæ§å¶ï¼falseï¼åæ¥åï¼trueï¼å¼æ¥ï¼é»è®¤çæ¯trueï¼å³è¯·æ±é»è®¤çæ¯å¼æ¥è¯·æ±
			data: { "HInterID": HInterID, "Type": num, "HMaker": HMaker },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			$("#btnSearch").trigger('click');
			});
			} else {
			layer.msg(result.Message, { icon: 2, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			}, error: function () {
			layer.msg('éè¯¯' + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}
			//#endregion

			//#region éåº
			form.on('submit(btn_Cancel)', function () {
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			//æä½ç±»åï¼OperationType=1æ°å¢ãOperationType=2ç¼è¾ï¼
			if (OperationType == 2) {
			if (OperationType == 2 \|\| OperationType == 1) {
			Pub_Close(1);
			}
			else {
			@@ -1774,7 +1906,15 @@
			sSubStr = JSON.parse(sSubStr);
			for (var i = 0; i <= sSubStr.length - 1; i++) {
			if (sSubStr[i].HTechParamID == "0") {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å·¥èºåæ°ä¿¡æ¯ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å·¥èºåæ°ä»£ç /åç§°ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			//if (sSubStr[i].HRemark == "æå¨è¾å¥" && (sSubStr[i].HVaule == "" \|\| sSubStr[i].HVaule == null)) {
			// layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,ææ¯è¾å¥çå·¥èºåæ°å¼ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			// return Result = false;
			//}
			if (sSubStr[i].HIsRequired == "true" && (sSubStr[i].HVaule == "" \|\| sSubStr[i].HVaule == null)) {
			layer.msg("æç»è®°å½ç¬¬" + (i + 1) + "è¡,å·¥èºåæ°å¼ä¸è½ä¸ºç©ºï¼", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return Result = false;
			}
			}
			@@ -1849,7 +1989,7 @@
			});
			})
			}
			//#endregion
			//#endregion
			</script>
			</body>
			</html>