调整顺序

gavel/src/main/resources/templates/views/kmes/gpjy/index.html

@@ -109,8 +109,8 @@
 						     that.cpsn = res.data.records.wosnid;
 						     that.ph = res.data.records.wlxxCode;
 						     let woid  = res.data.records.woDjid;
-							 let fkid = res.data.records.id;
-						y(fkid)
+							 that.fkid = res.data.records.id;
+						y(woid)
 						/** wobom查询  **/
 						
 						/* 日志操作 */
@@ -125,8 +125,8 @@
 				})
 			}
 			/* jyfk */
-			function jyfk_secjyfk(that,s){
-				gas.post('kmes/gpfk/jyfk',{"fkid":s, "hgsn":that.xlh}, function(res){
+			function jyfk_secjyfk(that){
+				gas.post('kmes/gpfk/jyfk',{"fkid":that.fkid, "hgsn":that.xlh}, function(res){
 					if(res.data&&res.data.records){
 						
 					}
@@ -135,6 +135,21 @@
 					}
 				});
 			}
+			/* pdfshow gxid登录页传进来 */
+			function jyfk_pdfshow(e,woid){
+				console.log("pdf")
+				let that=e
+				 let newPdfurl=that.pdfurl+"?woid="+woid+"&&"+"gxid="+window.gxid||"nogxid"
+				if (newPdfurl!=that.pdfurl){
+					that.pdfurl=newPdfurl
+					if(that.sivpdf){
+						clearInterval(that.sivpdf)
+					}
+					pdfshow(that.pdfurl, that.pdfdom, 20000).then(e => {
+						that.sivpdf = e
+					})
+				}
+			}
 			/* 总体扫描封装 */
 			function jyfk_jyfk(t){
 				let that=t
@@ -144,11 +159,10 @@
 						let msg="正在查询WOSNID:"+that.xlh
 						jyfk_wrz(that,msg)
 						jyfk_queryKwellWoinfo(that).then(function(s){
-							console.log(s)
-							jyfk_secjyfk(that,s)
 							jyfk_pdfshow(that,s)
 						})
 					}else if(e=="OKBZ"){
+						jyfk_secjyfk(that)
 					}else if(e=="NGBZ"){
 					}else if(e=="WLID"){
 						let msg="正在查询WLID:"+that.xlh
@@ -189,7 +203,7 @@
 					<div class="cpif">
 						<!-- top -->
 						<div class="cpiftop" style="display: flex;align-items: center;">
-								<span>序列号</span>：<input class="easyuitext " style="width: 84%;" v-model="xlh"  @keydown="scanxlh()" name="xlh"  placeholder="请扫码条码" />
+								<span>序列号</span>&nbsp;&nbsp;<input class="easyuitext " style="width: 84%;" v-model="xlh"  @keydown="scanxlh()" name="xlh"  placeholder="请扫码条码" />
 						</div>
 						<!-- bot -->
 						<div class="cpifbot" style="display: flex;flex-wrap: wrap;">
@@ -421,6 +435,7 @@
 			},
 			data:function(){
 				return{
+					pm:"",
 					ng:0,
 					hg:0,
 					pdfdom:"kwrkb04pdf",
@@ -497,6 +512,7 @@
 			},
 			data:function(){
 				return{
+					pm:"",
 					ng:0,
 					hg:0,
 					pdfdom:"kwrkb05pdf",
@@ -568,6 +584,7 @@
 			},
 			data:function(){
 				return{
+					pm:"",
 					ng:0,
 					hg:0,
 					pdfdom:"kwrkb06pdf",