MES-WEB-LayUI.git

			@@ -53,7 +53,7 @@
			<button type="button" id="btnSave" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">ä¿å</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">éåº</button>
			<!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btn_print">æå°</button>-->
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">éèåè®¾ç½®</button>
			<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn">éèåè®¾ç½®</button>-->
			</div>
			</div>
			<div class="layui-tab" lay-filter="tab-POStockInBill">
			@@ -333,8 +333,7 @@

			//#region è¿å¥é¡µé¢å³å è½½

			//åå§åçé¢
			set_ClearBill();


			var params = get_UrlVars();
			if (typeof (params[params[0]]) == "undefined") {
			@@ -342,7 +341,7 @@
			} else {
			var OperationType = params[params[0]];//æä½ç±»å
			var linterid = params[params[1]];//æºåid
			var HEntryID = params[params[2]];//æºååid
			var HEntryID = params[params[2]];//æµæ°´å·
			}

			//å·¥åºè¿å·¥æ°å¢
			@@ -361,7 +360,12 @@

			//æ¥è¯¢å·¥åºæµè½¬å¡
			get_ProcessExchange();
			//åå§åçé¢
			set_ClearBill();

			} else if (OperationType == 3) {
			//åå§åçé¢
			set_ClearBill();
			RoadBillMain(linterid);
			}

			@@ -392,11 +396,11 @@
			, data = checkStatus.data;
			//æ°å¢è¡è¡¨æ ¼æ°æ®
			var NewRow = {
			"HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
			"HProcNo": parseInt($("#HProcExchBegNO").val()) + table.cache["mainTable"].length+1, "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
			"HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
			"HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
			"HQty": 0, "HRemark": ""
			"HQty": $("#HQty").val(), "HRemark": ""
			};
			switch (obj.event) {
			case 'btn-AddLine':
			@@ -440,8 +444,10 @@
			if (rowIndex === '0') {
			layer.msg('é¦è¡æ æ³å é¤ï¼ï¼ï¼');
			} else {
			obj.del();
			option.data = table.cache["mainTable"];//å°æ°æ®ç»å®å°dataä¸
			var oldData = table.cache["mainTable"];
			oldData.splice(obj.tr.data('index'), 1)
			option.data = oldData;//å°æ°æ®ç»å®å°dataä¸
			table.render(option);
			layer.close(index);
			}
			});
			@@ -582,27 +588,7 @@
			return false;
			}
			})
			//åå»æ¹åä¸å¯ç¼è¾å¼
			if (obj.event === 'isEditCheck') {
			var flag = obj.data.isEdit;
			var flagValue = obj.data.isEditValue;
			if (flagValue === "false") {
			flagValue = "true";
			flag = "æ¯";
			}
			else if (flagValue === "true") {
			flagValue = "false";
			flag = "å¦";
			}
			else {
			flagValue = "false";
			flag = "å¦";
			}
			obj.update({
			isEdit: flag
			, isEditValue: flagValue
			});
			}

			});

			//ä¿åæäº¤
			@@ -684,11 +670,11 @@
			}
			};
			option.data = [{
			"HProcNo": "", "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
			"HProcNo": parseInt($("#HProcExchBegNO").val()) + 1, "HProcID": 0, "HProcNumber": "", "HProcName": "", "HWorkRemark": "",
			"HCenterID": 0, "HCenterNumber": "", "HCenterName": "",
			"HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
			"HSupID": 0, "HSupNumber": "", "HSupName": "", "HSupFlag": "false",
			"HQty": 0, "HRemark": ""
			"HQty": $("#HQty").val(), "HRemark": ""
			}];
			table.render(option);

			@@ -707,8 +693,8 @@
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			if (checkStatus.data.length != 1) {
			return layer.msg('è¯·éæ©ä¸æ¡æ°æ®');
			}
			//è·åæ°æ®
			$("#HEmpID").val(checkStatus.data[0].HItemID);//è´è´£äººid
			@@ -721,11 +707,12 @@

			//æ¥è¯¢å·¥åºæµè½¬å¡
			function get_ProcessExchange() {
			var sWhere = " where hmainid=" + linterid + " and (HEntryID=" + HEntryID + " or HEntryID>" + HEntryID + ") ";
			var sWhere = " where hmainid=" + linterid + " and (cast(æµæ°´å· as int)=" + HEntryID + " or cast(æµæ°´å· as int)>" + HEntryID + ") ";
			//ç¼è¾å è½½æ°æ®
			$.ajax({
			url: GetWEBURL() + 'Sc_ProcExchWorkBackBill/GetProcessExchangeBillSub',
			type: "GET",
			async: false,
			data: { "sWhere": sWhere },
			success: function (result) {
			if (result.count == 1) {
			@@ -787,20 +774,34 @@
			layer.msg("ç¬¬" + indexRow + "è¡ï¼æµæ°´å·ä¸è½ä¸º0ï¼");
			return;
			}
			if (!option.data[i].HProcID) {
			if (option.data[i].HProcID==0) {
			var indexRow = i + 1;
			layer.msg("ç¬¬" + indexRow + "è¡ï¼å·¥åºä¸è½ä¸ºç©ºï¼");
			return;
			}
			if (!option.data[i].HCenterID) {
			var indexRow = i + 1;
			layer.msg("ç¬¬" + indexRow + "è¡ï¼å·¥ä½ä¸å¿ä¸è½ä¸ºç©ºï¼");
			return;

			//å§å¤æ è®°
			if (option.data[i]["HSupFlag"]=="true") {
			if (option.data[i]["HSupID"] == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:ä¾åºåä¸è½ä¸ºç©º!");
			return false;
			}
			} else {
			if (option.data[i]["HCenterID"] == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:å·¥ä½ä¸å¿ä¸è½ä¸ºç©º!");
			return false;
			}
			}

			if (parseInt(option.data[i].HQty) > parseInt($("#HQty").val())) {
			var indexRow = i + 1;
			layer.msg("ç¬¬" + indexRow + "è¡ï¼è¿å·¥æ°éè¶åºéè¦è¿å·¥æ°éï¼");
			return;
			}

			if (parseInt(option.data[i].HQty) <= 0) {
			var indexRow = i + 1;
			layer.msg("ç¬¬" + indexRow + "è¡ï¼è¿å·¥æ°éä¸è½å°äºçäº0ï¼");
			return;
			}

			@@ -813,15 +814,15 @@
			return false;
			}

			if (parseInt(option.data[i].HProcNo) < parseInt($("#HProcExchBegNO").val())) {
			if (parseInt(option.data[i].HProcNo) <= parseInt($("#HProcExchBegNO").val())) {
			var indexRow = i + 1;
			layer.msg("ç¬¬" + indexRow + "è¡ï¼æµæ°´å·å°äºå¼å§æµæ°´å·ï¼");
			layer.msg("ç¬¬" + indexRow + "è¡ï¼æµæ°´å·å°äºæçäºå¼å§æµæ°´å·ï¼");
			return;
			}

			if (parseInt(option.data[i].HProcNo) > parseInt($("#HProcExchEndNO").val())) {
			if (parseInt(option.data[i].HProcNo) >= parseInt($("#HProcExchEndNO").val())) {
			var indexRow = i + 1;
			layer.msg("ç¬¬" + indexRow + "è¡ï¼æµæ°´å·å¤§äºç»ææµæ°´å·ï¼");
			layer.msg("ç¬¬" + indexRow + "è¡ï¼æµæ°´å·å¤§äºæçäºç»ææµæ°´å·ï¼");
			return;
			}