调整

html/Needlecarquality_new.html

@@ -114,7 +114,7 @@
 										<button class="bg" type="button" style="width: 100%;height: 50px" class="mui-btn mui-btn-blue mui-btn-outlined">{{itemdef}}</button>
 									</td>
 									<td class="altrowstable" style=" height: 50px" v-for="itemd,isize in itemsSize">
-										<button class="bg" :style="stylebg(isize)" style="width: 100%;height: 50px; border:0px ;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined"
+										<button class="bg" :style="stylebg(itemd)" style="width: 100%;height: 50px; border:0px ;" type="button" class="mui-btn mui-btn-blue mui-btn-outlined"
 										 @click="selectSize(itemd)">{{itemd}}</button>
 									</td>
 
@@ -205,7 +205,8 @@
 			});
 
 			function initPage() {
-				plus.screen.lockOrientation("landscape-secondary") //横屏
+				// plus.screen.lockOrientation("landscape-secondary") //横屏
+				plus.screen.lockOrientation("landscape-primary") //横屏
 				app.init();
 			}
 
@@ -249,7 +250,8 @@
 					itemsSize: [],
 					SizeQty: [],
 					itemsSizeDef: [40, 41, 42, 43, 44, 45, 46],
-
+					type : 1,
+					parentSize:0,
 					IndexID: 0,
 					disable_save_button: 'disabled',
 					disable_reportDelete: 'disabled',
@@ -299,8 +301,10 @@
 
 						this.itemsDetail = mui.currentWebview.itemsDetail;
 						this.itemsSize = mui.currentWebview.itemsSize;
-
-
+						this.type = mui.currentWebview.type;
+						this.parentSize = mui.currentWebview.parentSize;
+						console.log("this.type:::" + this.type)
+						console.log("this.parentSize:::" + this.parentSize)
 
 						this.getDataInit();
 					},
@@ -660,14 +664,20 @@
 
 					},
 
-					stylebg: function(n) {
+					stylebg: function(k) {
+									if(this.type ==1){
+										return 
+									}
+									else if(this.type ==2) {
+										if (k == this.parentSize) {
+											this.size=this.parentSize
+											return {
+												"background": "#02C1ED"
+												
+											}
+										}
+									}
 												
-						// 						if (n == 0) {
-						// 							return {
-						// 								"background": "#02C1ED"
-						// 								
-						// 							}
-						// 						}
 					},
 
 

html/Needlecarreport_new.html

@@ -23,6 +23,8 @@
 				height: 200%;
 				/*background-color: #F6F6F6;*/
 			}
+			
+			.mui-backdrop {position: fixed;top:251px;right: 10px;bottom: 5px;left: 698px;z-index: 998;background-color: rgba(0,0,0,.3);}
 		</style>
 	</head>
 
@@ -38,33 +40,50 @@
 						<label style=" text-align: center; position: relative;  left: 50px;">今日完成数量:{{number}} </label>
 					</div>
 					<div id="left-2">
-						<table class="mui-table" style=" position: relative;top: -472px;">
-							<thead class="mui-table-view">
+						<table class="mui-table" style=" position: relative;top: -432px;  ">
+							<tbody class="mui-table-view-cell" >
 								<tr>
-									<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">时间</th>
-									<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">指令号</th>
-									<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;">数量</th>
+									<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;width: 30%;">时间</th>
+									<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;width: 50% ">指令号</th>
+									<th style="font-size: 16px;font-weight: normal;background-color: #E2E2E9;width: 19%; ">数量</th>
 								</tr>
-							</thead>
+							</tbody>
 						</table>
-						<div class="mui-scroll-wrapper " style="border: solid #DAE6EF 1px  ;background: white; display: inline-block; width: 30%; top: 49px;">
+						<div id="item1" class="mui-scroll-wrapper scroll1"  style=" border: solid #DAE6EF 1px  ;height: 480px; background: white; display: inline-block; width: 30%; top: 49px;">
 							<div class="mui-scroll">
-
-
-
 								<table class="mui-table">
 									<tbody class="mui-table-view-cell">
 										<tr :id="'ReportID_'+item.ReportID" class="Report" v-for=" item in itemsLeft" @click="selectReport(item.ReportID)">
