Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
warehouse
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
胡懿
warehouse
Commits
d11ac164
Commit
d11ac164
authored
Jul 19, 2023
by
anxiaohe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
台账信息明细扫码功能
parent
9aff9718
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
52 additions
and
4 deletions
+52
-4
goodsList.js
src/main/webapp/webpage/modules/warehouse/goods/goodsList.js
+2
-1
ledgerForm.jsp
...in/webapp/webpage/modules/warehouse/ledger/ledgerForm.jsp
+1
-0
ledgerList.js
...ain/webapp/webpage/modules/warehouse/ledger/ledgerList.js
+0
-0
ledgerList.jsp
...in/webapp/webpage/modules/warehouse/ledger/ledgerList.jsp
+42
-2
storageDetail.jsp
...ebapp/webpage/modules/warehouse/storage/storageDetail.jsp
+2
-1
storageForm.jsp
.../webapp/webpage/modules/warehouse/storage/storageForm.jsp
+5
-0
No files found.
src/main/webapp/webpage/modules/warehouse/goods/goodsList.js
View file @
d11ac164
...
...
@@ -316,7 +316,8 @@ $(document).ready(function() {
jp
.
get
(
"${ctx}/warehouse/goods/goods/printQr?goodsInfoId="
+
id
,
function
(
res
)
{
if
(
res
.
success
)
{
var
row
=
res
.
body
.
goodsInfo
.
qrCode
;
console
.
log
(
row
)
var
imgUrl
=
"${ctxPath}/"
+
row
.
url
;
jp
.
showPic
(
imgUrl
);
}
jp
.
close
();
})
...
...
src/main/webapp/webpage/modules/warehouse/ledger/ledgerForm.jsp
View file @
d11ac164
...
...
@@ -8,6 +8,7 @@
<link
rel=
"stylesheet"
href=
"${ctxStatic}/plugin/bootstrapTable/bootstrap-table.min.css"
>
<script
type=
"text/javascript"
src=
"${ctxStatic}/plugin/bootstrapTable/bootstrap-table.min.js"
></script>
<script
type=
"text/javascript"
src=
"${ctxStatic}/plugin/bootstrapTable/bootstrap-table-zh-CN.js"
></script>
<script
type=
"text/javascript"
src=
"${ctxStatic}/common/js/big.js"
></script>
</head>
<body>
<div
class=
"wrapper wrapper-content"
>
...
...
src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.js
View file @
d11ac164
This diff is collapsed.
Click to expand it.
src/main/webapp/webpage/modules/warehouse/ledger/ledgerList.jsp
View file @
d11ac164
...
...
@@ -8,6 +8,18 @@
<
%@
include
file=
"/webpage/include/bootstraptable.jsp"
%
>
<
%@
include
file=
"/webpage/include/treeview.jsp"
%
>
<
%@
include
file=
"ledgerList.js"
%
>
<script
type=
"text/javascript"
src=
"${ctxStatic}/common/js/big.js"
></script>
<style>
#scanIpt
{
position
:
absolute
;
top
:
-10000px
;
left
:
0
;
opacity
:
0
;
}
.scan-content
{
padding
:
10px
;
}
</style>
</head>
<body>
<div
class=
"wrapper wrapper-content"
>
...
...
@@ -53,7 +65,7 @@
</div>
<!-- 工具栏 -->
<
%
--
<
div
id=
"toolbar"
>
--%
>
<div
id=
"toolbar"
>
<
%
--
<
shiro:hasPermission
name=
"warehouse:ledger:ledger:add"
>
--%>
<
%
--
<
button
id=
"add"
class=
"btn btn-primary"
onclick=
"add()"
>
--%>
<
%
--
<
i
class=
"glyphicon glyphicon-plus"
></i>
新建--%>
...
...
@@ -82,7 +94,10 @@
<
%
--
<
i
class=
"fa fa-search-plus"
></i>
查看--%>
<
%
--
</
button
>
--%>
<
%
--
</
shiro:hasPermission
>
--%>
<
%
--
</
div
>
--%>
<button
class=
"btn btn-default"
onclick=
"viewScanData()"
>
<i
class=
"fa fa-search-plus"
></i>
查看二维码数据
</button>
</div>
<!-- 表格 -->
<table
id=
"ledgerTable"
data-toolbar=
"#toolbar"
></table>
...
...
@@ -102,6 +117,31 @@
</ul>
</div>
</div>
</div>
<script
type=
"type/template"
id=
"scanTpl"
>
<
div
class
=
"scan-content"
>
<
input
type
=
"text"
id
=
"scanIpt"
/>
<
div
id
=
"scan-searchForm-box"
class
=
"collapse show"
>
<
div
class
=
"accordion-inner"
>
<
form
:
form
id
=
"scan-searchForm"
class
=
"form form-horizontal well clearfix"
>
<
div
class
=
"col-xs-12 col-sm-6 col-md-4"
>
<
label
class
=
"label-item single-overflow pull-left"
title
=
"数量:"
>
编号:
<
/label
>
<%--
<
form
:
input
path
=
"code"
htmlEscape
=
"false"
class
=
" form-control"
/>--%>
<
input
type
=
"text"
id
=
"scan-code"
class
=
"form-control"
onfocus
=
"scanIptGetFocusStop()"
onblur
=
"scanIptGetFocusStart()"
/>
<
/div
>
<
div
class
=
"col-xs-12 col-sm-6 col-md-4"
>
<
div
style
=
"margin-top:26px"
>
<
a
id
=
"scan-search"
class
=
"btn btn-primary btn-rounded btn-bordered btn-sm"
onclick
=
"searchScanData()"
><
i
class
=
"fa fa-search"
><
/i> 查询</
a
>
<
a
id
=
"scan-reset"
class
=
"btn btn-primary btn-rounded btn-bordered btn-sm"
onclick
=
"refreshScanData()"
><
i
class
=
"fa fa-refresh"
><
/i> 重置</
a
>
<
/div
>
<
/div
>
<
/form:form
>
<
/div
>
<
/div
>
<
div
class
=
"scan-data-content"
>
<
table
id
=
"scan_detail_table"
><
/table
>
<
/div
>
<
/div
>
</script>
</body>
</html>
src/main/webapp/webpage/modules/warehouse/storage/storageDetail.jsp
View file @
d11ac164
...
...
@@ -450,6 +450,7 @@
* @param elem
*/
function onScanChange(elem){
// console.log($(elem).val());
try{
var json = JSON.parse($(elem).val());
var qrCodeId = json.code;
...
...
@@ -573,7 +574,7 @@
<label>扫码结果:</label>
</div>
<div class="col-xs-10">
<input type="text" id="scanResult" class="form-control" onchange="onScanChange(this)">
<input type="text" id="scanResult" class="form-control"
style="ime-mode: active"
onchange="onScanChange(this)">
<span class="text-danger">请切换英文输入法</span>
</div>
</div>
...
...
src/main/webapp/webpage/modules/warehouse/storage/storageForm.jsp
View file @
d11ac164
...
...
@@ -36,6 +36,11 @@
</style>
<script
type=
"text/javascript"
src=
"${ctxStatic}/plugin/bootstrapTable/bootstrap-table.min.js"
></script>
<script
type=
"text/javascript"
src=
"${ctxStatic}/plugin/bootstrapTable/bootstrap-table-zh-CN.js"
></script>
<style>
#scanResult
{
-ms-ime-mode
:
inactive
;
}
</style>
</head>
<body>
<div
class=
"wrapper wrapper-content"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment