Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
srm
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
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
Jobs
Commits
Open sidebar
aship
srm
Commits
a7f8db21
Commit
a7f8db21
authored
Sep 07, 2019
by
顾俭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
FIX BARCODE_FUNCTION
parent
5f7e291a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
query.html
src/main/resources/static/app/srm/barcode/query/query.html
+2
-2
query.js
src/main/resources/static/app/srm/barcode/query/query.js
+1
-1
No files found.
src/main/resources/static/app/srm/barcode/query/query.html
View file @
a7f8db21
...
...
@@ -26,7 +26,7 @@
<label>
</label>
<div>
<button
acl-check
class=
"btn btn-primary"
func=
" 'BARCODE_FUNCTION' "
ng-click=
"query()"
ng-disabled=
"!barcodeForm.$valid"
resource=
" '
QUERY
' "
type=
"button"
><i
class=
"fa fa-search"
></i>
查询状态
ng-disabled=
"!barcodeForm.$valid"
resource=
" '
GET_BARCODE_STATUS
' "
type=
"button"
><i
class=
"fa fa-search"
></i>
查询状态
</button>
<span
ng-if=
"loading"
><img
src=
"img/spinner.gif"
style=
"width: 30px;"
/></span>
</div>
...
...
@@ -51,7 +51,7 @@
<div
class=
"row"
>
<div
class=
"col-md-6"
>
<button
acl-check
class=
"btn btn-primary plm prm mrm"
func=
" 'BARCODE_FUNCTION' "
ng-click=
"void()"
ng-disabled=
"!okStatus"
resource=
" 'VOID_BARCODE' "
>
ng-disabled=
"!okStatus"
resource=
" 'VOID_BARCODE' "
>
<i
class=
"fa fa-times"
></i>
作废
</button>
<button
acl-check
class=
"btn btn-primary plm prm"
func=
" 'BARCODE_FUNCTION' "
ng-click=
"print()"
...
...
src/main/resources/static/app/srm/barcode/query/query.js
View file @
a7f8db21
...
...
@@ -9,7 +9,7 @@ angular.module('IOne').controller('BarcodeQueryController', function ($scope, Co
$scope
.
dtlMessage
=
""
;
$scope
.
query
=
function
()
{
if
(
AuthService
.
hasAcl
(
$scope
.
vm
.
currentAcl
,
'BARCODE_FUNCTION'
,
'
QUERY
'
))
{
if
(
AuthService
.
hasAcl
(
$scope
.
vm
.
currentAcl
,
'BARCODE_FUNCTION'
,
'
GET_BARCODE_STATUS
'
))
{
BarcodeService
.
getBarcodeStatus
(
$scope
.
queryCondition
.
factory
.
factoryUid
,
$scope
.
queryCondition
.
barcode
).
then
(
function
(
response
)
{
if
(
response
.
data
.
code
==
'0'
)
{
...
...
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