MES-WEB-LayUI.git

			@@ -14,7 +14,7 @@
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<style>
			<!--<style>
			.main-btn { /å¤´é¨ä¸»æé®/
			padding: 0 2px; /è°æ´æé®å·¦å³ç©ºéå¤§å°/
			height: 30px;
			@@ -44,7 +44,7 @@
			.layui-form-label {
			width: 25%;
			}
			</style>
			</style>-->

			</head>
			<body>
			@@ -75,14 +75,14 @@
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-inline" style="width:500px;">
			<label class="layui-form-label" style="width: 85px;">åæ®å·</label>
			<label class="layui-form-label" style="width: 85px;">åæ®å·<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 120px; width: 180px;">
			<input type="text" class="layui-input" name="HBillNo" lay-verify="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HInterID" id="HInterID" lay-verify="HInterID">
			</div>
			</div>
			<div class="layui-inline" style="width:500px;">
			<label class="layui-form-label" style="width: 85px;">æ¥æ</label>
			<label class="layui-form-label" style="width: 85px;">æ¥æ<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 120px; width:180px;">
			<input type="date" class="layui-input" lay-verify="HDate" name="HDate" id="HDate" style="padding-left: 80px;">
			</div>
			@@ -96,7 +96,7 @@
			</div>
			<div class="layui-row">
			<div class="layui-inline" style="width:500px;">
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">é¨é¨</label>
			<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">é¨é¨<label style="color:red"> * </label></label>
			<div class="layui-input-block" style="margin-left: 77px; width: 270px;">
			<input type="text" class="layui-input" lay-verify="HDeptName" name="HDeptName" id="HDeptName" style="background-color: #efefef4d; width: 180px; display: inline-block;" readonly>
			<input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" value="0">
			@@ -224,8 +224,8 @@
			<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"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>ä¸ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>ä¸ä¸è¡</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_up"><i class="layui-icon layui-icon-form"></i>ä¸ä¸è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_under"><i class="layui-icon layui-icon-form"></i>ä¸ä¸è¡</button>-->
			</div>
			</script>
			</form>
			@@ -495,36 +495,37 @@
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: true
			, limit: 500
			, limits: [50, 500, 5000, 50000]
			//, page: true
			//, limit: 500
			//, limits: [50, 500, 5000, 50000]
			/* , totalRow: true*/
			, cellMinWidth: 120
			, height: 400
			, cols: [[
			{ type: 'checkbox', totalRowText: 'åè®¡è¡' }
			, { type: 'numbers', title: 'åºå·', totalRow: true }
			, { field: 'RowID', title: 'è¡å·', hide: true } //è¡æ è¯ï¼ç¨äºä¸ä¸è¡ãä¸ä¸è¡è¯å«æå¨è¡
			, { field: 'HEmpID', title: 'èåID', hide: true }
			, { type: 'numbers', title: 'åºå·', style: 'background-color: #f9f9f9;'}
			, { field: 'RowID', title: 'è¡å·', hide: true, style: 'background-color: #f9f9f9;' } //è¡æ è¯ï¼ç¨äºä¸ä¸è¡ãä¸ä¸è¡è¯å«æå¨è¡
			, { field: 'HEmpID', title: 'èåID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HEmpNumber', title: 'èåä»£ç ', edit: 'text', event: "HEmpNumber" } //f7
			, { field: 'HEmpName', title: 'èååç§°' }
			, { field: 'HOldDeptID', title: 'åé¨é¨ID', hide: true }
			, { field: 'HOldDeptNumber', title: 'åé¨é¨ä»£ç ', edit: 'text', event: "HOldDeptNumber" } //f7
			, { field: 'HOldDeptName', title: 'åé¨é¨åç§°' }
			, { field: 'HDeptID', title: 'è°å¥é¨é¨ID', hide: true }
			, { field: 'HEmpName', title: 'èååç§°', style: 'background-color: #f9f9f9;' }
			, { field: 'HOldDeptID', title: 'åé¨é¨ID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HOldDeptNumber', title: 'åé¨é¨ä»£ç ', style: 'background-color: #f9f9f9;' } //f7
			, { field: 'HOldDeptName', title: 'åé¨é¨åç§°', style: 'background-color: #f9f9f9;' }
			, { field: 'HDeptID', title: 'è°å¥é¨é¨ID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HDeptNumber', title: 'è°å¥é¨é¨ä»£ç ', edit: 'text', event: "HDeptNumber" } //f7
			, { field: 'HDeptName', title: 'è°å¥é¨é¨åç§°' }
			, { field: 'HOldGroupID', title: 'åçç»ID', hide: true }
			, { field: 'HOldGroupNumber', title: 'åçç»ä»£ç ', edit: 'text', event: "HOldGroupNumber" } //f7
			, { field: 'HOldGroupName', title: 'åçç»åç§°' }
			, { field: 'HGroupID', title: 'è°å¥çç»ID', hide: true }
			, { field: 'HDeptName', title: 'è°å¥é¨é¨åç§°', style: 'background-color: #f9f9f9;' }
			, { field: 'HOldGroupID', title: 'åçç»ID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HOldGroupNumber', title: 'åçç»ä»£ç ', style: 'background-color: #f9f9f9;' } //f7
			, { field: 'HOldGroupName', title: 'åçç»åç§°', style: 'background-color: #f9f9f9;' }
			, { field: 'HGroupID', title: 'è°å¥çç»ID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HGroupNumber', title: 'è°å¥çç»ä»£ç ', edit: 'text', event: "HGroupNumber" } //f7
			, { field: 'HGroupName', title: 'è°å¥çç»åç§°' }
			, { field: 'HOldPostID', title: 'åå²ä½ID', hide: true }
			, { field: 'HOldPostNumber', title: 'åå²ä½ä»£ç ', edit: 'text', event: "HOldPostNumber" } //f7
			, { field: 'HOldPostName', title: 'åå²ä½åç§°' }
			, { field: 'HPostID', title: 'è°å¥å²ä½ID', hide: true }
			, { field: 'HGroupName', title: 'è°å¥çç»åç§°', style: 'background-color: #f9f9f9;' }
			, { field: 'HOldPostID', title: 'åå²ä½ID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HOldPostNumber', title: 'åå²ä½ä»£ç ', style: 'background-color: #f9f9f9;' } //f7
			, { field: 'HOldPostName', title: 'åå²ä½åç§°', style: 'background-color: #f9f9f9;' }
			, { field: 'HPostID', title: 'è°å¥å²ä½ID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HPostNumber', title: 'è°å¥å²ä½ä»£ç ', edit: 'text', event: "HPostNumber" } //f7
			, { field: 'HPostName', title: 'è°å¥å²ä½åç§°' }
			, { field: 'HPostName', title: 'è°å¥å²ä½åç§°', style: 'background-color: #f9f9f9;' }
			, { field: 'HReason', title: 'å¼å¨åå ', edit: 'text' }
			, { fixed: 'right', title: 'æä½', toolbar: '#barDemo' }
			]]
			@@ -697,76 +698,76 @@
			//#region æ°æ®æ ¡éª
			function AllowLoadData(data) {
			//#region è¡¨å¤´æ°æ®æ£éª
			//if ($("#HBillNo").val() == "") {
			// layer.msg("åæ®å·ä¸è½ä¸ºç©º!");
			// return false;
			//}
			//if ($("#HInnerBillNo").val() == "") {
			// layer.msg("åé¨åæ®å·ä¸è½ä¸ºç©º!");
			// return false;
			//}
			//if ($("#HGroupName").val() == "") {
			// layer.msg("çç»æªéæ©!");
			// return false;
			//}
			//if ($("#HDeptName").val() == "") {
			// layer.msg("é¨é¨æªéæ©!");
			// return false;
			//}
			//if ($("#HEmpName").val() == "") {
			// layer.msg("ä¸»ç®¡æªéæ©!");
			// return false;
			//}
			//if ($("#HPayTypeName").val() == "") {
			// layer.msg("å·¥èµç±»åæªéæ©!");
			// return false;
			//}
			if ($("#HBillNo").val() == "") {
			layer.msg("åæ®å·ä¸è½ä¸ºç©º!");
			return false;
			}
			if ($("#HDate").val() == "") {
			layer.msg("æ¥æä¸è½ä¸ºç©º!");
			return false;
			}
			if ($("#HDeptID").val() == "0") {
			layer.msg("é¨é¨æªéæ©!");
			return false;
			}
			//#endregion

			//#region åè¡¨æ°æ®æ£éª
			//var temp; //è®°å½éè¦æ£éªçå±æ§çå¼ï¼ç¨äºæ£éª
			//var ref = /^\d+(\.\d+)?$/; //å¤ææ¯å¦æ¯éè´æµ®ç¹æ°
			//var ref1 = /^\d+$/; //å¤ææ¯å¦æ¯éè´æ´æ°
			//var value1 = ["HTimes", "HQty", "HPrice", "HPriceRate", "HSubsidyQty", "HSubsidyMoney", "HSubsidyTotal", "HDeuctTotal", "HPackQty", "HPackPrice", "HPackMoney", "HMoney"]; //åè¡¨éè¦è¿è¡æµ®ç¹æ°éªè¯çå±æ§æ¸å
			//var value1_ = ["å·¥æ¶", "æ°é", "å·¥ä»·", "å®é¢æµ®å¨æ¯ç", "è¡¥è´´æ°é", "è¡¥è´´éé¢", "è¡¥è´´åè®¡", "æ£æ¬¾å°è®¡", "åè£æ°é", "åè£åä»·", "åè£éé¢", "éé¢"]; ////åè¡¨éè¦è¿è¡æµ®ç¹æ°éªè¯çå±æ§æ¸åå¯¹åºçååæ¸å
			//var value2 = ["HICMOInterID", "HProcReportInterID", "HProcReportEntryID", "HProcPlanInterID", "HProcPlanEntryID"]; //åè¡¨éè¦æ´æ°æ£éªçå±æ§æ¸å
			//var value2_ = ["çäº§ä»»å¡åID", "å·¥åºæ±æ¥åID", "å·¥åºæ±æ¥ååID", "å·¥åºè®¡ååID", "å·¥åºè®¡åååID"]; //åè¡¨éè¦æ´æ°æ£éªçå±æ§æ¸åå¯¹åºçååæ¸å
			//var value3 = ["HMaterNumber", "HProcNumber", "HEmpNumber", "HPackMaterName"]; //åè¡¨éè¦è¿è¡éç©ºæ£éªçå±æ§æ¸å
			//var value3_ = ["ç©æ", "å·¥åº", "èå", "åè£æ¹å¼"]; //åè¡¨éè¦è¿è¡éç©ºæ£éªçå±æ§æ¸åå¯¹åºçååæ¸å
			//for (var i = 0; i < option.data.length; i++) {
			// if (option.data[i] != "") {
			// //éç©ºæ£éª
			// for (var j = 0; j < value3.length; j++) {
			// temp = option.data[i][value3[j]] + "";
			// if (temp == "") {
			// layer.msg("ç¬¬" + (i + 1) + "è¡:" + value3_[j] + "æªéæ©!");
			// return false;
			// }
			// }
			// //æ´æ°æ£éª
			// for (var j = 0; j < value2.length; j++) {
			// temp = option.data[i][value2[j]] + "";
			// if (temp == "") {
			// layer.msg("ç¬¬" + (i + 1) + "è¡:" + value2_[j] + "ä¸è½ä¸ºç©º!");
			// return false;
			// } else if (!ref1.test(temp)) {
			// layer.msg("ç¬¬" + (i + 1) + "è¡:" + value2_[j] + "è¯·è¾å¥éè´æ´æ°!");
			// return false;
			// }
			// }
			// //æµ®ç¹æ°æ£éª
			// for (var j = 0; j < value1.length; j++) {
			// temp = option.data[i][value1[j]] + "";
			// if (temp == "") {
			// layer.msg("ç¬¬" + (i + 1) + "è¡:" + value1_[j] + "ä¸è½ä¸ºç©º!");
			// return false;
			// } else if (!ref.test(temp)) {
			// layer.msg("ç¬¬" + (i + 1) + "è¡:" + value1_[j] + "è¯·è¾å¥æ£ç¡®éè´æ°å!");
			// return false;
			// }
			// }
			// }
			//}
			var temp; //è®°å½éè¦æ£éªçå±æ§çå¼ï¼ç¨äºæ£éª
			var ref = /^\d+(\.\d+)?$/; //å¤ææ¯å¦æ¯éè´æµ®ç¹æ°
			var ref1 = /^\d+$/; //å¤ææ¯å¦æ¯éè´æ´æ°
			var value1 = []; //åè¡¨éè¦è¿è¡æµ®ç¹æ°éªè¯çå±æ§æ¸å
			var value1_ = []; ////åè¡¨éè¦è¿è¡æµ®ç¹æ°éªè¯çå±æ§æ¸åå¯¹åºçååæ¸å
			var value2 = []; //åè¡¨éè¦æ´æ°æ£éªçå±æ§æ¸å
			var value2_ = []; //åè¡¨éè¦æ´æ°æ£éªçå±æ§æ¸åå¯¹åºçååæ¸å
			var value3 = ["HEmpID", "HOldDeptID", "HDeptID", "HOldGroupID", "HGroupID", "HOldPostID", "HPostID"]; //åè¡¨éè¦è¿è¡éç©ºæ£éªçå±æ§æ¸å
			var value3_ = ["èå", "åé¨é¨", "è°å¥é¨é¨", "åçç»", "è°å¥çç»", "åå²ä½", "è°å¥å²ä½"]; //åè¡¨éè¦è¿è¡éç©ºæ£éªçå±æ§æ¸åå¯¹åºçååæ¸å
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i] != "") {
			//éç©ºæ£éª
			for (var j = 0; j < value3.length; j++) {
			temp = option.data[i][value3[j]] + "";
			if (temp == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:" + value3_[j] + "æªéæ©!");
			return false;
			}
			}
			//æ´æ°æ£éª
			for (var j = 0; j < value2.length; j++) {
			temp = option.data[i][value2[j]] + "";
			if (temp == "") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:" + value2_[j] + "ä¸è½ä¸ºç©º!");
			return false;
			} else if (!ref1.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡:" + value2_[j] + "è¯·è¾å¥éè´æ´æ°!");
			return false;
			}
			}
			//æµ®ç¹æ°æ£éª
			for (var j = 0; j < value1.length; j++) {
			temp = option.data[i][value1[j]] + "";
			if (temp == "") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:" + value1_[j] + "ä¸è½ä¸ºç©º!");
			return false;
			} else if (!ref.test(temp)) {
			layer.msg("ç¬¬" + (i + 1) + "è¡:" + value1_[j] + "è¯·è¾å¥æ£ç¡®éè´æ°å!");
			return false;
			}
			}
			}
			}
			//#endregion

			//#region åè¡¨å³é®åæ®µéå¤æ£éª
			var num = [];
			for (var i = 0; i < option.data.length; i++) {
			temp = option.data[i]["HEmpID"];
			if ($.inArray(temp, num) != -1) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼èåéå¤ï¼è¯·éæ°éæ©ï¼");
			return false;
			}
			num.push(temp);
			}
			//#endregion
			return true;
			}
			@@ -863,12 +864,51 @@
			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HEmpID": checkStatus.data[0].HItemID
			, "HEmpNumber": checkStatus.data[0].HNumber
			, "HEmpName": checkStatus.data[0].HName
			})

			var HEmpID = checkStatus.data[0].HItemID;
			$.ajax({
			url: GetWEBURL() + "HR_EmpDimissionBill/getInfoByHEmpID",
			type: "GET",
			data: {
			"HEmpID": HEmpID
			},
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var HEmpID = checkStatus.data[0].HItemID;
			var HEmpNumber = checkStatus.data[0].HNumber;
			var HEmpName = checkStatus.data[0].HName;
			var HOldDeptID = result.data[0]["HDeptID"] == null ? 0 : result.data[0]["HDeptID"];
			var HOldDeptNumber = result.data[0]["HDeptNumber"];
			var HOldDeptName = result.data[0]["HDeptName"];
			var HOldGroupID = result.data[0]["HGroupID"] == null ?0: result.data[0]["HGroupID"];
			var HOldGroupNumber = result.data[0]["HGroupNumber"];
			var HOldGroupName = result.data[0]["HGroupName"];
			var HOldPostID = result.data[0]["HPostID"]==null ? 0 : result.data[0]["HPostID"];
			var HOldPostNumber = result.data[0]["HPostNumber"];
			var HOldPostName = result.data[0]["HPostName"];

			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HEmpID": checkStatus.data[0].HItemID
			, "HEmpNumber": checkStatus.data[0].HNumber
			, "HEmpName": checkStatus.data[0].HName
			, "HOldDeptID": HOldDeptID
			, "HOldDeptNumber": HOldDeptNumber
			, "HOldDeptName": HOldDeptName
			, "HOldGroupID": HOldGroupID
			, "HOldGroupNumber": HOldGroupNumber
			, "HOldGroupName": HOldGroupName
			, "HOldPostID": HOldPostID
			, "HOldPostNumber": HOldPostNumber
			, "HOldPostName": HOldPostName
			})
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			layer.close(index);//å³éå¼¹çª
			}
			})
			@@ -1141,9 +1181,9 @@
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			option.cols[0][i + 1]["style"] += "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			option.cols[0][i + 1]["style"] += "font-size:100%";
			}
			//è®¾ç½®åå®½
			//if (data1.data[0].HColumnWidth != 0) {

	WebTM/Properties/PublishProfiles/JFTM.pubxml.user	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/人事管理/职员异动单/HR_EmpChangeBill.html	248 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -1746,7 +1746,7 @@
			<publishTime>07/21/2023 10:15:10</publishTime>
			</File>
			<File Include="views/äººäºç®¡ç/èåå¼å¨å/HR_EmpChangeBill.html">
			<publishTime>07/26/2023 09:51:54</publishTime>
			<publishTime>08/15/2023 15:23:07</publishTime>
			</File>
			<File Include="views/äººäºç®¡ç/èåå¼å¨å/HR_EmpChangeBillList.html">
			<publishTime>07/25/2023 19:25:14</publishTime>