Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
Laisi_AutoMES2
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
jiawei.su
Laisi_AutoMES2
Commits
dbe060ae
Commit
dbe060ae
authored
Jan 20, 2021
by
yucheng.jiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
储位信息维护
parent
17804432
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
300 additions
and
41 deletions
+300
-41
accountInfo.vue
Html/src/view/fms/config/accountInfo.vue
+253
-0
typeMaintenance.vue
Html/src/view/fms/config/typeMaintenance.vue
+1
-1
storagemaintenance.vue
Html/src/view/wms/config/storagemaintenance.vue
+46
-40
No files found.
Html/src/view/fms/config/accountInfo.vue
View file @
dbe060ae
<
template
>
<div>
<div
class=
"divborder newSearchDiv"
>
<div
class=
"filter"
>
<label>
工装类型:
</label>
<Cascader
class=
"searchSelect"
:data=
"frockTypeTree"
clearable
change-on-select
v-model=
"frockType"
@
on-change=
"changeFrockType"
></Cascader>
</div>
<div
class=
"filter"
>
<label>
工装编号:
</label>
<Select
v-model=
"frockCode"
label-in-value
clearable
filterable
filter-by-label
class=
"searchSelect"
>
<Option
v-for=
"(item,index) in frockList"
:value=
"item.id"
:key=
"index"
:label=
"item.name"
>
{{
item
.
name
}}
</Option>
</Select>
</div>
<div
class=
"filter"
>
<label>
状态:
</label>
<Select
v-model=
"status"
clearable
class=
"searchSelect"
>
<Option
:value=
"1"
>
可用
</Option>
<Option
:value=
"0"
>
停用
</Option>
</Select>
</div>
<div
class=
"searchBtn"
>
<Button
type=
"primary"
class=
"twoWord"
icon=
"ios-search"
@
click=
"tosearch()"
>
{{
$t
(
1001
)
}}
</Button>
<!--
<Button
type=
"success"
class=
"twoWord"
icon=
"md-add-circle"
@
click=
"add()"
>
{{
$t
(
'1002'
)
}}
</Button>
-->
<!--
<Button
type=
"warning"
class=
"twoWord"
icon=
"ios-create-outline"
@
click=
"edit()"
>
{{
$t
(
'1003'
)
}}
</Button>
<Button
type=
"error"
class=
"twoWord intervalRight"
icon=
"md-close-circle"
@
click=
"dele()"
>
{{
$t
(
1004
)
}}
</Button>
<Button
type=
"primary"
class=
"fourWord"
icon=
"md-download"
@
click=
"loadexcel()"
>
{{
$t
(
'1005'
)
}}
</Button>
<Upload
style=
"display:inline-block"
ref=
"upload"
:action=
"action"
name=
"excel-file"
:headers=
"headers"
:show-upload-list=
"false"
:on-format-error=
"handleFormatError"
:on-success=
"handleSuccess"
:on-error=
"handleError"
:format=
"['xlsx']"
>
<Button
type=
"primary"
class=
"fourWord"
icon=
"md-cloud-upload"
>
{{
$t
(
'1006'
)
}}
</Button>
</Upload>
<Button
type=
"primary"
class=
"fourWord"
icon=
"ios-cloud-download"
@
click=
"Export()"
>
{{
$t
(
'1007'
)
}}
</Button>
-->
</div>
</div>
<div
class=
"divborder newTableDiv"
>
<Table
class=
"tableClass"
@
on-current-change=
"handleRowChange"
highlight-row
:data=
"tableData1"
:columns=
"tableColumns1"
></Table>
<div
class=
"pageDiv"
>
<div
class=
"pageDirection"
>
<Page
:total=
"total"
:current=
"page"
@
on-change=
"changePage"
show-elevator
show-sizer
show-total
@
on-page-size-change=
"handlePageSize"
:page-size-opts=
"[10,20,30,40,100]"
></Page>
</div>
</div>
</div>
</div>
</
template
>
<
script
>
export
default
{
data
(){
return
{
//搜索
frockTypeTree
:[],
//树形结构
frockType
:[],
//工装类型
frockTypeid
:
''
,
frockList
:[],
//工装编号
frockCode
:
''
,
//工装编号
status
:
''
,
//状态
//列表
total
:
0
,
page
:
1
,
pagesize
:
10
,
tableData1
:[],
tableColumns1
:[
{
type
:
"index2"
,
title
:
this
.
$t
(
"1008"
),
key
:
"xuhao"
,
render
:
(
h
,
params
)
=>
{
return
h
(
"span"
,
params
.
index
+
(
this
.
page
-
1
)
*
this
.
pagesize
+
1
);
},
},
{
title
:
'工装类型'
,
key
:
''
},
{
title
:
'管理类型'
,
key
:
''
},
{
title
:
'工装料号'
,
key
:
''
},
{
title
:
'工装名称'
,
key
:
''
},
{
title
:
'工装编号'
,
key
:
''
},
{
title
:
'规格型号'
,
key
:
''
},
{
title
:
'数量'
,
key
:
''
},
{
title
:
'状态'
,
key
:
''
},
{
title
:
'备注'
,
key
:
''
},
{
title
:
'附件'
,
key
:
''
},
{
title
:
'维护人'
,
key
:
''
},
{
title
:
'维护时间'
,
key
:
''
}
],
}
},
created
(){
},
methods
:{
//工装类型
initFrockType
(){
// this.axios.request({
// url: "/fms/typeMaintenance/frockTypeList",
// method: "get",
// })
// .then((res) => {
// if (res.data.ret == 1) {
// let arr = res.data.data.children;
// this.frockTypeTree = arr;
// this.contentTree(arr);
// }
// });
},
contentTree
(
arr
)
{
arr
.
forEach
(
ele
=>
{
ele
.
disabled
=
false
;
ele
.
value
=
ele
.
id
;
ele
.
label
=
ele
.
name
;
if
(
ele
.
children
.
length
!=
0
&&
ele
.
children
!=
undefined
&&
ele
.
children
!=
null
)
{
this
.
contentTree
(
ele
.
children
);
}
});
},
changeFrockType
(
value
){
this
.
frockTypeid
=
""
;
if
(
value
!=
undefined
&&
value
.
length
){
this
.
frockTypeid
=
value
[
value
.
length
-
1
];
}
},
tosearch
(){
this
.
page
=
1
;
this
.
pagesize
=
10
;
this
.
search
(
0
);
},
search
(
toexcel
){
let
params
=
{
frockTypeid
:
this
.
frockTypeid
,
//工装类型id
page
:
this
.
page
,
pagesize
:
this
.
pagesize
,
toexcel
:
toexcel
//0查询 1导出
}
this
.
detailobj
=
{};
// this.axios.request({
// url: "/fms/typeMaintenance/search",
// params,
// method: "get",
// })
// .then((res) => {
// if(toexcel === 1){
// if (res.data.ret === 1) {
// window.location.href =
// axios.publicPath + "" + res.data.data;
// } else {
// this.$Message.error(this.$t(res.data.msg));
// }
// }
// else{
// this.total = 0;
// this.tableData1 = [];
// let data = res.data.data;
// if (res.data.ret == 1 &&Array.isArray(data)&&data.length) {
// this.total = res.data.total;
// this.tableData1 = res.data.data;
// }
// }
// });
},
handleRowChange
(
currentRow
,
oldCurrentRow
)
{
this
.
detailobj
=
currentRow
;
},
handlePageSize
(
value
)
{
this
.
page
=
1
;
this
.
pagesize
=
value
;
this
.
search
(
0
);
},
changePage
(
value
)
{
this
.
page
=
value
;
this
.
search
(
0
);
},
}
}
</
script
>
<
style
>
</
style
>
\ No newline at end of file
Html/src/view/fms/config/typeMaintenance.vue
View file @
dbe060ae
...
...
@@ -3,7 +3,7 @@
<div
class=
"divborder newSearchDiv"
>
<div
class=
"filter"
>
<label>
工装类型:
</label>
<Cascader
class=
"searchSelect"
:data=
"frockTypeTree"
change-on-select
v-model=
"frockType"
@
on-change=
"changeFrockType"
></Cascader>
<Cascader
class=
"searchSelect"
:data=
"frockTypeTree"
c
learable
c
hange-on-select
v-model=
"frockType"
@
on-change=
"changeFrockType"
></Cascader>
</div>
<div
class=
"searchBtn"
>
<Button
type=
"primary"
class=
"twoWord"
icon=
"ios-search"
@
click=
"tosearch()"
>
{{
$t
(
1001
)
}}
</Button>
...
...
Html/src/view/wms/config/storagemaintenance.vue
View file @
dbe060ae
...
...
@@ -16,9 +16,7 @@
<div
class=
"searchBtn"
>
<Button
type=
"primary"
class=
"twoWord"
icon=
"ios-search"
@
click=
"tosearch()"
>
{{
$t
(
1001
)
}}
</Button>
<Button
type=
"success"
class=
"twoWord"
icon=
"md-add-circle"
@
click=
"add()"
>
{{
$t
(
'1002'
)
}}
</Button>
<Button
type=
"warning"
class=
"twoWord"
icon=
"ios-create-outline"
@
click=
"edit()"
>
{{
$t
(
'1003'
)
}}
</Button>
<Button
type=
"error"
class=
"twoWord intervalRight"
icon=
"md-close-circle"
@
click=
"dele()"
>
{{
$t
(
1004
)
}}
</Button>
<!--
<Button
type=
"primary"
class=
"twoWord intervalRight"
icon=
"ios-cloud-download"
@
click=
"print()"
>
打印
</Button>
-->
<Button
type=
"warning"
class=
"twoWord intervalRight"
icon=
"ios-create-outline"
@
click=
"edit()"
>
{{
$t
(
'1003'
)
}}
</Button>
<Button
type=
"primary"
class=
"fourWord"
icon=
"md-download"
@
click=
"loadexcel()"
>
{{
$t
(
'1005'
)
}}
</Button>
<Upload
style=
"display:inline-block"
...
...
@@ -64,7 +62,7 @@
</div>
</div>
</div>
<Modal
class=
"newModalClass"
v-model=
"modal"
:styles=
"
{width:'400px'}">
<Modal
class=
"newModalClass"
v-model=
"
add
modal"
:styles=
"
{width:'400px'}">
<p
slot=
"header"
>
<span
v-show=
"type==1"
>
{{
$t
(
'1002'
)
}}
</span>
<span
v-show=
"type==2"
>
{{
$t
(
'1003'
)
}}
</span>
...
...
@@ -96,7 +94,7 @@
</div>
</div>
<div
slot=
"footer"
>
<Button
type=
"text"
size=
"large"
@
click=
"this.modal=false"
>
{{
$t
(
'1033'
)
}}
</Button>
<Button
type=
"text"
size=
"large"
@
click=
"this.
add
modal=false"
>
{{
$t
(
'1033'
)
}}
</Button>
<Button
type=
"primary"
size=
"large"
@
click=
"addPost()"
>
{{
$t
(
'1011'
)
}}
</Button>
</div>
</Modal>
...
...
@@ -141,26 +139,10 @@ export default {
whid1
:
''
,
//添加仓库
whdata1
:[],
//仓库列表
stid
:
1
,
//储位id
isdel
:
true
,
//启用
type
:
1
,
addmodal
:
false
,
data1
:
[],
name
:
""
,
detailobj
:
{},
modal
:
false
,
type
:
1
,
category
:
[],
name1
:
""
,
address
:
""
,
manager
:
""
,
phone
:
""
,
mobile
:
""
,
remark
:
""
,
isdel
:
false
,
typeid
:
0
,
typelevel
:
""
,
node
:
[],
downloadexe
:
false
,
printModal
:
false
,
};
},
created
()
{
...
...
@@ -224,10 +206,16 @@ export default {
title
:
item
.
name
});
})
this
.
tableColumns1
.
push
({
key
:
'state'
,
title
:
this
.
$t
(
'920152'
)
})
this
.
tableColumns1
.
push
(
{
key
:
'state'
,
title
:
this
.
$t
(
'920152'
)
},
{
key
:
'storeID'
,
title
:
'ID'
}
)
}
}
);
...
...
@@ -242,8 +230,8 @@ export default {
let
data
=
{
page
:
this
.
page
,
pageSize
:
this
.
pagesize
,
id
:
this
.
typeid
,
// 产线层级
id
isWa
vehouse
:
this
.
typelevel
,
id
:
this
.
whid
,
// 仓库
id
isWa
rehouse
:
1
,
};
this
.
detailobj
=
{};
this
.
request
(
"/wms/Location/GetLocationList"
,
data
,
"get"
).
then
(
...
...
@@ -267,11 +255,15 @@ export default {
pid
:
item
.
pid
,
serialNumber
:
item
.
serialNumber
,
storageName
:
item
.
storageName
,
sm_0
:
item
.
field
[
0
],
sm_1
:
item
.
field
[
1
],
sm_2
:
item
.
field
[
2
],
sm_3
:
item
.
field
[
3
],
sm_0
:
item
.
field
[
0
]
.
val
,
sm_1
:
item
.
field
[
1
]
.
val
,
sm_2
:
item
.
field
[
2
]
.
val
,
sm_3
:
item
.
field
[
3
]
.
val
,
state
:
item
.
state
==
1
?
"否"
:
"是"
,
status
:
item
.
state
,
storeID
:
item
.
storeID
,
field
:
item
.
field
,
warehouseId
:
item
.
warehouseId
});
});
}
...
...
@@ -294,8 +286,9 @@ export default {
})
this
.
whid1
=
""
;
this
.
stid
=
1
;
this
.
isdel
=
false
;
//启用
this
.
type
=
1
;
//添加
this
.
modal
=
true
;
this
.
add
modal
=
true
;
},
//添加提交
addPost
(){
...
...
@@ -317,15 +310,24 @@ export default {
return
false
;
}
let
url
=
''
;
let
id
=
''
;
if
(
this
.
type
===
1
){
url
=
'/wms/Location/AddLocation'
;
id
=
0
;
}
else
{
url
=
'/wms/Location/UpdateLocation'
;
id
=
this
.
detailobj
.
id
;
}
let
data
=
{
id
:
id
,
warehouseid
:
this
.
whid1
,
storeID
:
this
.
stid
,
status
:
this
.
isdel
?
0
:
1
,
storeArr
:
this
.
sTypes
}
this
.
request
(
url
,
data
,
"post"
).
then
((
res
)
=>
{
if
(
res
.
data
.
ret
==
1
)
{
this
.
modal
=
false
;
this
.
add
modal
=
false
;
if
(
this
.
type
===
1
){
this
.
tosearch
();
this
.
$Message
.
success
(
this
.
$t
(
'1055'
));
...
...
@@ -344,9 +346,13 @@ export default {
this
.
$Message
.
error
(
this
.
$t
(
'1017'
));
return
false
;
}
this
.
type
=
2
;
//修改
this
.
modal
=
true
;
this
.
sTypes
=
this
.
detailobj
.
field
;
this
.
whid1
=
this
.
detailobj
.
warehouseId
;
this
.
stid
=
this
.
detailobj
.
storeID
;
this
.
isdel
=
this
.
detailobj
.
status
?
false
:
true
;
//启用
this
.
type
=
2
;
//添加
this
.
addmodal
=
true
;
},
handleRowChange
(
currentRow
,
oldCurrentRow
)
{
this
.
detailobj
=
currentRow
;
...
...
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