MES-WEB-LayUI.git

			@@ -225,7 +225,14 @@
			<option value="æ¶æ¯">æ¶æ¯</option>
			<option value="åæ¶æ¥æ¶">åæ¶æ¥æ¶</option>
			</select>
			</script>
			</script>

			<!--å¤éæ¡ å®ææ è®°-->
			<script type="text/html" id="HIsRece">
			<div class="layui-input-block" style="margin-left: 20px;">
			<input type="checkbox" name="HIsRece" lay-filter="HIsRece" id="HIsRece{{d.LAY_TABLE_INDEX+1}}" lay-skin="primary">
			</div>
			</script>

			<script>

			@@ -289,22 +296,31 @@
			////ç¦ç¨ç»ç»éé¡¹
			//$("#HOrgID").attr("disabled", true);
			OperationType = 1;

			//åå§åé¡¹ç®é¶æ®µè¡¨
			get_InitGrid();

			//çæå¹¶è®¾ç½®ä¸»è¡¨çåç ååæ®å·
			createBillNo();


			//åå§åå¶åäººåå¶åæ¶é´
			$("#HMaker").val(sessionStorage["HUserName"]);
			$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));

			//åå§åæ¥æ
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));


			}
			else if (OperationType == 2) {//å¦æä¿®æ¹åèµ°ä¸é¢ new //ç¼è¾
			OperationType = 1;
			//åå§åé¡¹ç®é¶æ®µè¡¨
			get_InitGrid();
			RoadBillMain(linterid);
			//çæå¹¶è®¾ç½®ä¸»è¡¨çåç ååæ®å·
			createBillNo();
			//åå§åå¶åäººåå¶åæ¶é´
			$("#HMaker").val(sessionStorage["HUserName"]);
			$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åæ¥æ
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			}
			else if (OperationType == 3) {//å¦æä¿®æ¹åèµ°ä¸é¢ new //ç¼è¾
			////ç¦ç¨ç»ç»éé¡¹
			@@ -395,6 +411,8 @@
			, "HDutyNumber": ""
			, "HDutyName": ""
			, "HTimes": ""
			,"HReceiveType":""
			, "HIsRece": false
			, "HRemark": ""
			, "HReceiveType": ""
			, "HSourceInterID": "0"
			@@ -407,11 +425,19 @@
			table.cache["mainTable"].push(NewRow);
			option.data = table.cache["mainTable"];
			table.render(option);
			CheckedSet_tableSub();
			for (var i = 1; i <= option.data.length; i++) {
			$('#HReceiveType' + i + '').find("option[value='" + option.data[i - 1].HReceiveType + "']").attr("selected", true);

			$('#HReceiveType' + i + '').find("option[value='" + option.data[i - 1].HReceiveType + "']").attr("selected", true);
			}
			for (var i = 1; i <= option.data.length; i++) {
			//å®ææ è®°
			if (option.data[i - 1].HIsRece) {
			$('#HIsRece' + i + '').attr("checked", true);
			}
			}

			form.render('select');
			form.render('checkbox');
			break;
			case 'btn-CopyLine':
			var copydata = JSON.stringify(data);
			@@ -427,11 +453,19 @@
			table.cache["mainTable"].push(JSON.parse(copyrow));//å°å¤å¶çè¡å¼ºè½¬æjsonè¿½å å°è¡¨æ ¼ä¸
			option.data = table.cache["mainTable"];//å°æ°æ®ç»å®å°dataä¸
			table.render(option);//å°æ°æ®æ¸²æå°è¡¨æ ¼ä¸
			CheckedSet_tableSub();
			for (var i = 1; i <= option.data.length; i++) {
			$('#HReceiveType' + i + '').find("option[value='" + option.data[i - 1].HReceiveType + "']").attr("selected", true);

			}
			for (var i = 1; i <= option.data.length; i++) {
			//å®ææ è®°
			if (option.data[i - 1].HIsRece) {
			$('#HIsRece' + i + '').attr("checked", true);
			}
			}

			form.render('select');
			form.render('checkbox');
			}
			break;
			//ä¸ä¸è¡
			@@ -550,7 +584,7 @@
			, { field: 'HDutyName', title: 'èå¡åç§°', edit: 'text', event: "HDutyName", style: 'background-color: #f9f9f9;' } //f7
			, { field: 'HTimes', title: 'è§¦åæ¶é´', edit: 'text', style: 'background-color: #f9f9f9;', }
			, { field: 'HReceiveType', title: 'æ¥æ¶æ¨¡å¼', style: 'background-color: #f9f9f9;', templet: '#HReceiveType' }

			, { field: 'HIsRece', title: 'æ¯å¦æ¥æ¶äºº', templet: "#HIsRece" }//checkbox
			, { field: 'HRemark', title: 'å¤æ³¨', edit: 'text' }
			, { field: 'HSourceInterID', title: 'æºååç ', hide: true, style: 'background-color: #f9f9f9;' } //f7
			, { field: 'HSourceEntryID', title: 'æºåååç ', hide: true, style: 'background-color: #f9f9f9;' } //f7
			@@ -562,13 +596,14 @@

			var rowdata = [
			{
			"HSNO": ""
			"HSNO": "1"
			, "HDutyID": ""
			, "HDutyNumber": ""
			, "HDutyName": ""
			, "HTimes": ""
			, "HTimes": "1"
			, "HRemark": ""
			, "HReceiveType": ""
			, "HReceiveType": "çä¿¡"
			, "HIsRece": false
			, "HSourceInterID": "0"
			, "HSourceEntryID": "0"
			, "HSourceBillNo": ""
			@@ -595,6 +630,19 @@
			});
			//#endregion

			//#region å®ææ è®°
			form.on('checkbox(HIsRece)', function (data) {
			//è·åä¸ææ¡éä¸çå¼
			var elem = data.othis.parents('tr');
			var dataindex = elem.attr("data-index");
			$.each(option.data, function (index, value) {
			if (value.LAY_TABLE_INDEX == dataindex) {
			value.HIsRece = data.elem.checked;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			});
			});
			//#endregion

			//#region å¼å¸¸å¼å«ç±»å
			function get_checkSearchHErrMsg() {
			layer.open({
			@@ -613,7 +661,7 @@
			}
			//è·åæ°æ®
			$("#HErrMsgBackTypeID").val(checkStatus.data[0].HItemID);//å²ä½id
			$("#HErrMsgBackTypeName").val(checkStatus.data[0].å²ä½åç§°);//å²ä½åç§°
			$("#HErrMsgBackTypeName").val(checkStatus.data[0].å¼å¸¸åé¦ç±»ååç§°);//å²ä½åç§°

			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			@@ -632,7 +680,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'åéé¨é¨è¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -661,7 +709,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'æ¥æ¶é¨é¨è¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_DepartmentList.html?openType=2&HOrgName=' + sessionStorage["Organization"], 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -756,8 +804,8 @@

			//ä¸»è¡¨ èµå¼
			form.val("formData", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HInterID": data[0]["hmainid"]
			, "HBillNo": data[0]["åæ®å·"]
			"HInterID": OperationType == 2 ? "" : data[0]["hmainid"]
			, "HBillNo": OperationType == 2 ? "" : data[0]["åæ®å·"]
			, "HDate": formatDate(data[0]["æ¥æ"])
			, "HDeptID": data[0]["HDeptID"]
			, "HDeptName": data[0]["åèµ·é¨é¨"]
			@@ -789,22 +837,22 @@
			{
			"HSNO": tableSub[i].æµç¨å·, "HDutyID": tableSub[i].HDutyID, "HDutyNumber": tableSub[i].èå¡ç¼ç ,
			"HDutyName": tableSub[i].èå¡, "HTimes": tableSub[i].è§¦åæ¶é´, "HRemark": tableSub[i].å¤æ³¨,
			"HReceiveType": tableSub[i].æ¥æ¶æ¨¡å¼
			"HReceiveType": tableSub[i].æ¥æ¶æ¨¡å¼, "HIsRece": tableSub[i].HIsRece
			}
			)
			}
			option.data = rowdata;
			table.render(option);
			CheckedSet_tableSub();
			for (var i = 0; i < rowdata.length; i++) {
			$('#HReceiveType' + (i + 1)).find("option[value='" + tableSub[i].æ¥æ¶æ¨¡å¼ + "']").attr("selected", true);
			$('#HReceiveType' + (i + 1)).find("option[value='" + tableSub[i].æ¥æ¶æ¨¡å¼ + "']").attr("selected", true);
			}
			form.render('select');
			form.render('checkbox');
			}
			})
			}
			//#endregion

			//#endregion


			//#region å®¡æ ¸
			@@ -956,6 +1004,19 @@
			}
			//#endregion

			//#region å·æ°è®¾ç½®å¤éæ¡ç¶æ
			function CheckedSet_tableSub() {
			var tableSub = option.data;
			//å¯¹åè¡¨ä¸çå¤éæ¡è¿è¡éä¸
			for (var i = 0; i < tableSub.length; i++) {
			if (tableSub[i].HIsRece) {
			$('#HIsRece' + (i + 1)).attr("checked", true);
			}
			}
			form.render('checkbox');
			}
			//#endregion


			//#region éèåè®¾ç½®
			function get_HideColumn() {
			@@ -1102,7 +1163,7 @@
			$("#HReceiveDeptName").val(obj[0].é¨é¨åç§°);
			$("#HReceiveDeptID").val(obj[0].HItemID);
			}


			}
			//å¼å¸¸å¼å«ç±»å
			function GetErrMsgBackTypeValue(obj) {