MES-WEB-LayUI.git

			@@ -66,12 +66,12 @@
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>ç¡®è®¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>é©³å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>è¯¦æ</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>çæéè´§å</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>-->

			</div>
			</script>
			@@ -80,6 +80,11 @@
			</div>
			</div>
			</div>
			<script type="text/html" id="barDemo">
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="detail">æ¥ç</a>
			<a class="layui-btn layui-btn-xs" lay-event="edit">ç¼è¾</a>
			<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">å é¤</a>
			</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>
			@@ -103,70 +108,97 @@

			var option = {
			elem: '#mainTable'
			//, toolbar: '#toolbarDemo'
			, toolbar: '#toolbarDemo'
			,height: 'full-50'
			, page: true
			,cellMinWidth: 90
			, cols: [[
			//{ field: 'hmainid', title: 'hmainid', sort: true, width: 165 }
			{ type: 'checkbox' }
			,{ field: 'HDate', title: 'æ¥æ', sort: true, width: 120 }
			, { field: 'HBillNo', title: 'åæ®å·', sort: true, width: 170 }
			//, { field: 'HBillStatus ', title: 'åæ®ç¶æ', width: 105 }
			, { field: 'HICMOBillNo', title: 'ä»»å¡åå·' }
			, { field: 'çäº§è½¦é´ä»£ç ', title: 'çäº§è½¦é´ä»£ç ', width: 115 }
			{ type: 'checkbox' }
			,{fixed: 'left', title:'æä½', toolbar: '#barDemo', width:200}
			, { field: 'hmainid ', title: 'hmainid', width: 105, sort: true, fixed: true, hide: true }
			,{ field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 120 }
			, { field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 170 }
			, { field: 'HDeptID', title: 'é¨é¨ID', width: 115 }
			, { field: 'HDeptNumber', title: 'é¨é¨ä»£ç ' }
			, { field: 'HGroupID', title: 'çç»ID', width: 160 }
			, { field: 'HGroupNumber', title: 'çç»ä»£ç ', width: 160 }
			, { field: 'HMaterID ', title: 'çç»ä»£ç ', width: 215 }
			, { field: 'é¨é¨', title: 'é¨é¨' }
			, { field: 'HMaterID', title: 'HMaterID' }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 160 }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 160 }
			, { field: 'è§æ ¼åå· ', title: 'è§æ ¼åå·', width: 215 }
			////, { field: 'hunitid', title: 'hunitid' }
			, { field: 'HMaterID ', title: 'äº§åID ', width: 115 }
			, { field: 'HMaterNumber', title: 'äº§åä»£ç ' }
			, { field: 'HUnitID ', title: 'HUnitID ', width: 115 }
			, { field: 'åä½ä»£ç ', title: 'åä½ä»£ç ' }
			////, { field: 'hempid', title: 'hempid' }
			, { field: 'HUnitID', title: 'åä½ID', width: 100 }
			, { field: 'HUnitNumber', title: 'åä½ä»£ç ' }
			, { field: 'HPlanQty', title: 'è®¡åæ°é' }
			, { field: 'HInStockQty', title: 'å¥åºæ°é' }
			, { field: 'HSumTimes', title: 'æ»å·¥ä½æ¶é´' }
			, { field: 'åä½åç§°', title: 'åä½åç§°', width: 100 }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨' }
			, { field: 'hsubid', title: 'hsubid' }
			, { field: 'HEmpID', title: 'HEmpID' }
			, { field: 'èå', title: 'èå' }
			////, { field: 'HCenterID', title: 'HCenterID' }
			, { field: 'HExplanation', title: 'æè¦' }
			, { field: 'HRemark ', title: 'å¤æ³¨' }
			, { field: 'å·¥åº', title: 'å·¥åº' }
			, { field: 'åä»· ', title: 'åä»·' }
			////, { field: 'hbomid', title: 'hbomid' }
			, { field: 'HInnerBillNo', title: 'åé¨åæ®å·' }
			, { field: 'æ°é', title: 'æ°é' }
			////, { field: 'HRoutingInterID', title: 'HRoutingInterID' }
			, { field: 'HBacker', title: 'éåäºº' }
			, { field: 'HBackDate', title: 'éåæ¥æ' }
			, { field: 'HChecker', title: 'å®¡æ ¸äºº' }
			, { field: 'HCheckDate', title: 'å®¡æ ¸æ¥æ' }
			, { field: 'HMaker', title: 'å¶åäºº' }
			, { field: 'HMakeDate', title: 'å¶åæ¥æ' }
			, { field: 'HUpDater', title: 'ä¿®æ¹äºº' }
			, { field: 'HUpDateDate', title: 'ä¿®æ¹æ¥æ' }
			, { field: 'HCloseMan', title: 'å³éäºº' }
			, { field: 'HCloseDate', title: 'å³éæ¥æ' }
			, { field: 'HCloseType', title: 'å³éç±»å' }
			, { field: 'ä¸è¯æ°é', title: 'ä¸è¯æ°é' }
			, { field: 'æ¥åºæ°', title: 'æ¥åºæ°' }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨' }
			, { field: 'å¶åäºº', title: 'å¶åäºº' }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ' }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ' }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº' }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ' }
			, { field: 'å³éäºº', title: 'å³éäºº' }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ' }
			////, { field: 'hsubid', title: 'hsubid' }
			, { field: 'HDeleteMan', title: 'ä½åºäºº' }
			, { field: 'HDeleteDate', title: 'ä½åºæ¥æ' }
			//, { field: 'æºåååç ', title: 'æºåååç ' }
			//, { field: 'å¶åäºº', title: 'å¶åäºº' }
			//, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ' }
			//, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº' }
			//, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ' }
			//, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº' }
			//, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ' }
			//, { field: 'å³éäºº', title: 'å³éäºº' }
			//, { field: 'å³éæ¥æ', title: 'å³éæ¥æ' }
			//, { field: 'ä½åºäºº', title: 'ä½åºäºº' }
			//, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ' }
			//, { field: 'è¡å³éäºº', title: 'è¡å³éäºº' }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº' }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ' }
			, { field: 'æºåä¸»åç ', title: 'æºåä¸»åç ' }
			, { field: 'æºåååç ', title: 'æºåååç ' }
			, { field: 'æºååå·', title: 'æºååå·' }
			, { field: 'æºåç±»å', title: 'æºåç±»å' }
			, { field: 'è¡å³éäºº', title: 'è¡å³éäºº' }
			, { field: 'HBillType', title: 'HBillType' }
			, { field: 'HBillSubType', title: 'HBillSubType' }
			, { field: 'HICMOInterID', title: 'HICMOInterID' }
			, { field: 'ä»»å¡åå·', title: 'ä»»å¡åå·' }
			, { field: 'HSourceID', title: 'HSourceID' }
			, { field: 'çäº§èµæºä»£ç ', title: 'çäº§èµæºä»£ç ' }
			, { field: 'çäº§èµæº', title: 'çäº§èµæº' }
			//, { field: 'å³éç±»å', title: 'å³éç±»å' }
			//, { field: 'åæ®ç±»å', title: 'åæ®ç±»å' }
			//, { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·' }
			]]
			};
			//çå¬å·¥å·æ¡
			table.on('tool(mainTable)', function (obj) {
			var data = obj.data;
			if (obj.event === 'detail') {
			layer.msg('IDï¼' + data.hmainid + ' çæ¥çæä½'); //é¡µé¢å±
			layer.open({
			type: 2 //Pageå±ç±»å
			, area: ['100%', '100%']
			, title: 'æ¥çæ±æ¥å'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: false //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../å·¥åºæ±æ¥å/Sc_Add_ProcessReportList.html?HInterID=' + data.hmainid, 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}

			});
			} else if (obj.event === 'del') {
			layer.confirm('ççå é¤è¡ä¹', function (index) {
			obj.del();
			layer.close(index);
			});
			} else if (obj.event === 'edit') {
			layer.alert('ç¼è¾è¡ï¼<br>' + JSON.stringify(data))
			}
			});
			//è¿å¥é¡µé¢æ¾ç¤ºçç¼ååè¡¨
			var index0 = layer.load(0, { shade: false });
			$.ajax({
			@@ -197,6 +229,7 @@
			$("#WorkCenter").val("");//åæ®å·
			$("#btnSearch").click();
			});


			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {//éæ©ä»ä½
			@@ -205,16 +238,16 @@
			var HOrderProcNO = $("#HOrderProcNO").val();//è®¢åè·è¸ªå·
			var WorkCenter = $("#WorkCenter").val();//åæ®å·
			if (HDate) {
			sWhere += " and HDate >= '" + HDate + "'";
			sWhere += " and æ¥æ >= '" + HDate + "'";
			}
			if (HDate1) {
			sWhere += " and HDate <= '" + HDate1 + "'";
			sWhere += " and æ¥æ <= '" + HDate1 + "'";
			}
			if (HOrderProcNO) {
			sWhere += " and è®¢åè·è¸ªå· like '%" + HOrderProcNO + "%'";
			}
			if (WorkCenter) {
			sWhere += " and HBillNo like '%" + WorkCenter + "%'";
			sWhere += " and åæ®å· like '%" + WorkCenter + "%'";
			}
			var index = layer.load(0, { shade: false });
			$.ajax({