MES-WEB-LayUI.git

			@@ -64,21 +64,27 @@
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
			<input type="hidden" name="HInterID" id="HInterID" value="0">
			<input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">æ¥æ</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
			<input type="date" class="layui-input" name="HDate" id="HDate">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label">è¾å©åæ®µ</label>
			<label class="layui-form-label">çäº§è®¢å</label>
			<div class="layui-input-inline">
			<input class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off" readonly>
			<input type="text" name="HICMOBillNo" id="HICMOBillNo" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HICMOInterID" id="HICMOInterID" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HICMOEntryID" id="HICMOEntryID" class="layui-input" value="0" style="float:left;width:150px;">
			<input type="hidden" name="HICMOEntrySEQ" id="HICMOEntrySEQ" class="layui-input" value="0" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="BtnHICMOBill" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>

			</div>
			<div class="layui-row">
			<div class="layui-col-xs4 layui-inline">
			@@ -119,6 +125,16 @@
			<input class="layui-input" name="HQty" id="HQty" autocomplete="off" value="0">
			</div>
			</div>
			<div class="layui-col-xs4 layui-inline">
			<label class="layui-form-label" style="width: 80px;">ç»ç»*</label>
			<div class="layui-input-block" style="width: 190px;">
			<select name="HPRDORGID" id="HPRDORGID" lay-filter="HPRDORGID">
			<!--å¨ææ¸²æç»ç»-->
			</select>
			</div>
			</div>
			</div>
			<div class="layui-row">
			<div class="layui-col-xs7 layui-inline">
			<label class="layui-form-label">å¤æ³¨</label>
			<div class="layui-input-block">
			@@ -128,8 +144,6 @@
			</div>
			</div>
			</div>


			<!--å¶åä¿¡æ¯-->
			<div class="layui-tab-item">
			<div class="layui-form-item">
			@@ -248,7 +262,6 @@
			var day = date.getDate();
			var month = date.getMonth() + 1;
			var year = date.getFullYear();
			var shijian = year + "-" + month + "-" + day;
			var allVal;
			//#endregion

			@@ -263,7 +276,7 @@
			var OperationType = params[params[0]]; //ä»åæ°ä¸è·å æ°æ®ç±»å 1æ·»å ä¿å 2å¤å¶ 3 ç¼è¾
			var linterid = params[params[1]]; //ä»åæ°ä¸è·å åæ®åç

			$("#HUSEORGID").val(sessionStorage["OrganizationID"]);
			Organ();

			//å¤ææ¯å¦æ°å¢
			if (linterid == null \|\| linterid == 0) {
			@@ -350,6 +363,10 @@
			form.on('submit(HMaterList)', function () {
			get_checkMater();
			});
			//éæ©çäº§è®¢å
			form.on('submit(BtnHICMOBill)', function () {
			get_checkHICMOBill();
			});
			//éæ©è®¡éåä½æé®
			form.on('submit(HUnitList)', function () {
			get_checkUnit();
			@@ -386,6 +403,19 @@
			});
			}
			});

			$(document).ready(function () {

			$("#HQty").on("input", function (e) {
			currentValue = $(this).val(); // æ´æ°å½åå¼

			for (var i = 0; i < option.data.length; i++) {
			option.data[i]["HQty"] = e.delegateTarget.value;
			}
			table.render(option);
			});
			});


			//#endregion

			@@ -454,10 +484,10 @@
			//æ¥è¯¢æ£éªæ¹æ¡åæ¯å¦åå¨
			var ajaxLoad = layer.load();
			$.ajax({
			url: GetWEBURL() + "/Cg_POOrderBill/cx",
			url: GetWEBURL() + "/Sc_PPBomBill/Editlist",
			type: "GET",
			data: {
			"HInterID": linterid
			"sWhere": "and hmainid="+linterid
			},
			success: function (result) {
			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			@@ -466,40 +496,42 @@
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HBillNo": data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			, "HQty": formatDate(data.æ°é)
			//, "HInnerBillNo": data.åé¨åæ®å·
			, "HICMOBillNo": data.çäº§ä»»å¡åå·
			, "HICMOInterID": data.HICMOInterID
			, "HICMOEntryID": data.HICMOEntryID
			, "HICMOEntrySEQ": data.HICMOEntrySEQ
			, "HMaterName": data.äº§ååç§°
			, "HMaterID": data.HMaterID
			, "HDeptName": data.é¨é¨
			, "HDeptID": data.HDeptID
			, "HSupID": data.HSupID
			, "HSupName": data.ä¾åºå
			, "HEmpID": data.HEmpID
			, "HEmpName": data.ä¸å¡å
			, "HLinkMan": data.èç³»äºº
			, "HLinkPhone": data.èç³»çµè¯
			, "HInnerBillNo": data.è¾å©åæ®µ
			, "HUnitName": data.ä¸»è¡¨è®¡éåä½
			, "HUnitID": data.HUnitID
			, "HQty": data.çäº§æ°é
			, "HPRDORGID": data.HPRDORGID
			, "HRemark": data.è¡¨å¤´å¤æ³¨
			, "HMaker": data.å¶åäºº
			, "HChecker": data.å®¡æ ¸äºº
			, "HCloseMan": data.å³éäºº
			, "HUpDater": data.ä¿®æ¹äºº
			, "HDeleteMan": data.ä½åºäºº
			, "HMakeDate": data.å¶åæ¥æ
			, "HCheckDate": data.å®¡æ ¸æ¥æ
			, "HCloseDate": data.å³éæ¥æ
			, "HUpDateDate": data.ä¿®æ¹æ¥æ
			, "HDeleteDate": data.ä½åºæ¥æ
			});


			//åè¡¨ èµå¼
			var rowdata = [];
			for (var i = 0; i < 1; i++) {
			for (var i = 0; i < result.data.length; i++) {
			rowdata.push(
			{
			"HMaterID": data.HMaterID, "HMaterNumber": data.ç©æä»£ç , "ç©æåç§°": data.ç©æåç§°
			, "è§æ ¼åå·": data.è§æ ¼åå·, "HUnitID": data.HUnitID, "HUnitNumber": data.è®¡éåä½ä»£ç
			, "è®¡éåä½": data.è®¡éåä½, "HQty": data.æ°é, "HRemark": data.è¡¨ä½å¤æ³¨
			, "HPrice": data.åä»·, "HMoney": data.éé¢, "HTaxRate": data.ç¨ç
			, "HTaxMoney": data.éé¢ * data.ç¨ç, "HlineTotal": data.éé¢ + data.ç¨é¢
			, "HTaxPrice": data.å«ç¨åä»·, "HDiscountRate": data.ææ£ç, "HRelTaxPrice": data.å®éå«ç¨åä»·
			, "HDate": Format(new Date(data.äº¤è´§æ¥æ), "yyyy-MM-dd")
			"HMaterID": result.data[i].HMaterID, "HMaterNumber": result.data[i].ç©æä»£ç , "ç©æåç§°": result.data[i].ç©æåç§°
			, "è§æ ¼åå·": result.data[i].è§æ ¼åå·, "HUnitID": result.data[i].hunitid2, "HUnitNumber": result.data[i].è®¡éåä½ä»£ç
			, "è®¡éåä½": result.data[i].è®¡éåä½, "HQty": result.data[i].æ°é, "HRemark": result.data[i].è¡¨ä½å¤æ³¨
			, "HWHID": result.data[i].HWHID, "ä»åº": result.data[i].ä»åº, "HSPID": result.data[i].HSPID, "ä»ä½": result.data[i].ä»ä½
			, "HBASEUNITID": result.data[i].HBASEUNITID, "åºæ¬è®¡éåä½": result.data[i].åºæ¬è®¡éåä½
			}
			)
			}
			@@ -539,7 +571,7 @@

			$.ajax({
			type: "POST",
			url: GetWEBURL() + "Sc_PPBomBill/PPBomBillEdit", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			url: GetWEBURL() + "Sc_PPBomBill/sc_PPBomBillAdd", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "sMainSub": sMainSub },
			dataType: "json",
			@@ -589,12 +621,18 @@
			return layer.msg("è¯·éæ©ä¸æ¡æ°æ®");
			}

			var hqty = $("#HQty").val();

			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"HMaterID": checkStatus.data[0].HItemID
			, "HMaterNumber": checkStatus.data[0].ç©æä»£ç
			, "ç©æåç§°": checkStatus.data[0].ç©æåç§°
			, "è§æ ¼åå·": checkStatus.data[0].è§æ ¼åå·
			, "HUnitID": checkStatus.data[0].HUnitID
			, "HUnitNumber": checkStatus.data[0].è®¡éåä½ä»£ç
			, "è®¡éåä½": checkStatus.data[0].è®¡éåä½åç§°
			, "HQty": hqty
			})
			layer.close(index);//å³éå¼¹çª
			}
			@@ -679,7 +717,7 @@
			//æ´æ°è¡¨æ ¼ç¼åçæ°æ®
			obj.update({
			"ä»ä½": checkStatus.data[0].ä»ä½åç§°
			,"HSPID": checkStatus.data[0].HItemID
			, "HSPID": checkStatus.data[0].HMainID
			})
			layer.close(index);//å³éå¼¹çª
			}
			@@ -740,6 +778,28 @@
			}
			}

			//è·åç»ç»
			function Organ() {
			//è·åç»å½é¡µç»ç»å
			var Organization = '';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Web/GetOrganizations",
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
			}
			$("#HPRDORGID").append(Organization);
			$("#HPRDORGID").val(sessionStorage["OrganizationID"])
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}

			function get_checkMater() {
			layer.open({
			type: 2//å¼¹çªç±»å
			@@ -763,6 +823,38 @@
			})
			}

			function get_checkHICMOBill() {
			layer.open({
			type: 2//å¼¹çªç±»å
			, skin: 'layui-layer-rim' //å ä¸è¾¹æ¡
			, area: ['90%', '90%']//å¤§å°
			, title: 'çäº§è®¢ååè¡¨'//æ é¢
			, shift: 2//å¼¹åºå¨ç»
			, content: ['../../çäº§ç®¡ç/çäº§ä»»å¡å/Sc_ICMOBillList.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('è¯·éæ©æ°æ®');
			}
			$("#HICMOBillNo").val(checkStatus.data[0].åæ®å·);
			$("#HICMOInterID").val(checkStatus.data[0].hmainid);
			$("#HICMOEntryID").val(checkStatus.data[0].hsubid);
			$("#HICMOEntrySEQ").val(checkStatus.data[0].æç»è¡å·);
			$("#HMaterID").val(checkStatus.data[0].HMaterID);
			$("#HMaterName").val(checkStatus.data[0].äº§ååç§°);
			$("#HUnitID").val(checkStatus.data[0].HUnitID);
			$("#HUnitName").val(checkStatus.data[0].è®¡éåä½);
			$("#HDeptID").val(checkStatus.data[0].HDeptID);
			$("#HDeptName").val(checkStatus.data[0].çäº§è½¦é´);
			$("#HQty").val(checkStatus.data[0].çäº§ä»»å¡åæ°é);
			layer.close(index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) { }
			})
			}

			function get_checkUnit() {
			layer.open({
			type: 2//å¼¹çªç±»å

	WebTM/views/生产管理/生产投料单/Sc_PPBomBill.html	150 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产投料单/Sc_PPBomBillList.html	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -339,12 +339,12 @@
			layer.open({
			type: 2
			, area: ['100%', '100%']
			, title: 'ç¼è¾æ¶æéç¥å'
			, title: 'ç¼è¾çäº§ç¨æå'
			, closeBtn: 1
			, shade: 0.6 //é®ç½©éæåº¦
			, maxmin: true //åè®¸å¨å±æå°å
			, anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			, content: '../../éè´ç®¡ç/æ¶æéç¥å/Add_Edit_Cg_POInStockBillList.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
			, content: './Sc_PPBomBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
			, resize: false,
			end: function () {
			//å·æ°é¡µé¢,