From faecccbe46a1f85b5d9b18fce12e02764faba78e Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 09 六月 2021 12:58:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/webapp/views/pda/locNormalIn.html | 192 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 183 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/views/pda/locNormalIn.html b/src/main/webapp/views/pda/locNormalIn.html
index 6de0418..73ad16d 100644
--- a/src/main/webapp/views/pda/locNormalIn.html
+++ b/src/main/webapp/views/pda/locNormalIn.html
@@ -13,7 +13,65 @@
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<style>
+ .number-tool {
+ margin-left: 10px;
+ padding: 1px 0 1px 5px;
+ display: inline-block;
+ width: 120px;
+ }
+ .number-tool:after {
+ clear: both;
+ content: "";
+ display: table;
+ }
+
+ .number-tool button {
+ background-color: #fff;
+ margin-top: 3px;
+ font-size: 16px;
+ height: 25px;
+ float: left;
+ width: 25px;
+ border: 1px solid #777777;
+ }
+
+ .number-tool input {
+ text-align: center;
+ height: 30px;
+ float: left;
+ margin: 0 5px;
+ 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>
<body>
@@ -54,7 +112,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">杩斿洖
@@ -62,6 +120,59 @@
<span id="tips"></span>
</div>
</footer>
+
+<!-- 淇敼鏁伴噺寮圭獥 -->
+<div id="modify" style="display: none; text-align: center;padding-top: 10px">
+ <div class="form-box">
+ <div class="form-item">
+ <table style="display: none">
+ <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="2" 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>
+ </div>
+ </div>
+ <button id="confirm" onclick="confirm()">淇濆瓨</button>
+</div>
+
</body>
<script>
var tableIns;
@@ -76,14 +187,40 @@
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: 'matNo', align: 'center', title: '鐗╂枡缂栫爜', event: 'modify'},
+ {field: 'mnemonic', align: 'center', title: '鐢熶骇鍗曞彿', event: 'modify'},
+ {field: 'count', align: 'center', title: '鏁伴噺', style: 'color: blue', width: 50, event: 'modify'},
+ {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О', event: 'modify'},
]],
done: function (res, curr, count) {
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(chooseData)', function (obj) {
+ var data = obj.data;
+ switch (obj.event) {
+ case 'modify':
+ countLayer = layer.open({
+ type: 1,
+ offset: '20px',
+ title: '淇敼鏁伴噺',
+ shadeClose: true,
+ area: ['80%', '300px'],
+ content: $("#modify"),
+ success: function (layero, index) {
+ $('#matNo').val(data.matNo);
+ $('#matName').val(data.matName);
+ $('#count').val(data.count);
+ $('#mnemonic').val(data.mnemonic);
+ maxCount = data.count;
+ }
+ });
+ break;
}
});
@@ -104,13 +241,50 @@
$('#uuid').append(html);
layui.form.render('select');
} else if (res.code === 403) {
- top.location.href = baseUrl + "/";
+ top.location.href = baseUrl + "/pda";
} else {
layer.msg(res.msg)
}
}
});
});
+
+ /************************************* 鏁伴噺 ****************************************/
+ 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;
+ }
+ countDom.val(countDom.val() - 1);
+ }
+
+ // 淇敼鏁伴噺
+ function confirm() {
+ var matNo = $('#matNo').val();
+ var count = $('#count').val();
+ 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;
+ }
+ matData[j].count = Number(count);
+ }
+ }
+ tableIns.reload({data: matData});
+ layer.close(countLayer);
+ tips("淇敼鎴愬姛");
+ }
window.onload = function () {
document.getElementById("uuid").focus();
@@ -123,7 +297,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 +391,9 @@
if (isEmpty(billNo)) {
return;
}
+ if (billNo.indexOf('=') > -1) {
+ billNo = billNo.split(",")[0].split("=")[1];
+ }
// 璧嬪�煎墠娓呯┖琛ㄦ牸
matData = [];
tableIns.reload({data: matData});
@@ -254,9 +431,6 @@
* @param warn true锛氱孩鑹插瓧浣�
*/
function tips(msg, warn) {
- // var tips = $('#tips');
- // tips.html(msg);
- // tips.css("color", warn?"red":'#666');
layer.msg(msg, {icon: warn ? 2 : 1})
}
--
Gitblit v1.9.1