-											<td align="center">{{item.Date}}</td>
-											<td align="center">{{item.IndexNo}}</td>
-											<td align="center">{{item.Qty}}</td>
+											<td style="width: 30%;"  align="center">{{item.Date}}</td>
+											<td style="width: 50% "  align="center">{{item.IndexNo}}</td>
+											<td style="width: 19%;" align="center">{{item.Qty}}</td>
+									</tbody>
+									</tr>
+								</table>
+							</div>
+						</div>
+						
+						<div id="item2" class="mui-scroll-wrapper scroll2" :style="display_" style="  border: solid #DAE6EF 1px  ;height: 480px; background: white; display: inline-block; width: 30%; top: 49px;">
+													<div class="mui-scroll">
+														<table class="mui-table">
+															<tbody class="mui-table-view-cell">
+																<tr :id="'ReportID2_'+item.ReportID" class="Report" v-for=" item in itemsLeft2" @click="selectReport2(item.ReportID)">
+																	<td style="width: 30%;" align="center">{{item.Date}}</td>
+																	<td style="width: 50%;" align="center">{{item.IndexNo}}</td>
+																	<td style="width: 19%;" align="center">{{item.Qty}}</td>
 															</tbody>
 															</tr>
 														</table>
 													</div>
 												</div>
 
+           <div class="mui-segmented-control" style="position: relative;top: 50px;">
 						
+
+           	<a id="n1" class="mui-control-item mui-active" @click="selectDisplay(1)"  >今日实报</a>
+           	<a id="n2" class="mui-control-item "  @click="selectDisplay(2)" >单款实报</a>
+						
+           </div>
 					</div>
 				</div>
 
@@ -77,7 +96,7 @@
 							<button style="text-align: center;border-style:none; width: 100%;height: 100%; background: white;">指令号:</button>
 						</div>
 
-						<div class="mui-scroll-wrapper mui-slider-indicator mui-segmented-control mui-segmented-control-inverted" style=" display: inline-block; width: 64.5%; position: relative;top: 1px;">
+						<div class="mui-scroll-wrapper scroll3 mui-slider-indicator mui-segmented-control mui-segmented-control-inverted" style=" display: inline-block; width: 64.5%; position: relative;top: 1px;">
 
 							<div class="mui-scroll">
 
@@ -162,7 +181,7 @@
 						</div>
 						<div style="  display: inline-block; width: 17%; position: relative;top: -25px;">
 							<button type="button" class="mui-btn mui-btn-blue mui-btn-block" :disabled="disable_reportDelete" @click="reportDelete()">撤回实报</button>
-							<button type="button" class="mui-btn mui-btn-blue mui-btn-block" :disabled="disable_qq_" @click="nextPage()">品质问题</button>
+							<button type="button" class="mui-btn mui-btn-blue mui-btn-block" :disabled="disable_qq_" @click="nextPage(1,0)">品质问题</button>
 						</div>
 
 					</div>
@@ -181,15 +200,15 @@
 								</thead>
 
 							</table>
-							<div class="mui-scroll-wrapper " style=" border: #DAE6EF solid 1px; display: inline-block; height: 365px;background: white;  top:22px;">
+							<div class="mui-scroll-wrapper scroll4 " style=" border: #DAE6EF solid 1px; display: inline-block; height: 365px;background: white;  top:22px;">
 								<div class="mui-scroll">
 									<table class="mui-table ">
 										<tbody class="mui-table-view-cell">
 											<tr v-for="itemdetail,isize in itemsDetail1" @click="selectSize(itemdetail.SizeName)">
-												<td class="altrowstable bg " style="height: 50px" :style="stylebg(isize)" align="center">{{itemdetail.SizeName}}</td>
+												<td class="altrowstable bg " style="height: 50px"  align="center">{{itemdetail.SizeName}}</td>
 												<td class="altrowstable" align="center">{{itemdetail.Qty}}</td>
 												<td class="altrowstable" align="center">{{itemdetail.QualifiedQty}}</td>
-												<td class="altrowstable" align="center">{{itemdetail.UnQualifiedQty}}</td>
+												<td class="altrowstable" @click ="nextPage(2,itemdetail.SizeName)" align="center">{{itemdetail.UnQualifiedQty}}</td>
 
 											</tr>
 
