MES-WEB-LayUI.git

			@@ -38,12 +38,17 @@
			<div class="layui-card-header">
			<div class="layui-btn-group">
			<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">ä¿å</button>
			<button type="button" id="check-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Checker">å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">éåº</button>
			</div>
			</div>
			<div class="layui-card-body">
			<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
			<h1 style="text-align: center; padding: 10px 0;"><b>è®¾å¤ç¹æ£è§ç¨å</b></h1>
			<ul class="layui-tab-title" lay-filter="tab-all">
			<li lay-id="1" style="padding:1px;" class="layui-this">åºæ¬ä¿¡æ¯</li>
			<li lay-id="2" style="padding:1px;">å¶åä¿¡æ¯</li>
			</ul>
			<!--åºæ¬ä¿¡æ¯-->
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			@@ -105,6 +110,93 @@
			<textarea placeholder="è¯·è¾å¥å¤æ³¨" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä½¿ç¨ç»ç»</label>
			<div class="layui-input-block" style="width:190px;">
			<input type="hidden" class="layui-input" lay-verify="HCREATEORGID" name="HCREATEORGID" id="HCREATEORGID" value="0">
			<select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">é»è®¤è§ç¨</label>
			<div class="layui-input-inline">
			<input type="checkbox" name="HStandard" id="HStandard" lay-skin="primary" title="">
			</div>
			</div>
			</div>
			</div>
			<!--å¶åä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¶åäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å®¡æ ¸äºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å³éäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹äºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
			</div>
			</div>

			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¶åæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å®¡æ ¸æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å³éæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä¿®æ¹æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºäºº</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ä½åºæ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -114,10 +206,9 @@
			<table class="layui-hide" 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>
			<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="set_HideColumn" id="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			<script type="text/html" id="xuhao">
			@@ -137,6 +228,9 @@
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/layui/lay/modules/util.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/common.js"></script>
			<script src="../../../layuiadmin/SetColumn.js"></script>
			<script src="../../../layuiadmin/layui-common-custom.js"></script>
			<script>
			var OptionData = [];
			var Stverf = "";
			@@ -167,6 +261,8 @@
			, util = layui.util
			;
			var sBillType = "3913";
			var HModName= "Sb_EquipDotCheckRuleEdit"
			var unEditable = ["HManagerName"]
			//#endregion

			//#region è¿å¥é¡µé¢å³å è½½
			@@ -182,11 +278,21 @@
			set_InitFrom();
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//ç»ç»
			Organ();

			//å¤ææä½ç±»å
			if (OperationType == 1) {//æ æºå
			Stverf = "Add";
			set_AddFNew();
			}
			else if (OperationType == 2) {//å¦æä¿®æ¹åèµ°ä¸é¢ new //ç¼è¾
			Stverf = "Add";
			set_EditFromGrid();
			//åå§åæ¥æ
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			get_MAXNum();

			}
			else if (OperationType == 3) {//ç¼è¾
			Stverf = "Update";
			@@ -211,6 +317,11 @@
			break;
			//å¤å¶ä¸è¡
			case 'btn-CopyLine': btnCopyLine(data);
			break;
			case 'set_HideColumn': get_HideColumnEditWithCallback(HModName, sessionStorage['HUserName'], option, table, function () {
			setUneditableCol_WithUneditable(option, unEditable, [])
			table.render(option)
			})
			break;
			}
			});
			@@ -286,7 +397,7 @@
			}
			//å°æ¹ééæ©çæ°æ®åå¥æ°ç»ï¼å¤éè¡ï¼
			for (var i = 0; i < checkStatus.data.length; i++) {
			buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckItem": checkStatus.data[i].ç¹æ£é¡¹ç®åç§°, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": checkStatus.data[i].HDotCheckItemClassID, "HDotCheckItemClassName": checkStatus.data[i].ç¹æ£é¡¹ç®åç±»åç§°, "HDotCheckItemMethodID": 0,"HDotCheckItemMethodName":""});
			buttonArr.push({ "HDotCheckItemID": checkStatus.data[i].HItemID, "HDotCheckItem": checkStatus.data[i].ç¹æ£é¡¹ç®åç§°, "HDotCheckPart": "", "HClaim": "", "HManagerID": sessionStorage["HEmpID"], "HManagerNumber": sessionStorage["HEmpNumber"], "HManagerName": sessionStorage["HEmpName"], "HRemark": "", "HDotCheckItemClassID": checkStatus.data[i].HDotCheckItemClassID, "HDotCheckItemClassName": checkStatus.data[i].ç¹æ£é¡¹ç®åç±»åç§°, "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" });
			}

			table.reload("mainTable", {
			@@ -433,6 +544,7 @@
			}
			//åå§åè¡¨åæä»¶
			function set_InitFrom() {
			$("#check-btn").addClass("layui-btn-disabled").attr("disabled", true);
			//å¸¸è§ç¨æ³
			laydate.render({
			elem: '#HDate'
			@@ -476,6 +588,32 @@
			};

			}

			//è·åç»ç»
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			var Organization = '';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Web/GetOrganizations",
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			}
			$("#HOrgID").append(Organization);
			$("#HOrgID").val(sessionStorage["OrganizationID"])
			$("#HUSEORGID").append(Organization);
			$("#HUSEORGID").val(sessionStorage["OrganizationID"])
			$("#HCREATEORGID").val(sessionStorage["OrganizationID"])
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}

			//æ°å¢
			function set_AddFNew() {
			//è·åæå¤§åæ®å·
			@@ -549,19 +687,56 @@
			},
			success: function (d) {
			if (d.code == 1) { // è¯´æéªè¯æåäºï¼
			//console.log(result)
			var data = d.data.h_v_Sb_EquipDotCheckRuleList[0];
			var data = d.data.h_v_Sb_EquipDotCheckRuleEdit[0];
			if (data.é»è®¤è§ç¨ == 1) {
			$("input[name='HStandard']").prop("checked", true);
			}
			else {
			$("input[name='HStandard']").prop("checked", false);
			}
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HBillNo": data.åæ®å·
			, "HInterID": data.hmainid
			, "HDate": formatDate(data.æ¥æ)
			"HBillNo": OperationType == 2 ? "" : data.åæ®å·
			, "HInterID": OperationType == 2 ? "" : data.hmainid
			, "HDate": OperationType == 2 ? "" : formatDate(data.æ¥æ)
			, "HBeginDate": formatDate(data.è®¡åå¼å§æ¥æ)
			, "HEndDate": formatDate(data.è®¡åç»ææ¥æ)
			, "HCheckCycle": data.ç¹æ£å¨æ
			, "HCycleUnit": data.å¨æåä½
			, "HExplanation": data.æè¦
			, "HRemark": data.å¤æ³¨

			, "HMaker": data.å¶åäºº
			, "HMakeDate": data.å¶åæ¥æ == null ? "" : Format(new Date(data.å¶åæ¥æ), "yyyy-MM-dd")
			, "HChecker": data.å®¡æ ¸äºº
			, "HCheckDate": data.å®¡æ ¸æ¥æ == null ? "" : Format(new Date(data.å®¡æ ¸æ¥æ), "yyyy-MM-dd")
			, "HUpDater": data.ä¿®æ¹äºº
			, "HUpDateDate": data.ä¿®æ¹æ¥æ == null ? "" : Format(new Date(data.ä¿®æ¹æ¥æ), "yyyy-MM-dd")
			, "HCloseMan": data.å³éäºº
			, "HCloseDate": data.å³éæ¥æ == null ? "" : Format(new Date(data.å³éæ¥æ), "yyyy-MM-dd")
			, "HDeleteMan": data.ä½åºäºº
			, "HDeleteDate": data.ä½åºæ¥æ == null ? "" : Format(new Date(data.ä½åºæ¥æ), "yyyy-MM-dd")
			, "HUSEORGID": data.HUSEORGID
			});

			if (OperationType != 2) {
			if (isEmpty(data["å®¡æ ¸äºº"]) === false) {
			$("#add-btn").addClass("layui-btn-disabled").attr("disabled", true);
			} else {
			$("#check-btn").removeClass("layui-btn-disabled").attr("disabled", false);
			}
			} else {
			$("#HMaker").val(sessionStorage["HUserName"])
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"))
			$("#HChecker").val("")
			$("#HCheckDate").val("")
			$("#HUpDater").val("")
			$("#HUpDateDate").val("")
			$("#HCloseMan").val("")
			$("#HCloseDate").val("")
			$("#HDeleteMan").val("")
			$("#HDeleteDate").val("")
			OperationType = 1;
			}

			} else {
			layer.alert(result.msg, { icon: 5, btn: ['éåº'], time: 100000, offset: 't' });
			@@ -574,7 +749,7 @@
			$("#HInterID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
			//ç¼è¾å è½½æ°æ®
			$.ajax({
			url: GetWEBURL() + 'Sb_EquipDotCheckRuleBill/Sb_EquipDotCheckRuleBillListProjectDetai',
			url: GetWEBURL() + '/Sb_EquipDotCheckRuleBill/Sb_EquipDotCheckRuleBillListProjectDetai',
			type: "GET",
			data: { "sqlWhere": "and hmainid=" + linterid },
			success: function (result) {
			@@ -585,6 +760,8 @@
			rowarr.push({ "HDotCheckItemID": data[i].ç¹æ£é¡¹ç®ID, "HDotCheckItem": data[i].ç¹æ£é¡¹ç®, "HDotCheckPart": data[i].ç¹æ£é¨ä½, "HClaim": data[i].å·ä½è¦æ±, "HManagerID": data[i].è´è´£äººID, "HManagerNumber": data[i].è´è´£äººä»£ç , "HManagerName": data[i].è´è´£äºº, "HRemark": data[i].åå¤æ³¨, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].ç¹æ£é¡¹ç®åç±»åç§°, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].ç¹æ£æ¹æ³åç§° });
			}
			option.data = rowarr;
			DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table)
			setUneditableCol_WithUneditable(option, unEditable, [])
			table.render(option);

			} else {
			@@ -618,7 +795,8 @@
			if (HCheckCycle == "") {
			return layer.msg("ç¹æ£å¨æä¸è½ä¸ºç©º!");
			}

			var isEndCheck = document.getElementById("HStandard").checked;
			data.field.HStandard = isEndCheck;//å°æ°ç»åå¹¶æåç¬¦ä¸²
			data.field.HMaker = sessionStorage["HUserName"];//å¶åäºº
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache['mainTable']);