MES-WEB-LayUI.git

			@@ -458,7 +458,7 @@
			, data = checkStatus.data;
			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow = {
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HQtyMust": "", "HQty": "", "HRemark": "",
			"HMaterID": 0, "ç©æä»£ç ": "", "ç©æåç§°": "", "è§æ ¼åå·": "", "HUnitID": 0, "è®¡éåä½": "", "HQtyMust": "0", "HQty": "0", "HRemark": "",
			"HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "æ¶æä»åº": "",
			"HSPID": 0, "ä»ä½åç§°": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
			"HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
			@@ -986,7 +986,7 @@
			, { field: 'HPrice', title: 'åä»·', width: 100, edit: 'text' }
			, { field: 'HMoney', title: 'éé¢', width: 100, edit: 'text', totalRow: true }
			, { field: 'HOrderPrice', title: 'éè´éé¢', width: 100, edit: 'text', totalRow: true}
			, { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
			, { field: 'HWHID', title: 'HWHID', width: 100, hide: true }
			, { field: 'æ¶æä»åº', title: 'æ¶æä»åº', width: 100, edit: 'text', event: "HWHID" }//f7
			, { field: 'HSPID', title: 'HSPID', width: 100, hide: true }
			, { field: 'ä»ä½åç§°', title: 'ä»ä½åç§°', width: 100, edit: 'text', event: "HSPID" }//f7
			@@ -1114,8 +1114,11 @@
			var HSourceBillData = getPushSource_POOrderBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //è·åæºåæ°æ®
			if (HSourceBillData != "none") {
			if (HSourceBillData == null) {
			layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i + 1) + "è¡ï¼æªæ¥è¯¢å°æºååæ®!", { icon: 5 });
			return;
			if (option.data[i].HSourceInterID!=0) {
			layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i + 1) + "è¡ï¼æªæ¥è¯¢å°æºååæ®!", { icon: 5 });
			return;
			}

			} else if (HSourceBillData.ç¶æ != "å·²å®¡æ ¸") {
			var err = "ä¿åå¤±è´¥!åå ï¼ç¬¬" + (i + 1) + "è¡-æºååæ®ç¶æä¸ºâ" + HSourceBillData.ç¶æ + "âï¼ä¸åè®¸ä¿åï¼";
			layer.alert(err, { icon: 5 });
			@@ -1137,8 +1140,10 @@
			var HSourceBillData = getPushSource_POInStockBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //è·åæºåæ°æ®
			if (HSourceBillData != "none") {
			if (HSourceBillData == null) {
			layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i + 1) + "è¡ï¼æªæ¥è¯¢å°æºååæ®!", { icon: 5 });
			return;
			if (option.data[i].HSourceInterID != 0) {
			layer.alert("ä¿åå¤±è´¥!ç¬¬" + (i + 1) + "è¡ï¼æªæ¥è¯¢å°æºååæ®!", { icon: 5 });
			return;
			}
			} else if (HSourceBillData.ç¶æ != "å·²å®¡æ ¸") {
			var err = "ä¿åå¤±è´¥!åå ï¼ç¬¬" + (i + 1) + "è¡-æºååæ®ç¶æä¸ºâ" + HSourceBillData.ç¶æ + "âï¼ä¸åè®¸ä¿åï¼";
			layer.alert(err, { icon: 5 });
			@@ -1337,7 +1342,8 @@
			});

			//åè¡¨ èµå¼
			var rowdata = [];
			var rowdata = [];

			for (var i = 0; i < dataArray.length; i++) {
			rowdata.push(
			{
			@@ -1347,9 +1353,11 @@
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 2)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HQtyMust": dealDoubleToFixed(dataArray[i].æ°é, 2)
			, "HOrderPrice": dealDoubleToFixed(dataArray[i].æ°é * dataArray[i].åä»·, 2)
			, 'HDiscountRate': "0" //
			, 'HRelTaxPrice': "0"
			, "HTaxRate": dataArray[i].ç¨ç
			@@ -1467,6 +1475,7 @@
			$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
			//ä¿ååæµè§
			//ReRoadBillMain();
			$('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');
			}
			else {
			layer.alert(data.Message, { icon: 5 });
			@@ -1484,13 +1493,14 @@
			////#endregion

			function get_checkEmp() {
			var HOrgID = $("#HOrgID").val();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä¸å¡ååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HEmp', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HEmp&HOrgID=' + HOrgID, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1506,13 +1516,14 @@
			})
			}
			function get_checkSup() {
			var HOrgName = $('select[name="HOrgID"] option:selected').text();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä¾åºååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html?Type=HSup', 'yes']
			, content: ['../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html?Type=HSup&HOrgName=' + HOrgName, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1529,13 +1540,14 @@
			}
			//å·¥ç¨é¡¹ç®
			function get_btnHProjectID() {
			var HOrgID = $("#HOrgID").val();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'é¡¹ç®åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../é¡¹ç®ç®¡ç/å·¥ç¨é¡¹ç®/PM_ProjectBillList.html', 'yes']
			, content: ['../../é¡¹ç®ç®¡ç/å·¥ç¨é¡¹ç®/PM_ProjectBillList.html?Type=2&HOrgID=' + HOrgID, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1552,13 +1564,14 @@
			})
			}
			function get_checkWH() {
			var HOrgName = $('select[name="HOrgID"] option:selected').text();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä»åºåè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html?Type=HWH', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html?Type=HWH&HOrgName=' + HOrgName, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1585,13 +1598,14 @@
			})
			}
			function get_checkSecManager() {
			var HOrgID = $("#HOrgID").val();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'éªæ¶ååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HSecManager', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HSecManager&HOrgID=' + HOrgID, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1607,13 +1621,14 @@
			})
			}
			function get_checkKeeper() {
			var HOrgID = $("#HOrgID").val();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä¿ç®¡ååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HKeeper', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HKeeper&HOrgID=' + HOrgID, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1629,13 +1644,14 @@
			})
			}
			function get_checkDept() {
			var HOrgName = $('select[name="HOrgID"] option:selected').text();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'é¨é¨åè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html?Type=2&HOrgName=' + HOrgName, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1652,13 +1668,14 @@
			}

			function get_checkManager() {
			var HOrgID = $("#HOrgID").val();
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'è´è´£äººåè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HWorker', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HWorker&HOrgID=' + HOrgID, 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -1829,6 +1846,7 @@
			}
			//è®¡éåä½
			if (obj.event == "HUnitID") {
			var HOrgName = $('select[name="HOrgID"] option:selected').text();
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			@@ -1837,7 +1855,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html?Type=2&HOrgName=' + HOrgName, 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -1864,6 +1882,7 @@
			}
			//æ¶æä»åº
			if (obj.event == "HWHID") {
			var HOrgName = $('select[name="HOrgID"] option:selected').text();
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			@@ -1872,7 +1891,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html?type=Warehouse', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Warehouse.html?type=Warehouse&HOrgName=' + HOrgName, 'yes']
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			@@ -2378,7 +2397,10 @@
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["field"] + ",";
			}

			var colTitleName = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colTitleName += option.cols[0][i]["title"] + ",";
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç
			layer.open({
			type: 2
			@@ -2388,7 +2410,7 @@
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
			, content: ['../../åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName + '&colTitleName = ' + colTitleName, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			@@ -2666,8 +2688,8 @@
			OptionData = data
			}
			//åå»è¿åè®¡éåä½
			function GetGyUnit(data) {
			OptionData = data
			function GetUnitValue(data) {
			OptionData = data[0]
			}

			//åå»è¿åæ¶æä»åº