MES-WEB-LayUI.git

			@@ -12,62 +12,57 @@
			</head>
			<body>

			<div class="layui-card layadmin-header">
			<!--<div class="layui-card layadmin-header">
			<div class="layui-breadcrumb" lay-filter="breadcrumb">
			<a lay-href="">ä¸»é¡µ</a>
			<!--<a><cite>éè´è®¢å</cite></a>
			<a><cite>éè´è®¢åè¡¨æ ¼</cite></a>
			<a><cite>éè´è®¢åè¡¨æ ¼çéè½½</cite></a>-->
			</div>
			</div>
			<a lay-href="">ä¸»é¡µ</a>-->
			<!--<a><cite>éè´è®¢å</cite></a>
			<a><cite>éè´è®¢åè¡¨æ ¼</cite></a>
			<a><cite>éè´è®¢åè¡¨æ ¼çéè½½</cite></a>-->
			<!--</div>
			</div>-->

			<div class="layui-fluid">
			<div class="layui-row layui-col-space15">
			<div class="layui-col-md12">
			<div class="layui-card">

			<div class="layui-card-body">
			<!--<div class="test-table-reload-btn" style="margin-bottom: 10px;">-->
			<form class="layui-form" action="">
			<div class="layui-form-item">
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
			<div class="layui-card" style="padding: 1px">
			<form class="layui-form" action="" lay-filter="component-form-group">
			<div class="layui-collapse">
			<div class="layui-colla-item">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">åæ®å·</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
			</div>
			</div>
			</div>

			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDate1" id="HDate1">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">å¼å§æ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDate1" id="HDate1">
			</div>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HDate2" id="HDate2">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">ç»ææ¥æ</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HDate2" id="HDate2">
			</div>
			</div>
			</div>
			<div class="layui-inline">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

			</div>
			</div>

			<table class="layui-hide" 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="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>
			</div>
			</script>
			</form>
			<!--</div>-->
			</div>


			<table class="layui-hide" 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="btn-Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>å é¤</button>
			</div>
			</script>
			</div>
			</div>
			</div>
			@@ -130,12 +125,12 @@
			index: 'lib/index' //ä¸»å¥å£æ¨¡å
			}).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer'], function () {
			var $ = layui.$
			, admin = layui.admin
			, layer = layui.layer
			, laydate = layui.laydate
			, table = layui.table
			, form = layui.form
			, element = layui.element;
			, admin = layui.admin
			, layer = layui.layer
			, laydate = layui.laydate
			, table = layui.table
			, form = layui.form
			, element = layui.element;
			//å¸¸è§ç¨æ³
			laydate.render({
			elem: '#HDate1'
			@@ -156,43 +151,43 @@
			, toolbar: '#toolbarDemo' //å¼å¯å¤´é¨å·¥å·æ ï¼å¹¶ä¸ºå¶ç»å®å·¦ä¾§æ¨¡æ¿
			, defaultToolbar: ['filter', 'exports', 'print']
			// , where: { msg: "", NowPage: 1, OnePage: 10 }
			, cellMinWidth: 100
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
			, { field: 'hsubid', title: 'hsubid' ,hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 120 }
			, { field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 170 }
			, { field: 'è¡¨å¤´å¤æ³¨ ', title: 'è¡¨å¤´å¤æ³¨', width: 105 }
			, { field: 'çäº§èµæºåç§°', title: 'çäº§èµæºåç§°' }
			, { field: 'çäº§èµæºä»£ç ', title: 'çäº§èµæºä»£ç ' }
			, { field: 'äº§ååç ', title: 'äº§ååç ' }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°' }
			, { field: 'äº§ååå·', title: 'äº§ååå·', width: 115 }
			, { field: 'æ£éªåä»£ç ', title: 'æ£éªåä»£ç ', width: 115 }
			, { field: 'æ£éªååç§°', title: 'æ£éªååç§°' }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 160 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 160 }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 160 }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 160 }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 160 }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 160 }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 160 }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 160 }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', hide: true, width: 160 }
			, { field: 'ä½åºæ¥æ ', title: 'ä½åºæ¥æ', width: 215 }
			, { field: 'åæ®ç±»å ', title: 'åæ®ç±»å ', width: 115 }
			]]
			, cellMinWidth: 100
			, cols: [[
			{ type: 'checkbox', fixed: 'left' }
			, { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
			, { field: 'hsubid', title: 'hsubid', hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', sort: true, width: 120 }
			, { field: 'åæ®å·', title: 'åæ®å·', sort: true, width: 170 }
			, { field: 'è¡¨å¤´å¤æ³¨ ', title: 'è¡¨å¤´å¤æ³¨', width: 105 }
			, { field: 'çäº§èµæºåç§°', title: 'çäº§èµæºåç§°' }
			, { field: 'çäº§èµæºä»£ç ', title: 'çäº§èµæºä»£ç ' }
			, { field: 'äº§ååç ', title: 'äº§ååç ' }
			, { field: 'äº§ååç§°', title: 'äº§ååç§°' }
			, { field: 'äº§ååå·', title: 'äº§ååå·', width: 115 }
			, { field: 'æ£éªåä»£ç ', title: 'æ£éªåä»£ç ', width: 115 }
			, { field: 'æ£éªååç§°', title: 'æ£éªååç§°' }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 160 }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 160 }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 160 }
			, { field: 'å®¡æ ¸æ¥æ', title: 'å®¡æ ¸æ¥æ', width: 160 }
			, { field: 'ä¿®æ¹äºº', title: 'ä¿®æ¹äºº', width: 160 }
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 160 }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 160 }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 160 }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', hide: true, width: 160 }
			, { field: 'ä½åºæ¥æ ', title: 'ä½åºæ¥æ', width: 215 }
			, { field: 'åæ®ç±»å ', title: 'åæ®ç±»å ', width: 115 }
			]]
			//, skin: 'row' //è¡¨æ ¼é£æ ¼
			// , even: true
			, page: true //æ¯å¦æ¾ç¤ºåé¡µ
			, limits: [10, 20, 50, 100]
			, limit: 50 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
			, page: true //æ¯å¦æ¾ç¤ºåé¡µ
			, limits: [10, 20, 50, 100]
			, limit: 50 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
			//, height: 500
			, done: function (res, curr, count) {
			_cur_page = curr;
			layer.closeAll("loading");
			}
			, done: function (res, curr, count) {
			_cur_page = curr;
			layer.closeAll("loading");
			}
			});

			//å¤´å·¥å·æ äºä»¶
			@@ -269,36 +264,37 @@

			///å è½½æ¾ç¤ºæ°æ®
			function RoadHBillNo(sqlWhere) {
			var ajaxLoad = layer.load();
			where = sqlWhere;
			$.ajax({
			type: "get",
			url: GetWEBURL() +"/QC_Management/MES_QC_PatrolProcCheckBillList_Json",
			url: GetWEBURL() + "/QC_Management/MES_QC_PatrolProcCheckBillList_Json",
			async: true,
			data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"],
			success: function (result) {
			if (result.count == 1) {
			ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
			table.reload('mainTable', {
			data: ajaxReturnData
			, height: 'full-10'
			, page: {
			curr: _cur_page //å¿é¡»ä»ç¬¬ 1 é¡µå¼å§
			}
			, loading: false
			, done: function (index, res) {
			ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
			table.reload('mainTable', {
			data: ajaxReturnData
			, height: 'full-10'
			, page: {
			curr: _cur_page //å¿é¡»ä»ç¬¬ 1 é¡µå¼å§
			}
			, loading: false
			, done: function (index, res) {

			}
			});
			layer.close(index0);
			} else {
			layer.close(index0);
			}
			});
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}

			},
			error: function (result) {
			layer.close(index0);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			};
			@@ -314,7 +310,7 @@
			var HDate2 = $("#HDate2").val();//ç»ææ¥æ

			if (HBillNo)
			sqlWhere += " and åæ®å· like '%" + HBillNo+ "%'";
			sqlWhere += " and åæ®å· like '%" + HBillNo + "%'";
			if (HNumber)
			sqlWhere += " and ç©æä»£ç like '%" + HNumber + "%'";
			if (HName)