MES-WEB-LayUI.git

			@@ -30,11 +30,11 @@
			</div>
			<div class="layui-card-body">
			<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
			<!--<ul class="layui-tab-title">
			<li class="layui-this">åºæ¬ä¿¡æ¯</li>-->
			<!--<li>å¶ä»ä¿¡æ¯</li>-->
			<!--</ul>-->
			<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">
			<div class="layui-row">
			@@ -144,6 +144,76 @@
			</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>
			</div>
			</div>
			@@ -160,9 +230,9 @@
			<div class="layui-tab-item">
			<!--ç¹æ£è®¡å-->
			<table class="layui-hide" id="mainTable_plan" lay-filter="mainTable_plan"></table>
			</div>
			</div>
			</div>
			</div>
			</div>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">

			@@ -188,6 +258,7 @@
			<script src="../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../layuiadmin/PubCustom.js"></script>
			<script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
			<script>
			//è·ååæ°
			var params = get_UrlVars();
			@@ -235,6 +306,12 @@
			//å¤ææä½ç±»å
			if (OperationType == 1) {//æ æºå
			set_AddFNew();
			}
			else if (OperationType == 2) {//å¦æä¿®æ¹åèµ°ä¸é¢ new //å¤å¶
			OperationType = 1;
			set_EditFromGrid(linterid);
			//è·åæå¤§åæ®å·
			get_MAXNum();
			}
			else if (OperationType == 3) {//ç¼è¾
			//ç¦ç¨ç»ç»éé¡¹
			@@ -331,7 +408,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true
			, content: ['../è®¾å¤ç®¡ç/è®¾å¤æ¡£æ¡/Gy_EquipFileMainList.html', 'yes']
			, content: ['../è®¾å¤ç®¡ç/è®¾å¤æ¡£æ¡/Gy_EquipFileMainList.html?openType=2', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -369,7 +446,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../è®¾å¤ç®¡ç/è®¾å¤è§ç¨å/Sb_EquipDotCheckRuleList.html', 'yes'],
			content: ['../è®¾å¤ç®¡ç/è®¾å¤è§ç¨å/Sb_EquipDotCheckRuleList.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -383,6 +460,7 @@
			$("#HMouldDotCheckRuleID").val(checkStatus.data[0].hmainid);
			$("#HCycleUnit").val(checkStatus.data[0].å¨æåä½);
			$("#HCheckCycle").val(checkStatus.data[0].ç¹æ£å¨æ);
			$("#HExplanation").val(checkStatus.data[0].æè¦);
			//$("#HBeginDate").val(Pub_Format(checkStatus.data[0].è®¡åå¼å§æ¥æ, "yyyy-MM-dd"));
			//$("#HEndDate").val(Pub_Format(checkStatus.data[0].è®¡åç»ææ¥æ, "yyyy-MM-dd"));
			form.render('select');
			@@ -403,7 +481,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes'],
			content: ['../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -513,6 +591,7 @@
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			async: false,
			data: { "HBillType": sBillType },
			success: function (d) {
			var myDate = new Date();
			@@ -550,13 +629,13 @@
			function set_EditFromGrid() {
			set_EditForm(linterid); //ç¼è¾è·åè¡¨å¤´
			set_EditGrid(linterid); //ç¼è¾è·åè¡¨ä½
			option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
			table.render(option);
			//option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HDotCheckItemClassID": 0, "HDotCheckItemClassName": "", "HDotCheckItemMethodID": 0, "HDotCheckItemMethodName": "" }];
			//table.render(option);


			set_EditGrid_Plan(linterid); //ç¼è¾è·åè¡¨ä½--ç¹æ£è®¡å
			option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "æªç¹æ£", "DiffDate": 0 }];
			table.render(option_plan);
			//option.data = [{ "HPlanDate": "", "HPlanBeginTime": "", "HPlanEndTime": "", "HRelationFlag": "æªç¹æ£", "DiffDate": 0 }];
			//table.render(option_plan);
			}

			// ç¹æ£ä¿¡æ¯
			@@ -604,16 +683,16 @@
			$.ajax({
			url: GetWEBURL() + "Sb_EquipDotCheckPlanBill/Sb_EquipDotCheckPlanBillListCheckDetai",
			type: "GET",
			async: false,
			data: {
			"HID": linterid
			},
			success: function (result) {
			//console.log(result.code)
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			//console.log(result)
			var data = result.data.h_v_Sb_EquipDotCheckPlanBillList[0];
			var data = result.data.h_v_Sb_EquipDotCheckPlanBill_Edit2[0];
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HBillNo": data.åæ®å·
			"HInterID": OperationType == 2 ? "" : linterid
			, "HBillNo": OperationType == 2 ? "" : data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			, "HInnerBillNo": data.åé¨åæ®å·
			, "HEquipName": data.è®¾å¤åç§°
			@@ -630,6 +709,16 @@
			, "HUSEORGID": data.HUSEORGID
			, "HDeptID": data.HDeptID
			, "HDeptName": 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")
			});
			if ($("#HUSEORGID").val() == null \|\| $("#HUSEORGID").val() == "" \|\| $("#HUSEORGID").val() == undefined) {
			$("#HUSEORGID").val(sessionStorage["OrganizationID"])
			@@ -644,11 +733,11 @@
			}
			// ç¼è¾è·åè¡¨ä½--ç¹æ£é¡¹ç®
			function set_EditGrid(linterid) {
			$("#HInterID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
			//ç¼è¾å è½½æ°æ®
			$.ajax({
			url: GetWEBURL() + 'Sb_EquipDotCheckPlanBill/Sb_EquipDotCheckPlanBillListProjectDetai',
			type: "GET",
			async: false,
			data: { "sqlWhere": "and hmainid=" + linterid },
			success: function (result) {
			if (result.count == 1) {
			@@ -657,7 +746,6 @@
			for (var i = 0; i < data.length; i++) {
			subarr.push({ "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].è´è´£äºº, "HRemark": data[i].è¡¨ä½å¤æ³¨, "HDotCheckItemClassID": data[i].HDotCheckItemClassID, "HDotCheckItemClassName": data[i].ç¹æ£é¡¹ç®åç±»åç§°, "HDotCheckItemMethodID": data[i].HDotCheckItemMethodID, "HDotCheckItemMethodName": data[i].ç¹æ£æ¹æ³åç§° });
			}

			option.data = subarr;
			table.render(option);

			@@ -673,11 +761,11 @@

			// ç¼è¾è·åè¡¨ä½--ç¹æ£è®¡å
			function set_EditGrid_Plan(linterid) {
			$("#HInterID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
			//ç¼è¾å è½½æ°æ®
			$.ajax({
			url: GetWEBURL() + 'Sb_EquipDotCheckPlanBill/GetPlanList',
			type: "GET",
			async: false,
			data: { "sqlWhere": "and hmainid=" + linterid },
			success: function (result) {
			if (result.count == 1) {
			@@ -781,7 +869,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../åºç¡èµæ/åºç¡èµæ/Gy_DotCheckList.html', 'yes'],
			content: ['../åºç¡èµæ/åºç¡èµæ/Gy_DotCheckList.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -842,7 +930,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true
			, content: ['../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html', 'yes']
			, content: ['../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HEmp', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -879,7 +967,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true
			, content: ['../åºç¡èµæ/åºç¡èµæ/Gy_DotCheckItemClassList.html', 'yes']
			, content: ['../åºç¡èµæ/åºç¡èµæ/Gy_DotCheckItemClassList.html?openType=2', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -912,7 +1000,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true
			, content: ['../åºç¡èµæ/åºç¡èµæ/Gy_DotCheckItemMethodList.html', 'yes']
			, content: ['../åºç¡èµæ/åºç¡èµæ/Gy_DotCheckItemMethodList.html?openType=2', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°