MES-WEB-LayUI.git

			@@ -52,7 +52,7 @@
			<div class="layui-form-item">

			<div class="layui-inline">
			<label class="layui-form-label">æ¡ç ç¼å·:</label>
			<label class="layui-form-label">æ¡ç ç¼å·<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HBarCode" id="HBarCode"
			class="layui-input">
			@@ -62,7 +62,7 @@
			</div>

			<div class="layui-inline">
			<label class="layui-form-label">setå·:</label>
			<label class="layui-form-label">setå·<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HSetNo" id="HSetNo"
			class="layui-input">
			@@ -70,37 +70,35 @@
			</div>

			<div class="layui-inline">
			<label class="layui-form-label">PCSå·:</label>
			<label class="layui-form-label">PCSå·<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<input type="text" name="HPCSNo" id="HPCSNo"
			class="layui-input">
			</div>
			</div>

			<div class="layui-inline">
			<div class="layui-inline" style="display:none;">
			<label class="layui-form-label">PCSè¡ç´¢å¼:</label>
			<div class="layui-input-inline">
			<input type="number" name="HPosition_x" id="HPosition_x"
			class="layui-input">
			class="layui-input" value="0">
			</div>
			</div>

			<div class="layui-inline">
			<div class="layui-inline" style="display:none;">
			<label class="layui-form-label">PCSåç´¢å¼:</label>
			<div class="layui-input-inline">
			<input type="number" name="HPosition_y" id="HPosition_y"
			class="layui-input">
			class="layui-input" value="0">
			</div>
			</div>


			<div class="layui-inline">
			<label class="layui-form-label">æ£éªå·¥åº:</label>
			<label class="layui-form-label">æ£éªå·¥åº<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<select name="HCheckProc" lay-filter="HCheckProc"
			id="HCheckProc">
			<option value="ç¬æ£®VRSåå±" selected="selected">ç¬æ£®VRSåå±
			</option>
			<select name="HCheckProc" lay-filter="HCheckProc" id="HCheckProc">
			<option value="ç¬æ£®VRSåå±" selected="selected">ç¬æ£®VRSåå±</option>
			<option value="ç¬æ£®VRSå¤å±">ç¬æ£®VRSå¤å±</option>
			<option value="AVI">AVI</option>
			<option value="çµæµ">çµæµ</option>
			@@ -109,13 +107,13 @@
			</div>

			<div class="layui-inline">
			<label class="layui-form-label">æ£åé¢:</label>
			<label class="layui-form-label">æ£åé¢<label style="color:red"> * </label></label>
			<div class="layui-input-inline">
			<select name="HPageIndex" lay-filter="HPageIndex"
			id="HPageIndex">
			<option value="æ£é¢" data-value="1" selected="selected">æ£é¢
			<option value="æµè¯" data-value="æµè¯" selected="selected">æµè¯
			</option>
			<option value="åé¢" data-value="0">åé¢</option>
			<option value="æµè¯1" data-value="æµè¯1">æµè¯1</option>
			</select>
			</div>
			</div>
			@@ -125,8 +123,8 @@
			<div class="layui-inline">
			<label class="layui-form-label">ä¸è¯åå :</label>
			<div class="layui-input-inline">
			<textarea name="HPNLPosition_y" id="HPNLPosition_y"
			class="layui-textarea"></textarea>
			<select name="HBadReason" lay-filter="HBadReason" id="HBadReason">
			</select>
			</div>
			</div>
			</div>
			@@ -208,6 +206,9 @@
			var OperationType = params[params[0]];//æä½ç±»å
			var linterid = params[params[1]];//æºåid
			var HSouceBillType = params[params[2]];//æºåç±»å
			var HBarCode_PNL = params[params[3]]; //PNLæ¡ç ç¼å·
			var HSetNo = params[params[4]]; //setå·
			var HPCSNo = params[params[5]]; //PCSå·
			}

			layui.config({
			@@ -238,6 +239,7 @@
			//#region è¿å¥é¡µé¢å³å è½½

			//åå§åçé¢
			setInitSelect_BadReason();
			set_ClearBill();
			//å¤ææä½ç±»å
			if (OperationType == 1) {//æ æºå
			@@ -252,6 +254,32 @@
			}
			else if (OperationType == 3) {//ç¼è¾
			roadBillMain();
			} else if (OperationType == 4) {//ç´æ¹å¾æ°å¢
			set_AddFNew();
			$("#HBarCode").val(HBarCode_PNL);
			$("#HSetNo").val(HSetNo);
			$("#HPCSNo").val(HPCSNo);

			document.getElementById("HBarCode").setAttribute("disabled", "disabled");
			document.getElementById("HSetNo").setAttribute("disabled", "disabled");
			document.getElementById("HPCSNo").setAttribute("disabled", "disabled");
			} else if (OperationType == 5) {//ç´æ¹å¾ç¼è¾
			roadBillMain();
			document.getElementById("HBarCode").setAttribute("disabled", "disabled");
			document.getElementById("HSetNo").setAttribute("disabled", "disabled");
			document.getElementById("HPCSNo").setAttribute("disabled", "disabled");
			} else if (OperationType == 6) {//ç´æ¹å¾-avi æ°å¢
			set_AddFNew();
			$("#HBarCode").val(HBarCode_PNL);
			$("#HSetNo").val(HSetNo);
			$("#HPCSNo").val(HPCSNo);
			$("#HCheckProc").val("AVI");

			document.getElementById("HBarCode").setAttribute("disabled", "disabled");
			document.getElementById("HSetNo").setAttribute("disabled", "disabled");
			document.getElementById("HPCSNo").setAttribute("disabled", "disabled");
			document.getElementById("HCheckProc").setAttribute("disabled", "disabled");
			form.render('select');
			}
			else {
			layer.alert("æªç¥æä½ç±»åï¼", { icon: 5 });
			@@ -270,9 +298,9 @@

			debugger
			let url = GetWEBURL()
			if (OperationType == 3) {
			if (OperationType == 3 \|\| OperationType == 5) {
			url += "/QC_CheckNote_PNL_TempController/EditBill"
			} else if (OperationType == 1 \|\| OperationType == 2) {
			} else if (OperationType == 1 \|\| OperationType == 2 \|\| OperationType == 4 \|\| OperationType == 6) {
			url += "/QC_CheckNote_PNL_TempController/AddBill"
			}
			$.ajax(
			@@ -369,6 +397,34 @@
			$("#HMaker").val(sessionStorage["HUserName"]);; //æ ¹æ®ç»å½ç¨æ·å¸¦åºåå»ºäºº
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
			}

			//#region ä¸è¯åå ä¸æåè¡¨åå§å
			function setInitSelect_BadReason() {
			//è·åç»å½é¡µç»ç»å
			var ModRightNameCheck = "";
			var sql = "select * from Gy_BadReason where HCheckEmp <> '' and ISNULL(HStopEmp,'') = '' ";
			$.ajax({
			url: GetWEBURL() + '/CommonModel/searchMethod',
			async: false,
			type: "GET",
			data: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": ModRightNameCheck },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;

			var Organization = "";
			for (var i = 0; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';
			}
			$("#HBadReason").append(Organization);
			form.render('select');
			}
			layer.closeAll("loading");
			}
			});
			}
			//#endregion

			//æ æºåæ°å¢
			function set_AddFNew() {
			$("#HItemID").val(0)