MES-WEB-LayUI.git

			@@ -125,6 +125,7 @@
			<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;" 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_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>
			@@ -224,6 +225,9 @@
			//åä½åºæé®
			case 'set_DeDrop': set_DropBill(1);
			break;
			//æ¡ç æç»
			case 'get_BarCodeNote': get_BarCodeNote();
			break;
			//æå°
			case 'btn-print': get_PrintReport();
			break;
			@@ -306,6 +310,9 @@
			//#region é¡µé¢å¶å®æ¹æ³
			//#region åå§åçé¢
			function set_ClearBill() {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

			//åå§åè¡¨æ ¼
			set_InitGrid();
			//æ¥è¯¢
			@@ -315,12 +322,11 @@
			//#endregion

			//#region åå§åè¡¨æ ¼æ¹æ³
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			function set_InitGrid() {
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			, totalRow: true
			, height: 'full-50'
			, page: true
			, cellMinWidth: 90
			@@ -334,32 +340,27 @@
			,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>", sort: true }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 160, sort: true }
			, { field: 'æºååå·', title: 'éå®è®¢å', width: 200, templet: "<div>{{d.HSourceBillType != 1401 ? '': d.æºååå·}}</div>", sort: true }
			, { field: 'ç¶æ', title: 'ç¶æ', width: 160, sort: true }
			, { field: 'çº¢èåæ è®°', title: 'çº¢èåæ è®°', width: 160, sort: true }
			, { field: 'hsupid', title: 'hsupid', width: 200, hide: true, sort: true }
			, { field: 'å®¢æ·', title: 'å®¢æ·', width: 200, sort: true }
			, { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true, sort: true }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 200, sort: true }
			, { field: 'hmanagerid', title: 'hmanagerid', width: 200, hide: true, sort: true }
			, { field: 'ä¸»ç®¡', title: 'ä¸»ç®¡', width: 200, sort: true }
			, { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 160, hide: true, sort: true }
			, { field: 'åè´§äºº', title: 'åè´§äºº', width: 160, hide: true, sort: true }
			, { field: 'hkeeperid', title: 'hkeeperid', width: 160, hide: true, sort: true }
			, { field: 'ä¿ç®¡å', title: 'ä¿ç®¡å', width: 200, hide: true, sort: true }
			, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
			, { field: 'é¨é¨', title: 'é¨é¨', width: 200, sort: true }
			, { field: 'éå®æ¹å¼', title: 'éå®æ¹å¼', width: 200, hide: true, sort: true }
			, { field: 'hsubid', title: 'hsubid', width: 200, hide: true, sort: true }
			, { field: 'hmaterid', title: 'hmaterid', width: 200, hide: true, sort: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', width: 200, sort: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', width: 115, sort: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 115, sort: true }
			, { field: 'hunitid', title: 'hunitid', width: 200, hide: true, sort: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 200, sort: true }
			//, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 200, sort: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 115, sort: true }
			, { field: 'æ°é', title: 'æ°é', width: 200, sort: true }
			, { field: 'hsupid', title: 'hsupid', width: 200, hide: true, sort: true }
			, { field: 'å®¢æ·', title: 'å®¢æ·', width: 200, sort: true }
			, { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true, sort: true }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 200, sort: true }
			, { field: 'æ°é', title: 'æ°é', totalRow: true, width: 200, sort: true }
			, { field: 'åä»·', title: 'åä»·', width: 200, sort: true }
			, { field: 'éé¢', title: 'éé¢', width: 200, sort: true }
			, { field: 'ç¨ç', title: 'ç¨ç', width: 200, sort: true }
			, { field: 'å«ç¨åä»·', title: 'å«ç¨åä»·', width: 200, sort: true }
			, { field: 'éé¢', title: 'éé¢', totalRow: true, width: 200, sort: true }
			, { field: 'ä»·ç¨åè®¡', title: 'ä»·ç¨åè®¡', totalRow: true, width: 200, sort: true }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', width: 200, sort: true }
			, { field: 'å¶åäºº', title: 'å¶åäºº', width: 125, sort: true }
			, { field: 'å¶åæ¥æ', title: 'å¶åæ¥æ', width: 200, templet: "<div>{{d.å¶åæ¥æ ==null ?'':layui.util.toDateString(d.å¶åæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'å®¡æ ¸äºº', title: 'å®¡æ ¸äºº', width: 125, sort: true }
			@@ -371,6 +372,16 @@
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 125, sort: true }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 200, templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }

			//, { field: 'çº¢èåæ è®°', title: 'çº¢èåæ è®°', width: 160, sort: true }
			//, { field: 'hmanagerid', title: 'hmanagerid', width: 200, hide: true, sort: true }
			//, { field: 'ä¸»ç®¡', title: 'ä¸»ç®¡', width: 200, sort: true }
			//, { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 160, hide: true, sort: true }
			//, { field: 'åè´§äºº', title: 'åè´§äºº', width: 160, hide: true, sort: true }
			//, { field: 'hkeeperid', title: 'hkeeperid', width: 160, hide: true, sort: true }
			//, { field: 'ä¿ç®¡å', title: 'ä¿ç®¡å', width: 200, hide: true, sort: true }
			//, { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true, sort: true }
			//, { field: 'é¨é¨', title: 'é¨é¨', width: 200, sort: true }
			//, { field: 'éå®æ¹å¼', title: 'éå®æ¹å¼', width: 200, hide: true, sort: true }
			]]
			};
			}
			@@ -403,7 +414,7 @@
			} else {
			result[i].æ¥æ = null;
			result[i].åæ®å· = "";
			result[i].ç¶æ = "";
			/result[i].ç¶æ = "";/
			result[i].çº¢èåæ è®° = "";
			result[i].hsupid = "";
			result[i].å®¢æ· = "";
			@@ -619,7 +630,8 @@
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			if (data[0].ç¶æ != "åå»º") {
			layer.alert("ä¸æ¨å¤±è´¥!åå ï¼åæ®ç¶æä¸ä¸º'åå»º'ç¶æ!!", { icon: 5 });
			var err = "ä¸æ¨å¤±è´¥!åå ï¼å½ååæ®ç¶æä¸ºâ" + data[0].ç¶æ + "â,ä¸åè®¸ä¸æ¨ï¼";
			layer.alert(err, { icon: 5 });
			return;
			}

			@@ -801,11 +813,47 @@
			}
			//#endregion

			//#region æ¡ç æç»
			function get_BarCodeNote() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var hID = data[0].hmainid.toString();
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'éå®åºåº-æ¡ç æç»'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../é¢æåè´§/éå®åºåº/Kf_SellOutBillList_BarCodeNote.html?linterid=' + hID + '&HSouceBillType=1205&closeType=1'
			, resize: false,
			end: function () {
			//å·æ°é¡µé¢,
			/* $("#btnSearch").trigger('click');*/
			}
			, cancel: function () {

			}
			})
			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼');
			}
			}
			//#endregion


			//#region æå°
			function get_PrintReport() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			if (data[0].ç¶æ != "å·²å®¡æ ¸") {
			layer.alert("æå°å¤±è´¥!åå ï¼åæ®ç¶æä¸ä¸º'å·²å®¡æ ¸'ç¶æ!!", { icon: 5 });
			return;
			}

			layer.open({
			type: 2
			, area: ['50%', '50%']