MES-WEB-LayUI.git

			@@ -399,7 +399,7 @@
			window.OptionData = [];
			//è®°å½ç»ç»çå¼
			var HOrgIDBar = 0;

			var topScroll = 0;//è®°å½æ»å¨æ¡çä½ç½®

			//#region ãå¨æè·åæ¨¡ååç§°ã
			var HModuleType = "1426";
			@@ -764,11 +764,11 @@
			var HQty = dataArray[i].æ°é - dataArray[i].å³èæ°é; //æ°é
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].hmaterid
			"HMaterID": dataArray[i].HMaterID
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].hunitid
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(HQty, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			@@ -934,11 +934,13 @@
			table.on('edit(mainTable)', function (obj) {
			//æ°å¼æ ¼å¼æ ¡éªå·¥å·
			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var ref1 = /^-?\d+(\.\d+)?$/; //å¤æåç¬¦ä¸²æ¯å¦ä¸ºæ°å(åå«æ´æ°ãæµ®ç¹æ°)ï¼æ£åè¡¨è¾¾å¼
			var temp = "";
			var Dec = getDecByMaterID(obj.data.HMaterID) //è·åç²¾åº¦
			var HQtyDec = (Dec["HQtyDec"] == null \|\| Dec["HQtyDec"] == 0) ? 4 : Dec["HQtyDec"]; //æ°éç²¾åº¦
			var HPriceDec = (Dec["HPriceDec"] == null \|\| Dec["HPriceDec"] == 0) ? 4 : Dec["HPriceDec"]; //åä»·ç²¾åº¦
			var HMoneyDec = (Dec["HMoneyDec"] == null \|\| Dec["HMoneyDec"] == 0) ? 2 : Dec["HMoneyDec"]; //éé¢ç²¾åº¦
			topScroll = $('#mainTable').next('.layui-table-view').find('.layui-table-body').scrollTop();//è·åæ»å¨æ¡ä½ç½®
			// ååæ ¼ç¼è¾ä¹åçå¼
			var oldText = $(this).prev().text();
			var value = obj.value //å¾å°ä¿®æ¹åçå¼
			@@ -950,14 +952,23 @@
			case "HQty": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			temp = value + "";
			if (!ref.test(temp) \|\| temp == 0) {
			if (!ref1.test(temp)) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HQty: oldText
			});
			table.render(option);

			layer.msg("æ°éè¯·è¾å¥å¤§äº0çæ°å!");
			layer.msg("æ°éè¯·è¾å¥ä¸ä¸º0çæ°å!");
			return;
			} else if (temp * 1 == 0) {
			//æ¢å¤æ°æ®å°ç¼è¾å
			obj.update({
			HQty: oldText
			});
			table.render(option);

			layer.msg("æ°éè¯·è¾å¥ä¸ä¸º0çæ°å!");
			return;
			}

			@@ -997,7 +1008,7 @@
			, HlineTotalBB: HlineTotalBB //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			//table.render(option);
			table.render(option);
			break;
			case "HPrice": //åä»·
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -1051,7 +1062,7 @@
			, HlineTotalBB: HlineTotalBB //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			//table.render(option);
			table.render(option);
			break;
			case "HTaxRate": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -1105,7 +1116,7 @@
			, HlineTotalBB: HlineTotalBB //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			//table.render(option);
			table.render(option);
			break;
			case "HDiscountRate": //æ°é
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -1149,6 +1160,7 @@
			, HDiscountRate: HDiscountRate //æ´æ°HDiscountRateåæ®µï¼å¶å¼æ¥èªåéHDiscountRate
			, HRelTaxPrice: HRelTaxPrice //æ´æ°HRelTaxPriceåæ®µï¼å¶å¼æ¥èªåéHRelTaxPrice
			});
			table.render(option);
			break;
			case "HTaxPrice": //å«ç¨åä»·
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -1200,7 +1212,7 @@
			, HlineTotalBB: HlineTotalBB //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			//table.render(option)
			table.render(option)
			break;
			case "HMoney": //éé¢
			//æ°æ®æ ¼å¼æ ¡éª
			@@ -1254,7 +1266,7 @@
			, HlineTotalBB: HlineTotalBB //æ´æ°HlineTotalBBåæ®µï¼å¶å¼æ¥èªåéHlineTotalBB
			, HMoneyBB: HMoneyBB
			});
			//table.render(option);
			table.render(option);
			break;
			default:
			}
			@@ -1271,7 +1283,7 @@
			function changeHPrice() {
			//#region åè¡¨ æ°æ®æ£éª
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i]["HMaterID"] == "0") {
			if (option.data[i]["HMaterID"] == "0" \|\| option.data[i]["HMaterID"] == "" \|\| option.data[i]["HMaterID"] == undefined) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼ç©ææªéæ©ï¼");
			return false;
			} else {
			@@ -1897,7 +1909,7 @@
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].hunitid
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(HQty, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			@@ -2022,6 +2034,9 @@
			, { field: 'HSeOrderBillNo', title: 'éå®è®¢åå·', width: 100, hide: true, style: 'background-color:#efefef4d;' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo', width: 70 }
			]]
			, done: function (res, curr, count) {
			$(".layui-table-main").scrollTop(topScroll);
			}
			}

			var rowdata = [{
			@@ -2366,7 +2381,7 @@

			, "HDeptID": dataArray[0].HDeptID
			, "HDeptName": dataArray[0].é¨é¨
			, "HMangerID": dataArray[0].hmanagerid
			, "HMangerID": dataArray[0].HManagerID
			, "HMangerName": dataArray[0].ä¸»ç®¡
			, "HEmpID": dataArray[0].HEmpID
			, "HEmpName": dataArray[0].ä¸å¡å
			@@ -2386,11 +2401,11 @@
			for (var i = 0; i < dataArray.length; i++) {
			rowdata.push(
			{
			"HMaterID": dataArray[i].hmaterid
			"HMaterID": dataArray[i].HMaterID
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].hunitid
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(dataArray[i].æ°é, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			@@ -2514,6 +2529,7 @@
			function AllowLoadData(data) {
			//æ°å¼æ ¼å¼æ ¡éªå·¥å·
			var ref = /^\d+(\.\d+)?$/; //éè´æ°æ£åè¡¨è¾¾å¼
			var ref1 = /^-?\d+(\.\d+)?$/; //å¤æåç¬¦ä¸²æ¯å¦ä¸ºæ°å(åå«æ´æ°ãæµ®ç¹æ°)ï¼æ£åè¡¨è¾¾å¼
			var temp = "";

			//#region è¡¨å¤´æ°æ®æ£éª
			@@ -2576,11 +2592,11 @@

			//å®åæ°éæ ¼å¼æ ¡éª
			temp = option.data[i]["HQty"] + "";
			if (temp == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼å®åæ°éä¸è½ä¸º0ï¼");
			if (!ref1.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼å®åæ°éè¯·è¾å¥ä¸ä¸º0çæ°åï¼");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼å®åæ°éè¯·è¾å¥å¤§äº0çæ°åï¼");
			} else if (temp * 1 == 0) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼å®åæ°éè¯·è¾å¥ä¸ä¸º0çæ°åï¼");
			return false;
			}

			@@ -2611,26 +2627,26 @@
			return false;
			}

			//éé¢æ ¼å¼æ ¡éª
			temp = option.data[i]["HMoney"] + "";
			if (temp == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢ä¸è½ä¸º0ï¼");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢è¯·è¾å¥å¤§äº0çæ°åï¼");
			return false;
			}

			//ç¨é¢æ ¼å¼æ ¡éª
			temp = option.data[i]["HTaxMoney"] + "";
			////éé¢æ ¼å¼æ ¡éª
			//temp = option.data[i]["HMoney"] + "";
			//if (temp == "0") {
			// layer.msg("ç¬¬" + (i + 1) + "è¡ï¼ç¨é¢ä¸è½ä¸º0ï¼");
			// layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢ä¸è½ä¸º0ï¼");
			// return false;
			//} else
			if (!ref.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼ç¨é¢è¯·è¾å¥ä¸å°äº0çæ°åï¼");
			return false;
			}
			//} else if (!ref.test(temp)) {
			// layer.msg("ç¬¬" + (i + 1) + "è¡ï¼éé¢è¯·è¾å¥å¤§äº0çæ°åï¼");
			// return false;
			//}

			////ç¨é¢æ ¼å¼æ ¡éª
			//temp = option.data[i]["HTaxMoney"] + "";
			////if (temp == "0") {
			//// layer.msg("ç¬¬" + (i + 1) + "è¡ï¼ç¨é¢ä¸è½ä¸º0ï¼");
			//// return false;
			////} else
			//if (!ref.test(temp)) {
			// layer.msg("ç¬¬" + (i + 1) + "è¡ï¼ç¨é¢è¯·è¾å¥ä¸å°äº0çæ°åï¼");
			// return false;
			//}

			//åè´§ä»åºéç©ºéªè¯
			if (option.data[i]["HWHID"] == "0") {
			@@ -3379,7 +3395,7 @@

			, "HDeptID": dataArray[0].HDeptID
			, "HDeptName": dataArray[0].é¨é¨
			, "HMangerID": dataArray[0].hmanagerid
			, "HMangerID": dataArray[0].HManagerID
			, "HMangerName": dataArray[0].ä¸»ç®¡
			, "HEmpID": dataArray[0].HEmpID
			, "HEmpName": dataArray[0].ä¸å¡å
			@@ -3399,46 +3415,51 @@

			//åè¡¨ èµå¼
			var rowdataEntry = [];
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é * 1 - dataArray[i].å³èæ°é;
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].hmaterid
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].hunitid
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(HQty, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, "HMoney": dealDoubleToFixed(HQty * dataArray[i].åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""
			try {
			for (var i = 0; i < dataArray.length; i++) {
			var HQty = dataArray[i].æ°é * 1 - dataArray[i].å³èæ°é;
			rowdataEntry.push(
			{
			"HMaterID": dataArray[i].HMaterID
			, "ç©æä»£ç ": dataArray[i].ç©æä»£ç
			, "ç©æåç§°": dataArray[i].ç©æåç§°
			, "è§æ ¼åå·": dataArray[i].è§æ ¼åå·
			, "HUnitID": dataArray[i].HUnitID
			, "è®¡éåä½": dataArray[i].è®¡éåä½
			, "HQty": dealDoubleToFixed(HQty, 1)
			, "HPrice": dealDoubleToFixed(dataArray[i].åä»·, 3)
			, "HTaxPrice": dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, 'HDiscountRate': "1" //
			, 'HRelTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HTaxRate": dataArray[i].ç¨ç
			, 'HTaxMoney': "0" //
			, "HMoney": dealDoubleToFixed(HQty * dataArray[i].åä»·, 2)
			, 'HMoneyBB': dealDoubleToFixed(HQty * dataArray[i].åä»· * dataArray[0].æ±ç, 2)
			, 'HlineTotal': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»·, 2)
			, 'HlineTotalBB': dealDoubleToFixed(HQty * dataArray[i].å«ç¨åä»· * dataArray[0].æ±ç, 2)
			, "HRemark": ""

			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"
			, "HSourceInterID": dataArray[i].hmainid
			, "HSourceEntryID": dataArray[i].hsubid
			, "HSourceBillNo": dataArray[i].åæ®å·
			, "HSourceBillType": dataArray[i].HBillType
			, "HRelationQty": "0"
			, "HRelationMoney": "0"

			, 'HPOOrderInterID': "0"
			, 'HPOOrderEntryID': "0"
			, 'HPOOrderBillNo': ""
			, 'HPOOrderInterID': "0"
			, 'HPOOrderEntryID': "0"
			, 'HPOOrderBillNo': ""

			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
			, "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
			, "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].æºååå· : ""
			}
			);
			, 'HSeOrderTaxPrice': dealDoubleToFixed(dataArray[i].å«ç¨åä»·, 3)
			, "HSeOrderInterID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceInterID : "0"
			, "HSeOrderEntryID": dataArray[i].HSourceBillType == "1401" ? dataArray[i].HSourceEntryID : "0"
			, "HSeOrderBillNo": dataArray[i].HSourceBillType == "1401" ? dataArray[i].æºååå· : ""
			}
			);
			}
			}
			catch (error) {
			layer.alert(error.Message, { icon: 5 });
			}

			optionEntry.data = JSON.parse(JSON.stringify(rowdataEntry));
			@@ -3528,7 +3549,7 @@
			async: false, //æ¯å¦å¼å¯å¼æ¥
			type: "GET", //è¯·æ±ç±»å
			data: { //å®ä¹åéå°æå¡å¨çæ°æ®
			"HMaterID": HMaterID // å°hmateridä½ä¸ºè¯·æ±åæ°åé
			"HMaterID": HMaterID // å°HMaterIDä½ä¸ºè¯·æ±åæ°åé
			},
			success: function (result) { // å½è¯·æ±æåæ¶ï¼æ§è¡è¿ä¸ªå½æ°
			if (result.code == 1) { // å¦ææå¡å¨è¿åçæ°æ®ä¸ç`codeåæ®µçäº1ï¼è¿å¯è½è¡¨ç¤ºå®¡æ ¸æä½æåæ§è¡