Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
梁建民
/
wmsApp
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
bce1cd53
authored
May 25, 2023
by
LJM
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'fix/handa/20230524_late_print'
# Conflicts: # pages/repairPrint/index.vue
parents
2a0d1649
bd690a46
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
2 deletions
pages/index/index.vue
pages/repairPrint/index.vue
pages/index/index.vue
View file @
bce1cd53
...
...
@@ -74,6 +74,7 @@ export default {
this
.
request
(
API
.
getStatisticsInfo
,
'POST'
,
{},
false
).
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
this
.
info
=
res
.
data
;
uni
.
setStorageSync
(
'oa_user_email'
,
res
.
data
.
user_info
.
email
);
}
});
},
...
...
@@ -87,6 +88,7 @@ export default {
uni
.
removeStorageSync
(
'oa_skey'
);
uni
.
removeStorageSync
(
'oa_user_id'
);
uni
.
removeStorageSync
(
'company_id'
);
uni
.
removeStorageSync
(
'oa_user_email'
);
uni
.
redirectTo
({
url
:
'/pages/mine/login'
});
...
...
pages/repairPrint/index.vue
View file @
bce1cd53
...
...
@@ -56,6 +56,7 @@ import debounce from 'lodash/debounce';
export
default
{
data
()
{
return
{
company_id
:
1
,
input_flag
:
false
,
input_flag_num
:
false
,
index
:
0
,
...
...
@@ -82,9 +83,10 @@ export default {
}
],
formParams
:
{
user_email
:
''
,
// 登录账号邮箱
warehouse_id
:
''
,
// 登录仓库
sn
:
''
,
origin_device_ip
:
''
,
//获取设备内网IP
target_printer
:
''
,
//模板打印机
target_printer_ip
:
''
,
//模板打印机
tally_qty
:
''
,
//打印数量
type
:
5
//库位 1;库区 2;区域 3; 容器 4;入库 5 默认5
}
...
...
@@ -155,6 +157,17 @@ export default {
this
.
formParams
.
tally_qty
=
1
;
}
this
.
formParams
.
user_email
=
uni
.
getStorageSync
(
'oa_user_email'
)
||
''
;
// company_id == 1 ? '深圳市猎芯科技有限公司' : '深贸电子有限公司'
this
.
company_id
=
uni
.
getStorageSync
(
'company_id'
)
||
1
;
// 7 深圳仓, 10 香港仓
if
(
this
.
company_id
==
1
)
{
this
.
formParams
.
warehouse_id
=
7
;
}
else
{
this
.
formParams
.
warehouse_id
=
10
;
}
this
.
request
(
API
.
latePrint
,
'POST'
,
this
.
formParams
,
true
).
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
uni
.
showLoading
({
...
...
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