MES-WEB-LayUI.git

			@@ -36,11 +36,23 @@
			<input type="date" class="layui-input" id="HDate1">
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">è®¢åè·è¸ªå·</label>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çäº§èµæº</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HSource" id="HSource">
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">è®¢åè·è¸ªå·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
			</div>
			</div>-->
			<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>
			@@ -53,24 +65,20 @@
			<span>å¶ä»æ¡ä»¶></span>
			</div>
			</div>
			<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>
			</div>

			</div>
			</div>
			</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="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>-->
			<button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Print"><i class="layui-icon layui-icon-print"></i>é¢è§</button>
			<button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><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="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			</div>
			</script>
			</form>
			@@ -134,19 +142,24 @@
			break;
			case 'btn-Delete': set_DeleteBill();
			break;
			//å·æ°
			case 'get_Refresh': set_Refresh();
			break;
			//å®¡æ ¸æé®
			case 'btn-Audit': set_CheckBill();
			break;
			//åå®¡æ ¸æé®
			case 'btn-DeAudit': set_AbandonCheck();
			//éåº
			case 'get_Exit': Pub_Close(2);
			break;
			};
			});
			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {//éæ©ä»ä½
			var ajaxLoad = layer.load();
			var HDate = $("#HDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HDate1").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HSource = $("#HSource").val();//çäº§èµæº
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			}
			@@ -156,7 +169,9 @@
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			var index = layer.load(0, { shade: false });
			if (HSource) {
			sWhere += " and èµæºä»£ç like '%" + HSource + "%' or èµæºåç§° like '%" + HSource + "%'";
			}
			$.ajax({
			url: GetWEBURL() + '/Sc_MESStopWorkBill/list',
			type: "GET",
			@@ -165,14 +180,13 @@
			if (data1.count == 1) {
			option.data = data1.data;
			table.render(option);
			layer.close(index);
			layer.alert("æ¥è¯¢æå", { icon: 1 });
			layer.close(ajaxLoad);
			} else {
			layer.close(index);
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(index);
			layer.close(ajaxLoad);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			@@ -181,9 +195,10 @@

			//éç½®æé®
			form.on('submit(btnReSearch)', function (data) {
			$("#HDate").val("");//å¼å§æ¥æ
			$("#HDate1").val("");//ç»ææ¥æ
			$("#WorkCenter").val("");//åæ®å·
			$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
			$("#HBillNo").val("");//åæ®å·
			$("#HSource").val("");//çäº§èµæº
			$("#btnSearch").click();
			});
			//#endregion
			@@ -202,6 +217,8 @@

			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			@@ -213,7 +230,8 @@
			, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·' }
			, { field: 'HBillType', title: 'HBillType', hide: true }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', hide: true }
			, { field: 'HBillStatus', title: 'åæ®ç¶æ', width: 160 }
			, { field: 'ä»»å¡åå·', title: 'ä»»å¡åå·' }
			, { field: 'å·¥åºè®¡ååå·', title: 'å·¥åºè®¡ååå·' }
			, { field: 'å·¥åºæµè½¬å¡å·', title: 'å·¥åºæµè½¬å¡å·' }
			@@ -311,6 +329,11 @@
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var linterid = data[0].hmainid.toString();
			var HBillStatus = data[0].HBillStatus.toString();
			if (HBillStatus != "1") {
			layer.msg('åæ®ç¶æä¸ä¸ºæªå®¡æ ¸ç¶æ,ä¸åè®¸ç¼è¾ï¼');
			return false;
			}
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({
			type: 2
			@@ -342,12 +365,17 @@
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			var HBillStatus = data[0].HBillStatus.toString();
			if (HBillStatus != "1") {
			layer.msg('åæ®ç¶æä¸ä¸ºæªå®¡æ ¸ç¶æ,ä¸åè®¸å é¤ï¼');
			return false;
			}
			//é»è¾å é¤æ¹æ³
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "Sc_MESStopWorkBill/DeltetMESStopWorkBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID },
			data: { "HInterID": InterID, "UserName": sessionStorage["HUserName"]},
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			@@ -373,6 +401,11 @@
			}
			}

			//å·æ°
			function set_Refresh() {
			$("#btnSearch").click();
			}

			//å®¡æ ¸
			function set_CheckBill() {
			var checkStatus = table.checkStatus('mainTable')