MES-WEB-LayUI.git

			@@ -130,7 +130,10 @@
			<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="btn-PushSeOrderChangeBill" id="btn-PushSeOrderChangeBill"><i class="layui-icon layui-icon-delete"></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-PushICMOBill" id="btn-PushICMOBill"><i class="layui-icon layui-icon-delete"></i>ä¸æ¨(çäº§è®¢å)</button>
			<button type="button" class="layui-btn layui-btn-sm" style="display:none;" lay-event="btn-PushICStockBills" id="btn-PushICStockBills"><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="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;" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></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>
			@@ -230,6 +233,18 @@
			//ä¸æ¨(ç¹æ¹ç³è¯·å)
			case 'btn-PushExceptiveCheckRequestBill':
			set_PushExceptiveCheckRequestBill();
			break;
			//ä¸æ¨(çäº§è®¢å)
			case 'btn-PushICMOBill':
			set_PushICMOBill();
			break;
			//å¤è¡ä¸æ¨(éå®åºåºå)
			case 'btn-PushICStockBills':
			set_PushICStockBills();
			break;
			//ä¸æ¥
			case 'get_LookDown':
			set_LookDown();
			break;
			//å·æ°
			case 'get_Refresh': get_Refresh();
			@@ -351,6 +366,7 @@
			, toolbar: '#toolbarDemo'
			, height: 'full-50'
			, page: true
			, totalRow: true
			, cellMinWidth: 90
			, limit: 50
			, limits: [50, 500, 5000, 20000]
			@@ -359,50 +375,33 @@
			,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
			, { field: 'æ¥æ', title: 'æ¥æ', width: 125, sort: true }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 125, sort: true }
			, { field: 'ç¶æ', title: 'ç¶æ', width: 125, sort: true }
			, { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
			, { field: 'HCusID', title: 'HCusID', hide: true, sort: true }
			, { field: 'å®¢æ·ä»£ç ', title: 'å®¢æ·ä»£ç ', width: 125, sort: true }
			, { field: 'å®¢æ·', title: 'å®¢æ·', sort: true }
			, { field: 'äº¤è´§å°å', title: 'äº¤è´§å°å', width: 125, sort: true }
			, { field: 'HSSID', title: 'HSSID', hide: true, sort: true }
			, { field: 'ç»ç®æ¹å¼ä»£ç ', title: 'ç»ç®æ¹å¼ä»£ç ', width: 125, sort: true }
			, { field: 'ç»ç®æ¹å¼', title: 'ç»ç®æ¹å¼', width: 125, sort: true }
			, { field: 'ç»ç®æ¥æ', title: 'ç»ç®æ¥æ', width: 170, sort: true }
			, { field: 'HCurID', title: 'HCurID', hide: true, sort: true }
			, { field: 'å¸å«ä»£ç ', title: 'å¸å«ä»£ç ', sort: true }
			, { field: 'å¸å«', title: 'å¸å«', sort: true }
			, { field: 'æ±ç', title: 'æ±ç', sort: true }
			, { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 125, sort: true }
			, { field: 'é¨é¨', title: 'é¨é¨', width: 125, sort: true }
			, { field: 'éå®æ¹å¼', title: 'éå®æ¹å¼', sort: true }
			, { field: 'HManagerID', title: 'HManagerID', hide: true, sort: true }
			, { field: 'ä¸»ç®¡ä»£ç ', title: 'ä¸»ç®¡ä»£ç ', sort: true }
			, { field: 'ä¸»ç®¡', title: 'ä¸»ç®¡', sort: true }
			, { field: 'HEmpID', title: 'HEmpID', hide: true, sort: true }
			, { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ', sort: true }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', sort: true }
			, { field: 'æè¦', title: 'æè¦', sort: true }
			, { field: 'è¡¨å¤´å¤æ³¨', title: 'è¡¨å¤´å¤æ³¨', sort: true }
			, { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
			, { field: 'ç¶æ', title: 'ç¶æ', width: 125, sort: true }
			, { field: 'æ¯å¦ä¸æ¨çäº§è®¢å', title: 'æ¯å¦ä¸æ¨çäº§è®¢å', width: 125, sort: true }
			, { field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }
			, { field: 'ç©æä»£ç ', title: 'ç©æä»£ç ', sort: true }
			, { field: 'ç©æåç§°', title: 'ç©æåç§°', sort: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', sort: true }
			, { field: 'æ¹å·', title: 'æ¹å·', sort: true }
			, { field: 'æ°é', title: 'æ°é', sort: true, totalRow: true }
			, { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', sort: true }
			//, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', sort: true }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', sort: true }
			, { field: 'æ°é', title: 'æ°é', sort: true }
			, { field: 'HCusID', title: 'HCusID', hide: true, sort: true }
			//, { field: 'å®¢æ·ä»£ç ', title: 'å®¢æ·ä»£ç ', width: 125, sort: true }
			, { field: 'å®¢æ·', title: 'å®¢æ·', sort: true }
			, { field: 'HEmpID', title: 'HEmpID', hide: true, sort: true }
			//, { field: 'ä¸å¡åä»£ç ', title: 'ä¸å¡åä»£ç ', sort: true }
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', sort: true }
			, { field: 'åä»·', title: 'åä»·', sort: true }
			, { field: 'éé¢', title: 'éé¢', sort: true }
			, { field: 'ç¨ç', title: 'ç¨ç', sort: true }
			, { field: 'ç¨é¢', title: 'ç¨é¢', sort: true }
			, { field: 'ä»·ç¨åè®¡', title: 'ä»·ç¨åè®¡', sort: true }
			, { field: 'æºååå·', title: 'æºååå·', sort: true }
			, { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·', sort: true }
			, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', sort: true }
			, { field: 'å«ç¨åä»·', title: 'å«ç¨åä»·', 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, totalRow: true }
			, { field: 'çäº§å³èæ°é', title: 'çäº§å³èæ°é', sort: true, totalRow: true }
			, { field: 'çäº§æªå³èæ°é', title: 'çäº§æªå³èæ°é', sort: true, totalRow: 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 }
			@@ -414,6 +413,30 @@
			, { 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: 'HBillType', title: 'HBillType', hide: true, sort: true }
			//, { field: 'äº¤è´§å°å', title: 'äº¤è´§å°å', width: 125, sort: true }
			//, { field: 'HSSID', title: 'HSSID', hide: true, sort: true }
			//, { field: 'ç»ç®æ¹å¼ä»£ç ', title: 'ç»ç®æ¹å¼ä»£ç ', width: 125, sort: true }
			//, { field: 'ç»ç®æ¹å¼', title: 'ç»ç®æ¹å¼', width: 125, sort: true }
			//, { field: 'ç»ç®æ¥æ', title: 'ç»ç®æ¥æ', width: 170, sort: true }
			//, { field: 'HCurID', title: 'HCurID', hide: true, sort: true }
			//, { field: 'å¸å«ä»£ç ', title: 'å¸å«ä»£ç ', sort: true }
			//, { field: 'å¸å«', title: 'å¸å«', sort: true }
			//, { field: 'æ±ç', title: 'æ±ç', sort: true }
			//, { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
			//, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 125, sort: true }
			//, { field: 'é¨é¨', title: 'é¨é¨', width: 125, sort: true }
			//, { field: 'éå®æ¹å¼', title: 'éå®æ¹å¼', sort: true }
			//, { field: 'HManagerID', title: 'HManagerID', hide: true, sort: true }
			//, { field: 'ä¸»ç®¡ä»£ç ', title: 'ä¸»ç®¡ä»£ç ', sort: true }
			//, { field: 'ä¸»ç®¡', title: 'ä¸»ç®¡', sort: true }
			//, { field: 'æè¦', title: 'æè¦', sort: true }
			//, { field: 'æ¹å·', title: 'æ¹å·', sort: true }
			//, { field: 'ç¨é¢', title: 'ç¨é¢', sort: true }
			//, { field: 'æºååå·', title: 'æºååå·', sort: true }
			//, { field: 'è®¡åè·è¸ªå·', title: 'è®¡åè·è¸ªå·', sort: true }
			//, { field: 'è¡¨ä½å¤æ³¨', title: 'è¡¨ä½å¤æ³¨', sort: true }
			]]
			, done: function () {
			soulTable.render(this);
			@@ -435,7 +458,32 @@
			data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
			success: function (data1) {
			if (data1.count == 1) {
			option.data = data1.data;


			//è®¾ç½®åè¡¨åä¸ä¸ªåæ®åªæç¬¬ä¸æ¡æ°æ®æ¾ç¤ºä¸»è¡¨ä¿¡æ¯ï¼å¶å®è®°å½åªæ¾ç¤ºåè¡¨ä¿¡æ¯
			//è·ååè¡¨åæ°æ®
			var colList = [];
			for (var i = 0; i < option.cols[0].length; i++) {
			colList.push(option.cols[0][i].field);
			}
			//è®¾ç½®æ°æ®
			var result = data1.data;
			var temp = "";
			for (var i = 0; i < result.length; i++) {
			if (temp != result[i]["hmainid"]) {
			temp = result[i]["hmainid"];
			} else {
			var initIndex = $.inArray("hmainid", colList);
			var lastIndex = $.inArray("hsubid", colList);
			for (var j = initIndex + 1; j < lastIndex; j++) {
			var fieldName = colList[j];
			result[i][fieldName] = "";
			}
			}
			}


			option.data = result;
			table.render(option);
			layer.close(ajaxLoad);

			@@ -692,6 +740,12 @@
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {

			if (data[0].ç¶æ != "å·²å®¡æ ¸") {
			layer.alert("ä¸æ¨å¤±è´¥!åå ï¼åæ®ç¶æä¸ä¸º'å·²å®¡æ ¸'ç¶æ!!", { icon: 5 });
			return;
			}

			var hID = data[0].hmainid.toString();
			layer.open({
			type: 2
			@@ -723,6 +777,12 @@
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			if (data[0].ç¶æ != "åå»º") {
			layer.alert("ä¸æ¨å¤±è´¥!åå ï¼åæ®ç¶æä¸ä¸º'åå»º'ç¶æ!!", { icon: 5 });
			return;
			}


			var hID = data[0].hmainid.toString();
			layer.open({
			type: 2
			@@ -749,6 +809,123 @@
			}
			//#endregion

			//#region ä¸æ¨(çäº§è®¢å-æ åè¡¨)
			function set_PushICMOBill() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {

			if (data[0].ç¶æ != "å·²å®¡æ ¸") {
			layer.alert("ä¸æ¨å¤±è´¥!åå ï¼åæ®ç¶æä¸ä¸º'å·²å®¡æ ¸'ç¶æ!!", { icon: 5 });
			return;
			}

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

			}
			})

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

			//#region å¤è¡ä¸æ¨ï¼éå®åºåºåï¼
			function set_PushICStockBills() {
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;
			if (data.length > 0) {
			var dataArray = [];
			var HCusName = data[0].å®¢æ·;
			for (var i = 0; i < data.length; i++) {
			var temp = {
			"hmainid": data[i].hmainid
			, "hsubid": data[i].hsubid
			, "HBillStatus": data[i].ç¶æ
			, "HSourceBillType": "1401"
			}
			dataArray.push(temp);
			if (data[i].ç¶æ != "å·²å®¡æ ¸") {
			layer.msg("ä¸æ¨å¤±è´¥!åæ®å·ã" + data[i].åæ®å· + "ãåæ®ç¶æä¸ä¸ºå·²å®¡æ ¸ç¶æ!");
			return;
			}
			if (data[i].å®¢æ· != HCusName) {
			layer.msg("ä¸æ¨å¤±è´¥!å·²ç»éä¸çè®°å½ä¸åå¨ä¸åå®¢æ·!");
			return;
			}
			}

			var datajson = {
			"data": dataArray
			};

			var url = encodeURI('../../é¢æåè´§/éå®åºåº/Kf_SellOutBill.html?OperationType=4&linterid=0&HSouceBillType=1401&res=' + JSON.stringify(datajson));

			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'éå®è®¢å-å¤è¡ä¸æ¨éå®åºåºå'
			, shift: 0//å¼¹åºå¨ç»
			, content: url
			, btn: ['ç¡®å®'],
			// æé®1 çåè°
			end: function (index, layero, that) {
			//å·æ°é¡µé¢
			$("#btnSearch").trigger('click');
			}
			})
			} else {
			layer.msg('è¯·éæ©æ°æ®ä¸æ¨ï¼');
			}
			}
			//#endregion

			//#region ä¸æ¥
			function set_LookDown() {
			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: '../../éå®ç®¡ç/éå®è®¢å/Xs_SeOrderBill_LookDown.html?linterid=' + hID + '&HSouceBillType=1401&closeType=1'
			, resize: false,
			end: function () {
			//å·æ°é¡µé¢,
			/* $("#btnSearch").trigger('click');*/
			}
			, cancel: function () {

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

			//#region å·æ°
			function get_Refresh() {
			@@ -869,6 +1046,12 @@
			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%']