MES-WEB-LayUI.git

			@@ -384,6 +384,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>å¤å¶ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Up"><i class="layui-icon layui-icon-form"></i>ä¸ç§»</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Under"><i class="layui-icon layui-icon-form"></i>ä¸ç§»</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-batchDelete"><i class="layui-icon layui-icon-form"></i>æ¹éå é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			@@ -438,6 +439,10 @@
			var params = get_UrlVars();
			var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å 1æ·»å ä¿å 2å¤å¶ 3 ç¼è¾
			var linterid = params[params[1]]; //ä»åæ°ä¸è·å åæ®åç

			//éè¦æ¹éå é¤çåè¡¨
			var btnBatchDeleteList = [];

			//#endregion


			@@ -662,6 +667,9 @@
			break;
			//ä¸ç§»
			case 'btn-Under': btn_under();
			break;
			//æ¹éå é¤
			case 'btn-batchDelete': btn_batchDelete();
			break;
			//åè®¾ç½®
			case 'set_HideColumn':
			@@ -989,6 +997,32 @@
			break;
			default:
			}
			});
			//#endregion

			//#region çå¬å¤éæ¡éä¸äºä»¶
			table.on('checkbox(mainTable)', function (obj) {
			//è·åéä¸è¡çç´¢å¼åè¡¨
			var rowIndex = $(obj.tr).attr("data-index");

			if (typeof (rowIndex) == "undefined") {
			if (btnBatchDeleteList.length == option.data.length) {
			btnBatchDeleteList = [];
			} else {
			btnBatchDeleteList = [];
			for (var i = 0; i < option.data.length; i++) {
			btnBatchDeleteList.push(i + "");
			}
			}
			} else {
			if ($.inArray(rowIndex, btnBatchDeleteList) > -1) {
			var btnBatchDeleteList_New = btnBatchDeleteList.filter(item => item !== rowIndex);
			btnBatchDeleteList = btnBatchDeleteList_New;
			} else {
			btnBatchDeleteList.push(rowIndex);
			}
			}
			console.log(btnBatchDeleteList);
			});
			//#endregion
			//#endregion
			@@ -1770,8 +1804,7 @@
			//#region åè¡¨ æ°æ®æ£éª
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i]["HMaterID"] == "0") {
			layer.msg("ç¬¬" + i + "è¡ï¼ç©ææªéæ©ï¼");
			return false;
			continue;
			}

			if (option.data[i]["HUnitID"] == "0") {
			@@ -1938,15 +1971,15 @@
			//#endregion

			//#region åè¡¨ å³é®åéå¤æ ¡éª
			var num = [];
			for (var i = 0; i < option.data.length; i++) {
			if ($.inArray(option.data[i]["HMaterID"], num) == -1) {
			num.push(option.data[i]["HMaterID"]);
			} else {
			layer.msg("ç¬¬" + (i + 1) + "è¡,ç©æ:" + option.data[i]["HMaterID"] + "éå¤!");
			return false;
			}
			}
			//var num = [];
			//for (var i = 0; i < option.data.length; i++) {
			// if ($.inArray(option.data[i]["HMaterID"], num) == -1) {
			// num.push(option.data[i]["HMaterID"]);
			// } else {
			// layer.msg("ç¬¬" + (i + 1) + "è¡,ç©æ:" + option.data[i]["HMaterID"] + "éå¤!");
			// return false;
			// }
			//}
			//#endregion
			return true;
			}
			@@ -1979,7 +2012,7 @@
			//#endregion

			//#region å¨æ«å°¾å¢å æå®æ°éçè¡
			function btnAddLines(NewRow) {
			function btnAddLines(Row) {
			layer.prompt({ formType: 2, title: "è¯·è¾å¥éè¦æ°å¢çè¡æ°", value: '1' },
			function (value, index) {
			//æ°å¼æ ¼å¼æ ¡éªå·¥å·
			@@ -1993,15 +2026,51 @@
			return false;
			} else if (temp * 1 > 50) {
			layer.confirm("æ°å¢è¡æ°è¶è¿50è¡ï¼æ¯å¦ç¡®å®æ°å¢?", function (index1) {
			if (option.data.length > 0) {
			NewRow.HisStockGoods = option.data[0]["HisStockGoods"];
			} else {
			NewRow.HisStockGoods = "false";
			}
			var RowsCount = value * 1;
			for (var i = 0; i < RowsCount; i++) {
			var NewRow = {
			"HMaterID": "0",
			"ç©æä»£ç ": "",
			"ç©æåç§°": "",
			"HOrderLevID": "0",
			"è®¢åççº§ä»£ç ": "",
			"è®¢åççº§åç§°": "",
			"è§æ ¼åå·": "",
			"HUnitID": "0",
			"è®¡éåä½": "",
			"HQty": "0",
			"HPrice": "0",
			"HTaxPrice": "0",
			"HMoney": "0",
			"HDiscountRate": "0",
			"HRelTaxPrice": "0",
			"HTaxRate": "0",
			"HTaxMoney": "0",
			"HlineTotal": "0",
			"HlineTotalBB": "0",
			"HDate": Format(new Date(), 'yyyy-MM-dd'),
			"HisStockGoods": "false",
			"HOutStockQty": "0",
			"HInvoiceQty": "0",
			"HRemark": "",
			"HCusMaterNumber": "",
			"HCusModel": "",
			"HCusMaterName": "",
			"HRelationQty": "0",
			"HRelationQty_SellOutCheck": "0",
			"HRelationMoney_SellOutCheck": "0",
			"HRelationQty_ICMO": "0",
			"HRelationQty_SellBack": "0",
			"HRelationQty_SellBackCheck": "0"
			};
			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å¼è®¾ç½®ä¸æåè¡¨
			@@ -2016,15 +2085,51 @@
			layer.close(index);
			})
			} else {
			if (option.data.length > 0) {
			NewRow.HisStockGoods = option.data[0]["HisStockGoods"];
			} else {
			NewRow.HisStockGoods = "false";
			}
			var RowsCount = value * 1;
			for (var i = 0; i < RowsCount; i++) {
			var NewRow = {
			"HMaterID": "0",
			"ç©æä»£ç ": "",
			"ç©æåç§°": "",
			"HOrderLevID": "0",
			"è®¢åççº§ä»£ç ": "",
			"è®¢åççº§åç§°": "",
			"è§æ ¼åå·": "",
			"HUnitID": "0",
			"è®¡éåä½": "",
			"HQty": "0",
			"HPrice": "0",
			"HTaxPrice": "0",
			"HMoney": "0",
			"HDiscountRate": "0",
			"HRelTaxPrice": "0",
			"HTaxRate": "0",
			"HTaxMoney": "0",
			"HlineTotal": "0",
			"HlineTotalBB": "0",
			"HDate": Format(new Date(), 'yyyy-MM-dd'),
			"HisStockGoods": "false",
			"HOutStockQty": "0",
			"HInvoiceQty": "0",
			"HRemark": "",
			"HCusMaterNumber": "",
			"HCusModel": "",
			"HCusMaterName": "",
			"HRelationQty": "0",
			"HRelationQty_SellOutCheck": "0",
			"HRelationMoney_SellOutCheck": "0",
			"HRelationQty_ICMO": "0",
			"HRelationQty_SellBack": "0",
			"HRelationQty_SellBackCheck": "0"
			};
			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å¼è®¾ç½®ä¸æåè¡¨
			@@ -2187,6 +2292,30 @@
			}
			//#endregion

			//#region æ¹éå é¤
			function btn_batchDelete() {
			var data = [];
			for (var i = 0; i < option.data.length; i++) {
			if ($.inArray(i+"", btnBatchDeleteList) == -1) {
			data.push(option.data[i]);
			}
			}
			option.data = data;
			table.render(option);

			btnBatchDeleteList = [];

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

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

			//è®¾ç½®è¡¨å¤´æééé¢
			set_HBillMoney($("#HEarnestRate").val() * 1);
			}
			//#endregion

			//#region è¡¨æ ¼è¡åäºä»¶å é¤
			function set_GridDelete(obj) {
			var data = obj.data;
			@@ -2204,6 +2333,15 @@
			option.data = oldData;
			table.render(option);

			//æ´æ°æ¹éå é¤ç´¢å¼åè¡¨
			var btnBatchDeleteList_New = btnBatchDeleteList.filter(item => item !== rowIndex);
			btnBatchDeleteList = btnBatchDeleteList_New;
			for (var i = 0; i < btnBatchDeleteList.length; i++) {
			if (btnBatchDeleteList[i] * 1 > rowIndex * 1) {
			btnBatchDeleteList[i] = (btnBatchDeleteList[i] * 1 - 1) + "";
			}
			}

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