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">
			<!--åºæ¬ä¿¡æ¯-->
			@@ -714,6 +719,7 @@
			"HDataUnit": "ç§",
			"HDataTimes": "0",
			"HTechParamClassID": "0",
			"HTechParamClassName": "",
			"HSNO": "0",
			"HStdNextTimes": "0",
			"HTechParamIDStd": "0",
			@@ -762,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) {
			//æé®ãæé®ä¸ãçåè°
			@@ -886,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] //è·åå¼¹æ¡é¡µé¢
			@@ -915,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] //è·åå¼¹æ¡é¡µé¢
			@@ -944,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] //è·åå¼¹æ¡é¡µé¢
			@@ -994,8 +1000,8 @@
			"HTechParamID": rowData.HItemID,
			"HTechParamNumber": rowData.å·¥èºåæ°ä»£ç ,
			"HTechParamName": rowData.å·¥èºåæ°åç§°,
			"HTechParamUnitID": 0,
			"HTechParamUnitName": "",
			"HTechParamUnitID": rowData.HUnitID,
			"HTechParamUnitName": rowData.å·¥èºåæ°åä½,
			"HStd": "0",
			"HMax": "0",
			"HMin": "0",
			@@ -1003,7 +1009,8 @@
			"HIsRequired": false,
			"HDataUnit": "ç§",
			"HDataTimes": "0",
			"HTechParamClassID": "0",
			"HTechParamClassID": rowData.HClassID,
			"HTechParamClassName": rowData.å·¥èºåæ°å¤§ç±»,
			"HSNO": "0",
			"HStdNextTimes": "0",
			"HTechParamIDStd": "0",
			@@ -1022,10 +1029,13 @@
			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 = [];
			}
			@@ -1310,7 +1320,7 @@
			{

			$.ajax({
			url: GetWEBURL() + "Gy_MaterialTechParamBill/Gy_MaterialTechParamBillMainEditList",
			url: GetWEBURL() + "/Gy_MaterialTechParamBill/Gy_MaterialTechParamBillMainEditList",
			async: false,
			type: "GET",
			data: {
			@@ -1348,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")
			@@ -1356,6 +1366,8 @@
			, "HCloseMan": tableMain[0]["å³éäºº"]
			, "HCloseDate": tableMain[0]["å³éæ¶é´"] == null ? "" : Format(new Date(tableMain[0]["å³éæ¶é´"]), "yyyy-MM-dd")
			});


			//åè¡¨ èµå¼
			option.data = tableSub;
			table.render(option);
			@@ -1638,6 +1650,14 @@
			}
			}

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

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