MES-WEB-LayUI.git

			@@ -256,7 +256,11 @@
			, layer = layui.layer
			, table = layui.table
			, form = layui.form
			, element = layui.element;
			, element = layui.element;



			var option = [];

			//æºåæ¾è´§åè¡¨
			var ZHOption = {
			@@ -302,6 +306,44 @@
			$("#HBillerID").hide();
			var HSourceFlag = sessionStorage["SourceFlag"];


			//åå§åæç»è¡¨æ ¼
			function set_InitGrid() {
			columns = [
			{ type: 'checkbox', fixed: 'left' }
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 150 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { field: 'HInterID', title: 'åæ®ID', width: 150, hide: true }
			, { field: 'HBilltype', title: 'åæ®ç±»å', width: 150, hide: true }
			, { field: 'Hbarcode', title: 'æ¡ç ç¼å·', width: 150, hide: true }
			, { field: 'HSCWHID', title: 'è°åºä»åºID', width: 150, hide: true }
			, { field: 'HSCSPID', title: 'è°åºä»ä½ID', width: 150, hide: true }
			, { field: 'HAuxPropID', title: 'è¾å©å±æ§ID', width: 150, hide: true }
			, { field: 'HMTONo', title: 'MTOå·', width: 150, hide: true }
			, { field: 'HMaterID', title: 'ç©æID', width: 150, hide: true }
			];
			option = {
			id: 'wl-table'
			, elem: '#wl-table'
			, toolbar: '#toolbarDemo'
			, page: false
			, cellMinWidth: 120
			, height: 500
			, cols: [columns]
			, limit: 500 //æ¯é¡µé»è®¤æ¾ç¤ºçæ°é
			, done: function (res, curr, count) {
			}
			};
			}

			//å¤ææ¯å¦ç»å½ æªç»å½åè·³å°ç»å½é¡µ
			if (sessionStorage.login != "login") {
			layer.confirm("ç»å½å¤±æï¼è¯·éæ°ç»å½ï¼", {
			@@ -339,12 +381,10 @@
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HBillType").val(d.data[0].HSourceBillType);
			$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
			//$("#HWHID").val(d.data[0].HWhID);
			//$("#HKeeperID").val(d.data[0].HKeeperID);
			//$("#HSecManagerID").val(d.data[0].HSecManagerID);
			//$("#HDeptID").val(d.data[0].HDeptID);
			//$("#HBarCode").val(d.data[0].HBarCode);
			//$("#HQty").val(d.data[0].HQty);
			$("#HWHID").val(d.data[0].HWhID);
			$("#HStockPlaceID").val(d.data[0].HSPID);
			$("#HKeeperID").val(d.data[0].HKeeperID);
			$("#HSecManagerID").val(d.data[0].HSecManagerID);
			RoadSup();
			}
			})
			@@ -372,7 +412,7 @@
			$("#HSupID").val(result.data[0].HSupID);
			$("#HSupName").val(result.data[0].HSupName);
			$("#HDeptID").val(result.data[0].HDeptID);
			//$("#HDeptName").val(result.data[0].HDeptName);
			$("#HDeptName").val(result.data[0].HDeptName);
			//sessionStorage["SourceFlag"] = true;
			element.tabChange('tab-SellOutBill', '2');
			layer.load(3);
			@@ -388,28 +428,46 @@

			function RoadBillSub(linterid)//å è½½è¡¨ä½-----ä¸ä¼èµ°
			{
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			, cellMinWidth: 80
			, toolbar: '#toolbarDemo'
			, where: { HBillID: linterid, HBillType: '1205', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 80 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 100 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 100 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 100 }
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 100 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 100 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 100 }
			, { field: 'HAuxPropID', title: 'è¾å©å±æ§', width: 100 }
			, { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 100 }
			]]
			//, height: 500
			})
			$("#HInterID").val(linterid);//ä¿®æ¹æ¶ä¸»è¡¨ID
			//ç¼è¾å è½½æ°æ®
			$.ajax({
			url: GetWEBURL() + 'SellOut/SellOutDetaiNew',
			type: "GET",
			data: { "HInterID": linterid },
			success: function (result) {
			if (result.count == 1) {
			option.data = result.list[0];
			table.render(option);
			} else {
			layer.alert(result.code + result.Message, { icon: 5 });
			}
			}, error: function () {
			layer.close(index0);
			layer.alert("æ¥å£è¯·æ±å¤±è´¥!", { icon: 5 });
			}
			});
			//table.render({
			// elem: '#wl-table'
			// , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			// , cellMinWidth: 80
			// , toolbar: '#toolbarDemo'
			// , where: { HBillID: linterid, HBillType: '1205', sWhere: '' }
			// , cols: [[
			// { type: 'radio' }
			// , { field: 'HQty', title: 'æ°é', width: 80 }
			// , { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 80 }
			// , { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 100 }
			// , { field: 'HMaterName', title: 'ç©æåç§°', width: 100 }
			// , { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 100 }
			// , { field: 'HSourceInterID', title: 'æºåä¸»åç ', width: 100 }
			// , { field: 'HSourceEntryID', title: 'æºåååç ', width: 100 }
			// , { field: 'HSourceBillNo', title: 'æºååå·', width: 100 }
			// , { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 100 }
			// , { field: 'HAuxPropID', title: 'è¾å©å±æ§', width: 100 }
			// , { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 100 }
			// ]]
			// //, height: 500
			//})
			}

			//å¨æå è½½æºåç±»ååè¡¨ new
			@@ -435,6 +493,7 @@
			$("#HBillNo").val(d.data[0].HBillNo);
			//$("#HInterID").val('132522535');
			//$("#HBillNo").val('421458026');
			set_InitGrid();
			}
			});
			}
			@@ -490,37 +549,83 @@
			}
			})
			});
			//form.on('submit(HKeeperID-BT)', function () {//éæ©ä¿ç®¡
			// layer.open({
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'ä¿ç®¡åè¡¨'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HKeeper', 'yes']
			// , resize: false
			// , cancel: function () {
			// //$(".layui-btn").removeClass("layui-btn-disabled");
			// }
			// })
			//});
			//form.on('submit(HSecManagerID-BT)', function (data) {//éæ©åè´§
			// var sMainStr = JSON.stringify(data.field);
			// layer.open({
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'åè´§åè¡¨'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HSecManager', 'yes']
			// , resize: false
			// , cancel: function () {
			// //$(".layui-btn").removeClass("layui-btn-disabled");
			// }
			// })
			//});
			form.on('submit(HKeeperID-BT)', function () {//éæ©ä¿ç®¡
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ä¿ç®¡åè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HKeeper', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'èååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../PublicPage/UserInformation.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HKeeper").val(checkStatus.data[0].HName);
			$("#HKeeperID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			});
			form.on('submit(HSecManagerID-BT)', function (data) {//éæ©åè´§
			var sMainStr = JSON.stringify(data.field);
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'åè´§åè¡¨'
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/Baseset/åºç¡èµæ/Gy_EmployeeList.html?Type=HSecManager', 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'èååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../PublicPage/UserInformation.html', 'yes']
			, btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HSecManager").val(checkStatus.data[0].HName);
			$("#HSecManagerID").val(checkStatus.data[0].HItemID);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			});


			form.on('submit(HDeptID-BT)', function () {//éæ©é¨é¨
			layer.open({
			type: 2
			@@ -545,8 +650,22 @@

			//ç¼è¾
			form.on('submit(cmdModify)', function () {//ç¼è¾
			var sSubStr = table.cache['wl-table'];
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			var checkStatus = table.checkStatus('wl-table')
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var HInterID = data[0].HInterID.toString();
			var HMaterID = data[0].HMaterID.toString();
			var HAuxPropID = data[0].HAuxPropID.toString();
			var HMTONo = data[0].HMTONo.toString();
			var HWhID = data[0].HWhID.toString();
			var HSPID = data[0].HSPID.toString();
			var HSCWHID = data[0].HSCWHID.toString();
			var HSCSPID = data[0].HSCSPID.toString();
			var HBatchNo = data[0].HBatchNo.toString();
			var HSourceInterID = data[0].HSourceInterID.toString();
			var HSourceEntryID = data[0].HSourceEntryID.toString();
			var HBillType = '1205';
			var HBarCode = data[0].HBarCode.toString();
			layer.open({
			type: 2
			, area: ['100%', '100%']
			@@ -554,14 +673,17 @@
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: ['../../../views/å¬å±é¡µé¢/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
			, content: ['../../../views/å¬å±é¡µé¢/Kf_BarCodeEditDlg.html?HInterID=' + HInterID + '&HMaterID = ' + HMaterID + '&HAuxPropID = ' + HAuxPropID + '& HMTONo = ' + HMTONo + '&HWhID = ' + HWhID + '&HSPID = ' + HSPID + '&HSCWHID = ' + HSCWHID + '&HSCSPID= ' + HSCSPID + '&HBatchNo= ' + HBatchNo + '&HSourceInterID= ' + HSourceInterID + '&HSourceEntryID= ' + HSourceEntryID + '&HBillType= ' + HBillType + '&HBarCode= ' + HBarCode + ''
			, 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			})
			// }
			});
			} else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®ç¼è¾ï¼');
			}
			})

			//å é¤
			form.on('submit(cmdDelete)', function () {//å é¤
			@@ -605,6 +727,7 @@
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 100 }
			, { field: 'HAuxPropID', title: 'è¾å©å±æ§', width: 100 }
			, { field: 'HMTONo', title: 'è®¡åè·è¸ªå·', width: 100 }
			, { field: 'HWHID', title: 'ck', width: 100 }
			]]
			//, height: 500
			})
			@@ -722,7 +845,7 @@
			$.ajax({
			url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
			type: "GET",
			data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": 0 },
			data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) {
			if (result.data.HBarType == 'ä»åºæ¡ç ') {
			@@ -747,7 +870,7 @@
			element.tabChange('tab-Kf_SellOutBill', '3');//è·³è½¬é¡µç¾
			}
			else if (result.data.HBarType == 'æºåæ¡ç ') {
			$("#HSupName").val(result.data.HSupName);
			//$("#HSupName").val(result.data.HSupName);
			$("#HSupID").val(result.data.HSupID);
			//$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			@@ -772,7 +895,7 @@
			element.tabChange('tab-Kf_SellOutBill', '3');
			}
			else {
			$("#HSupName").val(result.data.HSupName);
			//$("#HSupName").val(result.data.HSupName);
			$("#HSupID").val(result.data.HSupID);
			//$("#HDeptName").val(result.data.HDeptName);
			$("#HDeptID").val(result.data.HDeptID);
			@@ -815,6 +938,14 @@
			, { field: 'HSourceEntryID', title: 'æºåååç ', width: 150 }
			, { field: 'HSourceBillNo', title: 'æºååå·', width: 150 }
			, { field: 'HBatchNo', title: 'æ¹æ¬¡', width: 150 }
			, { field: 'HInterID', title: 'åæ®ID', width: 150, hide: true }
			, { field: 'HBilltype', title: 'åæ®ç±»å', width: 150, hide: true }
			, { field: 'Hbarcode', title: 'æ¡ç ç¼å·', width: 150, hide: true }
			, { field: 'HSCWHID', title: 'è°åºä»åºID', width: 150, hide: true }
			, { field: 'HSCSPID', title: 'è°åºä»ä½ID', width: 150, hide: true }
			, { field: 'HAuxPropID', title: 'è¾å©å±æ§ID', width: 150, hide: true }
			, { field: 'HMTONo', title: 'MTOå·', width: 150, hide: true }
			, { field: 'HMaterID', title: 'ç©æID', width: 150, hide: true }
			]]
			// , data: [linterid]
			// , page: true
			@@ -1055,7 +1186,7 @@
			if (result.count == 1) {
			ZHOption.data = result.data;
			table.render(ZHOption);
			layer.close(index);
			// layer.close(index);
			element.tabChange('tab-SellOutBill', '5');
			}
			else {