MES-WEB-LayUI.git

			@@ -95,61 +95,61 @@
			</div>
			</div>
			</div>
			<!--å¶åä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item">
			<div class="layui-row">
			<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-tab-item">
			<div class="layui-form-item">
			<div class="layui-row">
			<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-row">
			<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 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-row">
			<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 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 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 class="layui-row">
			<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>
			<div class="layui-row">
			<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 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>
			@@ -244,6 +244,33 @@
			//åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
			option.data = [{"HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HRemark": ""}];
			table.render(option);
			} else if (OperationType == "2") {
			$("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HMaker").val(sessionStorage["HUserName"]);
			$("#HCheckDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HChecker").val(sessionStorage["HUserName"]);
			$("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HUpDater").val(sessionStorage["HUserName"]);
			$("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
			$.ajax({
			url: GetWEBURL() + 'Gy_GroupEmpBill/Gy_GroupEmpBillListProjectDetai',
			type: "GET",
			data: { "sqlWhere": "and hmainid=" + hID },
			success: function (result) {
			//console.log(result);
			//console.log('gouba' + result);
			if (result.count == 1) {
			option.data = result.data;
			table.render(option);

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			else {
			$("#HInterID").val(hID);//ä¿®æ¹æ¶ä¸»è¡¨ID
			@@ -312,7 +339,7 @@
			var rowIndex = $(obj.tr).attr("data-index");
			if (obj.event === 'del') {
			layer.confirm('ççå é¤è¡åï¼', function (index) {
			if (rowIndex === '0') {
			if (rowIndex === '0' && table.cache["mainTable"].length == 1) {
			layer.msg('é¦è¡æ æ³å é¤ï¼ï¼ï¼');
			} else {
			//obj.del();
			@@ -338,7 +365,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Type=HEmpList', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -348,9 +375,9 @@
			return layer.msg('è¯·éæ©æ°æ®');
			}
			obj.update({
			HEmpName: checkStatus.data[0].HName
			, HEmpID: checkStatus.data[0].HItemID
			, HEmpNumber: checkStatus.data[0].HNumber
			"HEmpID": checkStatus.data[0].HItemID
			, "HEmpNumber": checkStatus.data[0].èåä»£ç
			, "HEmpName": checkStatus.data[0].èååç§°
			});

			layer.close(layer.index);
			@@ -429,6 +456,20 @@
			$("#HInterID").val(0);
			}
			});
			} else if (OperationType == "2") {
			$("#HInterID").val("0");
			$("#HBillNo").val("");
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			type: "GET",
			data: { "HBillType": '9876' },
			success: function (d) {
			//console.log(d.data);
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HDate").val(shijian);
			$("#HInterID").val(0);
			}
			});
			}
			else {//å¦æä¿®æ¹åèµ°ä¸é¢ new
			RoadBillMain(hID);
			@@ -445,7 +486,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_GetProductionTeamList.html?Type=HGroupID', 'yes'],
			content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html?Type=HGroup', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -455,7 +496,7 @@
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HGroupName").val(checkStatus.data[0].çç»);
			$("#HGroupName").val(checkStatus.data[0].çç»åç§°);
			$("#HGroupID").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -476,7 +517,7 @@
			if (OperationType == 1) {
			Pub_Close(closeType);//ç´æ¥æ°å¢closeTypeå¼ä¸º2ï¼åè¡¨è°æ°å¢closeTypeå¼ä»åè¡¨ä¼ é
			}
			else if (OperationType == 3) {
			else if (OperationType == 3 \|\| OperationType==2) {
			Pub_Close(closeType);
			}
			else {
			@@ -504,6 +545,9 @@
			if (linterid != "" && linterid != null) {
			refSav = "Update";
			}
			if (OperationType == "2") {
			refSav = "Add";
			}
			data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//ç»ç»
			var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(table.cache['mainTable']);