From b9a39835ef2d4826d621a7585569ccc9df8af4a3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 29 六月 2020 10:57:43 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/index.html | 2
src/main/webapp/views/pda/stockIn.html | 203 +++++++++++++++++++++++++++++
src/main/webapp/static/css/pda.css | 86 ++++++++++++
src/main/webapp/views/pda/comb.html | 87 ------------
4 files changed, 291 insertions(+), 87 deletions(-)
diff --git a/src/main/webapp/static/css/pda.css b/src/main/webapp/static/css/pda.css
new file mode 100644
index 0000000..0e0ed19
--- /dev/null
+++ b/src/main/webapp/static/css/pda.css
@@ -0,0 +1,86 @@
+* {
+ font-family: microsoft yahei,serif;
+ margin: 0;
+ padding: 0;
+ box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ font-size: 11px;
+}
+html {
+ height: 100%;
+ background-color: #f1f1f1;
+ padding: 5px;
+}
+body {
+ height: 100%;
+ background-color: #fff;
+ border-radius: 5px;
+ box-shadow: 0 0 3px rgba(0,0,0,.3);
+ padding: 5px;
+ position: relative;
+}
+
+/* 澶撮儴 */
+header {
+ padding: 5px 0;
+}
+.layui-form-label {
+ width: initial;
+ padding: 6px 10px;
+}
+#code {
+ width: 75%;
+ height: 30px;
+ margin-right: 0;
+}
+header button {
+ height: 20px;
+ width: 70px;
+}
+
+/* layer */
+.layui-layer-title {
+ font-size: 11px;
+ height: 20px;
+ line-height: 20px;
+}
+
+/* 涓讳綋 */
+main {
+ height: 170px;
+ overflow: auto;
+}
+.layui-table, .layui-table-view {
+ margin: 0;
+}
+.layui-table-view .layui-table td, .layui-table-view .layui-table th {
+ padding: 0;
+}
+.layui-table-cell {
+ height: 22px;
+ line-height: 22px;
+ padding: 0;
+}
+.layui-table-grid-down {
+ display: none;
+}
+.layui-table-body .layui-none {
+ /*height: 144px;*/
+}
+/* 灏鹃儴 */
+footer {
+ position: absolute;
+ bottom: 5px;
+}
+.layui-btn-container .layui-btn {
+ margin-left: 10px;
+ margin-bottom: 2px;
+}
+#tips {
+ display: inline-block;
+ color: #666;
+ margin-left: 5px;
+ margin-bottom: 5px;
+ vertical-align: middle;
+}
\ No newline at end of file
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 96e78bc..01e0d7b 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -5,99 +5,14 @@
<meta name="viewport" content="width=device-width, target-densitydpi=high-dpi, initial-scale=1.0, user-scalable=no"/>
<title>缁勬墭</title>
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/pda.css" media="all">
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<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>
- * {
- font-family: microsoft yahei,serif;
- margin: 0;
- padding: 0;
- box-sizing: border-box;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- font-size: 11px;
- }
- html {
- height: 100%;
- background-color: #f1f1f1;
- padding: 5px;
- }
- body {
- height: 100%;
- background-color: #fff;
- border-radius: 5px;
- box-shadow: 0 0 3px rgba(0,0,0,.3);
- padding: 5px;
- position: relative;
- }
- /* 澶撮儴 */
- header {
- padding: 5px 0;
- }
- .layui-form-label {
- width: initial;
- padding: 6px 10px;
- }
- #code {
- width: 75%;
- height: 30px;
- margin-right: 0;
- }
- header button {
- height: 20px;
- width: 70px;
- }
-
- /* layer */
- .layui-layer-title {
- font-size: 11px;
- height: 20px;
- line-height: 20px;
- }
-
- /* 涓讳綋 */
- main {
- height: 170px;
- overflow: auto;
- }
- .layui-table, .layui-table-view {
- margin: 0;
- }
- .layui-table-view .layui-table td, .layui-table-view .layui-table th {
- padding: 0;
- }
- .layui-table-cell {
- height: 22px;
- line-height: 22px;
- padding: 0;
- }
- .layui-table-grid-down {
- display: none;
- }
- .layui-table-body .layui-none {
- /*height: 144px;*/
- }
- /* 灏鹃儴 */
- footer {
- position: absolute;
- bottom: 5px;
- text-align: center;
- }
- .layui-btn-container .layui-btn {
- margin-left: 10px;
- margin-bottom: 2px;
- }
- #tips {
- display: inline-block;
- color: #666;
- margin-left: 5px;
- margin-bottom: 5px;
- vertical-align: middle;
- }
</style>
</head>
<body>
diff --git a/src/main/webapp/views/pda/index.html b/src/main/webapp/views/pda/index.html
index 3876ad6..880b791 100644
--- a/src/main/webapp/views/pda/index.html
+++ b/src/main/webapp/views/pda/index.html
@@ -78,7 +78,7 @@
</ul>
<!-- 涓讳綋鍐呭 -->
-<iframe id="content" src="comb.html"></iframe>
+<iframe id="content" src="stockIn.html"></iframe>
</body>
<script>
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 8343641..f29a00f 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -5,13 +5,216 @@
<meta name="viewport" content="width=device-width, target-densitydpi=high-dpi, initial-scale=1.0, user-scalable=no"/>
<title>鍏ュ簱</title>
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/pda.css" media="all">
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<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>
+ main {
+ height: 145px;
+ }
+ .site-list {
+ padding: 2px 0;
+ height: 22px;
+ margin-bottom: 5px;
+ }
+ .site-list label {
+ padding: 0 0 0 15px;
+ }
+ .site-list span {
+ vertical-align: middle;
+ font-size: 13px;
+ }
+
+ .cool-checkbox:checked {
+ background:#1673ff
+ }
+ .cool-checkbox {
+ width:15px;
+ height:15px;
+ background-color:#ffffff;
+ border:solid 1px #dddddd;
+ -webkit-border-radius:50%;
+ border-radius:50%;
+ font-size:15px;
+ margin:0 5px 0 0;
+ padding:0;
+ position:relative;
+ display:inline-block;
+ vertical-align:middle;
+ cursor:default;
+ -webkit-appearance:none;
+ -webkit-user-select:none;
+ user-select:none;
+ -webkit-transition:background-color ease 0.1s;
+ transition:background-color ease 0.1s;
+ }
+ .cool-checkbox:checked::after {
+ content:'';
+ top:3px;
+ left:3px;
+ position:absolute;
+ background:transparent;
+ border:#fff solid 2px;
+ border-top:none;
+ border-right:none;
+ height:3px;
+ width:6px;
+ -moz-transform:rotate(-45deg);
+ -ms-transform:rotate(-45deg);
+ -webkit-transform:rotate(-45deg);
+ transform:rotate(-45deg);
+ }
+
+ </style>
</head>
<body>
+<!-- 澶撮儴 -->
+<header>
+ <div class="layui-input-inline">
+ <label class="layui-form-label">鏉＄爜</label>
+ <input class="layui-input" type="text" id="code" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
+ </div>
+ <div style="margin: 5px 5px">
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-xs" onclick="getMat()"><i class="layui-icon">+</i>鎻愬彇</button>
+ </div>
+</header>
+<!-- 涓讳綋 -->
+<main>
+ <table class="layui-table" id="chooseData" lay-filter="chooseData"></table>
+</main>
+<!-- 灏鹃儴 -->
+<footer>
+ <!-- 鍏ュ簱鍙� -->
+ <div class="site-list">
+ <label><input class="cool-checkbox" type="radio" name="site"><span>1</span></label>
+ <label><input class="cool-checkbox" type="radio" name="site"><span>2</span></label>
+ <label><input class="cool-checkbox" type="radio" name="site"><span>3</span></label>
+ </div>
+ <div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-xs layui-btn-primary" onclick="reset()">閲嶇疆</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-xs" onclick="pakIn()" style="margin-left: 20px">鍏ュ簱</button>
+ <span id="tips"></span>
+ </div>
+</footer>
</body>
+<script>
+ var tableIns;
+ layui.use(['table','laydate', 'form'], function() {
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var form = layui.form;
+
+ tableIns = table.render({
+ elem: '#chooseData',
+ data: [],
+ limit: 500,
+ cellMinWidth: 50,
+ cols: [[
+ {fixed: 'left', align: 'center', field: 'count', title: '閲�', style:'color: blue', width:20},
+ {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
+ {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+ ]],
+ done: function (res, curr, count) {
+ }
+ });
+
+ });
+
+ window.onload = function(){document.getElementById("code").focus();}
+
+ var matCodeLayerIdx;
+ function getMat() {
+ matCodeLayerIdx = layer.open({
+ type: 2,
+ title: '鐗╂枡',
+ shade: [0.3,'#000'],
+ area: ['90%', '90%'],
+ content: 'matQuery.html',
+ success: function(layero, index){
+ $('.layui-layer-title').css('height', '20px').css('line-height', '20px').css('font-size', '12px').css('padding-left', '10px')
+ $('.layui-layer-setwin').css("top", '2px').css('right', '3px')
+ }
+ });
+ }
+
+ // 娣诲姞琛ㄦ牸鏁版嵁
+ var matData = [];
+ function addTableData(data) {
+ if (isEmpty(data.matName)){
+ tips("鎻愬彇澶辫触");
+ return;
+ }
+ let toPush = true;
+ for (var j=0;j<matData.length;j++){
+ if (data.matNo === matData[j].matNo) {
+ matData[j].count = Number(matData[j].count) + Number(data.count);
+ toPush = false;
+ }
+ }
+ if (toPush) {
+ matData.push(data);
+ }
+ tips("鎻愬彇鎴愬姛");
+ tableIns.reload({data: matData});
+ }
+
+ // 閲嶇疆
+ function reset() {
+ $('#code').val("");
+ matData = [];
+ tableIns.reload({data: matData});
+ tips("");
+ }
+
+ // 鍏ュ簱
+ function pakIn() {
+ let barcode = $('#code').val();
+ if (isEmpty(barcode)) {
+ tips("鎵樼洏鏉＄爜涓虹┖", true);
+ document.getElementById("code").focus();
+ 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)
+ }
+ }
+ })
+ }
+
+ /**
+ * 鎻愮ず淇℃伅
+ * @param msg 鎻愮ず鍐呭
+ * @param warn true锛氱孩鑹插瓧浣�
+ */
+ function tips(msg, warn) {
+ let tips = $('#tips');
+ tips.html(msg);
+ tips.css("color", warn?"red":'#666');
+ }
+</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1