MES-WEB-LayUI.git

			@@ -27,66 +27,71 @@
			<span>æ´å¤</span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HDate">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HDate1">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
			</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>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">çäº§è½¦é´</label>
			<div class="layui-input-block">
			<select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">

			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
			<!--å¨ææ¸²æè½¦é´-->
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¸å¡ç¶æ</label>
			<div class="layui-input-block">
			<select name="HStatus" id="HStatus" lay-verify="required" lay-search class="layui-input">
			<!-- <option value="å¨é¨">å¨é¨</option>-->
			<option value="å¼å·¥">å¼å·¥</option>
			<option value="è®¡å">è®¡å</option>
			<option value="è®¡åç¡®è®¤">è®¡åç¡®è®¤</option>
			<option value="ä¸è¾¾">ä¸è¾¾</option>

			<option value="0">å¨é¨</option>
			<option value="å®å·¥">å®å·¥</option>
			<option value="ç»æ¡">ç»æ¡</option>
			</select>

			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¯å¦ä¸æ¨çææµè½¬å¡</label>
			<div class="layui-input-block" style="margin-top:10px">
			<select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input">
			<!-- <option value="å¨é¨">å¨é¨</option>-->
			<option value="å¨é¨">å¨é¨</option>
			<option value="å·²ä¸æ¨">å·²ä¸æ¨</option>
			<option value="æªä¸æ¨" selected="selected">æªä¸æ¨</option>
			</select>
			</div>
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>

			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">å¼å§æ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HDate">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ç»ææ¥æ</label>
			<div class="layui-input-block">
			<input type="date" class="layui-input" id="HDate1">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="WorkCenter" id="WorkCenter">
			</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>
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>
			</div>
			<div class="layui-colla-content">
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">çäº§è½¦é´</label>
			<div class="layui-input-block">
			<select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">

			<!--å¨ææ¸²æè½¦é´-->
			</select>

			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¸å¡ç¶æ</label>
			<div class="layui-input-block">
			<select name="HStatus" id="HStatus" lay-verify="required" lay-search class="layui-input">
			<!-- <option value="å¨é¨">å¨é¨</option>-->
			<option value="å¼å·¥">å¼å·¥</option>
			<option value="è®¡å">è®¡å</option>
			<option value="è®¡åç¡®è®¤">è®¡åç¡®è®¤</option>
			<option value="ä¸è¾¾">ä¸è¾¾</option>

			<option value="0">å¨é¨</option>
			<option value="å®å·¥">å®å·¥</option>
			<option value="ç»æ¡">ç»æ¡</option>
			</select>

			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®ç±»å</label>
			<div class="layui-input-block">
			@@ -99,28 +104,14 @@
			<input type="text" class="layui-input" name="HMaterName" id="HMaterName">
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-inline">
			<label class="layui-form-label">å¯ä¸ID</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HERPID" id="HERPID">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">æ¯å¦ä¸æ¨çææµè½¬å¡</label>
			<div class="layui-input-block">
			<select name="HSF" id="HSF" lay-verify="required" lay-search class="layui-input">
			<!-- <option value="å¨é¨">å¨é¨</option>-->
			<option value="å¨é¨" selected="selected">å¨é¨</option>
			<option value="å·²ä¸æ¨">å·²ä¸æ¨</option>
			<option value="æªä¸æ¨">æªä¸æ¨</option>

			</select>
			</div>
			</div>
			</div>
			<div class="layui-row">
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">è¿æ»¤</label>
			<div class="layui-input-block">
			@@ -147,24 +138,34 @@
			<input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
			</div>
			</div>
			<div class="layui-row" style="margin-top:5px">
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>
			</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="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ä¸æ¨</button>
			<button type="button" class="layui-btn layui-btn-lg" lay-event="set_ShowBill"><i class="layui-icon layui-icon-form"></i>ä¸æ¨</button>
			<button type="button" class="layui-btn" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ShowBill_pl"><i class="layui-icon layui-icon-form"></i>æ¹éä¸æ¨</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew_NT"><i class="layui-icon layui-icon-file-b"></i>æ°å¢(æ åè¡¨)</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Edit_NT"><i class="layui-icon layui-icon-form"></i>ç¼è¾(æ åè¡¨)</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-file-b"></i>Excelå¯¼å¥</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="get-view"><i class="layui-icon layui-icon-tips"></i>é¢è§</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get-print"><i class="layui-icon layui-icon-print"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>åè®¾ç½®</button>
			</div>
			</script>
			</form>
			@@ -238,7 +239,10 @@
			table.on('toolbar(mainTable)', function (obj) {
			switch (obj.event) {
			//ä¸æ¨
			case 'set_ShowBill': set_ShowBill();
			case 'set_ShowBill': set_ShowBill();
			break;
			//æ¹éä¸æ¨
			case 'set_ShowBill_pl': set_ShowBill_pl(); //set_ShowBill_pl
			break;
			//æ°å¢
			case 'set_AddNew': set_AddNew();
			@@ -462,8 +466,8 @@
			//, { field: 'hbomid', title: 'hbomid' , hide: true}
			//, { field: 'BOMåç¼ç ', title: 'BOMåç¼ç ', hide: true }
			//, { field: 'HRoutingInterID', title: 'HRoutingInterID' , hide: true}
			//, { field: 'å·¥èºè·¯çº¿ä»£ç ', title: 'å·¥èºè·¯çº¿ä»£ç ', hide: true }
			//, { field: 'å·¥èºè·¯çº¿', title: 'å·¥èºè·¯çº¿', hide: true}
			, { field: 'å·¥èºè·¯çº¿ä»£ç ', title: 'å·¥èºè·¯çº¿ä»£ç '}
			, { field: 'å·¥èºè·¯çº¿', title: 'å·¥èºè·¯çº¿'}
			//, { field: 'hsubid', title: 'hsubid' , hide: true}
			//, { field: 'æºååå·', title: 'æºååå·', hide: true}
			//, { field: 'æºåä¸»åç ', title: 'æºåä¸»åç ', hide: true}
			@@ -493,7 +497,7 @@
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
			ColFilter();
			}
			//layer.alert("æ¥è¯¢æå", { icon: 1 });
			layer.close(ajaxLoad);
			} else {
			layer.close(ajaxLoad);
			layer.alert(data1.code + data1.Message, { icon: 5 });
			@@ -638,6 +642,7 @@
			// layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			// }
			//});

			//ä¸æ¨åæ®
			function set_ShowBill() {
			var checkStatus = table.checkStatus('mainTable')
			@@ -651,6 +656,25 @@
			, title: 'å·¥åºæµè½¬å¡-ç¼è¾'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../../è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcessExchangeBill.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID+'&HSouceBillType=3772'
			})
			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ä¸æ¨ï¼');
			}
			}

			//æ¹éä¸æ¨åæ®
			function set_ShowBill_pl() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (data.length === 1) {
			var linterid = data[0].hmainid.toString();
			var HEntryID = data[0].HEntryID.toString();
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'å·¥åºæµè½¬å¡-ç¼è¾'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../../è½¦é´ç®¡ç/å·¥åºæµè½¬å¡/Sc_ProcessExchangeBill_Mul.html?OperationType=2&linterid=' + linterid + '&HEntryID=' + HEntryID + '&HSouceBillType=3772'
			})
			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ä¸æ¨ï¼');
			@@ -704,7 +728,7 @@
			, area: ['100%', '100%']
			, title: 'çäº§è®¢åæ°å¢'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../çäº§ä»»å¡å/Sc_ICMOBillEdit_NoTable.html?OperationType=1&linterid='
			, content: '../çäº§ä»»å¡å/Sc_ICMOBillEdit_NoTable.html?OperationType=1&linterid=&HEntryID=1'
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			@@ -718,13 +742,14 @@
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var linterid = data[0].hmainid;
			var HEntryID = data[0].hsubid;

			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'çäº§è®¢åç¼è¾'
			, shift: 0//å¼¹åºå¨ç»
			, content: '../çäº§ä»»å¡å/Sc_ICMOBillEdit_NoTable.html?OperationType=3&linterid=' + linterid + ''
			, content: '../çäº§ä»»å¡å/Sc_ICMOBillEdit_NoTable.html?OperationType=3&linterid=' + linterid + '&HEntryID=' + HEntryID
			, end: function () {
			//å·æ°é¡µé¢,
			location.reload();
			@@ -796,9 +821,9 @@
			function set_ResCnz() {
			var HBillno2 = $('#HBillno2').val();
			$.ajax({
			url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
			url: GetWEBURL() + '/Sc_ICMOBill/Sc_ICMOBillViewApi',
			type: "GET",
			data: { "HBillNo": HBillno2, "HBillType": 3710 },
			data: { "BillNo": HBillno2, "BillType": 3710 },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			@@ -932,7 +957,9 @@
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			var dataCols = dataCol[i].split('\|');
			if (dataCol[i]) {
			var dataCols = dataCol[i].split('\|');
			}
			//éèå
			if (dataCols[1] == 1) {
			option.cols[0][i + 1]["hide"] = true;