MES-WEB-LayUI.git

			@@ -82,6 +82,7 @@
			<option value="æ´ææ«ç ">æ´ææ«ç </option>
			<option value="åä¸ªæç ">åä¸ªæç </option>
			<option value="ååæç ">ååæç </option>
			<option value="æ´æå é¤">æ´æå é¤</option>
			</select>
			</div>
			</div>
			@@ -285,7 +286,6 @@
			<button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">æäº¤</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdModify">ç¼è¾</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDelete">å é¤</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="cmdSDelete">æ´æå é¤</button>
			<button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">éåº</button>
			</div>
			<div id="" style="display:none;">
			@@ -375,6 +375,7 @@
			, { templet: '#xuhao', title: 'åºå·', sort: true, fixed: 'left', event: "qwe", width: 100 }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HAuxQty', title: 'è¾å©æ°é', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { field: 'HMaterModel', title: 'è§æ ¼åå·', width: 150 }
			@@ -504,6 +505,7 @@
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 150 }
			, { field: 'HAuxQty', title: 'è¾å©æ°é', width: 150 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 150 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 150 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			@@ -696,8 +698,11 @@

			form.on('submit(Cancel)', function () {
			//sessionStorage["SourceFlag"] = false;
			parent.location.href = "../../../views/index.html"
			//parent.location.href = "../../../views/index.html"
			//window.close();//å³éå½åé¡µ
			layer.confirm('æ¨ç¡®å®è¦éåºåï¼', { icon: 3, title: 'æç¤º' }, function (index) {
			window.close();
			});
			})

			//ç¼è¾
			@@ -722,7 +727,7 @@
			// type: 2
			// , area: ['100%', '100%']
			// , title: 'æç»åè¡¨'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , shade: 0.6 //é®ç½©éæåº¦wl-table
			// , maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , 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 + ''
			@@ -769,6 +774,7 @@
			{ type: 'radio' }
			, { field: 'HSNO', title: 'åºå·', width: 60 }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
			@@ -822,7 +828,8 @@
			, where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 80 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 100 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			@@ -848,34 +855,6 @@
			});
			});

			//æ´æå é¤ cmdSDelete
			form.on('submit(cmdSDelete)', function () {//å é¤
			var HBarCode = $('#HBarCode').val();
			var HInterID = $('#HInterID').val();
			if (HBarCode) {
			layer.msg("æ¡ç ä¸è½ä¸ºç©º", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			$.ajax(
			{
			type: "Get",
			url: GetWEBURL() + "/POStockInBillList/SellOutBillSDeleCode",
			async: true,
			data: { "HBarCode": HBarCode, "HInterID": HInterID },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			layer.msg(data.Message, { icon: 1, btn: ['ç¡®è®¤'], time: 100000, title: "æ¸©é¦¨æç¤º" });
			}
			else {
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.msg("éè¯¯" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			});

			//æäº¤
			form.on('submit(Saver)', function (data) {//æäº¤
			@@ -1195,6 +1174,58 @@
			}
			});
			}
			else if (HScanStyle =="æ´æå é¤") {
			var HBarCode = $('#HBarCode').val();
			var HInterID = $('#HInterID').val();
			if (HBarCode=="") {
			layer.msg("æ´æå é¤æ¡ç ä¸è½ä¸ºç©º", { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			return;
			}
			$.ajax(
			{
			type: "Get",
			url: GetWEBURL() + "/POStockInBillList/SellOutBillSDeleCode",
			async: true,
			data: { "HBarCode": HBarCode, "HInterID": HInterID },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäº
			layer.msg(data.Message, { icon: 1, btn: ['ç¡®è®¤'], time: 100000, title: "æ¸©é¦¨æç¤º" });
			table.render({
			elem: '#wl-table'
			, url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
			, cellMinWidth: 80
			, toolbar: '#toolbarDemo'
			, defaultToolbar: []
			, where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
			, cols: [[
			{ type: 'radio' }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºæ¶æ°é', width: 80 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 100 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 150 }
			, { 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 }
			, { field: 'HWHID', title: 'ck', width: 100 }
			]]
			//, height: 500
			})
			}
			else {
			layer.msg(data.Message, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			},
			error: function (err) {
			layer.msg("éè¯¯" + err, { icon: 5, btn: ['ç¡®è®¤'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "æ¸©é¦¨æç¤º" });
			}
			});
			}
			else {
			var sBarCode = $('#HBarCode').val()
			if (sBarCode == '') {
			@@ -1295,6 +1326,7 @@
			{ type: 'radio' }
			, { field: 'HSNO', title: 'åºå·', width: 60 }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }
			@@ -1394,6 +1426,7 @@
			{ type: 'radio' }
			, { field: 'HSNO', title: 'åºå·', width: 60 }
			, { field: 'HQty', title: 'æ°é', width: 80 }
			, { field: 'HAuxQty', title: 'è¾å©æ°é', width: 80 }
			, { field: 'HQtyMust', title: 'åºåæ°é', width: 80 }
			, { field: 'HMaterName', title: 'ç©æåç§°', width: 90 }
			, { field: 'HMaterNumber', title: 'ç©æä»£ç ', width: 90 }