From e1749547c76a5d8bae94e47d38d4d75b481610c1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 09 九月 2021 10:51:15 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/comb.html | 224 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 178 insertions(+), 46 deletions(-)
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index f83699a..95f8800 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -12,7 +12,44 @@
<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;
+ }
</style>
</head>
<body>
@@ -39,6 +76,25 @@
<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="matnr" type="text" disabled="disabled" style="width: 70%">
+ </div>
+ <div class="form-item">
+ <span>鍚嶇О</span>
+ <input id="maktx" type="text" disabled="disabled" style="width: 70%">
+ </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="remove" onclick="remove()">绉婚櫎</button>
+ <button id="confirm" onclick="confirm()">淇濆瓨</button>
+</div>
</body>
<script>
var tableIns;
@@ -54,11 +110,34 @@
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: '鐗╂枡鍚嶇О'}
+ {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', event: 'modify', style:'color: blue', width:50},
+ {field: 'matnr', align: 'center', title: '鐗╂枡缂栫爜'},
+ {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
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%', '200px'],
+ content: $("#modify"),
+ success: function (layero, index) {
+ $('#matnr').val(data.matnr);
+ $('#maktx').val(data.maktx);
+ $('#count').val(data.count);
+ maxCount = data.count;
+ }
+ });
+ break;
}
});
@@ -67,39 +146,41 @@
window.onload = function(){document.getElementById("code").focus();}
function findCode(el) {
- if (el.value.length === 7) {
- $('#mat-btn').focus();
- getMat();
- }
+ // if (el.value.length === 7) {
+ // $('#mat-btn').focus();
+ // getMat();
+ // }
}
var matCodeLayerIdx;
function getMat() {
matCodeLayerIdx = layer.open({
type: 2,
- title: '鎻愬彇鐗╂枡',
+ title: '鎻愬彇鍟嗗搧',
shade: [0.3,'#000'],
area: ['90%', '80%'],
content: 'matQuery.html',
success: function(layero, index){
$('.layui-layer-title').css('font-size', '16px');
+ $('.layui-layer.layui-layer-iframe').css('border-radius', '8px');
},
end: function () {
$('#mat-btn').focus();
}
});
+ // layer.full(matCodeLayerIdx)
}
// 娣诲姞琛ㄦ牸鏁版嵁
var matData = [];
function addTableData(data) {
- if (isEmpty(data.matName)){
+ if (isEmpty(data.maktx)){
tips("鎻愬彇澶辫触", true);
return;
}
- let toPush = true;
+ var toPush = true;
for (var j=0;j<matData.length;j++){
- if (data.matNo === matData[j].matNo) {
+ if (data.matnr === matData[j].matnr) {
matData[j].count = Number(matData[j].count) + Number(data.count);
toPush = false;
}
@@ -120,41 +201,92 @@
// 缁勬墭
function comb() {
- let barcode = $('#code').val();
- if (isEmpty(barcode)) {
- tips("鎵樼洏鏉＄爜涓虹┖", true);
- // document.getElementById("code").focus();
- return;
- }
- if (barcode.length !== 7) {
- tips("鏉＄爜蹇呴』涓�7浣�", true);
- return;
- }
- if (matData.length === 0) {
- tips("璇锋彁鍙栫墿鏂�", true);
- return;
- }
- $.ajax({
- url: baseUrl+"/mobile/comb/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- barcode: barcode,
- combMats: matData
- }),
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200) {
- reset();
- tips("缁勬墭鎴愬姛")
- } else if (res.code === 403) {
- top.location.href = baseUrl + "/pda";
- } else {
- tips(res.msg, true)
- }
+ layer.confirm('缁勬墭褰撳墠鐗╂枡鏄庣粏锛�', {shadeClose: true}, function(){
+ var zpallet = $('#code').val();
+ if (isEmpty(zpallet)) {
+ tips("鎵樼洏鏉＄爜涓虹┖", true);
+ // document.getElementById("code").focus();
+ return;
}
- })
+ // if (zpallet.length !== 7) {
+ // tips("鏉＄爜蹇呴』涓�7浣�", true);
+ // return;
+ // }
+ if (matData.length === 0) {
+ tips("璇锋彁鍙栫墿鏂�", true);
+ return;
+ }
+ $.ajax({
+ url: baseUrl+"/mobile/comb/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify({
+ zpallet: zpallet,
+ combMats: matData
+ }),
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ reset();
+ tips("缁勬墭鎴愬姛")
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/pda";
+ } else {
+ tips(res.msg, true)
+ }
+ }
+ })
+ });
+ }
+
+ /************************************* 鏁伴噺 ****************************************/
+ 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 matnr = $('#matnr').val();
+ var count = $('#count').val();
+ for (var j=0;j<matData.length;j++){
+ if (matnr === matData[j].matnr) {
+ // if (count > maxCount || count < minCount) {
+ if (count < minCount) {
+ tips("鏁伴噺涓嶈兘瓒呰繃鑼冨洿", true);
+ return;
+ }
+ matData[j].count = Number(count);
+ }
+ }
+ tableIns.reload({data: matData});
+ layer.close(countLayer);
+ tips("淇敼鎴愬姛");
+ }
+
+ // 绉婚櫎鐗╂枡
+ function remove() {
+ var matnr = $('#matnr').val();
+ for (var j=0;j<matData.length;j++){
+ if (matnr === matData[j].matnr) {
+ matData.splice(j, 1);
+ }
+ }
+ tableIns.reload({data: matData});
+ layer.close(countLayer);
+ tips("绉婚櫎鎴愬姛");
}
/**
--
Gitblit v1.9.1