MES-WEB-LayUI.git

			@@ -61,11 +61,21 @@
			<input type="text" name="HInnerBillNo" id="HInnerBillNo" class="layui-input">
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">ä»åº</label>
			<div class="layui-input-inline">
			<input type="text" readonly name="HWhName" id="HWhName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HWhID" id="HWhID" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" id="HWhList" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">ä»åº</label>
			<div class="layui-input-inline">
			<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
			<input type="hidden" name="hwhid" id="hwhid" class="layui-input" value="" style="float:left;width:150px;">
			<button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			@@ -234,7 +244,7 @@
			, { field: 'HQty', title: 'å®æ¶æ°é', edit: 'text', width: 100}
			, { field: 'HPrice', title: 'åä»·', edit: 'text', width: 100}
			, { field: 'HMoney', title: 'éé¢', edit: 'text', width: 100}
			, { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true}
			, { field: 'hwhid', title: 'hwhid', edit: 'text', width: 100, hide: true}
			, { field: 'HWHCode', title: 'æ¶æä»åºä»£ç ', edit: 'text', event: 'HWHCode', width: 100 }
			, { field: 'HWHName', title: 'æ¶æä»åºåç§°', edit: 'text', width: 100 }
			, { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true}
			@@ -253,7 +263,7 @@
			//å¤ææ¯å¦æ°å¢
			if (hID == null \|\| hID == 0) {
			//åå§å è½½è¡¨æ ¼{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0,"HSPCode":"", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "","HBackFlag":"", "HRemark": "" }];
			option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "hwhid": 0, "HWHCode": "", "HWHName": "", "HSPID": 0,"HSPCode":"", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "","HBackFlag":"", "HRemark": "" }];
			table.render(option);
			}
			else {
			@@ -289,7 +299,7 @@
			var checkStatus = table.checkStatus('mainTable')
			, data = checkStatus.data;;
			var AddRow = table.cache['mainTable'];
			var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "", "HBackFlag": "", "HRemark": "" };
			var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HSecUnitID": 0, "HSecUnitCode": "", "HSecUnitName": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "hwhid": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HNewModel": "", "HWallThickness": "", "HHardness": "", "HLastProdModel": "", "HDiameter": "", "HBackFlag": "", "HRemark": "" };
			switch (obj.event) {
			case 'btn-AddLine':
			//table.cache["mainTable"].push(AddRow[rows]);
			@@ -491,7 +501,7 @@

			//åæ¥æ´æ°è¡¨æ ¼åç¼åå¯¹åºçå¼
			obj.update({
			HWHID: checkStatus.data[0].HItemID,
			hwhid: checkStatus.data[0].HItemID,
			HWHCode: checkStatus.data[0].HNumber,
			HWHName: checkStatus.data[0].HName,
			});
			@@ -621,7 +631,7 @@
			});




			function RoadBillMain(hID)//å è½½è¡¨å¤´
			{
			//alert(hID);
			@@ -635,13 +645,13 @@
			success: function (result) {

			if (result.code == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data.h_v_Sc_MouldProdBackBillList_Edit[0];
			var data = result.data.h_v_Sc_MouldProdBackBillList[0];
			console.info(data);
			form.val("component-form-group", { //formTest å³ class="layui-form" æå¨åç´ å±æ§ lay-filter="" å¯¹åºçå¼
			"HBillNo": data.åæ®å·
			, "HDate": formatDate(data.æ¥æ)
			, "HInnerBillNo": data.åé¨åæ®å·
			, "HWHID": data.HWHID //ä»åºID
			, "hwhid": data.hwhid //ä»åºID
			, "HWHName": data.ä»åºåç§° //ä»åºåç§°
			, "HSecManagerID": data.hsecmanagerid //éªæ¶åID
			, "HSecManagerName": data.éªæ¶å //éªæ¶ååç§°
			@@ -692,7 +702,22 @@
			RoadBillMain(hID);
			/* RoadBillSub(linterid);*/
			}

			////é»è®¤ä»åºHWhList
			//form.on('submit(HWhList)', function () {//éæ©å·¥ç§
			// layer.open({
			// type: 2
			// , area: ['666px', '666px']
			// , title: 'ä»åºåè¡¨'
			// , shade: 0.6 //é®ç½©éæåº¦
			// , maxmin: true //åè®¸å¨å±æå°å
			// , anim: 0 //0-6çå¨ç»å½¢å¼ï¼-1ä¸å¼å¯
			// , content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html?Type=HWHID', 'yes']
			// , resize: false
			// , cancel: function () {
			// //$(".layui-btn").removeClass("layui-btn-disabled");
			// }
			// })
			//});
			//è¡¨å¤´ä¿¡æ¯ä»åºå¼¹çª
			form.on('submit(WareHouse)', function () {
			//é¡µé¢å±-èªå®ä¹
			@@ -704,18 +729,18 @@
			shift: 2,
			area: ['80%', '80%'],
			maxmin: true,
			content: ['../../PublicPage/WareHouseInformation.html', 'yes'],
			content: ['../../../views/Baseset/åºç¡èµæ/Gy_WarehouseList.html', 'yes'],
			btn: ['ç¡®å®', 'åæ¶']
			, btn1: function (index, layero) {

			//æé®ãæé®ä¸ãçåè°
			var iframeWindow = window['layui-layer-iframe' + index] //è·åå¼¹æ¡é¡µé¢
			var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//è·åtableçelem:"#test"
			var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//è·åtableçelem:"#test"
			if (checkStatus.data.length === 0) {
			return layer.msg('è¯·éæ©æ°æ®');
			}
			$("#HWHName").val(checkStatus.data[0].HName);
			$("#HWHID").val(checkStatus.data[0].HItemID);
			$("#hwhid").val(checkStatus.data[0].HItemID);
			layer.close(layer.index); //å®è·åçå§ç»æ¯ææ°å¼¹åºçæä¸ªå±ï¼å¼æ¯ç±layeråé¨å¨æéå¢è®¡ç®ç
			}
			, btn2: function (index, layero) {
			@@ -738,7 +763,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'ä»åºåè¡¨',
			title: 'éªæ¶ååè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],
			@@ -776,7 +801,7 @@
			layer.open({
			type: 2,
			skin: 'layui-layer-rim', //å ä¸è¾¹æ¡
			title: 'ä»åºåè¡¨',
			title: 'ä¿ç®¡ååè¡¨',
			closeBtn: 1,
			shift: 2,
			area: ['80%', '80%'],