From 960d4eff85f99f138eda0ac360d2870882156a47 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期四, 25 三月 2021 10:47:16 +0800
Subject: [PATCH] 1.0.5 1.小太阳需求改动
---
src/main/webapp/views/pda/locNormalIn.html | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/views/pda/locNormalIn.html b/src/main/webapp/views/pda/locNormalIn.html
index ec81695..2342429 100644
--- a/src/main/webapp/views/pda/locNormalIn.html
+++ b/src/main/webapp/views/pda/locNormalIn.html
@@ -6,6 +6,7 @@
<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>
@@ -17,12 +18,15 @@
</head>
<body>
<!-- 澶撮儴 -->
-<header>
+<header class="layui-form">
<div>
<div class="layui-input-inline">
<label class="layui-form-label">搴撳尯</label>
- <input class="layui-input" id="uuid" onkeyup="exist(this.id, 'locArea')" placeholder="鎵爜 / 杈撳叆"
- autocomplete="off">
+ <div class="layui-input-inline" style="margin-left: 5px;width: 180px">
+ <select id="uuid">
+ <option value="">璇烽�夋嫨</option>
+ </select>
+ </div>
</div>
</div>
@@ -73,14 +77,33 @@
}
});
+ var areaType = getQueryVariable('areaType');
+ // 鑾峰彇浠撳簱涓嬫媺
+ $.ajax({
+ url: baseUrl + "/locArea/queryAll/auth?areaType=" + (areaType ? areaType : ""),
+ headers: {'token': localStorage.getItem('token')},
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200) {
+ var html = "";
+ if (res.data && res.data.length > 0) {
+ html += res.data.map(function (item) {
+ return "<Option value=" + item.uuid + ">" + item.name + "</Option>";
+ });
+ }
+ $('#uuid').append(html);
+ layui.form.render('select');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ });
});
window.onload = function () {
document.getElementById("uuid").focus();
- }
-
- function findCode(el) {
-
}
var matCodeLayerIdx;
@@ -126,8 +149,9 @@
// 缁勬墭
function comb() {
let barcode = $('#uuid').val();
+ console.log('barcode', barcode);
if (isEmpty(barcode)) {
- tips("搴撳尯鏉$爜涓虹┖", true);
+ tips("璇烽�夋嫨搴撳尯", true);
document.getElementById("uuid").focus();
return;
}
@@ -203,7 +227,6 @@
// 閲嶇疆
function reset() {
- $('#uuid').val("");
matData = [];
tableIns.reload({data: matData});
layer.closeAll();
--
Gitblit v1.9.1