MES-WEB-LayUI.git

			@@ -2,7 +2,7 @@
			<html>
			<head>
			<meta charset="utf-8" />
			<title>äº§åå¨å·æ¸å</title>
			<title>äº§åå·¥èºåæ°æ¸å</title>
			<meta name="renderer" content="webkit">
			<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
			<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
			@@ -25,14 +25,19 @@
			font-size: 16px;
			}
			/* é²æ¢ä¸ææ¡çä¸æåè¡¨è¢«éè---å¿é¡»è®¾ç½®--- */
			.layui-table-cell {
			/* .layui-table-cell {
			overflow: visible !important;
			}*/

			td:has(select) .layui-table-cell {
			overflow: visible !important;
			padding: 0;
			}
			/* ä½¿å¾ä¸ææ¡ä¸ååæ ¼åå¥½åé */
			td .layui-form-select {
			margin-top: -10px;
			margin-left: -15px;
			margin-right: -15px;
			/* margin-left: -15px;
			margin-right: -15px;*/
			}

			.layui-form-item .layui-inline {
			@@ -60,13 +65,13 @@
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnEdit" id="btnEdit">éåº</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CheckBill" id="set_CheckBill">å®¡æ ¸</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_AbandonCheck" id="set_AbandonCheck">åå®¡æ ¸</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">å³é</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">åå³é</button>
			<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CloseBill" id="set_CloseBill">å³é</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="set_CancelCloseBill" id="set_CancelCloseBill">åå³é</button>-->
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">åºæ¬ä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">å¶ä»ä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">å¶åä¿¡æ¯</li>
			</ul>
			<div class="layui-tab-content">
			<!--åºæ¬ä¿¡æ¯-->
			@@ -350,6 +355,12 @@
			<option value="æ¶">æ¶</option>
			</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 type="text/html" id="barDemo">
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
			</script>
			@@ -413,27 +424,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();

			@@ -550,6 +561,17 @@
			}
			});
			});
			//æ¯å¦ å¿å½æ§å¶
			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å¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			});
			});
			//#endregion

			//å¤´å·¥å·æ äºä»¶
			@@ -569,11 +591,12 @@
			"HMin": "0",
			"HDataForm": "è®¾å¤éé",
			"HDataUnit": "ç§",
			"HIsRequired": false,
			"HDataTimes": "0",
			"HTechParamClassID": "0",
			"HSNO": "0",
			"HStdNextTimes": "0",
			"HTechParamIDStd":"0",
			"HTechParamIDStd": "0",
			"HSourceBillNo": "0",
			"HSourceBillType": "0",
			"HSourceEntryID": "0",
			@@ -587,8 +610,12 @@
			for (var i = 1; i <= option.data.length; i++) {
			$('#HDataUnit' + i + '').find("option[value='" + option.data[i - 1].HDataUnit + "']").attr("selected", true);
			$('#HDataForm' + i + '').find("option[value='" + option.data[i - 1].HDataForm + "']").attr("selected", true);
			if (option.data[i - 1].HIsRequired) {
			$('#HIsRequired' + i + '').attr("checked", true);
			}
			}
			form.render('select');
			form.render('checkbox');
			break;
			case 'btn-CopyLine':
			var copydata = JSON.stringify(data);
			@@ -607,9 +634,12 @@
			for (var i = 1; i <= option.data.length; i++) {
			$('#HDataUnit' + i + '').find("option[value='" + option.data[i - 1].HDataUnit + "']").attr("selected", true);
			$('#HDataForm' + i + '').find("option[value='" + option.data[i - 1].HDataForm + "']").attr("selected", true);
			if (option.data[i - 1].HIsRequired) {
			$('#HIsRequired' + i + '').attr("checked", true);
			}
			}
			form.render('select');

			form.render('checkbox');
			}
			break;

			@@ -663,6 +693,7 @@
			, { field: 'HMax', title: 'ä¸é', edit: 'text', totalRow: true }
			, { field: 'HMin', title: 'ä¸é', edit: 'text', totalRow: true }
			, { field: 'HDataForm', title: 'ééæ¥æº', templet: '#HDataForm-select' }
			, { field: 'HIsRequired', title: 'æ¯å¦å¿å½', templet: "#HIsRequired", }
			, { field: 'HDataUnit', title: 'ééæ¶é´åä½', templet: '#HDataUnit-select' }
			, { field: 'HDataTimes', title: 'ééå¨æé¢ç', edit: 'text', totalRow: true }
			, { field: 'HTechParamClassID', title: 'å·¥èºåæ°å¤§ç±»', hide: true }
			@@ -674,7 +705,31 @@
			, { 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",
			"HTechParamClassName": "",
			"HSNO": "0",
			"HStdNextTimes": "0",
			"HTechParamIDStd": "0",
			"HSourceBillNo": "0",
			"HSourceBillType": "0",
			"HSourceEntryID": "0",
			"HSourceInterID": "0"
			}
			];
			option.data = rowdata;
			table.render(option);

			}
			@@ -713,7 +768,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes'],
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html?openType=2&HOrgID=' + sessionStorage['Organization'], 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -837,7 +892,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'å·¥åºè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html', 'yes']
			, content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Process.html?openType=2', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -866,7 +921,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'è®¾å¤ç¼ç è¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../è®¾å¤ç®¡ç/è®¾å¤æ¡£æ¡/Gy_EquipFileMainList.html', 'yes']
			, content: ['../../è®¾å¤ç®¡ç/è®¾å¤æ¡£æ¡/Gy_EquipFileMainList.html?openType=2', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -895,7 +950,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'å·¥åºè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Gy_MouldFileList.html', 'yes']
			, content: ['../../æ¨¡æ²»å·ç®¡ç/æ¨¡æ²»å·ç®¡ç/Gy_MouldFileList.html?openType=2', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -939,21 +994,23 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}

			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": "",
			"HTechParamUnitID": rowData.HUnitID,
			"HTechParamUnitName": rowData.å·¥èºåæ°åä½,
			"HStd": "0",
			"HMax": "0",
			"HMin": "0",
			"HDataForm": "æå·¥å½å¥",
			"HDataForm": "è®¾å¤éé",
			"HIsRequired": false,
			"HDataUnit": "ç§",
			"HDataTimes": "0",
			"HTechParamClassID": "0",
			"HTechParamClassID": rowData.HClassID,
			"HTechParamClassName": rowData.å·¥èºåæ°å¤§ç±»,
			"HSNO": "0",
			"HStdNextTimes": "0",
			"HTechParamIDStd": "0",
			@@ -965,34 +1022,20 @@
			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);
			table.render(option);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, end: function () {
			if (OptionData.length > 0) {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HTechParamID": OptionData[0].HItemID,
			"HTechParamNumber": OptionData[0].å·¥èºåæ°ä»£ç ,
			"HTechParamName": OptionData[0].å·¥èºåæ°åç§°,

			"HTechParamID": OptionData[0]['HItemID'],
			"HTechParamNumber": OptionData[0]['å·¥èºåæ°ä»£ç '],
			"HTechParamName": OptionData[0]['å·¥èºåæ°åç§°'],
			"HTechParamUnitID": OptionData[0]['HUnitID'],
			"HTechParamUnitName": OptionData[0]['å·¥èºåæ°åä½'],
			"HTechParamClassID": OptionData[0]['HClassID'],
			"HTechParamClassName": OptionData[0]['å·¥èºåæ°å¤§ç±»'],
			});
			OptionData = [];
			}
			@@ -1050,7 +1093,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_TechnologyParameterClass.html', 'yes'],
			content: ['../../../views/åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_TechnologyParameterType.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -1061,7 +1104,7 @@
			}
			obj.update({
			"HTechParamClassID": checkStatus.data[0].HItemID,
			"HTechParamClassName": checkStatus.data[0].å·¥èºåæ°å¤§ç±»åç§°,
			"HTechParamClassName": checkStatus.data[0].å·¥èºåæ°åç±»åç§°,

			});
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			@@ -1277,7 +1320,7 @@
			{

			$.ajax({
			url: GetWEBURL() + "Gy_MaterialTechParamBill/Gy_MaterialTechParamBillMainEditList",
			url: GetWEBURL() + "/Gy_MaterialTechParamBill/Gy_MaterialTechParamBillMainEditList",
			async: false,
			type: "GET",
			data: {
			@@ -1289,8 +1332,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]["ç©æä»£ç "]
			@@ -1315,7 +1358,7 @@
			, "HRemark": tableMain[0]["è¡¨å¤´å¤æ³¨"]
			, "HOrgID": tableMain[0].HOrgID
			, "HMaker": tableMain[0]["å¶åäºº"]
			, "HUpDater": tableMain[0]["ä¿®æ¹äºº"]
			, "HUpdater": tableMain[0]["ä¿®æ¹äºº"]
			, "HChecker": tableMain[0]["å®¡æ ¸äºº"]
			, "HMakeDate": tableMain[0]["å¶åæ¥æ"] == null ? "" : Format(new Date(tableMain[0]["å¶åæ¥æ"]), "yyyy-MM-dd")
			, "HUpDateDate": tableMain[0]["ä¿®æ¹æ¶é´"] == null ? "" : Format(new Date(tableMain[0]["ä¿®æ¹æ¶é´"]), "yyyy-MM-dd")
			@@ -1323,13 +1366,18 @@
			, "HCloseMan": tableMain[0]["å³éäºº"]
			, "HCloseDate": tableMain[0]["å³éæ¶é´"] == null ? "" : Format(new Date(tableMain[0]["å³éæ¶é´"]), "yyyy-MM-dd")
			});


			//åè¡¨ èµå¼
			option.data = tableSub;
			console.log(tableSub)
			table.render(option);
			for (var i = 1; i <= option.data.length; i++) {
			$('#HDataUnit' + i).find("option[value='" + option.data[i - 1].HDataUnit + "']").attr("selected", true).trigger("change");;
			$('#HDataForm' + i).find("option[value='" + option.data[i - 1].HDataForm + "']").attr("selected", true).trigger("change");;
			if (option.data[i-1].HIsRequired) {
			$('#HIsRequired' + i).attr("checked", true);
			}
			$('#HDataUnit' + i).find("option[value='" + option.data[i - 1].HDataUnit + "']").attr("selected", true).trigger("change");
			$('#HDataForm' + i).find("option[value='" + option.data[i - 1].HDataForm + "']").attr("selected", true).trigger("change");

			}
			form.render('select');
			form.render('checkbox');
			@@ -1363,8 +1411,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);
			@@ -1598,6 +1650,14 @@
			}
			}

			// ç©æ
			function GetGyMaterial(obj) {
			$("#HMaterID").val( obj.HItemID);
			$("#HMaterNumber").val(obj.ç©æä»£ç );
			$("#HMaterName").val( obj.ç©æåç§°);
			$("#HMaterModel").val( obj.è§æ ¼åå·);
			}

			//å·¥èºåæ°
			function GetParameterValue(obj) {
			OptionData = obj;