MES-WEB-LayUI.git

			@@ -144,10 +144,12 @@
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add" id="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="Edit"><i class="layui-icon layui-icon-form"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="CheckBill"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit" id="AbandonCheck"><i class="layui-icon layui-icon-circle"></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" lay-event="btn-Close" id="Close"><i class="layui-icon layui-icon-radio"></i>å³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeClose" id="DeClose"><i class="layui-icon layui-icon-radio"></i>åå³é</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CloseRow" id="set_CloseRow"><i class="layui-icon layui-icon-form"></i>è¡å³é</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="set_CancelCloseRow" id="set_CancelCloseRow"><i class="layui-icon layui-icon-form"></i>è¡åå³é</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Drop" id="Drop"><i class="layui-icon layui-icon-radio"></i>ä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeDrop" id="DeDrop"><i class="layui-icon layui-icon-radio"></i>åä½åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			@@ -274,7 +276,6 @@
			, { field: 'åæ®å·', title: 'åæ®å·', width: 150, sort: true}
			, { field: 'ç¶æ', title: 'ç¶æ', width: 100, sort: true}
			, { field: 'è¡ç¶æ', title: 'è¡ç¶æ', width: 125, sort: true }
			, { field: 'è¡å³éæ¥æ', title: 'è¡å³éæ¥æ', width: 125, sort: true, hide: true }
			, { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
			, { field: 'HSupID', title: 'HSupID', width: 120, hide: true, sort: true}
			, { field: 'ä¾åºåä»£ç ', title: 'ä¾åºåä»£ç ', width: 120, sort: true}
			@@ -302,18 +303,19 @@
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', sort: true }
			, { field: 'æ¹å·', title: 'æ¹å·', sort: true }
			, { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 150, sort: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 150, sort: true , hide: true}
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 150, sort: true }
			, { field: 'æ°é', title: 'æ°é', sort: true, totalRow: true}
			, { field: 'å³èæ°é', title: 'å³èæ°é', sort: true, totalRow: true}
			, { field: 'åä»·', title: 'åä»·', sort: true }
			, { field: 'éé¢', title: 'éé¢', sort: true, totalRow: true }
			, { field: 'åä»·', title: 'åä»·', sort: true }
			, { field: 'ç¨ç', title: 'ç¨ç', sort: true }
			, { field: 'ç¨é¢', title: 'ç¨é¢', sort: true }
			, { field: 'HWHID', title: 'HWHID', hide: true, sort: true }
			, { field: 'æ¶æä»åºä»£ç ', title: 'æ¶æä»åºä»£ç ', width: 150, sort: true }
			, { field: 'æ¶æä»åºä»£ç ', title: 'æ¶æä»åºä»£ç ', width: 150, sort: true , hide: true}
			, { field: 'æ¶æä»åº', title: 'æ¶æä»åº', sort: true }
			, { field: 'HSPID', title: 'HSPID', hide: true, sort: true }
			, { field: 'ä»ä½ä»£ç ', title: 'ä»ä½ä»£ç ', sort: true }
			, { field: 'ä»ä½ä»£ç ', title: 'ä»ä½ä»£ç ', sort: true, hide: true }
			, { field: 'ä»ä½åç§°', title: 'ä»ä½åç§°', sort: true }
			, { field: 'æºååå·', title: 'æºååå·', width: 125, sort: true }
			, { field: 'éè´è®¢åå·', title: 'éè´è®¢åå·', width: 125, sort: true }
			@@ -327,6 +329,8 @@
			, { field: 'ä¿®æ¹æ¥æ', title: 'ä¿®æ¹æ¥æ', width: 200, sort: true , templet: "<div>{{d.ä¿®æ¹æ¥æ ==null ?'':layui.util.toDateString(d.ä¿®æ¹æ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'å³éäºº', title: 'å³éäºº', width: 125, sort: true }
			, { field: 'å³éæ¥æ', title: 'å³éæ¥æ', width: 200, sort: true , templet: "<div>{{d.å³éæ¥æ ==null ?'':layui.util.toDateString(d.å³éæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
			, { field: 'è¡å³éäºº', title: 'è¡å³éäºº', width: 125, sort: true }
			, { field: 'è¡å³éæ¥æ', title: 'è¡å³éæ¥æ', width: 200, templet: "<div>{{d.è¡å³éäºº == ''?'':layui.util.toDateString(d.è¡å³éæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
			, { field: 'ä½åºäºº', title: 'ä½åºäºº', width: 125, sort: true }
			, { field: 'ä½åºæ¥æ', title: 'ä½åºæ¥æ', width: 200, sort: true , templet: "<div>{{d.ä½åºæ¥æ ==null ?'':layui.util.toDateString(d.ä½åºæ¥æ, 'yyyy-MM-dd HH:mm:ss')}}</div>" }

			@@ -457,17 +461,21 @@
			//å·æ°
			case 'get_Refresh': get_Refresh();
			break;
			//å®¡æ ¸æé®
			case 'btn-Audit':
			set_CheckBill(1);
			//å®¡æ ¸
			case 'set_CheckBill': set_CheckBill(0);
			break;
			//åå®¡æ ¸æé®
			case 'btn-DeAudit':
			set_CheckBill(2);
			//åå®¡æ ¸
			case 'set_AbandonCheck': set_CheckBill(1);
			break;
			//å³éæé® ï¼1:å³éã2:åå³éï¼
			case 'btn-Close':
			set_CloseBill(1);
			break;
			//è¡å³é
			case 'set_CloseRow': set_CloseRow(0);
			break;
			//è¡åå³é
			case 'set_CancelCloseRow': set_CloseRow(1);
			break;
			//åå³éæé®
			case 'btn-DeClose':
			@@ -553,7 +561,7 @@
			})
			//#endregion

			//#region åå®¡æ ¸/å®¡æ ¸æ°æ®
			//#region åå®¡æ ¸/å®¡æ ¸æ°æ®
			function set_CheckBill(num) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			@@ -563,7 +571,7 @@
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cg_POInStockBill/AuditCg_POInStockBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] },
			data: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			@@ -625,6 +633,42 @@
			}
			//#endregion

			//#region è¡åå³é/è¡å³éæ°æ®
			function set_CloseRow(num) {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			var hsubid = data[0].hsubid.toString();
			//é»è¾å®¡æ ¸æ¹æ³
			$.ajax({
			type: "GET",
			url: GetWEBURL() + "/Cg_POInStockBill/CloseRowCg_POInStockBill", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			data: { "HInterID": InterID, "HEntryID": hsubid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] },
			success: function (result) {
			if (result.count == 1) {
			layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
			// å¾å°frameç´¢å¼
			var index = layer.getFrameIndex(window.name);
			//å³éå½åframe
			layer.close(index);
			//ä¿®æ¹ä¸ºååå·æ°çé¢
			$("#btnSearch").trigger('click');
			});

			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			}
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å³éï¼');
			}
			}
			//#endregion

			//#region åä½åº/ä½åºæ°æ®
			function set_DropBill(num) {
			@@ -854,7 +898,7 @@


			var dataCol = [];//æ°æ®åºæ¥è¯¢åºçåæ°æ®
			var titleData = ["hmainid", "HBillType", "HSupID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID", "HWHID","HSPID","è¡å³éæ¥æ"];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±
			var titleData = ["hmainid", "HBillType", "HSupID", "HCurID", "HDeptID", "HManagerID", "HEmpID", "hsubid", "HMaterID", "HUnitID", "HWHID","HSPID","è®¡éåä½ä»£ç ","æ¶æä»åºä»£ç ","ä»ä½ä»£ç "];//ä¸éè¦æ¾ç¤ºçåæ®µ å¯æ©å±

			dataCol = data1.data[0].HGridString.split(',');