MES-WEB-LayUI.git

			@@ -173,6 +173,7 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Add" id="btn_Add"><i class="layui-icon layui-icon-file-b"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Edit" id="btn_Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_WMSSub" id="btn_WMSSub"><i class="layui-icon layui-icon-form"></i>æ¡ç æç»</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PackStockDetail" id="btn-PackStockDetail" ><i class="layui-icon layui-icon-form"></i>åè£å®¹å¨åºå¥åºæç»</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Delete" id="btn_Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="btn_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Audit" id="btn_Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			@@ -225,7 +226,7 @@

			//#region ãå¨æè·åæ¨¡ååç§°ã
			//éè¿åæ®ç±»åï¼ä»æ°æ®åºå¨æè·ååæ®æ¨¡åå½å,å¼ç¨jsæä»¶ PageTitle.js
			var HPageTitle = get_PageTitle(HBillType) == "" ? document.title : get_PageTitle(HBillType);
			var HPageTitle = get_PageTitle(HBillType) \|\| document.title;
			//#endregion
			var totalArray = [];
			//#region ãè¿æ»¤æ¹æ¡ã
			@@ -469,11 +470,14 @@
			//ç¼è¾æé®
			case 'btn_Edit': btn_Edit();
			break;
			//æ¡ç æç»æé®
			case 'btn_WMSSub': getWmsSub();
			break;
			//å é¤æé®
			case 'btn_Delete': btn_Delete();
			break;
			//æ¡ç æç»
			case 'get_BarCodeNote': get_BarCodeNote();
			break;
			//åè£å®¹å¨åºå¥åºæç»
			case "btn-PackStockDetail": get_PackStockDetail();
			break;
			//å·æ°æé®
			case 'btn_Refresh': btn_Refresh();
			@@ -611,6 +615,40 @@
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ï¼');
			}
			}
			//#endregion

			//#region åè£å®¹å¨åºå¥åºæç»
			function get_PackStockDetail() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var HInterID = data[0].hmainid;
			var HBillType = '1202';
			var HBillNo = data[0]["åæ®å·"];

			layer.open({
			type: 2
			, area: ['90%', '90%']
			, title: 'åè£å®¹å¨åºå¥åºæç»'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../åè£åºå¥åºæç»/Kf_PackStockDetailQuery.html?HInterID=' + HInterID + '&HBillType=' + HBillType + '&HBillNo=' + HBillNo
			, resize: false
			, btn: ["ç¡®å®", "åæ¶"]
			, end: function () {
			//å·æ°é¡µé¢,
			//$("#btnSearch").click();
			}
			, cancel: function () {
			}
			})

			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼');
			}
			}
			//#endregion
			@@ -967,12 +1005,12 @@
			layer.open({ //ä½¿ç¨ layerçopenæå¼å¼¹åº å±
			type: 2 //è¡¨ç¤ºå¼¹åºå±çåå®¹æ¯ä¸ä¸ª iframe
			, area: ['100%', '100%']
			, title: 'ç¼è¾' + HPageTitle //è®¾ç½®å¼¹åºå±çååååé
			, title: HPageTitle + '-ç¼è¾' //è®¾ç½®å¼¹åºå±çååååé
			, closeBtn: 1//æ¾ç¤ºå³éæé®
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../éªæ¶å¥åº/äº§åå¥åº/Kf_ProductInBillEdit.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType=0&closeType=1' //è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼
			, content: '../../éªæ¶å¥åº/äº§åå¥åº/Kf_ProductInBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1' //è®¾ç½® iframe ç URLï¼URL ä¸åå«äºæ¥è¯¢åæ°ï¼æ¥è°ç¨æéè¦çå¼

			, resize: false, //æ¯å¦åè®¸ç¨æ·è°æ´å¼¹åºå¤§å°
			end: function () { //å½å³éæ¶è°ç¨
			@@ -1018,7 +1056,10 @@
			else if ($.inArray(data[i].name, totalArray) > -1) {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
			} else if (data[i].name == 'åæ®å·') {
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·' });
			col.push({
			field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'åæ®å·', event: 'åæ®å·', templet: function (d) {
			return '<span style="color: blue;">' + d.åæ®å· + '</span>'
			}, style: 'cursor: pointer;' });
			}else {
			switch (data[i].Type) {
			//int
			@@ -1057,13 +1098,14 @@
			option.cols = [columns];
			option.data = data1.data;
			option.totalRow = true;
			table.render(option);
			ins = table.render(option);
			//å·æ°è¡¨æ ¼æ°æ®
			DisPlay_HideColumn();
			table.render(option);
			ins = table.render(option);
			layer.close(ajaxLoad);
			//èªå®ä¹è¿æ»¤ä¸ææ¡å è½½
			if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {

			if ($("#ColName option").length < 1) {
			ColFilter();
			}
			} else {
			@@ -1157,7 +1199,7 @@


			//æ§è¡æ¥è¯¢æ¹æ³
			get_FastQuery();
			// get_FastQuery();
			} else {
			$('#HBeginDate').prop('disabled', false);
			$('#HEndDate').prop('disabled', false);
			@@ -1171,8 +1213,8 @@
			//éèæ¾ç¤ºè¿æ»¤æ¹æ¡çæ ç¾ä¿¡æ¯
			document.getElementById("HFilterScheme_Now").style.display = "none";
			//æ§è¡æ¥è¯¢æ¹æ³
			//get_FastQuery()
			//form.render("select");
			// get_FastQuery()
			form.render("select");
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });