MES-WEB-LayUI.git

			@@ -133,6 +133,15 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å®é¢ç±»å</label>
			<div class="layui-input-inline">
			<select name="HProcPriceType" id="HProcPriceType" lay-filter="HProcPriceType" style="width:200px;">
			<option value="ä¸´æ¶å®é¢" selected="selected">ä¸´æ¶å®é¢</option>
			<option value="æ°¸ä¹å®é¢">æ°¸ä¹å®é¢</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-block" style="margin-left: 96px;">
			<input type="checkbox" name="checkboxHStandard" id="checkboxHStandard" lay-skin="primary" lay-filter="checkboxHStandard" checked title="æ¯å¦é»è®¤å·¥èº">
			<input type="hidden" value="true" name="HStandard" id="HStandard" lay-verify="HStandard">
			@@ -433,7 +442,30 @@
			<input type="checkbox" name="HSNCtrl" lay-filter="HSNCtrl" id="HSNCtrl{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			</div>
			</script>

			<!--å¤éæ¡ æ¯å¦é¦ä»¶-->
			<script type="text/html" id="HQCFst">
			<div class="layui-input-block" style="margin-left: 20px;">
			<input type="checkbox" name="HQCFst" lay-filter="HQCFst" id="HQCFst{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			</div>
			</script>
			<!--å¤éæ¡ æ¯å¦æ«æ£-->
			<script type="text/html" id="HQCProc">
			<div class="layui-input-block" style="margin-left: 20px;">
			<input type="checkbox" name="HQCProc" lay-filter="HQCProc" id="HQCProc{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			</div>
			</script>
			<!--å¤éæ¡ æ¯å¦å·¡æ£-->
			<script type="text/html" id="HQCPatrol">
			<div class="layui-input-block" style="margin-left: 20px;">
			<input type="checkbox" name="HQCPatrol" lay-filter="HQCPatrol" id="HQCPatrol{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			</div>
			</script>
			<!--å¤éæ¡ ä¸æé²éæ§å¶-->
			<script type="text/html" id="HMaterToSourceCtrl">
			<div class="layui-input-block" style="margin-left: 20px;">
			<input type="checkbox" name="HMaterToSourceCtrl" lay-filter="HMaterToSourceCtrl" id="HMaterToSourceCtrl{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			</div>
			</script>
			<!--å¤éæ¡ æäº§å·¥åºæ è®°-->
			<script type="text/html" id="HSortProcFlag">
			<div class="layui-input-block" style="margin-left: 20px;">
			@@ -507,6 +539,7 @@
			, "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
			, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
			, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
			, "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
			}];
			var HModName = "Gy_RoutingBill";
			//#endregion
			@@ -535,7 +568,7 @@
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', edit: 'text', width: 110, event: "CheckHSupID" }
			, { field: 'ä¾åºå', title: 'ä¾åºå' }//f7
			, { field: 'HSupFlag', title: 'å¤åæ è®°', templet: "#HSupFlag" }//checkbox
			, { field: 'HSortProcFlag', title: 'æäº§å·¥åºæ è®°', templet: "#HSortProcFlag" }//checkbox
			, { field: 'HSortProcFlag', title: 'æäº§å·¥åºæ è®°', templet: "#HSortProcFlag", width: 120 }//checkbox

			//, { field: 'HProcType', title: 'å·¥åºç±»å', templet: '#HProcType' }//éæ©
			////, { field: 'HBadWHID', title: 'HBadWHID', hide: true }//, hide: true
			@@ -548,18 +581,22 @@
			//, { field: 'HPicNum', title: 'å¾çº¸ç¼å·', edit: 'text' }
			//, { field: 'HTimeUnit', title: 'æ¶é´åä½', edit: 'text' }
			//, { field: 'HUnitTime', title: 'è¿è¡æ¶é´', edit: 'text' }
			, { field: 'HWorkQty', title: 'å å·¥æ°é', edit: 'text', totalRow: true }//é»è®¤
			, { field: 'HSNCtrl', title: 'SNè¿ç«æ§å¶', templet: "#HSNCtrl" }
			, { field: 'HWorkQty', title: 'å å·¥æ°é', edit: 'text', totalRow: true, width: 120 }//é»è®¤
			, { field: 'HSNCtrl', title: 'SNè¿ç«æ§å¶', templet: "#HSNCtrl", width: 120 }
			, { field: 'HMaterToSourceCtrl', title: 'ä¸æé²éæ§å¶', templet: "#HMaterToSourceCtrl", width:120 }
			, { field: 'HQCFst', title: 'æ¯å¦é¦ä»¶', templet: "#HQCFst", width: 120 }
			, { field: 'HQCProc', title: 'æ¯å¦æ«æ£', templet: "#HQCProc", width: 120 }
			, { field: 'HQCPatrol', title: 'æ¯å¦å·¡æ£', templet: "#HQCPatrol", width: 120 }

			//, { field: 'HQCSchemeID_Fst', title: 'é¦ä»¶æ£éªæ¹æ¡ID', hide: true }//f7
			//, { field: 'HQCSchemeNumber_Fst', title: 'é¦ä»¶æ£éªæ¹æ¡ä»£ç ', edit: 'text', event: "HQCSchemeNumber_Fst",width:125 }
			//, { field: 'HQCSchemeName_Fst', title: 'é¦ä»¶æ£éªæ¹æ¡åç§°', width: 125 }//f7
			//, { field: 'HQCSchemeID_Proc', title: 'è½¬åºæ£éªæ¹æ¡ID', hide: true }//f7
			//, { field: 'HQCSchemeNumber_Proc', title: 'è½¬åºæ£éªæ¹æ¡ä»£ç ', edit: 'text', event: "HQCSchemeNumber_Proc", width: 125}
			//, { field: 'HQCSchemeName_Proc', title: 'è½¬åºæ£éªæ¹æ¡åç§°', width: 125}//f7
			//, { field: 'HQCSchemeID_Patrol', title: 'å·¡æ£æ£éªæ¹æ¡ID', hide: true }//f7
			//, { field: 'HQCSchemeNumber_Patrol', title: 'å·¡æ£æ£éªæ¹æ¡ä»£ç ', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125}
			//, { field: 'HQCSchemeName_Patrol', title: 'å·¡æ£æ£éªæ¹æ¡åç§°', width: 125}//f7
			, { field: 'HQCSchemeID_Fst', title: 'é¦ä»¶æ£éªæ¹æ¡ID', hide: true }//f7
			, { field: 'HQCSchemeNumber_Fst', title: 'é¦ä»¶æ£éªæ¹æ¡ä»£ç ', edit: 'text', event: "HQCSchemeNumber_Fst", width: 125 }
			, { field: 'HQCSchemeName_Fst', title: 'é¦ä»¶æ£éªæ¹æ¡åç§°', width: 125 }//f7
			, { field: 'HQCSchemeID_Proc', title: 'è½¬åºæ£éªæ¹æ¡ID', hide: true }//f7
			, { field: 'HQCSchemeNumber_Proc', title: 'è½¬åºæ£éªæ¹æ¡ä»£ç ', edit: 'text', event: "HQCSchemeNumber_Proc", width: 125 }
			, { field: 'HQCSchemeName_Proc', title: 'è½¬åºæ£éªæ¹æ¡åç§°', width: 125 }//f7
			, { field: 'HQCSchemeID_Patrol', title: 'å·¡æ£æ£éªæ¹æ¡ID', hide: true }//f7
			, { field: 'HQCSchemeNumber_Patrol', title: 'å·¡æ£æ£éªæ¹æ¡ä»£ç ', edit: 'text', event: "HQCSchemeNumber_Patrol", width: 125 }
			, { field: 'HQCSchemeName_Patrol', title: 'å·¡æ£æ£éªæ¹æ¡åç§°', width: 125 }//f7

			//, { field: 'HPassRate', title: 'è¯ç', edit: 'text' }//é»è®¤
			//, { field: 'HProcID_S', title: 'å·¥æ®µ', edit: 'text' }
			@@ -582,7 +619,7 @@
			//, { field: 'HSubStdEmpQty', title: 'æ åäººæ°', edit: 'text' }
			//, { field: 'HSubCanUseSourceQty', title: 'å¯æä½è®¾å¤æ°', edit: 'text' }
			//, { field: 'HFixPrice', title: 'çäº§å®é¢', edit: 'text' }//é»è®¤
			//, { field: 'HProcPrice', title: 'å·¥åºå·¥ä»·', edit: 'text' }//é»è®¤
			, { field: 'HProcPrice', title: 'å·¥åºå·¥ä»·', edit: 'text' }//é»è®¤
			//, { field: 'HBadPrice', title: 'ä¸åæ ¼åä»·', edit: 'text' }//é»è®¤
			//, { field: 'HWasterPrice', title: 'æ¥åºåä»·', edit: 'text' }//é»è®¤
			//, { field: 'HStdFlag', title: 'æ åå®é¢', templet: "#HStdFlag" }//chenbox
			@@ -814,7 +851,50 @@
			}
			});
			});

			//ä¸æé²éæ§å¶
			form.on('checkbox(HMaterToSourceCtrl)', function (data) {
			//è·åä¸ææ¡éä¸çå¼
			var elem = data.othis.parents('tr');
			var dataindex = elem.attr("data-index");
			$.each(option.data, function (index, value) {
			if (value.LAY_TABLE_INDEX == dataindex) {
			value.HMaterToSourceCtrl = data.elem.checked;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			});
			});
			//æ¯å¦é¦ä»¶
			form.on('checkbox(HQCFst)', function (data) {
			//è·åä¸ææ¡éä¸çå¼
			var elem = data.othis.parents('tr');
			var dataindex = elem.attr("data-index");
			$.each(option.data, function (index, value) {
			if (value.LAY_TABLE_INDEX == dataindex) {
			value.HQCFst = data.elem.checked;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			});
			});
			//æ¯å¦æ«æ£
			form.on('checkbox(HQCProc)', function (data) {
			//è·åä¸ææ¡éä¸çå¼
			var elem = data.othis.parents('tr');
			var dataindex = elem.attr("data-index");
			$.each(option.data, function (index, value) {
			if (value.LAY_TABLE_INDEX == dataindex) {
			value.HQCProc = data.elem.checked;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			});
			});
			///æ¯å¦å·¡æ£
			form.on('checkbox(HQCPatrol)', function (data) {
			//è·åä¸ææ¡éä¸çå¼
			var elem = data.othis.parents('tr');
			var dataindex = elem.attr("data-index");
			$.each(option.data, function (index, value) {
			if (value.LAY_TABLE_INDEX == dataindex) {
			value.HQCPatrol = data.elem.checked;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			});
			});
			//æäº§å·¥åºæ è®°
			form.on('checkbox(HSortProcFlag)', function (data) {
			//è·åä¸ææ¡éä¸çå¼
			@@ -911,6 +991,7 @@
			, "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
			, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
			, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
			, "HQCFst": false, "HQCProc": false, "HQCPatrol": false, "HMaterToSourceCtrl": false
			};
			switch (obj.event) {
			case 'btn-AddLine':
			@@ -927,6 +1008,22 @@
			//SNè¿ç«æ§å¶
			if (option.data[i - 1].HSNCtrl) {
			$('#HSNCtrl' + i + '').attr("checked", true);
			}
			//ä¸æé²éæ§å¶
			if (option.data[i - 1].HMaterToSourceCtrl) {
			$('#HMaterToSourceCtrl' + i + '').attr("checked", true);
			}
			//æ¯å¦é¦ä»¶
			if (option.data[i - 1].HQCFst) {
			$('#HQCFst' + i + '').attr("checked", true);
			}
			//æ¯å¦æ«æ£
			if (option.data[i - 1].HQCProc) {
			$('#HQCProc' + i + '').attr("checked", true);
			}
			//æ¯å¦å·¡æ£
			if (option.data[i - 1].HQCPatrol) {
			$('#HQCPatrol' + i + '').attr("checked", true);
			}
			//æäº§å·¥åºæ è®°
			if (option.data[i - 1].HSortProcFlag) {
			@@ -975,6 +1072,22 @@
			//SNè¿ç«æ§å¶
			if (option.data[i - 1].HSNCtrl) {
			$('#HSNCtrl' + i + '').attr("checked", true);
			}
			//ä¸æé²éæ§å¶
			if (option.data[i - 1].HMaterToSourceCtrl) {
			$('#HMaterToSourceCtrl' + i + '').attr("checked", true);
			}
			//æ¯å¦é¦ä»¶
			if (option.data[i - 1].HQCFst) {
			$('#HQCFst' + i + '').attr("checked", true);
			}
			//æ¯å¦æ«æ£
			if (option.data[i - 1].HQCProc) {
			$('#HQCProc' + i + '').attr("checked", true);
			}
			//æ¯å¦å·¡æ£
			if (option.data[i - 1].HQCPatrol) {
			$('#HQCPatrol' + i + '').attr("checked", true);
			}
			//æäº§å·¥åºæ è®°
			if (option.data[i - 1].HSortProcFlag) {
			@@ -1545,6 +1658,7 @@
			, "HQCSchemeID_Fst": 0, "HQCSchemeNumber_Fst": "", "HQCSchemeName_Fst": ""
			, "HQCSchemeID_Proc": 0, "HQCSchemeNumber_Proc": "", "HQCSchemeName_Proc": ""
			, "HQCSchemeID_Patrol": 0, "HQCSchemeNumber_Patrol": "", "HQCSchemeName_Patrol": ""
			, "HQCFst": false, "HQCProc": false, "HQCPatrol": false,"HMaterToSourceCtrl":false
			})
			j++;
			}
			@@ -1858,17 +1972,15 @@
			//ç¼è¾ é¡µé¢èµå¼
			function RoadBillMain(linterid)//å è½½è¡¨å¤´
			{
			var sWhere = " and hmainid='" + linterid + "'";

			$.ajax({
			url: GetWEBURL() + "/LEMS/MES_Gy_RoutingBillList_Json",
			url: GetWEBURL() + "/Gy_RoutingBill/cx",
			type: "GET",
			async: false,
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], "HBillSubType": HBillSubType },
			data: { "HInterID": linterid },
			success: function (d) {

			//alert(JSON.stringify(d.data[0]))
			//return false;

			var IsHStopflag = d.data[0].é»è®¤å·¥èº;
			if (IsHStopflag == 1) {
			$("input[name='checkboxHStandard']").prop("checked", true);
			@@ -1876,8 +1988,6 @@
			else {
			$("input[name='checkboxHStandard']").prop("checked", false);
			}


			//ä¸»è¡¨
			form.val("formData", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HBillNo": OperationType == 2 ? "" : d.data[0].åæ®å·
			@@ -1911,6 +2021,7 @@
			, "HProductNum": d.data[0].æåç¼å·
			, "HVerNum": d.data[0].çæ¬
			, "HOrgID": d.data[0].HOrgID
			, "HProcPriceType": d.data[0].HProcPriceType == null ? "ä¸´æ¶å®é¢" : d.data[0].HProcPriceType
			//å¶ä»ä¿¡æ¯
			, "hmakers": d.data[0].å¶åäºº
			, "hmakedate": d.data[0].å¶åæ¥æ == null ? "" : Format(new Date(d.data[0].å¶åæ¥æ), "yyyy-MM-dd")
			@@ -1924,6 +2035,7 @@

			//åè¡¨ èµå¼
			var rowdata = [];
			console.log(d.data)
			for (var i = 0; i < d.data.length; i++) {
			rowdata.push(
			{
			@@ -1942,6 +2054,7 @@
			, "HQCSchemeID_Fst": d.data[i].HQCSchemeID_Fst, "HQCSchemeNumber_Fst": d.data[i].é¦ä»¶æ£éªæ¹æ¡ä»£ç , "HQCSchemeName_Fst": d.data[i].é¦ä»¶æ£éªæ¹æ¡
			, "HQCSchemeID_Proc": d.data[i].HQCSchemeID_Proc, "HQCSchemeNumber_Proc": d.data[i].è½¬åºæ£éªæ¹æ¡ä»£ç , "HQCSchemeName_Proc": d.data[i].è½¬åºæ£éªæ¹æ¡
			, "HQCSchemeID_Patrol": d.data[i].HQCSchemeID_Patrol, "HQCSchemeNumber_Patrol": d.data[i].å·¡æ£æ£éªæ¹æ¡ä»£ç , "HQCSchemeName_Patrol": d.data[i].å·¡æ£æ£éªæ¹æ¡
			, "HQCFst": d.data[i].HQCFst == 1 ? true : false, "HQCProc": d.data[i].HQCProc == 1 ? true : false, "HQCPatrol": d.data[i].HQCPatrol == 1 ? true : false, "HMaterToSourceCtrl": d.data[i].HMaterToSourceCtrl == 1 ? true : false
			}
			)
			}
			@@ -1955,6 +2068,18 @@
			if (d.data[i].SNè¿ç«æ§å¶) {
			$('#HSNCtrl' + (i + 1)).attr("checked", true);
			}
			if (d.data[i].HQCFst) {
			$('#HQCFst' + (i + 1)).attr("checked", true);
			}
			if (d.data[i].HQCProc) {
			$('#HQCProc' + (i + 1)).attr("checked", true);
			}
			if (d.data[i].HQCPatrol) {
			$('#HQCPatrol' + (i + 1)).attr("checked", true);
			}
			if (d.data[i].HMaterToSourceCtrl) {
			$('#HMaterToSourceCtrl' + (i + 1)).attr("checked", true);
			}
			if (d.data[i].æäº§å·¥åºæ è®°) {
			$('#HSortProcFlag' + (i + 1)).attr("checked", true);
			}