From 5080eb086d46f524bb5e7c39653abb737403ccf4 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期六, 27 三月 2021 14:39:32 +0800
Subject: [PATCH] 1.0.5 pda样式调整
---
src/main/webapp/views/pda/combPro.html | 164 ++++++++++++++++++---------
src/main/webapp/views/pda/stockOut.html | 8
src/main/webapp/views/pda/locNormalOut.html | 54 +++++++-
src/main/webapp/views/pda/locDetlIframe.html | 40 +++++-
src/main/webapp/views/pda/matQuery.html | 40 +++++-
5 files changed, 217 insertions(+), 89 deletions(-)
diff --git a/src/main/webapp/views/pda/combPro.html b/src/main/webapp/views/pda/combPro.html
index 268cd00..15435a7 100644
--- a/src/main/webapp/views/pda/combPro.html
+++ b/src/main/webapp/views/pda/combPro.html
@@ -18,11 +18,13 @@
display: inline-block;
width: 120px;
}
+
.number-tool:after {
clear: both;
content: "";
display: table;
}
+
.number-tool button {
background-color: #fff;
margin-top: 3px;
@@ -32,6 +34,7 @@
width: 25px;
border: 1px solid #777777;
}
+
.number-tool input {
text-align: center;
height: 30px;
@@ -40,15 +43,33 @@
width: 50px;
padding: 0;
}
+
#confirm {
margin: 10px 10px;
padding: 5px 20px;
font-weight: 600;
}
+
#remove {
margin: 10px 10px;
padding: 5px 20px;
color: darkred;
+ }
+
+ .form-box span {
+ font-size: 16px;
+ display: inline-block;
+ text-align: right;
+ }
+
+ .form-box input {
+ width: 165px;
+ padding-left: 5px;
+ height: 30px;
+ border: 1px solid #777777;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
</style>
</head>
@@ -57,11 +78,13 @@
<header>
<div class="layui-input-inline" style="margin-top: 5px">
<label class="layui-form-label" style="margin-left: 16px">鍗曞彿</label>
- <input class="layui-input" id="billNo" oninput="find(this)" placeholder="鎵爜 / 杈撳叆" autocomplete="off" style="width: 175px; height: 40px; margin-right: 0;">
+ <input class="layui-input" id="billNo" oninput="find(this)" placeholder="鎵爜 / 杈撳叆" autocomplete="off"
+ style="width: 175px; height: 40px; margin-right: 0;">
</div>
<div class="layui-input-inline">
<label class="layui-form-label">鎵樼洏鐮�</label>
- <input class="layui-input" style="width: 175px;" type="number" id="code" onkeyup="findCode(this)" oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
+ <input class="layui-input" style="width: 175px;" type="number" id="code" onkeyup="findCode(this)"
+ oninput="if(value.length>8)value=value.slice(0,8)" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
</div>
</header>
@@ -73,30 +96,63 @@
<footer>
<div class="layui-btn-container">
<button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
- <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()" style="margin-left: 20px">缁勬墭</button>
- <button type="button" id="retrun-btn" class="layui-btn layui-btn-primary " onclick="back()" style="margin-left: 20px">杩斿洖</button>
+ <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()"
+ style="margin-left: 20px">缁勬墭
+ </button>
+ <button type="button" id="retrun-btn" class="layui-btn layui-btn-primary " onclick="back()"
+ style="margin-left: 20px">杩斿洖
+ </button>
<span id="tips"></span>
</div>
</footer>
<!-- 淇敼鏁伴噺寮圭獥 -->
<div id="modify" style="display: none; text-align: center;padding-top: 10px">
- <div class="form-item">
- <span>鐗╂枡</span>
- <input id="matNo" type="text" disabled="disabled" style="width: 70%">
- </div>
- <div class="form-item">
- <span>鍚嶇О</span>
- <input id="matName" type="text" disabled="disabled" style="width: 70%">
- </div>
- <div class="form-item">
- <span>鐢熶骇鍗曞彿</span>
- <input id="warehouse" type="text" disabled="disabled" style="width: 60%;height: 24.8px; color: blue">
+ <div class="form-box">
+ <div class="form-item">
+ <table style="display: inline">
+ <tr>
+ <td>
+ <span style="width: 35px; margin-right: 5px">鐗╂枡</span>
+ </td>
+ <td style="text-align: left">
+ <input id="matNo" type="text" disabled="disabled">
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="form-item">
+ <table style="display: inline">
+ <tr>
+ <td style="vertical-align: top">
+ <span style="width: 35px; margin-right: 5px">鍚嶇О</span>
+ </td>
+ <td style="text-align: left">
+ <textarea rows="3" style="resize: none; width: 165px" id="matName" type="text" disabled="disabled"
+ readonly="readonly"></textarea>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="form-item">
+ <table style="display: inline">
+ <tr>
+ <td>
+ <span style="width: 35px; margin-right: 5px">鍗曞彿</span>
+ </td>
+ <td style="text-align: left">
+ <input id="mnemonic" type="text" disabled="disabled">
+ </td>
+ </tr>
+ </table>
+ </div>
</div>
<div class="form-item" style="margin-top: 5px">
<span style="vertical-align: middle">鏁伴噺</span>
<div class="number-tool" style="vertical-align: middle">
- <button onclick="reduce()">-</button><input id="count" type="number"><button onclick="add()">+</button>
+ <button onclick="reduce()">-</button>
+ <input id="count" type="number">
+ <button onclick="add()">+</button>
</div>
</div>
<button id="remove" onclick="remove()">绉婚櫎</button>
@@ -105,10 +161,12 @@
</body>
<script>
- window.onload = function(){document.getElementById("billNo").focus();}
+ window.onload = function () {
+ document.getElementById("billNo").focus();
+ }
var tableIns;
var countLayer;
- layui.use(['table','laydate', 'form'], function() {
+ layui.use(['table', 'laydate', 'form'], function () {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
@@ -122,7 +180,15 @@
cols: [[
{field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
{field: 'mnemonic', align: 'center', title: '鐢熶骇鍗曞彿'},
- {fixed: 'right', align: 'center', field: 'count', title: '鏁伴噺', event: 'modify', style:'cursor: pointer;color: blue', width:50},
+ {
+ fixed: 'right',
+ align: 'center',
+ field: 'count',
+ title: '鏁伴噺',
+ event: 'modify',
+ style: 'cursor: pointer;color: blue',
+ width: 50
+ },
// {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
done: function (res, curr, count) {
@@ -130,7 +196,7 @@
});
// 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(chooseData)', function(obj) {
+ table.on('tool(chooseData)', function (obj) {
var data = obj.data;
switch (obj.event) {
case 'modify':
@@ -139,13 +205,13 @@
offset: '20px',
title: '淇敼鏁伴噺',
shadeClose: true,
- area: ['80%', '220px'],
+ area: ['80%', '300px'],
content: $("#modify"),
success: function (layero, index) {
$('#matNo').val(data.matNo);
$('#matName').val(data.matName);
$('#count').val(data.count);
- $('#warehouse').val(data.warehouse);
+ $('#mnemonic').val(data.mnemonic);
maxCount = data.count;
}
});
@@ -163,13 +229,14 @@
// 娣诲姞琛ㄦ牸鏁版嵁
var matData = [];
+
function addTableData(data) {
- for (var i=0;i<data.length;i++) {
+ for (var i = 0; i < data.length; i++) {
var toPush = true;
- for (var j=0;j<matData.length;j++){
- if (data[i].matNo === matData[j].matNo && data[i].warehouse === matData[j].warehouse) {
+ for (var j = 0; j < matData.length; j++) {
+ if (data[i].matNo === matData[j].matNo && data[i].mnemonic === matData[j].mnemonic) {
matData[j].count = Number(matData[j].count) + Number(data[i].count);
- toPush = false;
+ toPush = false;
}
}
if (toPush) {
@@ -184,7 +251,7 @@
/**
* 鏍规嵁閫氱煡鍗曞彿鏌ヨ鐗╂枡璇︽儏
*/
- function find(el){
+ function find(el) {
if (isEmpty(el.value)) {
return;
}
@@ -222,12 +289,14 @@
var countDom = $('#count');
var minCount = 1;
var maxCount = 1;
+
function add() {
if (countDom.val() >= maxCount) {
return;
}
countDom.val(Number(countDom.val()) + 1);
}
+
function reduce() {
if (countDom.val() <= minCount) {
return;
@@ -236,12 +305,12 @@
}
// 淇敼鏁伴噺
- function confirm(){
+ function confirm() {
var matNo = $('#matNo').val();
var count = $('#count').val();
- var warehouse = $("#warehouse").val() === '' ? null : $("#warehouse").val();
- for (var j=0;j<matData.length;j++){
- if (matNo === matData[j].matNo && warehouse === matData[j].warehouse) {
+ var mnemonic = $("#mnemonic").val() === '' ? null : $("#mnemonic").val();
+ for (var j = 0; j < matData.length; j++) {
+ if (matNo === matData[j].matNo && mnemonic === matData[j].mnemonic) {
if (count > maxCount || count < minCount) {
tips("鏁伴噺涓嶈兘瓒呰繃鑼冨洿", true);
return;
@@ -257,9 +326,9 @@
// 绉婚櫎鐗╂枡
function remove() {
var matNo = $('#matNo').val();
- var warehouse = $("#warehouse").val() === '' ? null : $("#warehouse").val();
- for (var j=0;j<matData.length;j++){
- if (matNo === matData[j].matNo && warehouse === matData[j].warehouse) {
+ var mnemonic = $("#mnemonic").val() === '' ? null : $("#mnemonic").val();
+ for (var j = 0; j < matData.length; j++) {
+ if (matNo === matData[j].matNo && mnemonic === matData[j].mnemonic) {
matData.splice(j, 1);
}
}
@@ -267,23 +336,6 @@
layer.close(countLayer);
tips("绉婚櫎鎴愬姛");
}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
// 閲嶇疆
@@ -311,17 +363,17 @@
return;
}
var billNo = $('#billNo').val();
- var warehouse = $('#warehouse').val();
+ var mnemonic = $('#mnemonic').val();
$.ajax({
- url: baseUrl+"/mobile/comb/auth",
+ url: baseUrl + "/mobile/comb/auth",
headers: {'token': localStorage.getItem('token')},
data: JSON.stringify({
barcode: barcode,
combMats: matData,
billNo: billNo,
- warehouse: warehouse,
+ mnemonic: mnemonic,
}),
- contentType:'application/json;charset=UTF-8',
+ contentType: 'application/json;charset=UTF-8',
method: 'POST',
async: false,
success: function (res) {
@@ -343,7 +395,7 @@
* @param warn true锛氱孩鑹插瓧浣�
*/
function tips(msg, warn) {
- layer.msg(msg, {icon: warn?2:1})
+ layer.msg(msg, {icon: warn ? 2 : 1})
}
document.onkeyup = function (e) {
diff --git a/src/main/webapp/views/pda/locDetlIframe.html b/src/main/webapp/views/pda/locDetlIframe.html
index 7d0cbaf..3edf80b 100644
--- a/src/main/webapp/views/pda/locDetlIframe.html
+++ b/src/main/webapp/views/pda/locDetlIframe.html
@@ -24,11 +24,9 @@
.form-box span {
display: inline-block;
text-align: right;
- width: 70px;
}
.form-box input {
- width: 120px;
- margin-left: 10px;
+ width: 160px;
padding-left: 5px;
height: 30px;
border: 1px solid #777777;
@@ -75,16 +73,40 @@
<body>
<div class="form-box">
<div class="form-item">
- <span>搴撲綅鍙�</span>
- <input id="locNo" type="text" disabled="disabled">
+ <table style="display: inline">
+ <tr>
+ <td>
+ <span style="width: 35px; margin-right: 5px">搴撲綅</span>
+ </td>
+ <td style="text-align: left">
+ <input id="locNo" type="text" disabled="disabled">
+ </td>
+ </tr>
+ </table>
</div>
<div class="form-item">
- <span>鐗╂枡缂栫爜</span>
- <input id="matnr" type="text" disabled="disabled">
+ <table style="display: inline">
+ <tr>
+ <td>
+ <span style="width: 35px; margin-right: 5px">缂栫爜</span>
+ </td>
+ <td style="text-align: left">
+ <input id="matnr" type="text" disabled="disabled">
+ </td>
+ </tr>
+ </table>
</div>
<div class="form-item">
- <span>鐗╂枡鍚嶇О</span>
- <input id="maktx" type="text" disabled="disabled">
+ <table style="display: inline">
+ <tr>
+ <td style="vertical-align: top">
+ <span style="width: 35px; margin-right: 5px">鍚嶇О</span>
+ </td>
+ <td style="text-align: left">
+ <textarea rows="4" style="width: 165px; resize: none" id="maktx" type="text" disabled="disabled" readonly="readonly"></textarea>
+ </td>
+ </tr>
+ </table>
</div>
<div class="form-item">
<span style="vertical-align: middle">鏁伴噺</span>
diff --git a/src/main/webapp/views/pda/locNormalOut.html b/src/main/webapp/views/pda/locNormalOut.html
index def0d04..aebd9c0 100644
--- a/src/main/webapp/views/pda/locNormalOut.html
+++ b/src/main/webapp/views/pda/locNormalOut.html
@@ -12,6 +12,20 @@
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
</head>
<style>
+ .form-box span {
+ font-size: 16px;
+ display: inline-block;
+ text-align: right;
+ }
+ .form-box input {
+ width: 165px;
+ padding-left: 5px;
+ height: 30px;
+ border: 1px solid #777777;
+ overflow:hidden;
+ white-space:nowrap;
+ text-overflow:ellipsis;
+ }
.number-tool {
margin-left: 10px;
padding: 1px 0 1px 5px;
@@ -88,18 +102,36 @@
</footer>
<!-- 淇敼鏁伴噺寮圭獥 -->
-<div id="modify" style="display: none; text-align: center;padding-top: 10px">
- <div class="form-item">
- <span>缂栫爜</span>
- <input id="matnr2" type="text" disabled="disabled" style="width: 70%">
- </div>
- <div class="form-item">
- <span>鍚嶇О</span>
- <textarea rows="2" style="width: 70%; resize: none" id="maktx2" type="text" disabled="disabled"
- readonly="readonly"></textarea>
+<div id="modify" style="display: none; padding-top: 10px; text-align: center;">
+ <div class="form-box">
+ <div class="form-item">
+ <table style="display: inline">
+ <tr>
+ <td>
+ <span style="width: 35px; margin-right: 5px">缂栫爜</span>
+ </td>
+ <td style="text-align: left">
+ <input id="matnr2" type="text" disabled="disabled">
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="form-item">
+ <table style="display: inline">
+ <tr>
+ <td style="vertical-align: top">
+ <span style="width: 35px; margin-right: 5px">鍚嶇О</span>
+ </td>
+ <td style="text-align: left">
+ <textarea rows="3" style="resize: none; width: 165px" id="maktx2" type="text" disabled="disabled"
+ readonly="readonly"></textarea>
+ </td>
+ </tr>
+ </table>
+ </div>
</div>
<input id="index" type="text" disabled="disabled" style="display: none;">
- <div class="form-item" style="margin-top: 5px; margin-bottom: 8px">
+ <div class="form-item" style="margin-top: 5px; margin-bottom: 8px;">
<span style="vertical-align: middle">鏁伴噺</span>
<div class="number-tool" style="vertical-align: middle">
<button onclick="reduce()">-</button>
@@ -179,7 +211,7 @@
offset: '20px',
title: '淇敼鏁伴噺',
shadeClose: true,
- area: ['80%', '200px'],
+ area: ['80%', '240px'],
content: $("#modify"),
success: function (layero, index) {
$('#matnr2').val(data.matnr);
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index b7de3f7..a7117a7 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -26,11 +26,9 @@
font-size: 16px;
display: inline-block;
text-align: right;
- width: 70px;
}
.form-box input {
- width: 120px;
- margin-left: 10px;
+ width: 160px;
padding-left: 5px;
height: 30px;
border: 1px solid #777777;
@@ -77,16 +75,40 @@
<div class="form-box">
<div class="form-item">
- <span>鐗╂枡缂栫爜</span>
- <input id="matNo" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">
+ <table style="display: inline">
+ <tr>
+ <td>
+ <span style="width: 35px; margin-right: 5px">缂栫爜</span>
+ </td>
+ <td style="text-align: left">
+ <input id="matNo" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">
+ </td>
+ </tr>
+ </table>
</div>
<div class="form-item">
- <span style="margin-right: 10px">鐗╂枡鍚嶇О</span>
- <textarea rows="2" style="width: 125px; resize: none" id="matName" type="text" disabled="disabled" readonly="readonly"></textarea>
+ <table style="display: inline">
+ <tr>
+ <td style="vertical-align: top">
+ <span style="width: 35px; margin-right: 5px">鍚嶇О</span>
+ </td>
+ <td style="text-align: left">
+ <textarea rows="4" style="width: 165px; resize: none" id="matName" type="text" disabled="disabled" readonly="readonly"></textarea>
+ </td>
+ </tr>
+ </table>
</div>
<div class="form-item">
- <span>鐗╂枡瑙勬牸</span>
- <input id="str2" type="text" disabled="disabled">
+ <table style="display: inline">
+ <tr>
+ <td>
+ <span style="width: 35px; margin-right: 5px">瑙勬牸</span>
+ </td>
+ <td style="text-align: left">
+ <input id="str2" type="text" disabled="disabled">
+ </td>
+ </tr>
+ </table>
</div>
<!--<div class="form-item">-->
<!--<span>鍗曚綅</span>-->
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 7b0580b..c4083c0 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -147,11 +147,11 @@
limit: 500,
cellMinWidth: 50,
cols: [[
- {type: 'checkbox', fixed: 'left', width:30},
- {field: 'count', align: 'center', title: '鏁伴噺', event: 'detail', style:'color: blue', width:50},
{field: 'matnr', align: 'center', title: '缂栫爜', event: 'detail'},
{field: 'maktx', align: 'center', title: '鍚嶇О', event: 'detail'},
- {field: 'locNo', align: 'center', title: '搴撲綅', event: 'detail'}
+ {field: 'locNo', align: 'center', title: '搴撲綅', event: 'detail'},
+ {field: 'count', align: 'center', title: '鏁伴噺', event: 'detail', style:'color: blue', width:50},
+ {type: 'checkbox', fixed: 'right', width:30},
]],
done: function (res, curr, count) {
}
@@ -167,7 +167,7 @@
type: 2,
title: '搴撳瓨鏄庣粏',
shade: [0.3,'#000'],
- area: ['90%', '70%'],
+ area: ['90%', '75%'],
content: 'locDetlIframe.html',
success: function(layero, index){
// 璁剧疆寮圭獥鏍峰紡
--
Gitblit v1.9.1