From 1667372f02fb00dc76e172b5348c8e75ffb79bb9 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 10 五月 2021 16:58:45 +0800
Subject: [PATCH] 1.盘点出库状态工作任务不进行删除 2.托盘码为空不允许进行盘点出库
---
src/main/webapp/views/pda/combPro.html | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/pda/combPro.html b/src/main/webapp/views/pda/combPro.html
index 15435a7..95cc57c 100644
--- a/src/main/webapp/views/pda/combPro.html
+++ b/src/main/webapp/views/pda/combPro.html
@@ -110,7 +110,7 @@
<div id="modify" style="display: none; text-align: center;padding-top: 10px">
<div class="form-box">
<div class="form-item">
- <table style="display: inline">
+ <table style="display: none">
<tr>
<td>
<span style="width: 35px; margin-right: 5px">鐗╂枡</span>
@@ -128,7 +128,7 @@
<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"
+ <textarea rows="2" style="resize: none; width: 165px" id="matName" type="text" disabled="disabled"
readonly="readonly"></textarea>
</td>
</tr>
@@ -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;
}
--
Gitblit v1.9.1