MES-WEB-LayUI.git

			@@ -26,10 +26,13 @@
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlock" id="btnUnlock">è§£é</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnCompleteSetAnalysis" id="btnCompleteSetAnalysis">é½å¥åæ</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnTLYS" id="btnTLYS">ææè¿ç®</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnYLYS" id="btnYLYS">è¦æè¿ç®</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnICMOBill" id="btnICMOBill">çäº§è®¢åéå</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnReady" id="btnReady">åå¤</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnProPC" id="btnProPC">æäº§</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnRoutEdit" id="btnRoutEdit">å·¥èºè·¯çº¿</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnLockOrder" id="btnLockOrder">éå®å·¥å</button>
			<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="btnUnlockOrder" id="btnUnlockOrder">è§£éå·¥å</button>
			</div>
			<div class="layui-collapse resizable-container">
			<div class="layui-colla-item">
			@@ -290,7 +293,7 @@
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_BatchFill"><i class="layui-icon layui-icon-file-b"></i>æ¹éå¡«å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill"><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_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤è¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_MoverUp"><i class="layui-icon layui-icon-delete"></i>ä¸ç§»</button>
			@@ -298,6 +301,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Priority"><i class="layui-icon layui-icon-delete"></i>ä¼åçº§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadyAsc"><i class="layui-icon layui-icon-delete"></i>åå¤æåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Souce"><i class="layui-icon layui-icon-delete"></i>éäº§çº¿</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Emp"><i class="layui-icon layui-icon-delete"></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="set_Routing"><i class="layui-icon layui-icon-form"></i>å·¥èºè·¯çº¿</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Calendar"><i class="layui-icon layui-icon-form"></i>å·¥åæ¥å</button>
			@@ -330,6 +334,7 @@
			</script>
			<script>
			var OptionData = [];
			var OptionData_Emp = [];
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			@@ -565,6 +570,10 @@
			case 'set_Souce':
			set_Souce(data);
			break;
			//éæä½å·¥
			case 'set_Emp':
			set_Emp(data);
			break;
			//æ¥çå·¥èºè·¯çº¿
			case 'set_Routing':
			set_Routing();
			@@ -693,6 +702,11 @@
			get_btnTLYS();
			})

			//è¦æè¿ç®
			form.on('submit(btnYLYS)', function (data) {
			get_btnYLYS();
			})

			//çäº§è®¢åéå
			form.on('submit(btnICMOBill)', function (data) {
			get_btnICMOBill();
			@@ -778,6 +792,16 @@
			}
			})

			//éå®å·¥å
			form.on('submit(btnLockOrder)', function (data) {
			get_btnLockOrder();
			})

			//è§£éå·¥å
			form.on('submit(btnUnlockOrder)', function (data) {
			get_btnUnlockOrder();
			})

			//#endregion

			//#region æ¬é¡µé¢è¢«è°ç¨çæææ¹æ³
			@@ -832,11 +856,10 @@
			var oneday = 1000 * 60 * 60 * 24;

			columns.push({ type: 'checkbox', fixed: 'left', sort: true });
			columns.push({ type: 'numbers', title: 'åºå·', sort: true });
			columns.push({ type: 'numbers', field: 'åºå·', title: 'åºå·', sort: true });
			columns.push({ field: 'åæ®å·', title: 'åæ®å·', hide: true, sort: true });
			columns.push({ field: 'éå®è®¢åå·', title: 'éå®è®¢åå·', width: 150, sort: true });
			columns.push({ field: 'çäº§è®¢åå·', title: 'çäº§è®¢åå·', width: 150, style: 'background-color: #f9f9f9;', sort: true });
			columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150, sort: true });
			columns.push({ field: 'çäº§ç»ç»', title: 'çäº§ç»ç»', width: 150, sort: true });
			columns.push({ field: 'ç©æä»£ç ', title: 'ç©æç¼ç ', width: 150, sort: true });
			columns.push({ field: 'ç©æåç§°', title: 'ç©æåç§°', width: 150, sort: true });
			@@ -853,6 +876,7 @@
			columns.push({ field: 'æ¨æ¥æ°é', title: 'æ¨æ¥æ°é' });
			columns.push({ field: 'ä¼åçº§', title: 'ä¼åçº§', width: 150, edit: 'text', sort: true });
			columns.push({ field: 'çäº§èµæº', title: 'çäº§èµæº', width: 150, edit: 'text', event: "HSourceID" });
			columns.push({ field: 'æä½å·¥', title: 'æä½å·¥', width: 150, edit: 'text', event: "HEmpID" });

			columns.push({
			field: Format(myDate.getTime() + 0 * oneday, 'yyyy-MM-dd'), title: Format(myDate.getTime() + 0 * oneday, 'MM.dd'), edit: 'text', width: 70, templet: function (d) {
			@@ -1009,7 +1033,7 @@
			return DayColor(d[Format(myDate.getTime() + 30 * oneday, 'yyyy/MM/dd')], d[Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd')], d, Format(myDate.getTime() + 30 * oneday, 'yyyy-MM-dd'));
			}
			})//0

			columns.push({ field: 'çäº§è®¢åæç»è¡å·', title: 'çäº§è®¢åæç»è¡å·', width: 150, sort: true });
			columns.push({ field: 'T31', title: 'T31', width: 70 });//0
			columns.push({ field: 'è®¢åç±»å', title: 'è®¢åç±»å', width: 150, sort: true });
			columns.push({ field: 'çäº§è®¢ååæ®ç±»å', title: 'æºåè®¢ååæ®ç±»å', width: 150, sort: true });
			@@ -1040,7 +1064,9 @@
			columns.push({ field: 'HWorkShopID', title: 'HWorkShopID', hide: true });
			columns.push({ field: 'HUnitID', title: 'HUnitID', hide: true });
			columns.push({ field: 'HProdORGID', title: 'HProdORGID', hide: true });
			columns.push({ field: 'HEmpID', title: 'HEmpID', hide: true });
			columns.push({ field: 'æåæ±æ¥æ°é', title: 'æåæ±æ¥æ°é', width: 150, edit: 'text', sort: true });
			columns.push({ field: 'éå®å·¥å', title: 'éå®å·¥å', width: 150, sort: true, filter: true });//0
			columns.push({ fixed: 'right', title: 'æä½', toolbar: '#barDemo' });
			option_columns = columns;
			option = {
			@@ -1060,7 +1086,7 @@
			sWhere = {
			HORGID: sessionStorage["OrganizationID"]
			, HBEGINDATE: field
			, HENDDATE: field
			, HENDDATE: field
			}
			get_Display_3(JSON.stringify(sWhere));
			});
			@@ -1079,14 +1105,14 @@
			// }
			// }
			// }
			//})
			//})
			}
			}
			}


			//ç¼ºæåæè¡¨æ ¼æ°æ®
			function set_InitGrid1(field) {
			var columns = [];
			var columns = [];
			columns.push({ field: 'HOrgName', title: 'éè´ç»ç»', sort: true });
			columns.push({ field: 'FNUMBER', title: 'ç©æç¼ç ', sort: true });
			columns.push({ field: 'HMaterName', title: 'ç©æåç§°', sort: true });
			@@ -1095,7 +1121,7 @@
			columns.push({ field: 'CountHQty', title: 'åè®¡', sort: true });
			columns.push({ field: 'FBASEQTY', title: 'å³æ¶åºåæ°é', sort: true, totalRow: true });
			columns.push({ field: Format(field, 'yyyy-MM-dd'), title: Format(field, 'MM.dd'), width: 70 })


			option_columns = columns;
			option3 = {
			elem: '#mainTable_Material'
			@@ -1107,7 +1133,7 @@
			, limit: Number.MAX_VALUE//é»è®¤æ¾ç¤ºå¨é¨
			, done: function (res, page, count) {
			soulTable.render(this);


			}
			};
			}
			@@ -1677,6 +1703,34 @@
			});
			}

			//è¦æè¿ç®
			function get_btnYLYS() {
			sWhere = {
			HProdORGID: $("#HProdORGID").val()
			, HWorkShopID: $("#HWorkShopID").val()
			}
			sWhere = JSON.stringify(sWhere);
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_YLYS',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			get_FastQuery(2);
			layer.msg(data1.Message);
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}

			//çäº§è®¢åéå
			function get_btnICMOBill() {
			var HDeptID = $("#HWorkShopID").val() == "" ? 0 : $("#HWorkShopID").val();
			@@ -1722,10 +1776,10 @@
			}
			if (isNaN(data[i]["HSourceID"])) {
			return layer.msg("éæ©çäº§èµæº!!")
			}
			}
			HICOMNum.push(data[i]["HICMOInterID"] + ";" + data[i]["HICMOEntryID"] + ";" + data[i]["HSourceID"]);
			}


			$('#HProgressBar').html(`
			<div class="layui-progress" lay-filter="demo-filter-progress">
			<div class="layui-progress-bar" lay-percent="40%"></div>
			@@ -1793,7 +1847,7 @@
			return layer.alert("ç¬¬" + (i + 1) + 'è¡ï¼å°æ¶äº§è½æªè®¾ç½®ï¼è¯·æ ¸å¯¹æ°æ®ã' + '</br>' + '1.ç©ææªæ·»å å·¥èºè·¯çº¿' + '</br>' + '2.å·¥èºè·¯çº¿ä¸æªè®¾ç½®å°æ¶äº§è½' + '</br>' + '3.çäº§èµæºæªè®¾ç½®åçå·¥æ¶' + '</br>' + '4.çäº§èµæºä¸ç»å®å·¥ä½ä¸å¿ä¸å·¥èºè·¯çº¿ä¸è®¾ç½®çå·¥ä½ä¸å¿ä¸ä¸è´');
			}
			}


			} else {
			//layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			@@ -1892,6 +1946,7 @@
			}
			HinterID_S.push(option.data[i]["hmainid"]);
			}
			//è·åè®¡åéå®çå¤©æ°
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHinterIDList',
			type: "GET",
			@@ -1910,7 +1965,7 @@
			});

			//æ ¹æ®è½¦é´å é¤æ²¡æéå®çæ°æ®
			var sql = "delete from Sc_WorkBillSortBillSub where HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20) and HInterID in(select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + ")";
			var sql = "delete from Sc_WorkBillSortBillSub where HMasterDate>=convert(varchar(10) ,DATEADD(DAY," + HPlanDay + ",GETDATE()),20) and HInterID in(select HInterID from Sc_WorkBillSortBillMain where HWorkShopID=" + HWorkShopID + " and HLockOrder != 1 )";
			$.ajax({
			url: GetWEBURL() + '/Gy_SOPBillList/UpDelSQL',
			type: "GET",
			@@ -1926,10 +1981,11 @@
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});

			//å°è¡¨æ ¼æ°æ®å è½½å°TableDataéé¢
			get_HFData(0, 0);

			//åå§åè¡¨æ ¼æ°æ®
			//æ¸ç©ºéå®æ¥æä»¥å¤çæ°æ®
			for (var i = 0; i < option.data.length; i++) {
			for (var j = (22 + HPlanDay); j < 53; j++) {
			if (option.data[i][option.cols[0][j].field] != null) {
			@@ -1965,9 +2021,9 @@
			sWorkQty = option.data[i]["å°æ¶äº§è½"];
			sYX = option.data[i]["ä¼åçº§"];
			HReportQty = option.data[i]["æåæ±æ¥æ°é"];

			//æåæ°éåå»æ±æ¥æ°ééå®æ°é
			if (SDSum > 0) {
			sPlanQty = sPlanQty - SDSum - HReportQty;
			sPlanQty = sPlanQty - SDSum;
			}
			//å©ä½éæ±å·¥æ¶
			iLeftQty = sPlanQty - HReportQty;
			@@ -2726,12 +2782,59 @@
			return layer.msg("è¯·éæ©æ°æ®!")
			}
			}

			//éæä½å·¥
			function set_Emp(data) {
			if (data != 0) {
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "èååè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Htype=HEmp", "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("è¯·éæ©ä¸æ¡æ°æ®");
			}
			OptionData_Emp[0] = checkStatus.data[0];
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			if (OptionData_Emp.length > 0) {
			var num = 0;
			for (var i = 0; i < option.data.length; i++) {
			if (num >= data.length) {
			break;
			}
			if (option.data[i]["LAY_CHECKED"] == true) {
			option.data[i]["HEmpID"] = OptionData_Emp[0].HItemID;
			option.data[i]["æä½å·¥"] = OptionData_Emp[0].èååç§°;
			num += 1;
			}
			}
			table.render(option);
			}
			}
			})
			}
			else {
			return layer.msg("è¯·éæ©æ°æ®!")
			}
			}

			//ä¿å
			function set_AddNew() {

			//å é¤åè¡¨æ°æ® ä¼å ç¨æ°ç»çä½ç½®,éè¦éæ°æä¸ä¸é¡ºåº
			var num = [];
			var num = [];
			for (var i = 0; i < table.cache["mainTable"].length; i++) {
			if (table.cache["mainTable"][i] != "") {
			if (parseFloat(table.cache["mainTable"][i]["æåæ°é"]) == 0) {
			@@ -2743,7 +2846,7 @@
			table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
			num.push(table.cache["mainTable"][i])
			}
			}
			}

			//var sMainStr = JSON.stringify(data.field);
			var sSubStr = JSON.stringify(num);
			@@ -2852,6 +2955,47 @@
			}
			})
			}

			//æä½å·¥
			if (obj.event == "HEmpID") {
			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "åå·¥åè¡¨" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["90%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: ["../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_EmployeeList.html?Htype=HEmp", "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("è¯·éæ©ä¸æ¡æ°æ®");
			}
			OptionData_Emp[0] = checkStatus.data[0];
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HEmpID": checkStatus.data[0].HItemID
			, "æä½å·¥": checkStatus.data[0].èååç§°
			})
			layer.close(index);//å³éå¼¹çª
			}
			, end: function () {
			if (OptionData_Emp.length > 0) {
			obj.update({
			"HEmpID": OptionData_Emp[0].HItemID
			, "æä½å·¥": OptionData_Emp[0].èååç§°
			})
			OptionData_Emp = [];
			}
			}
			})
			}

			obj.event = "";
			return false;
			} else if (event.key == "F8") {
			@@ -2953,6 +3097,80 @@
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			}

			//éå®å·¥å
			function get_btnLockOrder() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;

			if (data.length > 0) {
			var HInterIDArr = [];

			for (var i = 0; i < data.length; i++) {
			HInterIDArr.push(data[i].hmainid);
			}

			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHLockedOrder',
			type: "GET",
			data: { "HInterIDs": HInterIDArr.toString() },
			success: function (data1) {
			if (data1.count == 1) {
			layer.msg("å·¥åå·²éå®");
			get_FastQuery(2);
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});

			} else {
			layer.msg('è¯·éæ©ä½ è¦éå®çå·¥åï¼');
			}
			}

			//è§£éå·¥å
			function get_btnUnlockOrder() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;

			if (data.length > 0) {
			var HInterIDArr = [];

			for (var i = 0; i < data.length; i++) {
			HInterIDArr.push(data[i].hmainid);
			}

			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/JIT_DayPlanPlatFormBill/JIT_DayPlanPlatFormBillHUnlockOrder',
			type: "GET",
			data: { "HInterIDs": HInterIDArr.toString() },
			success: function (data1) {
			if (data1.count == 1) {
			layer.msg("å·¥åå·²è§£é");
			get_FastQuery(2);
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});

			} else {
			layer.msg('è¯·éæ©ä½ è¦è§£éçå·¥åï¼');
			}
			}

			@@ -3145,7 +3363,7 @@
			item.è§æ ¼åå· = item.è§æ ¼åå·.replace(/[,]+/g, 'ï¼'); // å°æ¢åå·æ¿æ¢ä¸ºç©ºåç¬¦ä¸²
			}
			});
			table.exportFile(ins.config.id, data, "xls");
			table.exportFile(ins.config.id, data, "xls");
			}

			//æäº§åè½
			@@ -3216,8 +3434,8 @@
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			colName += option.cols[0][i]["title"] + ",";
			for (var i = 1; i < option.cols[0].length; i++) {
			colName += option.cols[0][i]["field"] + ",";
			}
			var urlStr = window.document.location.pathname;//è·åæä»¶è·¯å¾
			var urlLen = urlStr.split('/');
			@@ -3226,7 +3444,7 @@
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName;
			contentUrl += 'åºç¡èµæ/éèåè®¾ç½®/Gy_GridView_Hide_New.html?HModName=' + HModName + '&colName=' + colName;

			layer.open({
			type: 2
			@@ -3255,69 +3473,82 @@
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {


			titleData = [];
			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["åæ®å·", "HProdORGID", "HMaterID", "HUnitID", "HWorkShopID", "HSourceID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			var newCols = [[]];//å¯¹åºæ°æ®åºåé¡ºåºcol
			newCols[0].push(option.cols[0][0]);//æ¾å¥ç¬¬ä¸ä¸ªcheckbox
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] += ";font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] += ";font-size:100%";
			}
			//è®¾ç½®åå®½
			//if (data1.data[0].HColumnWidth != 0) {
			// option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
			//} else {
			// option.cols[0][i + 1]["width"] = "";
			//}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			}

			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			//åè®¾ç½®åæ°ä¸é¡µé¢åæ°æ¯å¦ä¸è´
			if (dataCol.length == option.cols[0].length - 1) {
			//éåå¯»æ¾åè®¾ç½®å¯¹åºåæé¡ºåºæå¥
			for (var j = 0; j < option.cols[0].length - 1; j++) {
			for (var i = 0; i < option.cols[0].length - 1; i++) {
			var dataCols = dataCol[j].split('\|');
			//éæ©ä¸datacolsç¸åºåè¿è¡ä¿®æ¹
			if (option.cols[0][i + 1]["field"] == dataCols[5]) {
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;
			}
			//è®¾ç½®åå®½
			if (dataCols[3] > 0) {
			option.cols[0][i + 1]["width"] = dataCols[3];
			}
			//è®¾ç½®åå®¹åä½å¤§å°
			if (data1.data[0].HFontSize != 0) {
			option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
			} else {
			option.cols[0][i + 1]["style"] = "font-size:100%";
			}
			//æ¾ç¤ºå
			if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
			option.cols[0][i + 1]["hide"] = false;
			}
			//ç»è®¡å
			if (dataCols[6] == 1) {
			option.cols[0][i + 1]["totalRow"] = true;
			}
			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			option.cols[0][i + 1]["align"] = "left";
			break;
			case "M":
			option.cols[0][i + 1]["align"] = "center";
			break;
			case "R":
			option.cols[0][i + 1]["align"] = "right";
			break;
			}
			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			newCols[0].push(option.cols[0][i + 1]);
			}
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			//éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
			if (dataCol.length == newCols[0].length - 1) {
			option.cols = newCols;
			//åæ¶å»ç»å
			for (var i = 1; i < option.cols[0].length - 1; i++) {
			if (option.cols[0][i]["fixed"] != null) {
			option.cols[0][i]["fixed"] = null;
			}
			else {
			break;
			}
			}
			//å»ç»å
			if (data1.data[0].HFixCols != 0) {
			for (var i = 0; i < data1.data[0].HFixCols; i++) {
			if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
			data1.data[0].HFixCols += 1;
			}
			option.cols[0][i + 1]["fixed"] = "left";
			}
			}
			}
			}
			table.render(option);
			@@ -3492,7 +3723,7 @@


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®


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

			for (var i = 0; i < option3.cols[0].length - 1; i++) {
			@@ -3513,7 +3744,7 @@
			} else {
			option3.cols[0][i + 1]["style"] = "font-size:100%";
			}


			//åä½æå¨ä½ç½®(å·¦ å±ä¸ å³)
			switch (dataCols[2]) {
			case "L":
			@@ -3536,7 +3767,7 @@
			else {
			break;
			}
			}
			}
			table.render(option3);
			} else {
			table.render(option3);
			@@ -3570,4 +3801,9 @@
			OptionData = data
			}

			//åå»è¿åæä½å·¥
			function GetHEmpValue(data) {
			OptionData_Emp = data
			}

			</script>