MES-WEB-LayUI.git

			@@ -11,6 +11,7 @@
			<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">
			@@ -103,7 +104,7 @@
			base: '../../../layuiadmin/' //éæèµæºæå¨è·¯å¾
			}).extend({
			index: 'lib/index', //ä¸»å¥å£æ¨¡å
			}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
			}).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () {
			//#region å¬ç¨åé
			var $ = layui.$
			, admin = layui.admin
			@@ -116,6 +117,7 @@
			, util = layui.util
			, tree = layui.tree
			, util = layui.util
			, soulTable = layui.soulTable
			var sWhere = " where 1=1 ";
			var option = [];
			//#endregion
			@@ -174,20 +176,20 @@
			function set_InitGrid() {
			var columns = [];

			columns.push({ type: 'checkbox', fixed: 'left' });
			columns.push({ field: 'ç»ç»', title: 'éè´ç»ç»' });
			columns.push({ field: 'FMATERIALNAME', title: 'ç©æåç§°' });
			columns.push({ field: 'FSPECIFICATION', title: 'ç©æè§æ ¼' });
			columns.push({ field: 'FNAME', title: 'ä¾åºå' });
			columns.push({ field: 'FSUMQTY', title: 'åè®¡' });
			columns.push({ field: 'HPOOrderBillNo', title: 'éè´è®¢åå·' });
			columns.push({ field: 'HSeOrderBillNo', title: 'éæ±åå·' });
			columns.push({ type: 'checkbox', fixed: 'left', sort: true});
			columns.push({ field: 'ç»ç»', title: 'éè´ç»ç»', sort: true});
			columns.push({ field: 'FMATERIALNAME', title: 'ç©æåç§°', sort: true});
			columns.push({ field: 'FSPECIFICATION', title: 'ç©æè§æ ¼', sort: true});
			columns.push({ field: 'FNAME', title: 'ä¾åºå', sort: true});
			columns.push({ field: 'FSUMQTY', title: 'åè®¡', sort: true});
			columns.push({ field: 'HPOOrderBillNo', title: 'éè´è®¢åå·', sort: true});
			columns.push({ field: 'HSeOrderBillNo', title: 'éæ±åå·', sort: true});
			//columns.push({ field: 'HPOOrderBillRemark', title: 'æè¦' });
			//columns.push({ field: 'HPOOrderBillNote', title: 'å¤æ³¨' });
			//columns.push({ field: 'éè´å', title: 'éè´å' });
			columns.push({ field: 'FNUMBER', title: 'ç©æç¼ç ' });
			columns.push({ field: 'è®¡éåä½åç§°', title: 'è®¡éåä½' });
			columns.push({ field: 'TQSUM', title: 'æææææ°é' });
			columns.push({ field: 'FNUMBER', title: 'ç©æç¼ç ', sort: true});
			columns.push({ field: 'è®¡éåä½åç§°', title: 'è®¡éåä½', sort: true});
			columns.push({ field: 'TQSUM', title: 'æææææ°é', sort: true, totalRow: true});
			//è·åä¸¤ä¸ªææä¹é´çç¸å·®
			var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//å¼å§æ¶é´
			var time2 = Date.parse(new Date($("#HENDDATE").val()));//ç»ææ¶é´
			@@ -203,7 +205,7 @@

			var k = 0;//æ¶éå¾ªç¯æ¬¡æ°
			for (var j = 0; j <= (Days - k); j++) {
			columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70 })
			columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true})
			//è·¨å¹´çè¯ ä¼ä»ä¸æä¸å·å¼å§
			if (MM == 12 && (HBEGINDATE + j) == 31) {
			yyyy += 1;
			@@ -230,8 +232,12 @@
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			, totalRow: true
			, loading: false
			, cols: [columns]
			, done: function (res, curr, count) {
			soulTable.render(this);
			}
			};
			}
			//#endregion
			@@ -354,7 +360,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'ç©æåè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_MaterialList.html', 'yes']
			, content: ['../../åºç¡èµæ/å¬ç¨åºç¡èµæ/Gy_Material.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -364,7 +370,7 @@
			}
			//è·åæ°æ®
			$("#HMATERIALID").val(checkStatus.data[0].HItemID);
			$("#HMATERIALNAME").val(checkStatus.data[0].HName);
			$("#HMATERIALNAME").val(checkStatus.data[0].ç©æåç§°);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			@@ -379,7 +385,7 @@
			, area: ['90%', '90%']//å¤§å°
			, title: 'ä¾åºååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../Baseset/åºç¡èµæ/Gy_SupplierList.html', 'yes']
			, content: ['../../åºç¡èµæ/éè´åºç¡èµæ/Gy_Supplier.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			@@ -389,7 +395,7 @@
			}
			//è·åæ°æ®
			$("#HSUPPLIERID").val(checkStatus.data[0].HItemID);
			$("#HSUPPLIERNAME").val(checkStatus.data[0].HName);
			$("#HSUPPLIERNAME").val(checkStatus.data[0].ä¾åºååç§°);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }