MES-WEB-LayUI.git

			@@ -8,17 +8,13 @@
			<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
			<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
			<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
			<!--<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>-->
			<script src="../../../layuiadmin/layui/layui.js"></script>
			<script src="../../../layuiadmin/HideButton_New.js"></script>
			<script src="../../../layuiadmin/SetColumn.js"></script>
			<script src="../../../layuiadmin/Scripts/json2.js"></script>
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script src="../../../layuiadmin/PubCustom.js"></script>
			<script src="../../../layuiadmin/soulTable.slim.js"></script>
			</head>
			<body>
			<div class="layui-fluid">
			@@ -150,21 +146,23 @@
			</div>
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><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_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>å¯¼å¥</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop"><i class="layui-icon layui-icon-radio"></i>ç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>åç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<div class="layui-btn-container" id="toolbarDemo_ButtonSet">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SouceExcel" id="set_SouceExcel"><i class="layui-icon layui-icon-delete"></i>å¯¼å¥</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>å¤å¶</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill" id="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill" id="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Stop" id="btn-Stop"><i class="layui-icon layui-icon-radio"></i>ç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeStop" id="btn-DeStop"><i class="layui-icon layui-icon-radio"></i>åç¦ç¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn" id="HideColumnButton"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>ä¿åæ¹æ¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>è¯»åæ¹æ¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></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="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			</form>
			@@ -191,8 +189,10 @@
			var option = [];
			var sWhere = "";
			var HModName = "Gy_Process";
			var HBillType = "Gy_Process";
			var set_HideButton_ID = "toolbarDemo_ButtonSet";//éè¦è®¾ç½®çæé®çç¶çº§èç¹çid
			//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["HItemID", "HProcessID_K3", "HUSEORGID","HProcMulID"];
			var titleData = ["HItemID", "HProcessID_K3", "HUSEORGID", "HProcMulID", "HCREATEORGID"];

			var ins; //ç¨äºå¯¼åºexcel
			//#endregion
			@@ -221,24 +221,26 @@

			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//å¯¼å¥
			case 'set_SouceExcel': set_SouceExcel();
			break;
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			break;
			//å¤å¶
			case 'set_Copy': set_Copy();
			break;
			//æ°å¢
			case 'set_AddNew': set_AddNew();
			break;
			//ä¿åæ¹æ¡
			case 'set_SaveScheme': set_SaveScheme();
			break;
			//è¯»åæ¹æ¡
			case 'set_ReadScheme': set_ReadScheme();
			break;
			break;
			//ç¼è¾
			case 'set_ShowBill': set_ShowBill();
			break;
			//å é¤
			case 'set_DeleteBill': set_DeleteBill();
			break;
			//å¯¼å¥
			case 'set_SouceExcel': set_SouceExcel();
			break;

			//å·æ°
			case 'get_Refresh': get_Refresh();
			break;
			@@ -261,12 +263,18 @@
			//éåºæé®
			case 'get_Exit': Pub_Close(2);
			break;
			//å¯¼åºexcel
			case 'get_export':
			get_Export();
			//ä¿åæ¹æ¡
			case 'set_SaveScheme': set_SaveScheme();
			break;
			//è¯»åæ¹æ¡
			case 'set_ReadScheme': set_ReadScheme();
			break;
			//åè®¾ç½®
			case 'set_HideColumn': get_HideColumn();
			case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
			break;
			//æé®è®¾ç½®
			case 'set_HideButton':
			get_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);
			break;
			};
			});
			@@ -336,12 +344,12 @@

			//#region åå§åçé¢
			function set_ClearBill() {

			Organ();//åå§åç»ç»
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			get_FastQuery(1);
			Organ();

			}
			//#endregion

			@@ -450,7 +458,6 @@
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();
			$.ajax({
			//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
			url: GetWEBURL() + '/Gy_Process/list',
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
			@@ -504,15 +511,16 @@
			, limits: [50, 500, 5000, 20000]
			, limit: 50
			, totalRow: true
			//, cellMinWidth: 90
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			}
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, titleData)
			ins = table.render(option);

			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//å·æ°æé®æ¾ç¤º
			Display_HideButton(set_HideButton_ID, HBillType, HModName, sessionStorage["HUserName"]);

			layer.close(ajaxLoad);

			@@ -522,7 +530,6 @@
			get_DefaultModule();//å è½½æ¹æ¡
			}

			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			@@ -537,11 +544,10 @@
			//#endregion

			//#region å¿«éè¿æ»¤
			function get_FastQuery(number) {

			var HOrgID = "";
			function get_FastQuery(number) {
			var HNumber = $("#HNumber").val();//å·¥åºä»£ç
			var HName = $("#HName").val();//å·¥åºåç§°
			var HOrgID = $("#HOrgID").val();
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			@@ -551,6 +557,7 @@
			var ColName2 = $("#ColName2").val();//å¤éæ¡
			var Comparator2 = $("#Comparator2").val()
			var ColContent2 = $("#ColContent2").val();

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			switch (Comparator) {
			@@ -595,7 +602,7 @@
			}
			if (ColName2 != 0 && Comparator2 != 0) {
			var com2 = "";
			switch (Comparator) {
			switch (Comparator2) {
			case "7":
			com2 = "like'%" + ColContent2 + "%'";
			break;
			@@ -614,13 +621,9 @@
			}
			sWhere += " and " + ColName2 + " " + com2;
			}

			if (number == 1) {
			HOrgID = sessionStorage["OrganizationID"];
			}
			else {
			HOrgID = $("#HOrgID").val();//ç»ç»
			}
			if (HOrgID) {
			sWhere += " and HUSEORGID = '" + HOrgID + "'";
			}

			if (HNumber) {
			sWhere += " and å·¥åºä»£ç like '%" + HNumber + "%'";
			@@ -646,15 +649,15 @@
			$("#ColContent").val("");
			$("#ColName").val("0");
			$("#Comparator").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			$("#ColContent2").val("");
			$("#ColName2").val("0");
			$("#Comparator2").val("0");
			$("#ColContent1").val("");
			$("#ColName1").val("0");
			$("#Comparator1").val("0");
			form.render('select');

			sWhere = "";
			$("#btnSearch").click();
			}
			//#endregion

			@@ -674,6 +677,34 @@
			get_FastQuery(2);
			}
			})
			}
			//#endregion

			//#region å¤å¶
			function set_Copy() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var linterid = data[0].HItemID.toString();
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'å¤å¶-å·¥åºåè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../çäº§åºç¡èµæ/Add_Edit_Gy_Process.html?OperationType=2&linterid=' + linterid + '&HSouceBillType='
			, resize: false,
			end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			}
			, cancel: function () {
			}
			})
			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼');
			}
			}
			//#endregion

			@@ -844,138 +875,6 @@
			}
			//#endregion


			//#region éèåè®¾ç½®
			function get_HideColumn() {
			var colName = "";
			var contentUrl = "";
			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('/');
			for (var i = 0; i < urlLen.length - 4; i++) {
			contentUrl += "../";
			}
			colName = encodeURI(colName.substring(0, colName.length - 1));//å¯¹ URI è¿è¡ç¼ç

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

			layer.open({
			type: 2
			, skin: "layui-layer-rim" //å ä¸è¾¹æ¡
			, title: "éèåè®¾ç½®" //æ é¢
			, closeBtn: 1 //çªä½å³ä¸è§å³é ç æ ·å¼
			, shift: 2 //å¼¹åºå¨ç»
			, area: ["50%", "90%"] //çªä½å¤§å°
			, maxmin: true //è®¾ç½®æå¤§æå°æé®æ¯å¦æ¾ç¤º
			, content: [contentUrl, "yes"]
			, btn: ["ç¡®å®", "åæ¶"]
			, btn1: function (index, laero) {
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			layer.close(index);//å³éå¼¹çª
			}
			})
			}
			//#endregion
			//#region æ¾ç¤ºåæ°æ®
			function DisPlay_HideColumn() {
			$.ajax({
			url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
			type: "GET",
			data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.data.length != 0) {
			titleData = [];
			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var newCols = [[]];//å¯¹åºæ°æ®åºåé¡ºåºcol
			newCols[0].push(option.cols[0][0]);//æ¾å¥ç¬¬ä¸ä¸ªcheckbox
			dataCol = data1.data[0].HGridString.split(',');
			//åè®¾ç½®åæ°ä¸é¡µé¢åæ°æ¯å¦ä¸è´
			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]);
			}
			}
			}
			//éåå¾ªç¯åå¤æå¯¹åºåæ°æ¯å¦ä¸è´
			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);
			} else {
			table.render(option);
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			})
			}
			//#endregion

			//#region åææ¾ç¤ºä¸ææ¡
			function ColFilter() {