MES-WEB-LayUI.git

			@@ -179,34 +179,34 @@
			<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" style="display:none;" 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" style="display:none;" 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" style="display:none;" lay-event="btn-PushExceptiveCheckRequestBill" id="btn-PushExceptiveCheckRequestBill"><i class="layui-icon layui-icon-delete"></i>ä¸æ¨(ç¹æ¹ç³è¯·å)</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushReceivableBills" id="btn-PushReceivableBills"><i class="layui-icon layui-icon-delete"></i>å¤è¡ä¸æ¨(åºæ¶å)</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushSellOutChangeBills" id="btn-PushSellOutChangeBills"><i class="layui-icon layui-icon-delete"></i>å¤è¡ä¸æ¨(éå®è°ä»·å)</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" 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" style="display:none;" lay-event="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>åèµ·å®¡æ¹</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>æ¥çå®¡æ¹è¿åº¦</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>å¤çº§å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>å¤çº§åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>é©³å</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>å³é</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>åå³é</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>ä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>åä½åº</button>-->
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_BarCodeNote" id="get_BarCodeNote"><i class="layui-icon layui-icon-refresh-3"></i>æ¡ç æç»</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_LookDown" id="get_LookDown"><i class="layui-icon layui-icon-refresh-3"></i>ä¸æ¥</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>éèåè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-BarCodeDetail" id="btn-BarCodeDetail"><i class="layui-icon layui-icon-logout"></i>æ¡ç æç»</button>-->
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>ä¿åæ¹æ¡</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>è¯»åæ¹æ¡</button>
			<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-PushExceptiveCheckRequestBill" id="btn-PushExceptiveCheckRequestBill"><i class="layui-icon layui-icon-delete"></i>ä¸æ¨(ç¹æ¹ç³è¯·å)</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushReceivableBills" id="btn-PushReceivableBills"><i class="layui-icon layui-icon-delete"></i>å¤è¡ä¸æ¨(åºæ¶å)</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-PushSellOutChangeBills" id="btn-PushSellOutChangeBills"><i class="layui-icon layui-icon-delete"></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="get_Refresh" id="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill" id="CheckBill"><i class="layui-icon layui-icon-form"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck" id="AbandonCheck"><i class="layui-icon layui-icon-form"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_startCheckBill" id="set_startCheckBill"><i class="layui-icon layui-icon-form"></i>åèµ·å®¡æ¹</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_CheckFlowInfo" id="get_CheckFlowInfo"><i class="layui-icon layui-icon-form"></i>æ¥çå®¡æ¹è¿åº¦</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CheckBill_Flow" id="CheckBill_Flow"><i class="layui-icon layui-icon-form"></i>å¤çº§å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_AbandonCheck_Flow" id="AbandonCheck_Flow"><i class="layui-icon layui-icon-form"></i>å¤çº§åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_RejectCheck_Flow" id="RejectCheck_Flow"><i class="layui-icon layui-icon-form"></i>é©³å</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CloseBill" id="set_CloseBill"><i class="layui-icon layui-icon-form"></i>å³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_CancelCloseBill" id="set_CancelCloseBill"><i class="layui-icon layui-icon-form"></i>åå³é</button>-->
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="set_Drop" id="set_Drop"><i class="layui-icon layui-icon-radio"></i>ä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeDrop" id="set_DeDrop"><i class="layui-icon layui-icon-radio"></i>åä½åº</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_BarCodeNote" id="get_BarCodeNote"><i class="layui-icon layui-icon-refresh-3"></i>æ¡ç æç»</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_LookDown" id="get_LookDown"><i class="layui-icon layui-icon-refresh-3"></i>ä¸æ¥</button>
			<button type="button" class="layui-btn layui-btn-sm" id="btn-print" lay-event="btn-print"><i class="layui-icon layui-icon-form"></i>æå°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit" id="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn" id="HideColumn"><i class="layui-icon layui-icon-form"></i>éèåè®¾ç½®</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideButton" id="HideButton"><i class="layui-icon layui-icon-form"></i>æé®è®¾ç½®</button>
			<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-BarCodeDetail" id="btn-BarCodeDetail"><i class="layui-icon layui-icon-logout"></i>æ¡ç æç»</button>-->
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_SaveScheme" id="set_SaveScheme"><i class="layui-icon layui-icon-template"></i>ä¿åæ¹æ¡</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="set_ReadScheme" id="set_ReadScheme"><i class="layui-icon layui-icon-set"></i>è¯»åæ¹æ¡</button>

			</div>
			</script>
			@@ -252,7 +252,7 @@
			var titleData = ["hmainid", "hsupid", "HEmpID", "hmanagerid", "hsecmanagerid", "åè´§äºº", "hkeeperid", "ä¿ç®¡å", "HDeptID", "éå®æ¹å¼", "hsubid", "hmaterid", "hunitid", "HWHID"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			//#region ãè¿æ»¤æ¹æ¡ã

			//è¿æ»¤æ¡ä»¶çclassç±»
			//è¿æ»¤æ¡ä»¶çclassç±»
			var HClassTag = "ForFilteringSchemes";
			//æ¨¡ååç§°ï¼ä¸æçï¼ æ¯ä¸ªæ¨¡åé¡µé¢é½éè¦ä¿®æ¹
			window.HModuleName = "éå®åºåºååè¡¨";
			@@ -339,7 +339,7 @@
			//åå³é
			case 'set_CancelCloseBill': set_CloseBill(1);
			break;
			//ä½åºæé®
			//ä½åºæé®
			case 'set_Drop': set_DropBill(0);
			break;
			//åä½åºæé®
			@@ -434,7 +434,7 @@
			$("#btnSearch").trigger('click');
			}
			, cancel: function () {


			}
			})
			});
			@@ -563,9 +563,9 @@

			//åæ®å·è¶é¾æ¥
			if (obj.event == 'åæ®å·') { //æ£æ¥ obj.event æ¯å¦çäºåç¬¦ä¸² 'åæ®å·'ãå¦æçäºï¼åæ§è¡ifå¾ªç¯
			var linterid = data.hmainid.toString(); //å£°æåélinterid ä¸º data.hmainid
			var linterid = data.hmainid.toString(); //å£°æåélinterid ä¸º data.hmainid
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({ //ä½¿ç¨ layerçopenæå¼å¼¹åº å±
			layer.open({ //ä½¿ç¨ layerçopenæå¼å¼¹åº å±
			type: 2 //è¡¨ç¤ºå¼¹åºå±çåå®¹æ¯ä¸ä¸ª iframe
			, area: ['100%', '100%']
			, title: 'ç¼è¾' + HPageTitle //è®¾ç½®å¼¹åºå±çååååé
			@@ -592,6 +592,7 @@
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + '/Kf_SellOutBill/GetSellOutBillList',
			async:false,
			type: "GET",
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			@@ -619,7 +620,7 @@
			if ($.inArray(data[i].name, titleData) > -1) {//æ£æ¥dataãiã.nameæ¯å¦å¨æ°ç»ä¸ //è®¡ç®å
			col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //éèidå
			}
			else if ($.inArray(data[i].name, totalArray) > -1) { //è®¡ç®å
			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({
			@@ -631,7 +632,7 @@
			switch (data[i].Type) {
			//int
			case 'DateTime':
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + (data[i].name == "è¡å³éæ¥æ" ? "è¡å³éäºº" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
			break;
			default:
			col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
			@@ -1120,7 +1121,7 @@
			} else {
			layer.msg('æ¤æ¡æ°æ®ä¸æ¯åå»ºç¶æ,æ æ³å é¤ï¼');
			}


			})
			}
			else {
			@@ -1551,6 +1552,9 @@
			dataCol = data1.data[0].HGridString.split(',');

			for (var i = 0; i < option.cols[0].length - 2; i++) {
			if (dataCol.length < i) {
			break;
			}
			var dataCols = dataCol[i].split('\|');
			//éèå
			if (dataCols[1] == 1) {
			@@ -1584,9 +1588,9 @@
			}

			//è®¾ç½®è¡¨æ ¼titleå±æ§æ¾ç¤ºå«å
			if (dataCols[4] != null && dataCols[4] != "") {
			option.cols[0][i + 1]["title"] = dataCols[4];
			}
			//if (dataCols[4] != null && dataCols[4] != "") {
			// option.cols[0][i + 1]["title"] = dataCols[4];
			//}
			}

			//åæ¶å»ç»å
			@@ -1795,7 +1799,7 @@
			for (var i = 0; i < Filter.length; i++) {
			HFilterIdList = Filter[i].id; //è¿æ»¤æ¡ä»¶ID
			HFilterIdLists += Filter[i].id + ","; //è¿æ»¤æ¡ä»¶ID(æ¼æ¥)
			HValue += $("#" + HFilterIdList).val() + ","; //è¿æ»¤æ¡ä»¶ä¸è¾å¥çå¼
			HValue += $("#" + HFilterIdList).val() + ","; //è¿æ»¤æ¡ä»¶ä¸è¾å¥çå¼
			HElement_type += document.getElementById(HFilterIdList).tagName + ",";//éè¿æ ç¾idè·åæ ç¾ç±»å
			}