调整同步

html/Needlecarreport_new.html

@@ -323,6 +323,7 @@
 							return 'disabled';
 						}
 					},
+					
 					display_:function(){
 						if(this.displayModel ==1 ){
 							return "display: none "
@@ -393,6 +394,9 @@
 							}
 
 
+						}, function(b, bb, bbb) {
+							mui.toast(JSON.stringify(bbb.message))
+
 						});
 					},
 					getDataDetail1: function() {
@@ -400,13 +404,20 @@
 						var para = {
 							IndexID: this.IndexID,
 						};
-
+						if(this.IndexID == 0){
+							return;
+						}
 						Api.post('/api/vMES/ProductionReport/ProductIndexNoDetail', para, function(e) {
+							if(e.success){
+								that.itemsDetail = e.data;
+								that.itemsDetail1 = e.data.ReportDetail;
+								that.itemsSize = e.data.SizeName;
+							}
+						
+							
+						}, function(b, bb, bbb) {
+							mui.toast(JSON.stringify(bbb.message))
 
-							that.itemsDetail = e.data;
-							that.itemsDetail1 = e.data.ReportDetail;
-							that.itemsSize = e.data.SizeName;
-							// that.size = e.data.SizeName[0];
 						});
 					},
 					getDataDetail2: function(n) {
@@ -423,9 +434,15 @@
 						// console.log(JSON.stringify(para))
 						if( n ==1 ){
 							Api.post('/api/vMES/ProductionReport/Report', para, function(e) {
-								
-								that.itemsLeft = e.items;
-							});
+								if(e.success){
+									that.itemsLeft = e.items;
+
+								}
+							
+							}, function(b, bb, bbb) {
+							mui.toast(JSON.stringify(bbb.message))
+
+						});
 						}
 						else if( n ==2){
 							if( this.IndexID == 0)
@@ -434,9 +451,14 @@
 							}
 							else{
 								Api.post('/api/vMES/ProductionReport/Report', para, function(e) {
+									if(e.success){
+										that.itemsLeft2 = e.items;
+									}
 									
-									that.itemsLeft2 = e.items;
-								});
+								}, function(b, bb, bbb) {
+							mui.toast(JSON.stringify(bbb.message))
+
+						});
 							}
 							
 						}
@@ -451,7 +473,10 @@
 							Date: this.dateTime + " 00:00:00",
 						};
 						Api.post('/api/vMES/ProductionReport/TotalQty', para, function(e) {
-							that.number = e.data;
+								if(e.success){
+									that.number = e.data;
+								}
+							
 						});
 					},
 					//完成进度
@@ -462,7 +487,9 @@
 
 						};
 						// console.log(JSON.stringify(para))
-
+						if(n == 0){
+							return;
+						}
 						Api.post('/api/vMES/ProductionReport/IndexNoCompleteRatio', para, function(e) {
 							that.CompleteRatio = e.data;
 							// console.log(JSON.stringify(e))
@@ -472,6 +499,9 @@
 									// console.log(that.CompleteRatio);
 								}
 							}
+						}, function(b, bb, bbb) {
+							mui.toast(JSON.stringify(bbb.message))
+
 						});
 
 					},
@@ -496,13 +526,18 @@
 								that.getDataDetail2(1); //获取左边列表明细
 								that.getDataDetail2(2);
 								that.Model = 0;
-								var Index = document.getElementById("Index_" + that.IndexID)
-								Index.style.background = "#02C1ED" ;
+								if(that.IndexID != 0){
+									var Index = document.getElementById("Index_" + that.IndexID)
+									Index.style.background = "#02C1ED" ;
+								}
 
 								mui.toast("撤回成功")
 							} else {
 								mui.toast("撤回失败" + e.message)
 							}
+						}, function(b, bb, bbb) {
+							mui.toast(JSON.stringify(bbb.message))
+
 						});
 
 					},
@@ -529,6 +564,9 @@
 							} else {
 								mui.toast("获取明细失败:" + e.message)
 							}
+						}, function(b, bb, bbb) {
+							mui.toast(JSON.stringify(bbb.message))
+
 						});
 					},
 					getLink:function(){
@@ -541,7 +579,7 @@
 						// console.log( JSON.stringify(para))
 						Api.post('/api/vMES/Sop/StyleSop', para, function(e) {
 							if(e.success){
-								// console.log( JSON.stringify(e))
+								 // console.log( JSON.stringify(e))
 								that.link = e.data.Url ; 
 								
 								var url_ = "sop.html";
@@ -552,7 +590,8 @@
 									extras: {
 										style:that.itemsDetail.StyleCode,
 										ReportType:that.ReportType,
-										link :that.link
+										link :that.link,
+										parentPage: "Needlecarreport_new.html"
 									},
 								});
 								

html/sop.html

@@ -46,7 +46,8 @@
 							item:1,
 							style:"",
 							ReportType:0,
-							link:""
+							link:"",
+							parentPage:"",
 						},
 						computed:{
 // 							link:function(){
@@ -59,17 +60,17 @@
 								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)
+								this.parentPage =  mui.currentWebview.parentPage
+								console.log("this.parent::" + this.parentPage)
+								
 								
 							},
 							
 							backaction:function(){
 								console.log('ddddd'); 
 								mui.openWindow({
-											url: 'Needlecarreport_new.html',
-											id: 'Needlecarreport_new.html',
+											url: this.parentPage,
+											id: this.parentPage,
 								}); 
 							},
 						}