MES-WEB-LayUI.git

			@@ -70,7 +70,7 @@
			}
			/æç»è¡å¤éæ¡å±ä¸/
			.layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
			margin-left: 35%;
			margin-left: 15%;
			}
			</style>
			</head>
			@@ -86,7 +86,7 @@
			<div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
			<button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">æ°å¢</button>
			<!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">æ¸ç©º</button>-->
			<button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">ä¿å</button>
			<button type="button" lay-submit="" lay-filter="Saver" id="Saver" class="layui-btn layui-btn-radius">ä¿å</button>
			<button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">éåº</button>
			</div>
			<div class="layui-tab layui-tab-card" lay-filter="TabTest">
			@@ -165,8 +165,40 @@
			<input type="text" name="HBarModel" class="layui-input LineHeight" id="HBarModel" style="border-radius: 50px;background-color:#EDEDED;" readonly>
			</td>
			</tr>
			<tr>
			<th>ç¹æ£è®¡å</th>
			<td class="bz_td">
			<input type="text" name="HPlanNo" class="layui-input LineHeight" id="HPlanNo" style="border-radius: 50px;background-color:#EDEDED;" readonly>
			<input type="hidden" name="HPlanInterID" class="layui-input LineHeight" id="HPlanInterID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
			<input type="hidden" name="HPlanEntryID" class="layui-input LineHeight" id="HPlanEntryID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
			</td>
			</tr>
			</tbody>
			</table>
			</div>
			<div class="layui-tab-item">
			<div class="layui-inline" style="margin-bottom:5px;">
			<label class="layui-form-label" style="width:100px;">è®¾å¤ç¹æ£è§ç¨</label>
			<div class="layui-input-inline">
			<input type="hidden" name="HEquipDotCheckRuleInterID" id="HEquipDotCheckRuleInterID" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="text" name="HEquipDotCheckRuleInterNo" id="HEquipDotCheckRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
			<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterist" style="width:40px;display:none;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>å¢è¡</button>
			</div>
			</script>
			<script type="text/html" id="xuhao">
			{{d.LAY_TABLE_INDEX+1}}
			</script>
			<script type="text/html" id="barDemo">
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
			</script>
			</div>
			<div class="layui-tab-item">
			<table style="width:80%;">
			@@ -222,35 +254,11 @@
			</tbody>
			</table>
			</div>
			<div class="layui-tab-item">
			<div class="layui-inline" style="margin-bottom:5px;">
			<label class="layui-form-label" style="width:100px;">è®¾å¤ç¹æ£è§ç¨</label>
			<div class="layui-input-inline">
			<input type="hidden" name="HEquipDotCheckRuleInterID" id="HEquipDotCheckRuleInterID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="text" name="HEquipDotCheckRuleInterNo" id="HEquipDotCheckRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
			<button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterist" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>å¢è¡</button>
			</div>
			</script>
			<script type="text/html" id="xuhao">
			{{d.LAY_TABLE_INDEX+1}}
			</script>
			<script type="text/html" id="barDemo">
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
			</script>
			</div>
			</div>
			<ul class="layui-tab-title">
			<li class="layui-this">åºæ¬ä¿¡æ¯</li>
			<li>å¶ä»ä¿¡æ¯</li>
			<li>æç»ä¿¡æ¯</li>
			<li>å¶ä»ä¿¡æ¯</li>
			</ul>
			</div>
			<!--éèåæ®µ-->
			@@ -328,13 +336,26 @@
			$("#HBillNo").val(d.data[0].HBillNo);
			}
			});

			//å½åæå¨é¡µç¾
			var cur_title = "åºæ¬ä¿¡æ¯";
			var HCheckNum = 0;
			//çå¬å½åå¤äºåªä¸ä¸ªé¡µç¾ï¼ä¼ HModName å¼
			element.on('tab(TabTest)', function (data) {
			cur_title = data.elem.context.innerText;
			if (cur_title == "æç»ä¿¡æ¯") {
			HCheckNum++;
			}
			})

			//#endregion

			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" };
			var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" };

			switch (obj.event) {
			//æ°å¢ä¸è¡
			case 'btn-AddLine': btnAddLine(NewRow);
			@@ -406,7 +427,7 @@
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			parent.layui.admin.events.closeThisTabs(); //å³éé¡µç¾
			});
			})
			})

			//æäº¤
			form.on('submit(Saver)', function (data) {//æäº¤
			@@ -414,7 +435,10 @@
			var oMain = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache['mainTable']);
			var sMainSub = oMain + ';' + sSubStr;

			if (AllowLoadData(sSubStr)) {
			$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//ä¿åæé®ç¦ç¨

			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/Sb_PDA_EquipDotCheckBill/SaveGetEquipDotCheckBillList",
			@@ -428,7 +452,7 @@
			$('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
			}
			else {
			layer.close(index);
			$('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//ä¿åæé®å¯ç¨
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			@@ -451,7 +475,7 @@
			// æ¸ç©ºè¡¨å ï¼âformDataâæ¯è¡¨åçidï¼
			$("#formData")[0].reset();
			layui.form.render();
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": ""}];
			table.render(option);

			$("#HBarCode").focus();
			@@ -564,17 +588,18 @@
			var BYData = result;//
			var rowdate1 = layui.table.cache["mainTable"];
			var data = result.data;
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
			table.render(option);

			if (BYData.data.length != 0) //è¡¨ä½æ°æ®ä¸ºç©ºæ¶
			{
			buttonArr = [];//æ¸ç©ºæ°ç»

			for (var i = 0; i < BYData.data.length; i++) {
			var checkrow = {
			"HDotCheckItemID": data[i].HDotCheckItemID, "HDotCheckCode": data[i].HDotCheckCode, "HDotCheckItem": data[i].HDotCheckItem,
			"HDotCheckPart": data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": data[i].HManagerID, "HManagerCode": data[i].HManagerCode,
			"HManagerName": data[i].HManagerName
			"HManagerName": data[i].HManagerName, "HSourceInterID": data[i].ç¹æ£è®¡åID, "HSourceEntryID": data[i].ç¹æ£è®¡ååID, "HSourceBillNo": data[i].ç¹æ£è®¡åå
			};
			buttonArr.push(checkrow); //å°ä¹åçæ°æ®åå¨
			}
			@@ -584,7 +609,7 @@
			}
			}
			else {
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
			table.render(option);
			layer.alert("è¯¥è®¾å¤ææ é»è®¤ç¹æ£è®°å½", { icon: 5 });
			}
			@@ -598,9 +623,9 @@
			function set_InitGrid() {
			//è¡¨å¤´
			columns = [
			{ type: 'checkbox' }
			, { templet: '#xuhao', title: 'åºå·', sort: true, event: "qwe", width: 80 }
			, { field: 'HDotCheckResult', title: 'ç¹æ£ç»æ', templet: '#HDotCheckResult' }
			//{ type: 'checkbox' }
			{ templet: '#xuhao', title: 'åºå·', event: "qwe", width: 45 }
			, { field: 'HDotCheckResult', title: 'ç»æ', templet: '#HDotCheckResult', width: 55 }
			, { field: 'HDotCheckItemID', title: 'ç¹æ£é¡¹ç®ID', edit: 'text', hide: true }
			, { field: 'HDotCheckCode', title: 'ç¹æ£é¡¹ç®ä»£ç ', edit: 'text', event: "HDotCheckCode", width: 115, hide: true }
			, { field: 'HDotCheckItem', title: 'ç¹æ£é¡¹ç®', edit: 'text', event: "" }
			@@ -610,22 +635,26 @@
			, { field: 'HManagerCode', title: 'è´è´£äººä»£ç ', edit: 'text', event: 'HManagerCode', width: 150, hide: true }
			, { field: 'HManagerName', title: 'è´è´£äººåç§°', edit: 'text' }
			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text' }
			, { field: 'HSourceInterID', title: 'æºååç ', edit: 'text', hide: true }
			, { field: 'HSourceEntryID', title: 'æºåååç ', edit: 'text', hide: true}
			, { field: 'HSourceBillNo', title: 'æºååå·', edit: 'text', hide: true}
			, { title: 'æä½', toolbar: '#barDemo', width: 80 }
			];
			option = {
			id: 'mainTable'
			, elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: true
			//, toolbar: '#toolbarDemo'
			, page: false
			, cellMinWidth: 100
			, height: 500
			, limit: 100
			, height: 'full-205'
			, cols: [columns]
			, done: function (res, curr, count) {

			}
			};

			option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
			option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
			table.render(option);
			}
			//å¢å ä¸è¡
			@@ -663,13 +692,23 @@
			}
			//æ°æ®éªè¯
			function AllowLoadData(sSubStr) {
			if ($("#HEquipName").val() == '') {
			if (HCheckNum < 1) {
			layer.msg("è¯·å° æç»ä¿¡æ¯ é¡µç¾ä¸æ ¸å¯¹è¿ä¸æ¬¡ä¿¡æ¯ååç¹å»ä¿åæé®", { icon: 5, btn: ['ç¡®è®¤'], time: 10000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}

			if ($("#HBarName").val() == '') {
			layer.msg("è®¾å¤æ²¡æéæ©", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			//å¤æç©ææç»é¡¹

			if ($("#HEquipDotCheckRuleInterID").val() == 0 \|\| $("#HEquipDotCheckRuleInterNo").val() == '') {
			layer.msg("ç¹æ£è§ç¨ä¸ºç©º", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			//å¤ææç»é¡¹
			if (typeof (sSubStr) == "undefined" \|\| sSubStr == "" \|\| sSubStr == "[]") {
			layer.msg("æ²¡æç©ææç»è®°å½", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			layer.msg("æ²¡æç¹æ£é¡¹ç®æç»è®°å½", { icon: 5, btn: ['ç¡®è®¤'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return false;
			}
			if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
			@@ -733,23 +772,28 @@
			$.ajax({
			url: GetWEBURL() + "/Web/GetItemByEquipFile",
			type: "GET",
			data: { "EquipProjectID": $("#HEquipID").val(), "Type": "DJ" },
			data: { "EquipProjectID": $("#HEquipID").val(), "Type": "DJ", "HDate": $("#HBeginDate").val() },
			success: function (result) {
			var data = result.data;
			$("#HEquipDotCheckRuleInterID").val(data[0].ç¹æ£è§ç¨ID);
			$("#HEquipDotCheckRuleInterNo").val(data[0].ç¹æ£è§ç¨åå·);
			var rowdata = [];
			for (let i = 0; i < data.length; i++) {
			rowdata.push(
			{
			"HDotCheckResult": data[i].é»è®¤ç»è®º, "HDotCheckItemID": data[i].ç¹æ£é¡¹ç®ID, "HDotCheckCode": data[i].ç¹æ£é¡¹ç®ä»£ç , "HDotCheckItem": data[i].ç¹æ£é¡¹ç®åç§°,
			"HDotCheckPart": data[i].ç¹æ£é¨ä½, "HClaim": data[i].å·ä½è¦æ±, "HManagerID": data[i].è´è´£äººID, "HManagerCode": data[i].è´è´£äººä»£ç ,
			"HManagerName": data[i].è´è´£äººåç§°
			}
			);
			if (result.code == 1) {
			var data = result.data;
			$("#HEquipDotCheckRuleInterID").val(data[0].ç¹æ£è§ç¨ID);
			$("#HEquipDotCheckRuleInterNo").val(data[0].ç¹æ£è§ç¨åå·);
			$("#HPlanNo").val(data[0].ç¹æ£è®¡åå);
			$("#HPlanInterID").val(data[0].ç¹æ£è®¡åID);
			$("#HPlanEntryID").val(data[0].ç¹æ£è®¡ååID);
			var rowdata = [];
			for (let i = 0; i < data.length; i++) {
			rowdata.push(
			{
			"HDotCheckResult": data[i].é»è®¤ç»è®º, "HDotCheckItemID": data[i].ç¹æ£é¡¹ç®ID, "HDotCheckCode": data[i].ç¹æ£é¡¹ç®ä»£ç , "HDotCheckItem": data[i].ç¹æ£é¡¹ç®åç§°,
			"HDotCheckPart": data[i].ç¹æ£é¨ä½, "HClaim": data[i].å·ä½è¦æ±, "HManagerID": data[i].è´è´£äººID, "HManagerCode": data[i].è´è´£äººä»£ç ,
			"HManagerName": data[i].è´è´£äººåç§°, "HSourceInterID": data[i].ç¹æ£è®¡åID, "HSourceEntryID": data[i].ç¹æ£è®¡ååID, "HSourceBillNo": data[i].ç¹æ£è®¡åå
			}
			);
			}
			option.data = rowdata;
			table.render(option);
			}
			option.data = rowdata;
			table.render(option);
			}
			})
			}