MES-WEB-LayUI.git

			@@ -64,7 +64,7 @@
			<h1 style="text-align:center;"><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>
			<!--<li lay-id="2" style="padding:1px;">éè¿ä¿¡æ¯</li>-->
			<li lay-id="3" style="padding:1px;">å¶åä¿¡æ¯</li>
			</ul>

			@@ -88,13 +88,13 @@
			placeholder="yyyy-MM-dd">
			</div>
			</div>
			<div class="layui-inline">
			<!--<div class="layui-inline">
			<label class="layui-form-label">åé¨åæ®å·</label>
			<div class="layui-input-inline">
			<input type="text" name="HInnerBillNo" id="HInnerBillNo"
			class="layui-input">
			</div>
			</div>
			</div>-->

			</div>
			<div class="layui-form-item">
			@@ -225,12 +225,25 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">
			ç¾å°è§è²
			</label>
			<div class="layui-input-inline">
			<input type="text" name="HSignRemark" id="HSignRemark" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn"
			lay-filter="HSignRemarkList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"
			style="margin-left:-9px;"></i>
			</button>
			</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="HSignRemark" id="HSignRemark"
			style="background-color:#efefef4d;">
			</div>
			</div>
			</div>-->
			</div>
			</div>
			<!--éä»¶ä¿¡æ¯-->
			@@ -424,10 +437,16 @@

			//è®°å½ç»ç»çå¼
			var HOrgIDBar = 0;
			$("#HOrgID").prop("disabled", true);
			$("#HOrgID").prop("disabled", true);
			//åå§åè¡¨æ ¼
			//set_InitGrid();

			$("#HOrgID").val(sessionStorage["OrganizationID"]);
			$("#HSourceID").val(sessionStorage["HSourceID"]);
			$("#HSourceName").val(sessionStorage["HSource"]);
			$("#HProcID").val(sessionStorage["HProcID"]);
			$("#HProcName").val(sessionStorage["HProcName"]);
			$("#HDeptID").val(sessionStorage["HDeptID"]);
			$("#HDeptName").val(sessionStorage["HDept"]);
			//å¤ææä½ç±»å
			if (OperationType == 1) {//æ æºå
			set_AddFNew();
			@@ -590,7 +609,7 @@
			});


			//è¡¨å¤´ä¿¡æ¯èåå¼¹çªHShiftsList
			//è¡¨å¤´ä¿¡æ¯èåå¼¹çªHSignRemarkList
			form.on('submit(HEmpList)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			@@ -812,6 +831,57 @@
			}
			});
			});
			//è¡¨å¤´ä¿¡æ¯èåå¼¹çª
			form.on('submit(HSignRemarkList)', function () {
			//é¡µé¢å±-èªå®ä¹
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'è§è²åè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../ç³»ç»ç®¡ç/ç¨æ·ç®¡ç/Xt_UserGroupList.html?Type=HEmp&multiSelect=true', 'yes'], // æ·»å multiSelect åæ°
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable'); //è·åtableçéä¸ç¶æ

			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©è³å°ä¸ä¸ªè§è²');
			}


			var selectedRoles = [];
			for (var i = 0; i < checkStatus.data.length; i++) {
			var roleName = checkStatus.data[i].è§è²;
			if (roleName && roleName.trim() !== '') {
			selectedRoles.push(roleName.trim());
			}
			}

			if (selectedRoles.length > 0) {
			var roleString = selectedRoles.join(',');
			$("#HSignRemark").val(roleString);
			layer.close(layer.index);
			} else {
			layer.msg('è¯·éæ©ææçè§è²');
			}
			}
			, btn2: function (index, layero) {
			//æé®ãæé®äºãçåè°
			//return false å¼å¯è¯¥ä»£ç å¯ç¦æ¢ç¹å»è¯¥æé®å³é
			},
			end: function () {
			// å¼¹çªå³éåçå¤ç
			},
			success: function (layero, index) {
			// å¼¹çªæå¼æååçå¤ç
			}
			});
			});
			//éåº
			form.on('submit(Exit)', function (data) {//
			if (linterid == undefined) {
			@@ -936,6 +1006,8 @@
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data.h_v_Sc_EmployeeSignInNoteBill[0];
			var tableSub = result.data.h_v_Sc_EmployeeSignInNoteBill
			if (data.HOrgID == "" \|\| data.HOrgID == undefined \|\| data.HOrgID == null)
			data.HOrgID = sessionStorage["OrganizationID"]
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HInterID": linterid
			, "HBillNo": data.åæ®å·

	WebTM/views/车间管理/员工签到记录单/Add_Edit_Sc_EmployeeSignInNoteBill.html	86 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/员工签到记录单/Sc_EmployeeSignInNoteBill.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -1042,7 +1042,7 @@

			//#regionèªå®ä¹äºä»¶è°ç¨
			function onHBillNumberClickHandler(data) {
			var hID = data.hmainid
			var hID = data.HInterID
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({
			type: 2
			@@ -1052,7 +1052,7 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../æ¨¡æ²»å·ç®¡ç/Add_Edit_Gy_QCVerificationBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
			, content: '../../è½¦é´ç®¡ç/åå·¥ç¾å°è®°å½å/Add_Edit_Sc_EmployeeSignInNoteBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
			, resize: false,
			end: function () {
			//å·æ°é¡µé¢,