wilson
/
rongxing-java
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

pda-页面样式

master
[li_she] 4 years ago
parent
06bebe0259
commit
71242e22f8
6 changed files with 22 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      pom.xml
  2. 2
      src/main/resources/static/pda/js/produce/produce_accept.js
  3. 4
      src/main/resources/static/pda/js/produce/produce_roll_nos.js
  4. 8
      src/main/resources/static/pda/js/receipt/receipt_order.js
  5. 24
      src/main/resources/templates/produce/produce_roll_nos.ftl
  6. 2
      src/main/resources/templates/receipt/matter_roll.ftl

1
pom.xml
View File

@ -52,7 +52,6 @@
</properties>
<dependencies>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>

2
src/main/resources/static/pda/js/produce/produce_accept.js
View File

@ -44,7 +44,7 @@ function scanRollNo(rollNo){
var tempData = data.obj;
if (code=='200') {
// 刷新页面
window.document.location.href = "/pda/publicMenu?titleName=''&menuId=0";
window.document.location.href = "/pda/produceAccept?titleName=''&menuId=0";
// 更新供应商编码
} else if (code=='500') {
layer.msg(data.msg);

4
src/main/resources/static/pda/js/produce/produce_roll_nos.js
View File

@ -36,10 +36,10 @@ function delRollNo(rollNo,orderNo,tags){
$("#roll_nums").val(current_roll_nums);
$("#show_roll_nums").html(current_roll_nums);
if(current_roll_nums==0){
window.document.location.href = "/pda/pdaBase";
window.document.location.href = "/pda/produceAccept?titleName=''&menuId=0";
}
} else if (code=='500') {
window.document.location.href = "/pda/procuce/produceRollNos";
window.document.location.href = "/pda/produce/produceRollNos";
}
},
error : function(data) {

8
src/main/resources/static/pda/js/receipt/receipt_order.js
View File

@ -211,11 +211,15 @@ function endCurrentScan(){
layer.closeAll('dialog');
});
}else{
layer.msg(code+"122313156");
var outData = data.obj;
var outShow = '状态有误的卷号：';
for(var i = 0;i<outData.length;i++){
outShow+=outData[i];
if (outData){
for(var i = 0;i<outData.length;i++){
outShow+=outData[i];
}
}
layer.msg(outShow);
}
},

24
src/main/resources/templates/produce/produce_roll_nos.ftl
View File

@ -18,7 +18,7 @@
<link rel="stylesheet" type="text/css" href="/pda/jeasyui/themes/icon.css">
<!-- Custom styles for this template -->
<link href="/css/base.css" rel="stylesheet">
<link href="/pda/css/base.css" rel="stylesheet">
<link rel="stylesheet" type="text/css" href="/css/button.css">
</head>
<body>
@ -27,7 +27,7 @@
<header class="mint-header is-fixed">
<div class="mint-header-button is-left">
<div class="header-title">
<a href="/pda/produceReceipt" class="go-back"><i class="mintui mintui-back"></i></a>
<a href="/pda/produceAccept?titleName=''&menuId=0" class="go-back"><i class="mintui mintui-back"></i></a>
<span>融欣MES - 生产收货</span>
</div>
</div>
@ -36,27 +36,27 @@
</header>
<div class="r-left ivu-row">
<div class="ivu-col ivu-col-span-6">生产订单号：</div>
<div class="ivu-col ivu-col-span-14">${rollNos.orderNo }</div>
<input id="orderNo" type="hidden" value="${rollNos.orderNo }" >
<div class="ivu-col ivu-col-span-14">${rollNos.orderNo!'' }</div>
<input id="orderNo" type="hidden" value="${rollNos.orderNo!'' }" >
</div>
<div class="r-left ivu-row">
<div class="ivu-col ivu-col-span-6">物料编码：</div>
<div class="ivu-col ivu-col-span-14">${rollNos.partNo }</div>
<input id="partNo" type="hidden" value="${rollNos.partNo }" >
<div class="ivu-col ivu-col-span-14">${rollNos.partNo!'' }</div>
<input id="partNo" type="hidden" value="${rollNos.partNo!'' }" >
</div>
<div class="r-left ivu-row">
<div class="ivu-col ivu-col-span-6">物料描述：</div>
<div class="ivu-col ivu-col-span-14">${rollNos.partDes }</div>
<div class="ivu-col ivu-col-span-14">${rollNos.partDes!'' }</div>
</div>
<div class="r-left ivu-row">
<div class="ivu-col ivu-col-span-6">单卷数量：</div>
<div class="ivu-col ivu-col-span-14">${rollNos.nums }</div>
<input id="sigelNums" type="hidden" value="${rollNos.nums }" >
<div class="ivu-col ivu-col-span-14">${rollNos.nums!'' }</div>
<input id="sigelNums" type="hidden" value="${rollNos.nums!'' }" >
</div>
<div class="r-left ivu-row">
<div class="ivu-col ivu-col-span-6">卷数：</div>
<div class="ivu-col ivu-col-span-14" id="show_roll_nums">${rollNos.rollNums }</div>
<input id="roll_nums" type="hidden" value="${rollNos.rollNums }" >
<div class="ivu-col ivu-col-span-14" id="show_roll_nums">${rollNos.rollNums!'' }</div>
<input id="roll_nums" type="hidden" value="${rollNos.rollNums!'' }" >
</div>
<div class="ivu-table-wrapper">
<div class="ivu-table">
@ -125,7 +125,7 @@
</div>
<div class="ivu-row" style="margin-top: 10px;">
<div class="ivu-col ivu-col-span-6 ivu-col-offset-18">
<a href="/pda/publicMenu?titleName=''&menuId=0" class="ivu-btn ivu-btn-primary">
<a href="/pda/produceAccept?titleName=''&menuId=0" class="ivu-btn ivu-btn-primary">
<span>返回</span>
</a>
</div>

2
src/main/resources/templates/receipt/matter_roll.ftl
View File

@ -31,7 +31,7 @@
<header class="mint-header is-fixed">
<div class="mint-header-button is-left">
<div class="header-title">
<a href="/pda/publicMenu?titleName=''&menuId=0" class="go-back"><i class="mintui mintui-back"></i></a>
<a href="/pda/receipt" class="go-back"><i class="mintui mintui-back"></i></a>
<span>融欣MES - 收货采购订单</span>
</div>
</div>

Write Preview
Loading…
Cancel
Save