From ec444c3a240a5679fc83ec12fa0d7cf41826e932 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 07 四月 2021 14:25:32 +0800
Subject: [PATCH] 1.0.6 pda调整优化
---
src/main/webapp/views/pda/combPro.html | 12 +++++++-----
src/main/webapp/views/pda/stockIn.html | 2 +-
src/main/webapp/views/pda/stockOut.html | 4 ++++
src/main/webapp/views/pda/locNormalIn.html | 14 ++++++++++----
src/main/webapp/views/pda/comb.html | 4 +++-
src/main/webapp/views/pda/locNormalOut.html | 3 +++
src/main/webapp/views/pda/matQuery.html | 15 ++++++++++++++-
7 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 0859f2e..c90be2c 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -52,11 +52,13 @@
tableIns = table.render({
elem: '#chooseData',
data: [],
+ width: 320,
limit: 500,
cellMinWidth: 50,
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
{field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
+ {field: 'mnemonic', align: 'center', title: '鐢熶骇鍗曞彿'},
{field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
done: function (res, curr, count) {
@@ -80,7 +82,7 @@
type: 2,
title: '鎻愬彇鐗╂枡',
shade: [0.3,'#000'],
- area: ['90%', '80%'],
+ area: ['90%', '90%'],
content: 'matQuery.html',
success: function(layero, index){
$('.layui-layer-title').css('font-size', '16px');
diff --git a/src/main/webapp/views/pda/combPro.html b/src/main/webapp/views/pda/combPro.html
index 15435a7..909d15d 100644
--- a/src/main/webapp/views/pda/combPro.html
+++ b/src/main/webapp/views/pda/combPro.html
@@ -175,13 +175,13 @@
tableIns = table.render({
elem: '#chooseData',
data: [],
+ width: 320,
limit: 500,
cellMinWidth: 50,
cols: [[
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
- {field: 'mnemonic', align: 'center', title: '鐢熶骇鍗曞彿'},
+ {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜',event: 'modify',},
+ {field: 'mnemonic', align: 'center', title: '鐢熶骇鍗曞彿',event: 'modify',},
{
- fixed: 'right',
align: 'center',
field: 'count',
title: '鏁伴噺',
@@ -189,7 +189,7 @@
style: 'cursor: pointer;color: blue',
width: 50
},
-// {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+ {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О',event: 'modify',}
]],
done: function (res, curr, count) {
}
@@ -255,8 +255,10 @@
if (isEmpty(el.value)) {
return;
}
-// var billNo = el.value.split(",")[0].split("=")[1];
var billNo = el.value;
+ if (billNo.indexOf('=') > -1) {
+ billNo = billNo.split(",")[0].split("=")[1];
+ }
if (isEmpty(billNo)) {
return;
}
diff --git a/src/main/webapp/views/pda/locNormalIn.html b/src/main/webapp/views/pda/locNormalIn.html
index 6de0418..4b50791 100644
--- a/src/main/webapp/views/pda/locNormalIn.html
+++ b/src/main/webapp/views/pda/locNormalIn.html
@@ -54,7 +54,7 @@
<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">缁勬墭
+ style="margin-left: 20px">鍏ュ簱
</button>
<button type="button" id="retrun-btn" class="layui-btn layui-btn-primary " onclick="back()"
style="margin-left: 20px">杩斿洖
@@ -76,12 +76,15 @@
tableIns = table.render({
elem: '#chooseData',
data: [],
+ width: 320,
limit: 500,
cellMinWidth: 50,
cols: [[
- {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style: 'color: blue', width: 50},
{field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
- {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+ {field: 'mnemonic', align: 'center', title: '鐢熶骇鍗曞彿'},
+ { field: 'count', align: 'center', title: '鏁伴噺', style: 'color: blue', width: 50},
+ {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
+
]],
done: function (res, curr, count) {
}
@@ -123,7 +126,7 @@
type: 2,
title: '鎻愬彇鐗╂枡',
shade: [0.3, '#000'],
- area: ['90%', '80%'],
+ area: ['90%', '90%'],
content: 'matQuery.html',
success: function (layero, index) {
$('.layui-layer-title').css('font-size', '16px');
@@ -217,6 +220,9 @@
if (isEmpty(billNo)) {
return;
}
+ if (billNo.indexOf('=') > -1) {
+ billNo = billNo.split(",")[0].split("=")[1];
+ }
// 璧嬪�煎墠娓呯┖琛ㄦ牸
matData = [];
tableIns.reload({data: matData});
diff --git a/src/main/webapp/views/pda/locNormalOut.html b/src/main/webapp/views/pda/locNormalOut.html
index aebd9c0..9879238 100644
--- a/src/main/webapp/views/pda/locNormalOut.html
+++ b/src/main/webapp/views/pda/locNormalOut.html
@@ -263,6 +263,9 @@
function findCode(el, type) {
warehouseBar = $('#uuid').val();
billNo = $("#billNo").val();
+ if (billNo && billNo != '' && billNo.indexOf('=') > -1) {
+ billNo = billNo.split(",")[0].split("=")[1];
+ }
switch (type) {
case 'uuid':
// exist('uuid', 'locArea');
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index a7117a7..6292268 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -110,6 +110,18 @@
</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" autocomplete="off">
+ </td>
+ </tr>
+ </table>
+ </div>
<!--<div class="form-item">-->
<!--<span>鍗曚綅</span>-->
<!--<input id="str1" type="text" disabled="disabled">-->
@@ -168,7 +180,8 @@
var data = {
matNo: $('#matNo').val(),
matName: $('#matName').val(),
- count: countDom.val()
+ count: countDom.val(),
+ mnemonic: $("#mnemonic").val()
};
parent.addTableData(data);
parent.layer.close(parent.matCodeLayerIdx);
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 9960cfb..2ddc61b 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -170,7 +170,7 @@
type: 2,
title: '鐗╂枡',
shade: [0.3,'#000'],
- area: ['90%', '80%'],
+ area: ['90%', '90%'],
content: 'matQuery.html',
success: function(layero, index){
$('.layui-layer-title').css('font-size', '16px');
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index c4083c0..1b09851 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -101,10 +101,14 @@
if (isEmpty(el.value)) {
return;
}
+
find(null, null, el.value);
}
function find(locNo, matNo, billNo) {
+ if (billNo.indexOf('=') > -1) {
+ billNo = billNo.split(",")[0].split("=")[1];
+ }
$.ajax({
url: baseUrl + "/mobile/locDetl",
headers: {'token': localStorage.getItem('token')},
--
Gitblit v1.9.1