Skip to content

K
kwell-mes
Commit 001c2219 authored by 李苏's avatar 李苏 💬
Browse files
Options

功能完善

parent dd327db0
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 44 deletions
gavel/src/main/resources/templates/views/kmes/gphy/index.html
View file @ 001c2219
...@@ -124,7 +124,9 @@ ...@@ -124,7 +124,9 @@
gas.post('kmes/gphy/zpwl',{"wlxh":that.xlh,"fkid":that.fkid}, function(res){ gas.post('kmes/gphy/zpwl',{"wlxh":that.xlh,"fkid":that.fkid}, function(res){
if(res.data&&res.data.records){ if(res.data&&res.data.records){
/* 表格加1 ok标志改变 日志 */ /* 表格加1 ok标志改变 日志 */
zpfk_queryKwellWoinfo2(that).then(function(s){
zpfk_queryWoBomByWoid(that,s)
})
}else{ }else{
let msg="查询装配物料:"+that.xlh+"失败" let msg="查询装配物料:"+that.xlh+"失败"
that.xlh="" that.xlh=""
...@@ -132,6 +134,32 @@ ...@@ -132,6 +134,32 @@
} }
}) })
} }
/* 刷新获取工单 */
function zpfk_queryKwellWoinfo2(e){
let that=e
return new Promise(function(y,n){
gas.post('kmes/gpfk/queryKwellWoinfo',{"wosnid":that.cpsn,"bzlx":window.bzlx}, function(res){
if(res.data&&res.data.records){
/* 赋值操作 */
that.gd = res.data.records.woDjid;
that.cpsn = res.data.records.wosnid;
that.ph = res.data.records.wlxxCode;
let woid = res.data.records.woid;
that.fkid=res.data.records.id
y(woid)
/** wobom查询 **/
/* 日志操作 */
/* pdf地址 */
}else{
let msg="查询最新工单信息:"+that.cpsn+"失败"
that.xlh=""
zpfk_wrz(that,msg,'error')
screenAlert(that.el,msg,2000)
}
});
})
}
/* 获取工序工单等信息 */ /* 获取工序工单等信息 */
function zpfk_queryKwellWoinfo(e){ function zpfk_queryKwellWoinfo(e){
let that=e let that=e
...@@ -281,7 +309,7 @@ ...@@ -281,7 +309,7 @@
<ul class="tipul" style="height: 100%;"> <ul class="tipul" style="height: 100%;">
<li>当前工序:{{gx}}</li> <li>当前工序:{{gx}}</li>
<li>{{username}}</li> <li>{{username}}</li>
<li class="tipuli2" style="width: 300px;">{{systime}}</li> <li class="tipuli2" style="width: 250px;">{{systime}}</li>
<li class="tipuli2" style="margin-right: 200px;">计数:30</li> <li class="tipuli2" style="margin-right: 200px;">计数:30</li>
<li class="tipuli2"></li> <li class="tipuli2"></li>
...@@ -342,7 +370,7 @@ ...@@ -342,7 +370,7 @@
</div> </div>
</div> </div>
<!-- div2 --> <!-- div2 -->
<div id="kwrkb02" > <div id="kwrkb02" style="display: none;">
<!-- 顶部信息条 --> <!-- 顶部信息条 -->
<div class="toptitle" style="position: relative;"> <div class="toptitle" style="position: relative;">
<ul style="position: absolute;right: 50%;transform: translateX(50%);"> <ul style="position: absolute;right: 50%;transform: translateX(50%);">
...@@ -356,7 +384,7 @@ ...@@ -356,7 +384,7 @@
<input class="easyuitext" style="width: 250px;" @keydown="scanxlh()" placeholder="请扫码条码" name="xlh" v-model="xlh" /> <input class="easyuitext" style="width: 250px;" @keydown="scanxlh()" placeholder="请扫码条码" name="xlh" v-model="xlh" />
<button type="button" ><b style="color: #666666;font-style:oblique;">SUBMIT</b></button> <button type="button" ><b style="color: #666666;font-style:oblique;">SUBMIT</b></button>
</li> </li>
<li class="tipuli2" style="width: 300px;">{{systime}}</li> <li class="tipuli2" style="width: 250px;">{{systime}}</li>
<li class="tipuli2" style="margin-right: 10px;">计数:<span style="font-size: 16px;">30</span></li> <li class="tipuli2" style="margin-right: 10px;">计数:<span style="font-size: 16px;">30</span></li>
...@@ -413,14 +441,14 @@ ...@@ -413,14 +441,14 @@
</div> </div>
</div> </div>
<!-- 界面3 --> <!-- 界面3 -->
<div id="kwrkb03" > <div id="kwrkb03" style="display: none;">
<!-- 顶部信息条 --> <!-- 顶部信息条 -->
<div class="toptitle" style="position: relative;"> <div class="toptitle" style="position: relative;">
<ul class="tipul" style="height: 100%;width: 100%;"> <ul class="tipul" style="height: 100%;width: 100%;">
<li class="tipulmid">ADMIN</li> <li class="tipulmid">ADMIN</li>
<li class="tipulmid">{{username}}</li> <li class="tipulmid">{{username}}</li>
<li class="tipulmid">甲班</li> <li class="tipulmid">甲班</li>
<li class="tipuli2" style="width: 300px;">{{systime}}</li> <li class="tipuli2" style="width: 250px;">{{systime}}</li>
<li class="tipuli2" style="margin-right: 10px;">计数:30</li> <li class="tipuli2" style="margin-right: 10px;">计数:30</li>
<li class="tipuli2" style="margin-right: 10px;">当前工序:{{gx}}</li> <li class="tipuli2" style="margin-right: 10px;">当前工序:{{gx}}</li>
</ul> </ul>
......
gavel/src/main/resources/templates/views/kmes/gpjy/index.html
View file @ 001c2219
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</style> </style>
<div> <div>
<div class="btn-group" > <div class="btn-group" >
<button id="btnqh1" type="button" class="btn btn-default" style="color: white;position: absolute;right: 5px;z-index: 9999999999;height: 50px;width: 200px;border: 0 solid #00AAFF;background-color: #00AAFF;">切换风格</button> <button id="btnqh1" type="button" class="btn btn-default" style="color: white;position: absolute;right: 5px;z-index: 9999999999;height: 50px;width: 200px;border: 0 solid #00AAFF;background-color: #00AAFF;display: none;">切换风格</button>
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
}) })
/* 通用代码 */ /* 通用代码 */
const pdfUr="kmes/gpfk/queryPdfByWoidAndZpgx"
/* 初始化工序 */ /* 初始化工序 */
function jyfk_getgx(e){ function jyfk_getgx(e){
let that=e let that=e
...@@ -136,21 +137,22 @@ ...@@ -136,21 +137,22 @@
} }
} }
else{ else{
let msg=res.message||"操作执行失败"
jyfk_wrz(that,msg,"error")
} }
}); });
} }
/* pdfshow gxid登录页传进来 */ /* pdfshow gxid登录页传进来 */
function jyfk_pdfshow(e,woid){ function jyfk_pdfshow(e,woid){
console.log("pdf")
let that=e let that=e
let newPdfurl=that.pdfurl+"?woid="+woid+"&&"+"gxid="+window.gxid||"nogxid" let newpdfurl=pdfUr+"/"+woid+"/"+window.bzlx
if (newPdfurl!=that.pdfurl){ that.pdf=""
that.pdfurl=newPdfurl if (newpdfurl!=that.pdfurl){
that.pdfurl=newpdfurl
if(that.sivpdf){ if(that.sivpdf){
clearInterval(that.sivpdf) clearInterval(that.sivpdf)
} }
pdfshow(that.pdfurl, that.pdfdom, 20000).then(e => { pdfshow(that.pdfurl, that.pdfdom, 10000).then(e => {
that.sivpdf = e that.sivpdf = e
}) })
} }
...@@ -166,12 +168,14 @@ ...@@ -166,12 +168,14 @@
jyfk_queryKwellWoinfo(that).then(function(s){ jyfk_queryKwellWoinfo(that).then(function(s){
jyfk_pdfshow(that,s) jyfk_pdfshow(that,s)
}) })
that.xlh=""
}else if(e=="OKBZ"){ }else if(e=="OKBZ"){
if(that.fkid){ if(that.fkid){
jyfk_secjyfk(that,"ok") jyfk_secjyfk(that,"ok")
}else{ }else{
jyfk_wrz(that,"请先扫描WOSNID","error") jyfk_wrz(that,"请先扫描WOSNID","error")
} }
that.xlh=""
}else if(e=="NGBZ"){ }else if(e=="NGBZ"){
if(that.fkid){ if(that.fkid){
...@@ -179,13 +183,16 @@ ...@@ -179,13 +183,16 @@
}else{ }else{
jyfk_wrz(that,"请先扫描WOSNID","error") jyfk_wrz(that,"请先扫描WOSNID","error")
} }
that.xlh=""
}else if(e=="WLID"){ }else if(e=="WLID"){
let msg="正在查询WLID:"+that.xlh let msg="正在查询WLID:"+that.xlh
jyfk_wrz(that,msg) jyfk_wrz(that,msg)
that.xlh=""
/* jyfk_wlxh(that) */ /* jyfk_wlxh(that) */
}else if(e=="LOGOUT"){ }else if(e=="LOGOUT"){
jyfk_wrz(that,"即将退出系统") zpfk_wrz(that,"即将退出系统")
that.xlh="" localStorage.clear();
window.location.href ="logout";
} }
/* 获取类型 */ /* 获取类型 */
}) })
...@@ -202,10 +209,8 @@ ...@@ -202,10 +209,8 @@
<!-- 顶部信息条 --> <!-- 顶部信息条 -->
<div class="toptitle" > <div class="toptitle" >
<ul class="tipul" style="height: 100%;"> <ul class="tipul" style="height: 100%;">
<li>ADMIN</li> <li>{{username}}</li>
<li>系统管理员</li> <li class="tipuli2" style="width: 250px;">{{systime}}</li>
<li>甲班</li>
<li class="tipuli2">{{systime}}</li>
<li class="tipuli2" style="margin-right: 200px;">计数:{{hg+ng}}</li> <li class="tipuli2" style="margin-right: 200px;">计数:{{hg+ng}}</li>
<li class="tipuli2">当前工序:{{gx}}</li> <li class="tipuli2">当前工序:{{gx}}</li>
...@@ -229,7 +234,7 @@ ...@@ -229,7 +234,7 @@
<span>工单</span><input class="easyuitext wid70" v-model="gd" name="gd" /> <span>工单</span><input class="easyuitext wid70" v-model="gd" name="gd" />
</div> </div>
<div class="ery"> <div class="ery">
<span>产品SN</span><input class="easyuitext wid70" v-model="cpsn" name="cpsn" /> <span>SN</span><input class="easyuitext wid70" v-model="cpsn" name="cpsn" />
</div> </div>
<div class="ery"> <div class="ery">
<span>品号</span><input class="easyuitext wid70" v-model="ph" name="ph" /> <span>品号</span><input class="easyuitext wid70" v-model="ph" name="ph" />
...@@ -272,14 +277,12 @@ ...@@ -272,14 +277,12 @@
</div> </div>
</div> </div>
<!-- 界面5 --> <!-- 界面5 -->
<div id="kwrkb05"> <div id="kwrkb05" style="display: none;">
<!-- 顶部信息条 --> <!-- 顶部信息条 -->
<div class="toptitle" > <div class="toptitle" >
<ul class="tipul" style="height: 100%;"> <ul class="tipul" style="height: 100%;">
<li>ADMIN</li> <li>username</li>
<li>系统管理员</li> <li class="tipuli2" style="width: 250px;">{{systime}}</li>
<li>甲班</li>
<li class="tipuli2">{{systime}}</li>
<li class="tipuli2" style="margin-right: 200px;">计数:{{ng+hg}}</li> <li class="tipuli2" style="margin-right: 200px;">计数:{{ng+hg}}</li>
<li class="tipuli2">当前工序:{{gx}}</li> <li class="tipuli2">当前工序:{{gx}}</li>
...@@ -304,7 +307,7 @@ ...@@ -304,7 +307,7 @@
<span>工单</span><input class="easyuitext" style="width: 70%" name="gd" v-model="gd" /> <span>工单</span><input class="easyuitext" style="width: 70%" name="gd" v-model="gd" />
</div> </div>
<div class="ery"> <div class="ery">
<span>产品SN</span><input class="easyuitext" style="width: 70%" name="cpsn" v-model="cpsn" /> <span>SN</span><input class="easyuitext" style="width: 70%" name="cpsn" v-model="cpsn" />
</div> </div>
<div class="ery"> <div class="ery">
<span>品号</span><input class="easyuitext" style="width: 70%" name="ph" v-model="ph" /> <span>品号</span><input class="easyuitext" style="width: 70%" name="ph" v-model="ph" />
...@@ -348,14 +351,12 @@ ...@@ -348,14 +351,12 @@
</div> </div>
</div> </div>
<!-- 看板6html --> <!-- 看板6html -->
<div id="kwrkb06"> <div id="kwrkb06" style="display: none;">
<!-- 顶部信息条 --> <!-- 顶部信息条 -->
<div class="toptitle" > <div class="toptitle" >
<ul class="tipul" style="height: 100%;"> <ul class="tipul" style="height: 100%;">
<li>ADMIN</li> <li>{{username}}</li>
<li>系统管理员</li> <li class="tipuli2"style="width: 250px;">{{systime}}</li>
<li>甲班</li>
<li class="tipuli2">{{systime}}</li>
<li class="tipuli2" style="margin-right: 200px;">计数:{{hg+ng}}</li> <li class="tipuli2" style="margin-right: 200px;">计数:{{hg+ng}}</li>
<li class="tipuli2">当前工序:{{gx}}</li> <li class="tipuli2">当前工序:{{gx}}</li>
...@@ -380,7 +381,7 @@ ...@@ -380,7 +381,7 @@
<span>工单</span><input class="easyuitext" style="width: 70%;" name="gd" v-model="gd" /> <span>工单</span><input class="easyuitext" style="width: 70%;" name="gd" v-model="gd" />
</div> </div>
<div class="ery"> <div class="ery">
<span>产品SN</span><input class="easyuitext" style="width: 70%;" name="cpsn" v-model="cpsn" /> <span>SN</span><input class="easyuitext" style="width: 70%;" name="cpsn" v-model="cpsn" />
</div> </div>
<div class="ery"> <div class="ery">
<span>品号</span><input class="easyuitext" style="width: 70%;" name="ph" v-model="ph" /> <span>品号</span><input class="easyuitext" style="width: 70%;" name="ph" v-model="ph" />
...@@ -434,10 +435,6 @@ ...@@ -434,10 +435,6 @@
mounted() { mounted() {
jyfk_getgx(this) jyfk_getgx(this)
dbenlarge('kwrkb04',1,this.isFocus()) dbenlarge('kwrkb04',1,this.isFocus())
pdfshow("pdf/dcAcess.pdf","gpjypdf",5000).then(e=>{
this.sivpdf=e
})
// this.sivpdf= // this.sivpdf=
this.initpage() this.initpage()
this.gettime() this.gettime()
...@@ -450,6 +447,7 @@ ...@@ -450,6 +447,7 @@
}, },
data:function(){ data:function(){
return{ return{
username:localStorage.getItem("username"),
pm:"", pm:"",
ng:0, ng:0,
hg:0, hg:0,
...@@ -511,10 +509,6 @@ ...@@ -511,10 +509,6 @@
mounted() { mounted() {
jyfk_getgx(this) jyfk_getgx(this)
dbenlarge('kwrkb05') dbenlarge('kwrkb05')
pdfshow("pdf/dcAcess.pdf","pdf",5000).then(e=>{
this.sivpdf=e
$("#kwrkb05").hide()
})
// this.sivpdf= // this.sivpdf=
this.initpage() this.initpage()
this.gettime() this.gettime()
...@@ -527,6 +521,7 @@ ...@@ -527,6 +521,7 @@
}, },
data:function(){ data:function(){
return{ return{
username:localStorage.getItem("username"),
pm:"", pm:"",
ng:0, ng:0,
hg:0, hg:0,
...@@ -583,10 +578,6 @@ ...@@ -583,10 +578,6 @@
mounted() { mounted() {
jyfk_getgx(this) jyfk_getgx(this)
dbenlarge('kwrkb06') dbenlarge('kwrkb06')
pdfshow("pdf/dcAcess.pdf","pdf",5000).then(e=>{
this.sivpdf=e
$("#kwrkb06").hide()
})
// this.sivpdf= // this.sivpdf=
this.initpage() this.initpage()
this.gettime() this.gettime()
...@@ -599,6 +590,7 @@ ...@@ -599,6 +590,7 @@
}, },
data:function(){ data:function(){
return{ return{
username:localStorage.getItem("username"),
pm:"", pm:"",
ng:0, ng:0,
hg:0, hg:0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment