MES-WEB-LayUI.git

			@@ -79,8 +79,8 @@
			</div>
			<div class="layui-col-xs8">
			<select name="HBillType" id="HBillType">
			<option value="3710">çäº§è®¢å</option>
			<option value="3711">çäº§æ±æ¥å</option>
			<option value="3710">çäº§è®¢å</option>
			</select>
			</div>
			</div>
			@@ -96,9 +96,9 @@
			<div class="layui-col-xs8">
			<input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs2">
			<!--<div class="layui-col-xs2">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">ç¡®å®</button>
			</div>
			</div>-->
			</div>
			</div>
			</div>
			@@ -127,7 +127,7 @@
			<input type="hidden" name="HStockPlaceID" id="HStockPlaceID" value="0" autocomplete="off" class="layui-input">
			</div>
			<div class="layui-col-xs3">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" >...</button>
			</div>
			</div>
			</div>
			@@ -421,6 +421,7 @@
			$("#HBillNo").val(d.data[0].HBillNo);
			$("#HBillType").val(d.data[0].HSourceBillType);
			$("#HSourceBillNo").val(d.data[0].HSourceBillNo);
			$("#HSourceBillNo").attr("disabled", "true");
			//$("#HWHID").val(d.data[0].HWhID);
			//$("#HStockPlaceID").val(d.data[0].HSPID);
			//$("#HKeeperID").val(d.data[0].HKeeperID);
			@@ -517,7 +518,7 @@
			$("#HInterID").val("");
			$("#HBillNo").val("");
			$.ajax({
			url: GetWEBURL() + "/Web/GetMAXNum",
			url: GetWEBURL() + "/Web/GetMAXNumPDA",
			type: "GET",
			data: { "HBillType": '1202' },
			success: function (d) {
			@@ -686,8 +687,29 @@
			});

			//ç¼è¾
			//form.on('submit(cmdModify)', function () {//ç¼è¾
			// var sSubStr = table.cache['wl-table'];
			// //if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			// layer.open({
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'æç»åè¡¨'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../../views/å¬å±é¡µé¢/Kf_BarCodeEditDlg.html?table=' + JSON.stringify(sSubStr), 'yes']
			// , resize: false
			// , cancel: function () {
			// //$(".layui-btn").removeClass("layui-btn-disabled");
			// }
			// })
			// // }
			//});

			form.on('submit(cmdModify)', function () {//ç¼è¾
			var sSubStr = table.cache['wl-table'];
			//var sSubStr = table.cache['wl-table'];
			var checkStatus = table.checkStatus('wl-table')
			, data = checkStatus.data;
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({
			type: 2
			@@ -696,19 +718,49 @@
			, 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=' + data[0].HInterID + '&HMaterID =' + data[0].HMaterID + '&HBillType =' + data[0].HBillType, 'yes']
			, resize: false
			, cancel: function () {
			//$(".layui-btn").removeClass("layui-btn-disabled");
			}
			, end: function () {
			//å·æ°é¡µé¢,
			//location.reload();
			var sInterID = $("#HInterID").val()
			table.render({
			elem: '#wl-table'
			//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { 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: 'HBarcodeQtys', title: 'æ¡ç æ°é', width: 150 }
			]]
			// , data: [linterid]
			// , page: true
			, height: 500
			, done: function () {
			layer.closeAll("loading");
			}
			})
			}
			})
			// }
			});

			form.on('submit(Cancel)', function () {
			//sessionStorage["SourceFlag"] = false;
			parent.location.href = "../../../views/index.html"
			//window.close();//å³éå½åé¡µ
			})

			////å é¤
			@@ -1204,7 +1256,7 @@
			}
			if (result.data.hSourceBillTypeField == "3710") {
			$("#HBillType").empty();
			$("#HBillType").val("3711");
			$("#HBillType").val("3710");
			var optionHtml = '';
			optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + 'çäº§è®¢å' + "</option>";
			$("#HBillType").append(optionHtml);
			@@ -1302,11 +1354,12 @@
			var listOption = {
			elem: '#wl-table'
			, toolbar: '#toolbarDemo'
			, totalRow: true
			, cellMinWidth: 90
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HQty', title: 'æ°é', width: 150, totalRow: true}
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150, totalRow: true }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			@@ -1372,8 +1425,10 @@
			data: { "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			$("#HDeptID").val(result.data[0].HDeptID);
			$("#HDeptName").val(result.data[0].HDeptName);
			if (result.data[0].HDeptID != 0) {
			$("#HDeptID").val(result.data[0].HDeptID);
			$("#HDeptName").val(result.data[0].HDeptName);
			}
			playSound1();
			HSourceFlag = true;
			layer.load(3)
			@@ -1383,12 +1438,13 @@
			//, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
			, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
			, toolbar: '#toolbarDemo'
			, totalRow: true
			, defaultToolbar: []
			, where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HQty', title: 'æ°é', width: 150, totalRow: true}
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150, totalRow: true}
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			@@ -1424,6 +1480,8 @@
			function GetHSpValue(obj) { //è¿åè°å¥ä»ä½
			$("#HStockPlaceName").val(obj[0].HName);
			$("#HStockPlaceID").val(obj[0].HItemID);
			$("#HWHNAME").val(obj[0].HWhName);
			$("#HWHID").val(obj[0].HWHID);
			}
			function GetHKeeperValue(obj) { //è¿åä¿ç®¡
			$("#HKeeper").val(obj[0].HName);