MES-WEB-LayUI.git

			@@ -125,8 +125,8 @@
			</div>
			<div class="layui-col-xs8 layui-inline">
			<label class="layui-form-label" style="width: 6.5%;">å¤æ³¨</label>
			<div class="layui-input-block">
			<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
			<div class="layui-input-inline">
			<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
			</div>
			</div>
			</div>
			@@ -291,7 +291,7 @@
			//};
			var Sctag = "0";
			var columns = "";
			var HIsSave = false;
			var HIsCheck = false;
			//#endregion


			@@ -409,7 +409,7 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html?type=HGroup', 'yes'],
			content: ['../../åºç¡èµæ/å·¥èµåºç¡èµæ/Gy_Group.html?type=HGroup&openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -549,6 +549,13 @@
			var row = [];
			for (var i = 0; i < table.cache['mainTable'].length; i++) {
			if (table.cache['mainTable'][i] != "") {
			if (table.cache["mainTable"][i].HMaterName.indexOf("\"") != -1 \|\| table.cache["mainTable"][i].HMaterName.indexOf(";") != -1) {
			table.cache["mainTable"][i].HMaterName = table.cache["mainTable"][i].HMaterName.replaceAll("\"", "â").replaceAll(";", "ï¼")
			}
			if (table.cache["mainTable"][i].HMaterSpec.indexOf("\"") != -1 \|\| table.cache["mainTable"][i].HMaterSpec.indexOf(";") != -1) {
			table.cache["mainTable"][i].HMaterSpec = table.cache["mainTable"][i].HMaterSpec.replaceAll("\"", "â").replaceAll(";", "ï¼")
			}

			row.push(table.cache['mainTable'][i])
			}
			}
			@@ -567,7 +574,6 @@
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			HIsSave = true;
			layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
			$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);//ä¿åæé®ç¦ç¨
			$('#set_CheckBill').removeClass("layui-btn-disabled").attr("disabled", false);//å®¡æ ¸æé®å¯ç¨
			@@ -618,7 +624,7 @@

			//#region æå°
			form.on('submit(get_PrintReport)', function (data) {
			if (HIsSave == true) {
			if (HIsCheck == true) {
			layer.open({
			type: 2
			, area: ['50%', '50%']
			@@ -631,7 +637,7 @@
			})
			}
			else {
			layer.msg('è¯·ä¿ååæ®æ°æ®åæå°ï¼');
			layer.msg('è¯·å®¡æ ¸åæ®æååæå°ï¼');
			}
			});
			//#endregion
			@@ -711,6 +717,7 @@
			data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			HIsCheck = true;
			layer.msg(result.Message, { time: 1 * 10000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			@@ -745,7 +752,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html?openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {
			//æé®ãæé®ä¸ãçåè°
			@@ -792,7 +799,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html', 'yes'],
			content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Unit.html?Type=HUnitList&openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -840,7 +847,7 @@
			shift: 2,
			area: ['90%', '90%'],
			maxmin: true,
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html', 'yes'],
			content: ['../../åºç¡èµæ/çäº§åºç¡èµæ/Gy_Source.html?Htype=&openType=2', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			@@ -1354,7 +1361,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] //è·åå¼¹æ¡é¡µé¢
			@@ -1663,7 +1670,7 @@
			OptionData = obj;
			}
			//åä½
			function GetUnitValue(obj) {
			function GetHUnitListValue(obj) {
			OptionData = obj;
			}
			//çäº§èµæº