Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
assets
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
黄媛媛
assets
Commits
402727af
Commit
402727af
authored
Jul 31, 2020
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
04a3ba90
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
71 additions
and
11 deletions
+71
-11
InventoryBosun.vue
src/components/Materialman/InventoryBosun.vue
+26
-3
InventoryBoyi.vue
src/components/Materialman/InventoryBoyi.vue
+26
-3
InventoryDetail.vue
src/components/Materialman/InventoryDetail.vue
+19
-4
consumablesInventory.vue
src/components/Materialman/consumablesInventory.vue
+0
-1
No files found.
src/components/Materialman/InventoryBosun.vue
View file @
402727af
...
@@ -137,10 +137,10 @@
...
@@ -137,10 +137,10 @@
mounted
()
{
mounted
()
{
this
.
msg
.
CheckId
=
this
.
$route
.
query
.
CheckId
;
this
.
msg
.
CheckId
=
this
.
$route
.
query
.
CheckId
;
this
.
saveMsg
.
CheckId
=
this
.
$route
.
query
.
CheckId
;
this
.
saveMsg
.
CheckId
=
this
.
$route
.
query
.
CheckId
;
this
.
saveMsg
.
WarehouseId
=
this
.
$route
.
query
.
WarehouseId
;
this
.
isFrom
=
this
.
$route
.
query
.
isFrom
;
this
.
isFrom
=
this
.
$route
.
query
.
isFrom
;
this
.
getList
();
this
.
getList
();
this
.
getCheckStatus
();
this
.
getCheckStatus
();
this
.
getWarehouseId
();
},
},
methods
:
{
methods
:
{
currentChange
(
val
)
{
currentChange
(
val
)
{
...
@@ -169,8 +169,7 @@
...
@@ -169,8 +169,7 @@
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
path
,
path
:
path
,
query
:
{
query
:
{
CheckId
:
this
.
msg
.
CheckId
,
CheckId
:
this
.
msg
.
CheckId
WarehouseId
:
this
.
saveMsg
.
WarehouseId
}
}
});
});
},
},
...
@@ -223,6 +222,12 @@
...
@@ -223,6 +222,12 @@
if
(
this
.
checkList
.
length
==
0
){
if
(
this
.
checkList
.
length
==
0
){
this
.
Error
(
'请选择报损单据'
);
this
.
Error
(
'请选择报损单据'
);
}
else
{
}
else
{
var
loading
=
this
.
$loading
({
lock
:
true
,
text
:
'玩命保存中...'
,
spinner
:
'el-icon-loading'
,
background
:
'rgba(0, 0, 0, 0.7)'
});
this
.
checkList
.
forEach
(
x
=>
{
this
.
checkList
.
forEach
(
x
=>
{
var
obj
=
{
var
obj
=
{
SuppliesId
:
x
.
SuppliesId
,
SuppliesId
:
x
.
SuppliesId
,
...
@@ -239,6 +244,7 @@
...
@@ -239,6 +244,7 @@
"/api/supplies/SetSuppliesReportLoss"
,
"/api/supplies/SetSuppliesReportLoss"
,
this
.
saveMsg
,
this
.
saveMsg
,
res
=>
{
res
=>
{
loading
.
close
();
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
Success
(
res
.
data
.
message
);
this
.
Success
(
res
.
data
.
message
);
this
.
getList
();
this
.
getList
();
...
@@ -250,6 +256,23 @@
...
@@ -250,6 +256,23 @@
);
);
}
}
},
},
//获取仓库id
getWarehouseId
(){
let
msg
=
{
CheckId
:
this
.
msg
.
CheckId
}
this
.
apiJavaPost
(
"/api/supplies/GetSuppliesCheckModel"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
saveMsg
.
WarehouseId
=
res
.
data
.
data
.
WarehouseId
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
}
}
}
};
};
...
...
src/components/Materialman/InventoryBoyi.vue
View file @
402727af
...
@@ -103,9 +103,9 @@
...
@@ -103,9 +103,9 @@
mounted
()
{
mounted
()
{
this
.
msg
.
CheckId
=
this
.
$route
.
query
.
CheckId
;
this
.
msg
.
CheckId
=
this
.
$route
.
query
.
CheckId
;
this
.
saveMsg
.
CheckId
=
this
.
$route
.
query
.
CheckId
;
this
.
saveMsg
.
CheckId
=
this
.
$route
.
query
.
CheckId
;
this
.
saveMsg
.
WarehouseId
=
this
.
$route
.
query
.
WarehouseId
;
this
.
isFrom
=
this
.
$route
.
query
.
isFrom
;
this
.
isFrom
=
this
.
$route
.
query
.
isFrom
;
this
.
getList
();
this
.
getList
();
this
.
getWarehouseId
();
},
},
methods
:
{
methods
:
{
currentChange
(
val
)
{
currentChange
(
val
)
{
...
@@ -122,8 +122,7 @@
...
@@ -122,8 +122,7 @@
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
path
,
path
:
path
,
query
:
{
query
:
{
CheckId
:
this
.
msg
.
CheckId
,
CheckId
:
this
.
msg
.
CheckId
WarehouseId
:
this
.
saveMsg
.
WarehouseId
}
}
});
});
},
},
...
@@ -176,6 +175,12 @@
...
@@ -176,6 +175,12 @@
if
(
this
.
checkList
.
length
==
0
){
if
(
this
.
checkList
.
length
==
0
){
this
.
Error
(
'请选择报损单据'
);
this
.
Error
(
'请选择报损单据'
);
}
else
{
}
else
{
var
loading
=
this
.
$loading
({
lock
:
true
,
text
:
'玩命保存中...'
,
spinner
:
'el-icon-loading'
,
background
:
'rgba(0, 0, 0, 0.7)'
});
this
.
checkList
.
forEach
(
x
=>
{
this
.
checkList
.
forEach
(
x
=>
{
var
obj
=
{
var
obj
=
{
SuppliesId
:
x
.
SuppliesId
,
SuppliesId
:
x
.
SuppliesId
,
...
@@ -192,6 +197,7 @@
...
@@ -192,6 +197,7 @@
"/api/supplies/SetSuppliesReportLoss"
,
"/api/supplies/SetSuppliesReportLoss"
,
this
.
saveMsg
,
this
.
saveMsg
,
res
=>
{
res
=>
{
loading
.
close
();
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
Success
(
res
.
data
.
message
);
this
.
Success
(
res
.
data
.
message
);
this
.
getList
();
this
.
getList
();
...
@@ -203,6 +209,23 @@
...
@@ -203,6 +209,23 @@
);
);
}
}
},
},
//获取仓库id
getWarehouseId
(){
let
msg
=
{
CheckId
:
this
.
msg
.
CheckId
}
this
.
apiJavaPost
(
"/api/supplies/GetSuppliesCheckModel"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
saveMsg
.
WarehouseId
=
res
.
data
.
data
.
WarehouseId
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
}
}
}
};
};
...
...
src/components/Materialman/InventoryDetail.vue
View file @
402727af
...
@@ -195,10 +195,10 @@
...
@@ -195,10 +195,10 @@
},
},
mounted
()
{
mounted
()
{
this
.
msg
.
CheckId
=
this
.
$route
.
query
.
CheckId
;
this
.
msg
.
CheckId
=
this
.
$route
.
query
.
CheckId
;
this
.
WarehouseId
=
this
.
$route
.
query
.
WarehouseId
;
this
.
CheckState
=
this
.
$route
.
query
.
CheckState
;
this
.
CheckState
=
this
.
$route
.
query
.
CheckState
;
this
.
getList
();
this
.
getList
();
this
.
getCheckStatus
();
this
.
getCheckStatus
();
this
.
getWarehouseId
();
//上传接口路径
//上传接口路径
this
.
importFileUrl2
=
this
.
domainManager
().
DomainUrl
+
this
.
importFileUrl2
=
this
.
domainManager
().
DomainUrl
+
"/api/file/LocalFileUploadImportForSuppliesCheck"
;
"/api/file/LocalFileUploadImportForSuppliesCheck"
;
...
@@ -253,8 +253,7 @@
...
@@ -253,8 +253,7 @@
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
path
,
path
:
path
,
query
:
{
query
:
{
CheckId
:
this
.
msg
.
CheckId
,
CheckId
:
this
.
msg
.
CheckId
WarehouseId
:
this
.
WarehouseId
}
}
});
});
},
},
...
@@ -480,8 +479,24 @@
...
@@ -480,8 +479,24 @@
getImgView
(
imglist
){
getImgView
(
imglist
){
this
.
isShowImageDialog
=
true
;
this
.
isShowImageDialog
=
true
;
this
.
InvimageList
=
imglist
;
this
.
InvimageList
=
imglist
;
},
//获取仓库id
getWarehouseId
(){
let
msg
=
{
CheckId
:
this
.
msg
.
CheckId
}
this
.
apiJavaPost
(
"/api/supplies/GetSuppliesCheckModel"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
this
.
WarehouseId
=
res
.
data
.
data
.
WarehouseId
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
null
);
}
}
}
}
};
};
...
...
src/components/Materialman/consumablesInventory.vue
View file @
402727af
...
@@ -323,7 +323,6 @@ export default {
...
@@ -323,7 +323,6 @@ export default {
path
:
path
,
path
:
path
,
query
:
{
query
:
{
CheckId
:
item
.
Id
,
CheckId
:
item
.
Id
,
WarehouseId
:
item
.
WarehouseId
,
CheckState
:
item
.
CheckState
CheckState
:
item
.
CheckState
}
}
});
});
...
...
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