MES-WEB-LayUI.git

			@@ -89,8 +89,8 @@
			<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-Print"><i class="layui-icon layui-icon-circle"></i>é¢è§</button>


			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Cell"><i class="layui-icon layui-icon-ok"></i>ä¿ååå®½</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-RefreshCell"><i class="layui-icon layui-icon-refresh"></i>é»è®¤åå®½</button>

			</div>
			</script>
			@@ -104,7 +104,9 @@
			<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
			<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
			<script>

			var DataList;
			var Name = "MouldScrapInHouseCellWidth";
			layui.config({
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			@@ -121,20 +123,12 @@
			, util = layui.util
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";

			var option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: true
			, cellMinWidth: 90
			, totalRow: true
			,limit: 10
			, cols: [[
			var columns = [
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hmainid', title: 'åæ®ID', hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160, totalRowText: 'åè®¡', templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 160 }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 160 }
			, { field: 'hmainid', title: 'åæ®ID', width: 200, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 200, totalRowText: 'åè®¡', templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 200 }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 200 }
			, { field: 'HManagerID', title: 'HManagerID', width: 200, hide: true }
			, { field: 'è´è´£äººä»£ç ', title: 'è´è´£äººä»£ç ', width: 200 }
			, { field: 'è´è´£äººåç§°', title: 'è´è´£äººåç§°', width: 200 }
			@@ -148,10 +142,10 @@
			, { field: 'ä¿ç®¡åä»£ç ', title: 'ä¿ç®¡åä»£ç ', width: 200 }
			, { field: 'ä¿ç®¡ååç§°', title: 'ä¿ç®¡ååç§°', width: 200 }
			, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 115 }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 200 }
			, { field: 'é¨é¨åç§°', title: 'é¨é¨åç§°', width: 200 }
			, { field: 'æè¦', title: 'æè¦', width: 200 }
			, { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 115 }
			, { field: 'åé¨åæ®å·', title: 'åé¨åæ®å·', width: 200 }
			, { field: 'å¤æ³¨', title: 'å¤æ³¨', width: 200 }
			, { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
			, { field: 'HMaterID', title: 'HMaterID', width: 200, hide: true }
			@@ -195,7 +189,30 @@
			, { field: 'æºåååç ', title: 'æºåååç ', width: 200, hide: true }
			, { field: 'æºååå·', title: 'æºååå·', width: 200 }
			, { field: 'æºåç±»å', title: 'æºåç±»å', width: 200 }
			]]
			];

			var newColumns = [];
			var colWidth = getColumnsWidth();
			if (colWidth == "" \|\| colWidth == []) {

			}
			else
			{
			$.each(columns, function (x, m) {
			m["width"] = colWidth[x];
			});
			}



			var option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, page: true
			, cellMinWidth: 120
			, totalRow: true
			, limit: 10
			, cols: [columns]
			, done: function (res, curr, count) {

			//ç¶åæå¼åä¸å»td[data-field="itemNo" å®ä¹å¨åªä¸ªååæ¾ç¤º
			@@ -217,6 +234,8 @@

			// }))
			//})


			}
			};
			var index = layer.load(0);
			@@ -393,6 +412,66 @@
			layer.msg('è¯·éæ©ä¸è¡æ°æ®åå®¡æ ¸ï¼');
			}
			break;
			case 'btn-Cell': //ä¿ååå®½
			var arr = [];
			// åæ°
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			for (var i = 0; i <= colNum; i++)
			{
			var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
			var colWidth = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).width();
			if (colName != "" && colName != null)
			{
			arr.push(colWidth == -1 ? 200 : colWidth);
			}
			}
			arr.unshift(40); //é¦ä½è¿½å
			$.ajax({
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
			async: true,
			type: "POST",
			dataType: "json",
			data: { "myMap": JSON.stringify(arr), "Name": Name},
			success: function (data1) {
			if (data1.count == 1) {
			layer.alert(data1.Message, { icon: 1 });
			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			break;
			case 'btn-RefreshCell': //é»è®¤åå®½
			var arr = [];
			// åæ°
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			for (var i = 0; i <= colNum; i++) {
			var colName = $(".layui-table-header").find("tr").eq(0).find("th").eq(i).text();
			if (colName != "" && colName != null) {
			arr.push(200); //é»è®¤å®½åº¦200
			}
			}
			arr.unshift(40); //é¦ä½è¿½å

			$.ajax({
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidth',
			async: true,
			type: "POST",
			dataType: "json",
			data: { "myMap": JSON.stringify(arr), "Name": Name },
			success: function (data1) {
			if (data1.count == 1) {
			layer.alert(data1.Message, { icon: 1 });
			} else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});
			break;
			};
			});

			@@ -516,7 +595,34 @@
			//ä»¥ä¸æ¯layuiæ¨¡å
			});

			function getColumnsWidth() {
			var result = [];
			var colNum = $(".layui-table-header").find("tr").eq(0).find("th").length;
			//è·ååå®½
			$.ajax({
			url: GetWEBURL() + '/tb_CellWidth/GetMouldScrapInHouseCellWidthList',
			async: false,
			type: "Get",
			dataType: "json",
			data: { "colNum": colNum, "Name": Name },
			success: function (data1) {
			if (data1.code == 1) {
			result = data1.data;
			}
			else if (data1.code == -1)
			{

			}
			else {
			layer.alert(data1.Message, { icon: 5 });
			}
			}, error: function (e) {
			layer.alert(e.Message, { icon: 5 });
			}
			});

			return result;
			}


			</script>

	WebTM/layuiadmin/Scripts/webConfig.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapInBillList.html	142 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -6,7 +6,7 @@
			//var WEBURL = "http://101.37.171.70/API/"; //å¬å¸æå¡å¨
			//var WEBURL = "http://localhost:8080/API/"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/lubao"; //é¢æåæ¬å°éç½®
			//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨é²æ¬å°éç½®
			var WEBURL = "http://localhost:8082/LuBaoAPI/"; //æ¨é²æ¬å°éç½®
			//var WEBURL = "http://10.1.4.154/API/"; //æ±ä¸°å®¢æ·
			//var WEBURL = "http://10.1.4.155/API/"; //æ±ä¸°å®¢æ·NEW
			var WEBURL = "http://47.96.97.237/API/"; //æºäºæå¡å¨