@@ -233,17 +252,11 @@
 							</div>
 						</div>
 
-
-
-
-
 					</div>
 				</div>
 			</div>
 			
 
-
-
 		</div>
 
 
@@ -273,17 +286,16 @@
 					size: 0,
 					dateTime: "",
 					today: "",
-					items: [11, 21, 31, 14, 15, 11, 21, 31, 14, 15, 11, 21, 31, 14, 15, 11, 21, 31, 14, 15, 11, 21, 31, 14, 15, 11,
-						21, 31, 14, 15, 11, 21, 31, 14, 15, 11, 21, 31, 14, 15,
-					],
+					link:"",
 					itemsDetail: [], //订单明细
 					itemsDetail1: [],
 					itemsDetail2: [],
 					itemsHead: [],
 					itemsLeft: [],
+					itemsLeft2:[],
 					itemsSize: [],
 					SizeQty: [],
-
+					ReportType :1 ,
 					IndexID: 0,
 					// disable_save_button: 'disabled',
 					disable_reportDelete: 'disabled',
@@ -292,6 +304,9 @@
 					Report_IndexID: 0,
 					Model: 0,
 					CompleteRatio: 0, //完成进度
+					displayModel:1, 
+					zhezhao :1, //
+					mask_: mui.createMask(function(e){return false;}),
 				},
 				computed: {
 					disable_save_button_C: function() {
@@ -307,6 +322,12 @@
 						} else {
 							return 'disabled';
 						}
+					},
+					display_:function(){
+						if(this.displayModel ==1 ){
+							return "display: none "
+						}
+						
 					}
 
 				},
@@ -336,11 +357,11 @@
 					getData: function() {
 						var that = this;
 						var tempdate = this.dateTime + " 00:00:00";
-
+						this.createZhezhao(-1)
 
 
 						var para = {
-							ReportType: 1,
+							ReportType: this.ReportType,
 							Date: tempdate
 
 						};
@@ -353,7 +374,7 @@
 								that.itemsDetail = e.items[0];
 								that.IndexID = e.items[0].IndexID;
 								that.getDataDetail1();
-								that.getDataDetail2();
+								that.getDataDetail2(1);
 								that.getTatolNum();
 								that.qty = 0;
 								that.disable_reportDelete = 'disabled';
@@ -367,7 +388,7 @@
 								that.number = 0;
 								that.qty = 0;
 								that.disable_reportDelete = 'disabled'
-								that.getDataDetail2();
+								that.getDataDetail2(1);
 								that.getTatolNum();
 							}
 
@@ -388,27 +409,45 @@
 							// that.size = e.data.SizeName[0];
 						});
 					},
-					getDataDetail2: function() {
+					getDataDetail2: function(n) {
+						
+						//n= 1 今日时报  n=2 单款时报
 						var that = this;
 						var para = {
-							ReportType: 1,
+							ReportType:  this.ReportType,
 							
-							IndexID: 0,
+							IndexID: n==1 ? 0 : this.IndexID ,
 							PageSize: 200,
 							PageIndex: 1,
 						};
-
+						console.log(JSON.stringify(para))
+						if( n ==1 ){
 							Api.post('/api/vMES/ProductionReport/Report', para, function(e) {
 								
 								that.itemsLeft = e.items;
 							});
+						}
+						else if( n ==2){
+							if( this.IndexID == 0)
+							{
+								that.itemsLeft2 =[];
+							}
+							else{
+								Api.post('/api/vMES/ProductionReport/Report', para, function(e) {
+									
+									that.itemsLeft2 = e.items;
+								});
+							}
+							
+						}
+						
 
 
 					},
 					getTatolNum: function() {
 						var that = this;
 						var para = {
-							ReportType: 1,
+							ReportType:  this.ReportType,
 							Date: this.dateTime + " 00:00:00",
 						};
 						Api.post('/api/vMES/ProductionReport/TotalQty', para, function(e) {
@@ -444,22 +483,25 @@
 
 						Api.post('/api/vMES/ProductionReport/Delete', para, function(e) {
 							if (e.success) {
+								that.createZhezhao(-1)
 								that.disable_reportDelete = 'disabled'
 								that.size = 0;
 								that.qty = 0;
 								that.getCompleteRatio(that.Report_IndexID); //订单进度
 								that.selectSize(0);
-								that.selectReport(0)
+								that.selectReport(0);
+								that.selectReport2(0);
 								that.getDataDetail1(); //获取列表尺码对应数量
 								that.getTatolNum(); //获取今日完成数量
-								that.getDataDetail2(); //获取左边列表明细
+								that.getDataDetail2(1); //获取左边列表明细
+								that.getDataDetail2(2);
 								that.Model = 0;
 								var Index = document.getElementById("Index_" + that.IndexID)
 								Index.style.background = "#02C1ED" ;
 
 								mui.toast("撤回成功")
 							} else {
-								mui.toast("撤回失败" + e.success.message)
+								mui.toast("撤回失败" + e.message)
 							}
 						});
 
@@ -489,7 +531,41 @@
 							}
 						});
 					},
+					getLink:function(){
+						var that = this;
+						var para ={
+							ReportType: this.ReportType,
+							StyleCode: this.itemsDetail.StyleCode
 							
+						}
+						console.log( JSON.stringify(para))
+						Api.post('/api/vMES/Sop/StyleSop', para, function(e) {
+							if(e.success){
+								console.log( JSON.stringify(e))
+								that.link = e.data.Url ; 
+								
+								var url_ = "sop.html";
+								var id_ = "sop.html";
+								mui.openWindow({
+									url: url_,
+									id: id_,
+									extras: {
+										style:that.itemsDetail.StyleCode,
+										ReportType:that.ReportType,
+										link :that.link
+									},
+								});
+								
+							}
+							else{
+								mui.toast("获取sop地址失败: " + e.message)
+							}
+							},function(b, bb, bbb) {
+							mui.toast(JSON.stringify(bbb.message))
+
+						});
+						
+					},
 
 					SizeQtyA: function() {
 						for (var i = 0; i < this.itemsSize.length; i++) {
@@ -520,7 +596,8 @@
 								that.selectSize(0);
 								that.getDataDetail1(); //获取列表尺码对应数量
 								that.getTatolNum(); //获取今日完成数量
-								that.getDataDetail2(); //获取左边列表明细
+								that.getDataDetail2(1); //获取左边列表明细 今日实报
+								that.getDataDetail2(2); //获取左边列表明细 单款实报
 								that.getCompleteRatio(that.IndexID) //订单进度
 								mui.toast("提交成功");
 							} else {
@@ -534,14 +611,19 @@
 					},
 					submitZD: function() {
 						var btnArray = ['否', '是'];
+						var that = this;
+
 						mui.confirm('请确认是否整单完工？', '提示', btnArray, function(e) {
 							if (e.index == 1) {
 								var para = {
-									ReportType: 1,
-									IndexID: this.IndexID,
+									ReportType:  this.ReportType,
+									IndexID: that.IndexID,
 
 								}
-								var that = this;
+							
+								console.log(JSON.stringify(para));
+								console.log(JSON.stringify(para));
+
 								Api.post('/api/vMES/ProductionReport/SingleComplete', para, function(e) {
 
 									if (e.success) {
@@ -551,7 +633,7 @@
 										that.selectSize(0);
 										that.getDataDetail1(); //获取列表尺码对应数量
 										that.getTatolNum(); //获取今日完成数量
-										that.getDataDetail2(); //获取左边列表明细
+										that.getDataDetail2(1); //获取左边列表明细
 										that.getCompleteRatio(that.IndexID) //订单进度
 										mui.toast("提交成功");
 									} else {
@@ -571,7 +653,7 @@
 
 					},
 					selectIndex: function(idx) {
-						console.log(idx)
+						this.createZhezhao(-1)//关闭遮罩
 						var indxx = document.getElementsByClassName("Index");
 						
 
@@ -587,7 +669,8 @@
 						if (this.IndexID != 0) {
 
 							this.getDataDetail1();
-							this.getDataDetail2();
+							this.getDataDetail2(1);
+							this.getDataDetail2(2);
 							this.getTatolNum();
 							this.selectSize(0);
 							this.selectReport(0);
@@ -606,15 +689,51 @@
 							this.disable_reportDelete = 'disabled'
 						}
 			
+						mui('.scroll1').scroll().scrollTo(0,0,100);
+						mui('.scroll2').scroll().scrollTo(0,0,100);
+						// mui('.scroll3').scroll().scrollTo(0,0,100);
+						mui('.scroll4').scroll().scrollTo(0,0,100);
+					},
+					
+					createZhezhao:function(n){
+						console.log(n)
+						if(n== -1){
+								// var mask = mui.createMask();//callback为用户点击蒙版时自动执行的回调； 
+								
+													// this.mask_.close();
+													this.mask_._remove()
+													this.zhezhao = 1;
+												  console.log("n== -1")
+						}
+						else{
+							if (this.zhezhao == 1 ){
+// 														var mask = mui.createMask(function(e){
+// 														return false;
+// 							
+// 														});//callback为用户点击蒙版时自动执行的回调； 
+						
+														this.mask_.show();//显示遮罩
+												
+														this.zhezhao = 2
+													
+															// mask.close();//关闭遮罩
+													}
+						}
 						
 					},
 					selectReport: function(obj) {
+						
+						
+						
+						
 						var op = document.getElementById("ReportID_" + obj)
 
 						this.ReportID = obj;
 						if (obj == 0) {
 							this.Report_IndexID = 0
 						} else {
+							this.createZhezhao(1)
+
 							for (var i = 0; i < this.itemsLeft.length; i++) {
 								if (this.itemsLeft[i].ReportID == obj) {
 									this.Report_IndexID = this.itemsLeft[i].IndexID
@@ -632,14 +751,85 @@
 							reportele[i].style.background = ""
 						}
 						if (obj != 0) {
+							if(this.IndexID != 0){
+								var Index = document.getElementById("Index_" + this.IndexID)
+								Index.style.background = "";
+							}
+							op.style.background = "#02C1ED";
+							this.Model = 1;
+							this.getDataByReportID();
+						}
+
+
+					},
+					selectReport2: function(obj) {
+						
+						
+						
+											var op = document.getElementById("ReportID2_" + obj)
+					
+											this.ReportID = obj;
+											if (obj == 0) {
+												this.Report_IndexID = 0
+											} else {
+												this.createZhezhao(1)
+												for (var i = 0; i < this.itemsLeft2.length; i++) {
+													if (this.itemsLeft2[i].ReportID == obj) {
+														this.Report_IndexID = this.itemsLeft2[i].IndexID
+													}
+												}
+											}
+											
+					
+											if (this.ReportID != 0) {
+												this.disable_reportDelete = null;
+											}
+											var reportele = document.getElementsByClassName("Report");
+					
+											for (var i = 0; i < reportele.length; i++) {
+												reportele[i].style.background = ""
+											}
+											if (obj != 0) {
+												console.log("obj:;" + obj )
+												console.log("IndexID::" + this.IndexID )
+												if(this.IndexID != 0){
 													var Index = document.getElementById("Index_" + this.IndexID)
 													Index.style.background = "";
+												}
+												
 												op.style.background = "#02C1ED";
 												this.Model = 1;
 												this.getDataByReportID();
 											}
 					
 					
+										},
+					selectDisplay:function(n){
+						var opt = document.getElementById("item1" )
+						var opt2 = document.getElementById("item2" )
+						var n1 = document.getElementById("n1" )
+
+						var n2 = document.getElementById("n2" )
+						console.log(opt.style.display)
+						console.log(opt2.style.display)
+						if( n== 1){
+							n1.style.background ="royalblue"
+							n1.style.color = "white"
+							n2.style.background ="white"
+							n2.style.color = "royalblue"
+							opt.style.display ="inline-block";
+							opt2.style.display = "none"
+							}
+						if(n== 2){
+							this.getDataDetail2(2)
+							n1.style.background ="white"
+							n1.style.color = "royalblue"
+							n2.style.background ="royalblue"
+							n2.style.color = "white"
+							opt.style.display ="none";
+							opt2.style.display = "inline-block"
+						}
+							
 					},
 					changeValue: function() {
 						if (isNaN(parseInt(this.qty))) {
@@ -708,6 +898,7 @@
 
 					},
 					nextday: function(n) {
+						this.createZhezhao(-1)
 						console.log("next")
 						var d = new Date(this.dateTime);
 						d.setTime(d.getTime() + 24 * 60 * 60 * 1000 * n);
@@ -718,6 +909,11 @@
 						}
 
 						this.getData();
+						
+						 mui('.scroll1').scroll().scrollTo(0,0,100);
+						 mui('.scroll2').scroll().scrollTo(0,0,100);
+						 mui('.scroll3').scroll().scrollTo(0,0,100);
+						 mui('.scroll4').scroll().scrollTo(0,0,100);
 					},
 					stylebg: function(n) {
 
@@ -728,7 +924,7 @@
 							}
 						}
 					},
-					nextPage: function() {
+					nextPage: function(n,k) {
 						var url_;
 						var id_;
 						url_ = "Needlecarquality_new.html";
@@ -740,23 +936,22 @@
 								IndexID: this.IndexID,
 								dateTime: this.dateTime,
 								itemsDetail: this.itemsDetail,
-								itemsSize: this.itemsSize
+								itemsSize: this.itemsSize,
+								type: n  ,  // n =2 点击不合格进去 ,
+								parentSize:k, 
 							},
 						});
 
 					},
 					sop: function() {
-						var url_;
-						var id_;
-						url_ = "report_gysm.html";
-						id_ = "report_gysm.html";
-						mui.openWindow({
-							url: url_,
-							id: id_,
-							extras: {
 						
-							},
-						});
+						this.getLink();
+						
+						
+											
+												
+						
+					
 
 					},
 					selecttime: function() {
@@ -809,6 +1004,10 @@
 								_self.picker = null;
 							});
 						}
+						mui('.scroll1').scroll().scrollTo(0,0,100);
+						mui('.scroll2').scroll().scrollTo(0,0,100);
+						mui('.scroll3').scroll().scrollTo(0,0,100);
+						mui('.scroll4').scroll().scrollTo(0,0,100);
 					}, //selecttime
 					back: function() {
 						// plus.screen.lockOrientation("portrait-primary") //横屏

html/sop.html

+<!doctype html>
+<html>
+
+	<head>
+		<meta charset="utf-8">
+		<title>SOP</title>
+		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
+		<link href="../dest/css/mui.min.css" rel="stylesheet" />
+	</head>
+
+	<body  style="margin: 0; padding: 0; width: 100px;">
+		<div id="app">
+		<header @click="backaction" class="mui-bar mui-bar-nav " style="width: 150px !important; background: #DCDCE1;  position: relative;left: 810px; "  >
+			<button  class="mui-icon mui-icon-arrowleft mui-btn-outlined ;" style=" border: 0px; padding: 0; width: 50px; height: 100%; color: #007AFF;" 
+			> </button>
+	
+			<!-- <a class="mui-icon mui-icon-left-nav mui-pull-left" onclick="mui.back()"></a> -->
+			<h1 class="mui-title" >返回</h1>
+		</header>
+		
+		
+		<div  class=" mui-fullscreen"  >
+			
+			<iframe  style=" border-width: 0; "  
+			:src="link"
+			 width="100%" height="571"></iframe>
+		</div>
+		</div>
+		
+		<script src="../dest/js/mui.min.js"></script>
+		<script src="../dest/js/public.min.js"></script>
+		<script src="../dest/js/vue.min.js"></script>
+		<script type="text/javascript">
+					mui.plusReady(function() {
+		
+						initPage();
+					});
+					function initPage() {
+					
+						app.init();
+					
+					}
+					var app = new Vue({
+						el: '#app',
+						data:{
+							item:1,
+							style:"",
+							ReportType:0,
+							link:""
+						},
+						computed:{
+// 							link:function(){
+// 								
+// 							}
+						},
+						methods: {
+							init:function(){
+								console.log("init")
+								this.style = mui.currentWebview.style
+								this.ReportType = mui.currentWebview.ReportType
+								this.link = mui.currentWebview.link
+
+								console.log("this.style::" + this.style)
+								console.log("this.link::" + this.link)
+								
+							},
+							
+							backaction:function(){
+								console.log('ddddd'); 
+								mui.openWindow({
+											url: 'Needlecarreport_new.html',
+											id: 'Needlecarreport_new.html',
+								}); 
+							},
+						}
+						})		
+		</script>			
+	</body>
+	
+</html>