MES-WEB-LayUI.git

			@@ -205,7 +205,7 @@
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HRemark" id="HRemark" lay-verify="HRemark" style=" width: 500px;">
			</div>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			@@ -413,27 +413,27 @@
			$("#HMaker").val(sessionStorage["HUserName"]);
			$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
			}
			//else if (OperationType == 2) {

			// RoadBillMain(linterid);
			// $.ajax({
			// url: GetWEBURL() + "/Web/GetMAXNum",
			// type: "GET",
			// async: false,
			// data: { "HBillType": '3301' },
			// success: function (d) {
			// $("#HInterID").val(d.data[0].HInterID);
			// $("#HBillNo").val(d.data[0].HBillNo);
			// $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			// }
			// });
			//}
			else if (OperationType == 2) {
			//åå§åè¡¨æ ¼
			get_InitGrid();
			RoadBillMain(linterid);
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			async: false,
			data: { "HBillType": '3334' },
			success: function (d) {
			$("#HInterID").val(d.data[0].HInterID);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			}
			});
			}
			else if (OperationType == 3) {

			//ç¦ç¨æé®
			var num = 1;
			HfBtn(num);
			debugger;
			//åå§åè¡¨æ ¼
			get_InitGrid();

			@@ -559,10 +559,10 @@

			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow = {
			"HTechParamID": "",
			"HTechParamID": 0,
			"HTechParamNumber": "",
			"HTechParamName": "",
			"HTechParamUnitID": "",
			"HTechParamUnitID": 0,
			"HTechParamUnitName": "",
			"HStd": "0",
			"HMax": "0",
			@@ -570,6 +570,10 @@
			"HDataForm": "è®¾å¤éé",
			"HDataUnit": "ç§",
			"HDataTimes": "0",
			"HTechParamClassID": "0",
			"HSNO": "0",
			"HStdNextTimes": "0",
			"HTechParamIDStd":"0",
			"HSourceBillNo": "0",
			"HSourceBillType": "0",
			"HSourceEntryID": "0",
			@@ -661,10 +665,39 @@
			, { field: 'HDataForm', title: 'ééæ¥æº', templet: '#HDataForm-select' }
			, { field: 'HDataUnit', title: 'ééæ¶é´åä½', templet: '#HDataUnit-select' }
			, { field: 'HDataTimes', title: 'ééå¨æé¢ç', edit: 'text', totalRow: true }
			, { field: 'HTechParamClassID', title: 'å·¥èºåæ°å¤§ç±»', hide: true }
			, { field: 'HTechParamClassName', title: 'å·¥èºåæ°å¤§ç±»åç§°', edit: 'text', event: "HTechParamClassName" } //f7
			, { field: 'HSNO', title: 'å·¥èºæ¬¡åº', edit: 'text', totalRow: true }
			, { field: 'HStdNextTimes', title: 'çè®ºæ¬¡åºé´é', edit: 'text', totalRow: true }
			, { field: 'HTechParamIDStd', title: 'å¯¹åºè®¾å®å¼å·¥èºåæ°', hide: true }
			, { field: 'HTechParamIDStdName', title: 'å¯¹åºè®¾å®å¼å·¥èºåæ°å¼', edit: 'text', event: "HTechParamIDStdName " } //f7
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			]]
			}
			option.data = [];
			var rowdata = [
			{
			"HTechParamID": 0,
			"HTechParamNumber": "",
			"HTechParamName": "",
			"HTechParamUnitID": 0,
			"HTechParamUnitName": "",
			"HStd": "0",
			"HMax": "0",
			"HMin": "0",
			"HDataForm": "è®¾å¤éé",
			"HDataUnit": "ç§",
			"HDataTimes": "0",
			"HTechParamClassID": "0",
			"HSNO": "0",
			"HStdNextTimes": "0",
			"HTechParamIDStd": "0",
			"HSourceBillNo": "0",
			"HSourceBillType": "0",
			"HSourceEntryID": "0",
			"HSourceInterID": "0"
			}
			];
			option.data = rowdata;
			table.render(option);

			}
			@@ -911,11 +944,10 @@
			if (event.key == "F7") {
			//å·¥èºåæ°
			if (obj.event == "HTechParamNumber") {
			//æå¼å¨å·ç®¡çå°çªä½
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'æ¨¡å·åè¡¨',
			title: 'å·¥èºåè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			@@ -929,12 +961,52 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			obj.update({
			"HTechParamID": checkStatus.data[0].HItemID,
			"HTechParamNumber": checkStatus.data[0].å·¥èºåæ°ä»£ç ,
			"HTechParamName": checkStatus.data[0].å·¥èºåæ°åç§°,

			});
			// table.cache["mainTable"].splice(0, 1);
			table.cache["mainTable"] = table.cache["mainTable"].filter(row => row.HTechParamID !== 0 && row.HTechParamID !== undefined);
			for (var rowData of checkStatus.data) {
			var NewRow = {
			"HTechParamID": rowData.HItemID,
			"HTechParamNumber": rowData.å·¥èºåæ°ä»£ç ,
			"HTechParamName": rowData.å·¥èºåæ°åç§°,
			"HTechParamUnitID": 0,
			"HTechParamUnitName": "",
			"HStd": "0",
			"HMax": "0",
			"HMin": "0",
			"HDataForm": "è®¾å¤éé",
			"HDataUnit": "ç§",
			"HDataTimes": "0",
			"HTechParamClassID": "0",
			"HSNO": "0",
			"HStdNextTimes": "0",
			"HTechParamIDStd": "0",
			"HSourceBillNo": "0",
			"HSourceBillType": "0",
			"HSourceEntryID": "0",
			"HSourceInterID": "0"
			};
			table.cache["mainTable"].push(NewRow);
			}
			option.data = table.cache["mainTable"];
			table.render(option);

			//for (var i = 0; i < checkStatus.data.length; i++) {
			// option.data.push({
			// "HTechParamID": checkStatus.data[i].HItemID,
			// "HTechParamNumber": checkStatus.data[i].å·¥èºåæ°ä»£ç ,
			// "HTechParamName": checkStatus.data[i].å·¥èºåæ°åç§°,
			// })
			//}


			//obj.update({
			// "HTechParamID": checkStatus.data[0].HItemID,
			// "HTechParamNumber": checkStatus.data[0].å·¥èºåæ°ä»£ç ,
			// "HTechParamName": checkStatus.data[0].å·¥èºåæ°åç§°,

			//});
			//table.render(option);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, end: function () {
			@@ -988,6 +1060,85 @@
			});
			OptionData = [];
			}
			}
			});
			}
			//å·¥èºåæ°å¤§ç±»
			if (obj.event == "HTechParamClassName") {
			//æå¼å·¥èºåæ°å¤§ç±»å°çªä½
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'å·¥èºåæ°å¤§ç±»',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_TechnologyParameterType.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			obj.update({
			"HTechParamClassID": checkStatus.data[0].HItemID,
			"HTechParamClassName": checkStatus.data[0].å·¥èºåæ°åç±»åç§°,

			});
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, end: function () {
			//if (OptionData.length > 0) {
			// //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			// obj.update({
			// "HTechParamClassID": OptionData[0].HItemID,
			// "HTechParamClassName": OptionData[0].å·¥èºåæ°å¤§ç±»åç§°,
			// });
			// OptionData = [];
			//}
			}
			});
			}
			//å¯¹åºè®¾å®å¼å·¥èºåæ°
			if (obj.event == "HTechParamIDStdName") {
			//æå¼å¯¹åºè®¾å®å¼å·¥èºåæ°(å°çªä½
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'å¯¹åºè®¾å®å¼å·¥èºåæ°åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_TechnologyParameter.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			obj.update({
			"HTechParamIDStd": checkStatus.data[0].HItemID,
			"HTechParamIDStdName": checkStatus.data[0].å¯¹åºè®¾å®å¼å·¥èºåæ°åç§°,

			});
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, end: function () {
			//if (OptionData.length > 0) {
			// //æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			// obj.update({
			// "HTechParamIDStd": OptionData[0].HItemID,
			// "HTechParamIDStdName": OptionData[0].å¯¹åºè®¾å®å¼å·¥èºåæ°åç§°,

			// });
			// OptionData = [];
			//}
			}
			});
			}
			@@ -1162,8 +1313,8 @@
			var tableSub = result.data[1];
			//ä¸»è¡¨
			form.val("formData", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HInterID": tableMain[0]["HInterID"]
			, "HBillNo": tableMain[0]["åæ®å·"]
			"HInterID": OperationType == 2 ? "" : tableMain[0]["HInterID"]
			, "HBillNo": OperationType == 2 ? "" : tableMain[0]["åæ®å·"]
			, "HDate": Format(new Date(tableMain[0]["æ¥æ"]), "yyyy-MM-dd")
			, "HMaterID": tableMain[0]["HMaterID"]
			, "HMaterNumber": tableMain[0]["ç©æä»£ç "]
			@@ -1236,8 +1387,12 @@
			for (var i = 0; i < table.cache["mainTable"].length; i++) {
			if (table.cache["mainTable"][i] != "") {
			table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
			table.cache["mainTable"][i].HTechParamIDStd == null ? 0 : table.cache["mainTable"][i].HTechParamIDStd
			num.push(table.cache["mainTable"][i])
			}



			}
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(num);