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,20 +75,20 @@
			<div class="layui-form-item" style="padding-top: 10px;">
			<div class="layui-row">
			<div class="layui-inline">
			<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;">
			<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">
			<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>
			</div>
			<div class="layui-inline">
			<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;">
			<input type="text" class="layui-input" lay-verify="HReportEmpName" name="HReportEmpName" id="HReportEmpName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
			<input type="hidden" name="HReportEmpID" id="HReportEmpID" lay-verify="HReportEmpID" value="0">
			@@ -100,7 +100,7 @@
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¤æ³¨<label style="color:red"> * </label></label>
			<label class="layui-form-label" style="width: 85px;">å¤æ³¨</label>
			<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
			<input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark">
			</div>
			@@ -108,11 +108,21 @@
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<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: 501px;">
			<select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<div class="layui-input-block" style="margin-left: 120px; width: 501px;">
			<input type="hidden" name="HProID" id="HProID" lay-verify="HProID" value="0">
			<input type="hidden" name="HProjectStageID" id="HProjectStageID" lay-verify="HProjectStageID" value="0">
			<input type="hidden" name="HMainSourceBillType" id="HMainSourceBillType" lay-verify="HMainSourceBillType" value="0">
			<input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" lay-verify="HMainSourceBillNo" value="0">
			</div>
			</div>
			</div>
			@@ -131,7 +141,7 @@
			<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="HUpDater" id="hupdater" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="HUpdater" id="HUpdater" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			@@ -152,7 +162,7 @@
			<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="HUpDaterDate" id="hupdatedate" style="background-color:#efefef4d;" readonly>
			<input type="text" class="layui-input" name="HUpdaterDate" id="HUpdaterDate" style="background-color:#efefef4d;" readonly>
			</div>
			</div>
			<div class="layui-inline">
			@@ -227,8 +237,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>
			</div>
			@@ -263,10 +273,13 @@
			var HModName = "PM_WorkTaskReportBill";
			//è¡¨æ ¼æ¸²æåæ°
			var option = {}; //é¡¹ç®é¶æ®µè¡¨æ¸²æåæ°
			//è®°å½ç»ç»çå¼
			var HOrgIDBar = 0;
			//è·ååæ°
			var params = getUrlVars();
			var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å 1æ·»å ä¿å 2å¤å¶ 3 ç¼è¾
			var linterid = params[params[1]]; //ä»åæ°ä¸è·å åæ®åç
			var HProjectStageID = params[params[3]]; //é¶æ®µåç

			//#endregion

			@@ -289,6 +302,8 @@

			//#region å¤æå¹¶è®¾ç½®æä½ç±»åãé¡µé¢åå§å
			if (OperationType == null \|\| OperationType == 1) { //æ°å¢
			//ç¦ç¨ç»ç»éé¡¹
			$("#HOrgID").attr("disabled", true);
			OperationType = 1;
			//çæå¹¶è®¾ç½®ä¸»è¡¨çåç ååæ®å·
			createBillNo();
			@@ -319,12 +334,30 @@
			// });
			//}
			else if (OperationType == 3) {//å¦æä¿®æ¹åèµ°ä¸é¢ new //ç¼è¾
			////ç¦ç¨ç»ç»éé¡¹
			//$("#HOrgID").attr("disabled", true);
			//ç¦ç¨ç»ç»éé¡¹
			$("#HOrgID").attr("disabled", true);
			//åå§åé¡¹ç®é¶æ®µè¡¨
			get_InitGrid();
			RoadBillMain(linterid);
			} else if (OperationType == 4 && HProjectStageID != null) {
			//ç¦ç¨ç»ç»éé¡¹
			$("#HOrgID").attr("disabled", true);
			//çæå¹¶è®¾ç½®ä¸»è¡¨çåç ååæ®å·
			createBillNo();
			//åå§åå¶åäººåå¶åæ¶é´
			$("#HMaker").val(sessionStorage["HUserName"]);
			$("#HMakerDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åæ¥æ
			$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
			//åå§åé¡¹ç®é¶æ®µè¡¨
			get_InitGrid();
			//ä¸æ¨-é¡µé¢è®¾ç½®
			set_WorkTaskReport();
			}
			//#endregion

			//#region åå§åè¡¨æ ¼
			DisPlay_HideColumn();
			//#endregion

			//#endregion
			@@ -429,7 +462,7 @@
			break;
			//åè®¾ç½®
			case 'set_HideColumn':
			//get_HideColumn();
			get_HideColumn();
			break;
			//ä¸ä¸è¡
			case 'btn_up':
			@@ -513,7 +546,10 @@
			Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			}
			$("#HOrgID").append(Organization);
			$("#HOrgID").val(sessionStorage["OrganizationID"])
			if (OperationType == 1) {
			HOrgIDBar = sessionStorage["OrganizationID"];
			}
			$("#HOrgID").val(HOrgIDBar);
			form.render('select');
			}
			layer.closeAll("loading");
			@@ -556,22 +592,23 @@
			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: 'HProNumber', title: 'é¡¹ç®ä»£ç ', edit: 'text' }
			, { field: 'HProjectStageID', title: 'é¡¹ç®é¶æ®µID', hide: true }
			, { field: 'HProjectStageName', title: 'é¡¹ç®é¶æ®µ', edit: 'text', event: "HProjectStageName" } //f7
			, { field: 'HName', title: 'ä»»å¡åç§°', edit: 'text' }
			, { field: 'HTaskNote', title: 'ä»»å¡æè¿°', edit: 'text' }
			, { field: 'HType', title: 'ä»»å¡ç±»å', edit: 'text' }
			, { field: 'HRelTimes', title: 'èç¨å·¥æ¶', edit: 'text' }
			, { type: 'numbers', title: 'åºå·', style: 'background-color: #f9f9f9;' }
			, { field: 'RowID', title: 'è¡å·', hide: true, style: 'background-color: #f9f9f9;' } //è¡æ è¯ï¼ç¨äºä¸ä¸è¡ãä¸ä¸è¡è¯å«æå¨è¡
			, { field: 'HProNumber', title: 'é¡¹ç®ä»£ç ', style: 'background-color: #f9f9f9;'}
			, { field: 'HProjectStageID', title: 'é¡¹ç®é¶æ®µID', hide: true, style: 'background-color: #f9f9f9;' }
			, { field: 'HProjectStageName', title: 'é¡¹ç®é¶æ®µ', style: 'background-color: #f9f9f9;' } //f7
			, { field: 'HName', title: 'ä»»å¡åç§°', edit: 'text', event: "HName" }
			, { field: 'HTaskNote', title: 'ä»»å¡æè¿°', style: 'background-color: #f9f9f9;' }
			, { field: 'HType', title: 'ä»»å¡ç±»å', style: 'background-color: #f9f9f9;'}
			, { field: 'HRelTimes', title: 'èç¨å·¥æ¶', edit: 'text', totalRow: true }
			, { field: 'HReportNote', title: 'æ±æ¥åå®¹', edit: 'text' }
			, { field: 'HAdv', title: 'ä¼åå»ºè®®', edit: 'text' }
			, { field: 'HRemarkSub', title: 'å¤æ³¨', edit: 'text' }
			@@ -638,9 +675,15 @@
			num.push(table.cache["mainTable"][i])
			}
			}

			//è·åç»ç»æ°æ®
			data.field.HPRDORGID = sessionStorage["OrganizationID"];//ç»ç»
			//è¥ä¸ºç¼è¾-ä¿åï¼åæ´æ°ä¿®æ¹äººåä¿®æ¹æ¶é´
			if (OperationType == 3) {
			data.field.HUpdater = sessionStorage["HUserName"];
			data.field.HUpdaterDate = Format(new Date(), "yyyy-MM-dd");
			$("#HUpdater").val(sessionStorage["HUserName"]);
			$("#HUpdaterDate").val(Format(new Date(), "yyyy-MM-dd"));
			}
			//è·åè¡¨å¤´æ°æ®å¹¶åºåå
			var sMainStr = JSON.stringify(data.field); //ä¸»è¡¨æ°æ®
			//åè¡¨æ°æ®åºåå
			@@ -698,21 +741,61 @@
			, "HMaker": tableMain[0]["HMaker"]
			, "HUpdater": tableMain[0]["HUpdater"]
			, "HChecker": tableMain[0]["HChecker"]
			, "HMakerDate": tableMain[0]["HMakerDate"] == null ? "" : Format(new Date(tableMain[0]["HMakerDate"]), "yy-MM-dd")
			, "HUpdaterDate": tableMain[0]["HUpdaterDate"] == null ? "" : Format(new Date(tableMain[0]["HUpdaterDate"]), "yy-MM-dd")
			, "HCheckerDate": tableMain[0]["HCheckerDate"] == null ? "" : Format(new Date(tableMain[0]["HCheckerDate"]), "yy-MM-dd")
			, "HMakerDate": tableMain[0]["HMakerDate"] == null ? "" : Format(new Date(tableMain[0]["HMakerDate"]), "yyyy-MM-dd")
			, "HUpdaterDate": tableMain[0]["HUpdaterDate"] == null ? "" : Format(new Date(tableMain[0]["HUpdaterDate"]), "yyyy-MM-dd")
			, "HCheckerDate": tableMain[0]["HCheckerDate"] == null ? "" : Format(new Date(tableMain[0]["HCheckerDate"]), "yyyy-MM-dd")
			, "HCloseMan": tableMain[0]["HCloseMan"]
			, "HDeleteMan": tableMain[0]["HDeleteMan"]
			, "HBacker": tableMain[0]["HBacker"]
			, "HCloseManDate": tableMain[0]["HCloseManDate"] == null ? "" : Format(new Date(tableMain[0]["HCloseManDate"]), "yyyy-MM-dd")
			, "HDeleteManDate": tableMain[0]["HDeleteManDate"] == null ? "" : tFormat(new Date(tableMain[0]["HDeleteManDate"]), "yyyy-MM-dd")
			, "HCloseManDate": tableMain[0]["HCloseDate"] == null ? "" : Format(new Date(tableMain[0]["HCloseDate"]), "yyyy-MM-dd")
			, "HDeleteManDate": tableMain[0]["HDeleteDate"] == null ? "" : Format(new Date(tableMain[0]["HDeleteDate"]), "yyyy-MM-dd")
			, "HBackerDate": tableMain[0]["HBackerDate"] == null ? "" : Format(new Date(tableMain[0]["HBackerDate"]), "yyyy-MM-dd")
			, "HBackRemark": tableMain[0]["HBackRemark"]
			, "HReportEmpID": tableMain[0]["HReportEmpID"]
			, "HReportEmpName": tableMain[0]["HReportEmpName"]
			});

			//ç»ç»çå¼HOrgIDååï¼éæ°æ¸²æ
			HOrgIDBar = tableMain[0]["HOrgID"];

			//åè¡¨ èµå¼
			for (var i = 0; i < tableSub.length; i++) {
			tableSub[i].RowID = (i + 1) * 10;
			}
			option.data = tableSub;
			table.render(option);
			}
			})
			}
			//#endregion

			//#region ä¸æ¨-é¡µé¢èµå¼
			function set_WorkTaskReport() {
			$.ajax({
			url: GetWEBURL() + "/PM_ProjectBill/set_WorkTaskReport",
			type: "GET",
			async: false,
			data: { "HInterID": linterid, "HProjectStageID": HProjectStageID, "user": sessionStorage["HUserName"] },
			success: function (result) {
			var tableMain = result.data[0];
			var tableSub = result.data[1];

			//ä¸»è¡¨ èµå¼
			form.val("formData", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HOrgID": tableMain[0]["HOrgID"]
			, "HProID": tableMain[0]["HInterID"]
			, "HProjectStageID": tableMain[0]["HProjectStageID"]
			, "HMainSourceBillNo": tableMain[0]["åæ®å·"]
			, "HMainSourceBillType": tableMain[0]["åæ®ç±»å"]
			});

			//ç»ç»çå¼HOrgIDååï¼éæ°æ¸²æ
			HOrgIDBar = tableMain[0]["HOrgID"];

			//åè¡¨ èµå¼
			for (var i = 0; i < tableSub.length; i++) {
			tableSub[i].RowID = (i + 1) * 10;
			}
			option.data = tableSub;
			table.render(option);
			}
			@@ -827,22 +910,31 @@
			layer.msg("åæ®å·ä¸è½ä¸ºç©º!");
			return false;
			}

			if ($("#HDate").val() == "") {
			layer.msg("æ¥æä¸è½ä¸ºç©º!");
			return false;
			}

			if ($("#HReportEmpID").val() == "0") {
			layer.msg("æ±æ¥äººæªéæ©!");
			return false;
			}
			//#endregion

			//#region é¡¹ç®é¶æ®µè¡¨æ°æ®æ£éª
			var num = [];
			for (var i = 0; i < option.data.length; i++) {
			if (option.data[i] != "") {
			////é¡¹ç®é¶æ®µéå¤æ£éª
			//if ($.inArray(option.data[i]["HProjectStageID"], num) == -1) {
			// num.push(option.data[i]["HProjectStageID"]);
			//} else {
			// layer.msg("ç¬¬" + (i + 1) + "è¡,é¡¹ç®é¶æ®µ:" + option.data[i]["HProjectStageName"] + "éå¤!");
			// return false;
			//}
			//é¡¹ç®é¶æ®µéç©ºæ£éª
			if (option.data[i]["HProjectStageName"] == "") {
			if (option.data[i]["HProjectStageID"] == "0") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:é¡¹ç®é¶æ®µä¸è½ä¸ºç©º!");
			return false;
			}

			//ä»»å¡åç§°éç©ºæ£éª
			if (option.data[i]["HName"] == "") {
			layer.msg("ç¬¬" + (i + 1) + "è¡:ä»»å¡åç§°ä¸è½ä¸ºç©º!");
			return false;
			}

			@@ -859,6 +951,18 @@
			}
			}
			}
			}
			//#endregion

			//#region åè¡¨å³é®åæ®µéå¤æ£éª
			var num = [];
			for (var i = 0; i < option.data.length; i++) {
			temp = option.data[i]["HProNumber"] + "\|" + option.data[i]["HProjectStageID"] + "\|" + option.data[i]["HName"];
			if ($.inArray(temp, num) != -1) {
			layer.msg("ç¬¬" + (i + 1) + "è¡ï¼é¡¹ç®ä»£ç ãé¡¹ç®é¶æ®µãä»»å¡åç§°éå¤ï¼è¯·éæ°éæ©ï¼");
			return false;
			}
			num.push(temp);
			}
			//#endregion
			return true;
			@@ -958,16 +1062,85 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HProjectStageID": checkStatus.data[0].HItemID
			, "HProjectStageName": checkStatus.data[0].HName
			, "HProjectStageName": checkStatus.data[0].é¶æ®µåç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			if (obj.event == "HProNumber") {
			//å·¥ç¨é¡¹ç®ä»£ç
			//æå¼å·¥ç¨é¡¹ç®å°çªä½
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "å·¥ç¨é¡¹ç®åè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../é¡¹ç®ç®¡ç/å·¥ç¨é¡¹ç®/PM_ProjectBillList.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HProNumber": checkStatus.data[0].é¡¹ç®ä»£ç
			})
			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			})
			}
			if (obj.event == "HName") {
			//å·¥ä½ä»»å¡ä»£ç
			//æå¼å·¥ä½ä»»å¡å°çªä½
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "å·¥ä½ä»»å¡åè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../é¡¹ç®ç®¡ç/å·¥ä½ä»»å¡/PM_WorkTaskBillList.html", "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//æé®ä¸ çåè°
			var iframeWindow = window["layui-layer-iframe" + index];//è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//è·åéä¸çæ°æ®

			if (checkStatus.data.length != 1) {
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}

			if (checkStatus.data[0].å³éäºº == null \|\| checkStatus.data[0].å³éäºº == "") {
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HName": checkStatus.data[0].ä»»å¡åç§°
			, "HTaskNote": checkStatus.data[0].ä»»å¡æè¿°
			, "HType": checkStatus.data[0].ä»»å¡ç±»å
			, "HProNumber": checkStatus.data[0].é¡¹ç®ä»£ç
			, "HProjectStageID": checkStatus.data[0].HProjectStageID
			, "HProjectStageName": checkStatus.data[0].é¡¹ç®é¶æ®µ
			})
			} else {
			layer.msg("è¯¥ä»»å¡å·²å³éï¼è¯·éæ°éæ©!");
			}
			layer.close(index);//å³éå¼¹çª
			}
			, btn2: function (index, layero) { }
			})
			}
			obj.event = "";
			return false;
			}

			})
			}
			//#endregion
			@@ -1017,7 +1190,7 @@
			success: function (data1) {
			if (data1.data.length != 0) {
			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["ç¨åºå·", "æ¬å·¥åºç¡®è®¤è®°å½", "èªå¨ç§»è½¬", "æ¢ååå¤æ¶é´", "æ¬éåå¤æ¶é´", "ä¸éå¾ªç¯å¨æ", "ä¸éåºå®å¤©æ°", "å¼å·¥ä½éï¼åºæ°ï¼", "å¼å·¥ä½éï¼å¤©æ°ï¼", "æ åå®é¢", "æ¥åºåä»·", "ä¸åæ ¼åä»·", "å·¥åºå·¥ä»·", "çäº§å®é¢", "å¯æä½è®¾å¤æ°", "æ åäººæ°", "æµè½¬å·¥åº", "ä¸éæµè½¬å·¥åº", "åºå®çäº§å¤©æ°", "çäº§å¨æ", "ææ¾åº", "å¨è½¬ç®±", "å¨è½¬ç®±æ å", "æ¢æ¨¡æ¶é´", "è½¬ç§»æ¶é´", "æéæ¶é´", "åå¤æ¶é´", "äº§çº¿äººæ°", "äº§çº¿äº§è½", "äº§çº¿ä¸å¿", "è¯ç", "å å·¥æ°é", "è¿è¡æ¶é´", "æ¶é´åä½", "å¾çº¸ç¼å·", "æ¨¡å·ç¼å·", "è¯åä»", "æ¥åºåä»", "ä¸è¯åä»", "å·¥åºç±»å"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["è¡å·","é¡¹ç®é¶æ®µID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			dataCol = data1.data[0].HGridString.split(',');

			@@ -1033,9 +1206,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) {