MES-WEB-LayUI.git

			@@ -422,6 +422,7 @@

			<script>
			//#region æå æ³¨é
			var HDataTemp = {};
			//#endregion
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			@@ -1188,7 +1189,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'åè´§äººåè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HSecManager', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1213,7 +1214,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä»ç®¡åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HKeeper', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1286,6 +1287,20 @@
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			, end: function () {
			if (HDataTemp != {}) {
			//æ ¹æ®è¡¨å¤´ åºåºä»åº å¸¦åºåè¡¨ åè´§ä»åº
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i].HWHID + "" == "0") {
			option.data[i].HWHID = HDataTemp.HItemID;
			option.data[i].åè´§ä»åº = HDataTemp.ä»åºåç§°;
			}
			}
			table.render(option);

			HDataTemp = {};
			}
			}
			})
			}
			//#endregion
			@@ -2009,6 +2024,8 @@
			if (event.key == "F7") {
			//ç©æ
			if (obj.event == "HMaterID") {
			var HOrgID = $("#HOrgID").val();

			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			@@ -2017,7 +2034,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2&HOrgID=' + HOrgID, 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -2038,6 +2055,20 @@
			, "è®¡éåä½": checkStatus.data[0].è®¡éåä½åç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			if (HDataTemp != {}) {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HMaterID": HDataTemp.HItemID
			, "ç©æä»£ç ": HDataTemp.ç©æä»£ç
			, "ç©æåç§°": HDataTemp.ç©æåç§°
			, "è§æ ¼åå·": HDataTemp.è§æ ¼åå·
			, "HUnitID": HDataTemp.HUnitID
			, "è®¡éåä½": HDataTemp.è®¡éåä½åç§°
			})
			HDataTemp = {};
			}
			}
			})
			}
			@@ -2068,6 +2099,16 @@
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			if (HDataTemp != {}) {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HUnitID": HDataTemp.HItemID
			, "è®¡éåä½": HDataTemp.è®¡éåä½åç§°
			})
			HDataTemp = {};
			}
			}
			})
			}
			//åè´§ä»åº
			@@ -2080,7 +2121,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html?Type=HSubWHID', 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -2096,6 +2137,16 @@
			, "HWHID": checkStatus.data[0].HItemID
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			if (HDataTemp != {}) {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HWHID": HDataTemp.HItemID
			, "åè´§ä»åº": HDataTemp.ä»åºåç§°
			})
			HDataTemp = {};
			}
			}
			})
			}
			@@ -2158,9 +2209,25 @@

			//#region å¨æ«å°¾å¢å ä¸è¡
			function btnAddLine(NewRow) {
			if (option.data.length > 0) {
			NewRow.HisStockGoods = option.data[0]["HisStockGoods"];
			} else {
			NewRow.HisStockGoods = "false";
			}


			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];
			table.render(option);

			//å·æ°è¡¨æ ¼åæ¶æ ¹æ®optionä¸HisStockGoodså¼è®¾ç½®ä¸æåè¡¨
			setSelectHisStockGoodsByTableRender();

			//æ ¹æ®æ¯å¦ååºåè·åå®éæ¯ä¾
			//setHEarnestRateByHisStockGoods();

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney($("#HEarnestRate").val() * 1);
			//rows++;
			layer.msg('å¢å ä¸è¡æé®ï¼')
			}
			@@ -2700,8 +2767,9 @@

			function GetHWHValue(obj) //è¿åä»åº
			{
			//$("#HWHName").val(obj[0].HName);
			//$("#HWHID").val(obj[0].HItemID);
			$("#HWHName").val(obj[0].ä»åºåç§°);
			$("#HWHID").val(obj[0].HItemID);
			HDataTemp = obj[0];
			}

			function GetSellStyleValue(obj) //è¿åéå®æ¹å¼
			@@ -2712,13 +2780,13 @@

			function GetHKeeperValue(obj) //è¿åä¿ç®¡å
			{
			$("#HKeeperName").val(obj[0].HName);
			$("#HKeeperName").val(obj[0].èååç§°);
			$("#HKeeperID").val(obj[0].HItemID);
			}

			function GetHWorkerValue(obj) //è¿ååè´§äººï¼æä½å·¥ï¼
			function GetHSecManagerValue(obj) //è¿ååè´§äººï¼æä½å·¥ï¼
			{
			$("#HSecManagerName").val(obj[0].HName);
			$("#HSecManagerName").val(obj[0].èååç§°);
			$("#HSecManagerID").val(obj[0].HItemID);
			}

			@@ -2739,6 +2807,21 @@
			$("#HWHID").val(obj[0].HItemID);
			}

			function GetMaterValue(obj) //ç©æåç§°
			{
			HDataTemp = obj[0];
			}

			function GetUnitValue(obj) //è®¡éåä½
			{
			HDataTemp = obj[0];
			}

			function GetHSubWHValue(obj) //åè¡¨åè´§ä»åº
			{
			HDataTemp = obj[0];
			}

			//#region æ ¹æ®å®¢æ·è·åå¸å«ãæ±çãç»ç®æ¹å¼ãå®¢æ·ä¿¡ç¨é¢åº¦ãèç³»äººãèç³»çµè¯
			function getCustomerByCusID(HCusID) {
			$.ajax({