Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
self-support
Project
Project
Details
Activity
Releases
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
李俊赕
self-support
Commits
21fc7d2c
Commit
21fc7d2c
authored
Apr 09, 2022
by
刘文虎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加盘点入口检测盘点开关状态
parent
f242b1ca
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
4 deletions
+28
-4
inventory.js
src/common/api/mine/inventory.js
+7
-2
mine.vue
src/pages/index/mine.vue
+20
-1
complete.vue
src/pages/order/complete.vue
+1
-1
No files found.
src/common/api/mine/inventory.js
View file @
21fc7d2c
...
@@ -42,14 +42,19 @@ let inventoryApiFun = function(vm) {
...
@@ -42,14 +42,19 @@ let inventoryApiFun = function(vm) {
*/
*/
let
applyReInventoryByInventoryModules
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
parts
+
vm
.
vuex_token
+
let
applyReInventoryByInventoryModules
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
parts
+
vm
.
vuex_token
+
'/take/stock/take/submit/'
+
params
);
'/take/stock/take/submit/'
+
params
);
/**
* 提查询是否开启盘点
*/
let
getInventoryStartByInventoryModules
=
async
(
params
=
{})
=>
await
vm
.
$u
.
get
(
parts
+
vm
.
vuex_token
+
'/take/stock/sign/start'
);
const
inventoryApi
=
{
const
inventoryApi
=
{
inventoryListByInventoryModules
,
inventoryListByInventoryModules
,
inventoryDetailByInventoryModules
,
inventoryDetailByInventoryModules
,
addInventoryByInventoryModules
,
addInventoryByInventoryModules
,
deleteInventoryByInventoryModules
,
deleteInventoryByInventoryModules
,
confirmInventoryByInventoryModules
,
confirmInventoryByInventoryModules
,
applyReInventoryByInventoryModules
applyReInventoryByInventoryModules
,
getInventoryStartByInventoryModules
}
}
return
inventoryApi
return
inventoryApi
}
}
...
...
src/pages/index/mine.vue
View file @
21fc7d2c
...
@@ -275,13 +275,32 @@ export default {
...
@@ -275,13 +275,32 @@ export default {
});
});
return
;
return
;
}
}
if
(
path
===
'warehouse/inventory'
)
{
this
.
handleClickInventory
(
path
);
}
else
{
this
.
$u
.
route
({
this
.
$u
.
route
({
url
:
'pages/mine/'
+
path
url
:
'pages/mine/'
+
path
});
});
}
}
else
{
}
else
{
this
.
$u
.
route
({
url
:
'pages/login/index'
});
this
.
$u
.
route
({
url
:
'pages/login/index'
});
}
}
},
},
async
handleClickInventory
(
path
)
{
let
res
=
await
this
.
$u
.
api
.
getInventoryStartByInventoryModules
();
let
{
code
,
data
,
message
}
=
res
;
if
(
code
===
200
&&
data
===
'Y'
)
{
this
.
$u
.
route
({
url
:
'pages/mine/'
+
path
});
}
else
{
this
.
$refs
.
uToast
.
show
({
title
:
'盘点尚未开始'
,
type
:
'warning'
,
duration
:
1500
});
}
},
handleClickSetting
()
{
handleClickSetting
()
{
this
.
$u
.
route
({
url
:
'pages/mine/setting/index'
});
this
.
$u
.
route
({
url
:
'pages/mine/setting/index'
});
},
},
...
...
src/pages/order/complete.vue
View file @
21fc7d2c
...
@@ -720,7 +720,7 @@ export default {
...
@@ -720,7 +720,7 @@ export default {
});
});
}
else
{
}
else
{
let
msg
=
''
;
let
msg
=
''
;
if
(
data
&&
data
instanceof
s
tring
)
{
if
(
data
&&
data
instanceof
S
tring
)
{
msg
=
data
;
msg
=
data
;
}
else
{
}
else
{
msg
=
message
;
msg
=
message
;
...
...
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