Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mes-ui
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
周远喜
mes-ui
Commits
7dbc480f
Commit
7dbc480f
authored
Mar 31, 2020
by
renjintao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
scroll
parent
5f32a654
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
157 additions
and
157 deletions
+157
-157
index.vue
pages/qc/certificate/endIssued/index.vue
+5
-3
index.vue
pages/qc/certificate/waitOpened/index.vue
+5
-3
index.vue
pages/resource/material/placode/index.vue
+3
-2
index.vue
pages/resource/material/powder/index.vue
+141
-148
index.vue
pages/resource/material/scraper/index.vue
+3
-1
No files found.
pages/qc/certificate/endIssued/index.vue
View file @
7dbc480f
<
template
>
<div
class=
"end-issued"
>
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
:conditions=
"easySearch"
:high=
"false"
></DataGrid>
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
:conditions=
"easySearch"
:high=
"false"
:height=
"tdHeight"
></DataGrid>
<Modal
v-model=
"detailModal"
title=
"查看合格证"
footer-hide
width=
"1000"
:mask-closable=
"false"
>
<Detail
@
on-close=
"cancel"
@
on-ok=
"addOk"
:eid=
"curId"
/>
</Modal>
...
...
@@ -21,6 +21,7 @@ export default {
detailModal
:
false
,
curId
:
0
,
modalInfo
:
false
,
tdHeight
:
''
,
rules
:
{
approveUser
:
[{
required
:
true
,
message
:
'必填'
,
trigger
:
'blur'
}]
},
...
...
@@ -130,8 +131,9 @@ export default {
}
}
},
mounted
()
{
console
.
log
(
this
)
mounted
()
{},
created
()
{
this
.
tdHeight
=
window
.
innerHeight
-
260
},
methods
:
{
addOk
()
{
...
...
pages/qc/certificate/waitOpened/index.vue
View file @
7dbc480f
<
template
>
<div
class=
"wait-opened"
>
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
:conditions=
"easySearch"
:high=
"false"
></DataGrid>
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
:conditions=
"easySearch"
:high=
"false"
:height=
"tdHeight"
></DataGrid>
<Modal
v-model=
"addModal"
title=
"开合格证"
fullscreen
footer-hide
:mask-closable=
"false"
>
<Add
@
on-close=
"cancel"
@
on-ok=
"addOk"
:eid=
"curId"
ref=
"addFile"
/>
</Modal>
...
...
@@ -21,6 +21,7 @@ export default {
checkLists
:
[],
addModal
:
false
,
curId
:
null
,
tdHeight
:
''
,
columns
:
[
{
key
:
'id'
,
title
:
this
.
l
(
'id'
),
hide
:
true
,
align
:
'left'
},
{
...
...
@@ -127,8 +128,9 @@ export default {
async
fetch
({
store
,
params
})
{
await
store
.
dispatch
(
'loadDictionary'
)
// 加载数据字典
},
mounted
()
{
console
.
log
(
this
)
mounted
()
{},
created
()
{
this
.
tdHeight
=
window
.
innerHeight
-
260
},
methods
:
{
addOk
()
{
...
...
pages/resource/material/placode/index.vue
View file @
7dbc480f
...
...
@@ -4,7 +4,7 @@
<StoreHouseLeft
@
storeIds=
"storeIds"
:type=
'1'
></StoreHouseLeft>
</Sider>
<Content
class=
"content"
>
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
:conditions=
"easySearch"
>
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
:conditions=
"easySearch"
:height=
"tdHeight"
>
<template
slot=
"searchForm"
>
<Search
/>
</
template
>
...
...
@@ -82,6 +82,7 @@ export default {
deletelModal
:
false
,
setNumModal
:
false
,
inventoryModal
:
false
,
tdHeight
:
""
,
curId
:
0
,
easySearch
:
{
keys
:
{
op
:
'code,name'
,
value
:
''
,
default
:
true
},
...
...
@@ -256,7 +257,7 @@ export default {
},
mounted
()
{},
created
()
{
this
.
tdHeight
=
window
.
innerHeight
-
260
},
methods
:
{
addOk
()
{
...
...
pages/resource/material/powder/index.vue
View file @
7dbc480f
<
template
>
<Layout
class=
"full"
>
<Sider
hide-trigger
:style=
"
{ background: '#fff' }"
class="menu"
width="240"
style=" flex:0;"
>
<Sider
hide-trigger
:style=
"
{ background: '#fff' }" class="menu" width="240" style=" flex:0;">
<StoreHouseLeft
@
storeIds=
"storeIds"
:type=
"1"
></StoreHouseLeft>
</Sider>
<Content
class=
"content"
>
...
...
@@ -15,6 +9,7 @@
ref=
"grid"
:action=
"action"
:conditions=
"easySearch"
:height=
"tdHeight"
>
<template
slot=
"searchForm"
>
<Search
/>
...
...
@@ -33,12 +28,7 @@
<Modal
v-model=
"detailModal"
title=
"详情"
width=
"800"
>
<Detail
:eid=
"curId"
/>
</Modal>
<Modal
v-model=
"deletelModal"
title=
"删除"
@
on-ok=
"removeOk"
@
on-cancel=
"cancel"
>
<Modal
v-model=
"deletelModal"
title=
"删除"
@
on-ok=
"removeOk"
@
on-cancel=
"cancel"
>
<p>
确定删除?
</p>
</Modal>
<Modal
v-model=
"inventoryModal"
title=
"盘库"
footer-hide
width=
"800"
>
...
...
@@ -76,15 +66,15 @@
</Layout>
</template>
<
script
>
import
Api
from
'./api'
import
Add
from
'./add'
import
Edit
from
'./edit'
import
Detail
from
'./detail'
import
Search
from
'./search'
import
Inventory
from
'./inventory'
import
StoreHouseLeft
from
'@/components/modalTree/StoreHouseLeft.vue'
import
Api
from
"./api"
;
import
Add
from
"./add"
;
import
Edit
from
"./edit"
;
import
Detail
from
"./detail"
;
import
Search
from
"./search"
;
import
Inventory
from
"./inventory"
;
import
StoreHouseLeft
from
"@/components/modalTree/StoreHouseLeft.vue"
;
export
default
{
name
:
'list'
,
name
:
"list"
,
components
:
{
Add
,
Edit
,
...
...
@@ -102,203 +92,204 @@ export default {
deletelModal
:
false
,
setNumModal
:
false
,
inventoryModal
:
false
,
tdHeight
:
""
,
curId
:
0
,
easySearch
:
{
keys
:
{
op
:
'code,name'
,
value
:
''
,
default
:
true
},
storeId
:
{
op
:
'In'
,
value
:
''
}
keys
:
{
op
:
"code,name"
,
value
:
""
,
default
:
true
},
storeId
:
{
op
:
"In"
,
value
:
""
}
},
columns
:
[
{
key
:
'id'
,
title
:
this
.
l
(
'id'
),
hide
:
true
,
align
:
'left'
},
{
key
:
"id"
,
title
:
this
.
l
(
"id"
),
hide
:
true
,
align
:
"left"
},
{
key
:
'code'
,
title
:
this
.
l
(
'code'
),
align
:
'left'
,
key
:
"code"
,
title
:
this
.
l
(
"code"
),
align
:
"left"
,
easy
:
true
,
high
:
true
,
width
:
200
},
{
key
:
'name'
,
title
:
this
.
l
(
'name'
),
align
:
'left'
,
key
:
"name"
,
title
:
this
.
l
(
"name"
),
align
:
"left"
,
easy
:
true
,
high
:
true
,
tooltip
:
true
},
{
key
:
'brand'
,
title
:
this
.
l
(
'brand'
),
align
:
'left'
,
key
:
"brand"
,
title
:
this
.
l
(
"brand"
),
align
:
"left"
,
easy
:
true
,
high
:
true
},
{
key
:
'specifications'
,
title
:
this
.
l
(
'specifications'
),
align
:
'left'
,
key
:
"specifications"
,
title
:
this
.
l
(
"specifications"
),
align
:
"left"
,
easy
:
true
,
high
:
true
},
{
key
:
'originalManufacturer'
,
title
:
this
.
l
(
'originalManufacturer'
),
align
:
'left'
,
key
:
"originalManufacturer"
,
title
:
this
.
l
(
"originalManufacturer"
),
align
:
"left"
,
easy
:
true
,
hide
:
true
,
high
:
true
},
{
key
:
'batch'
,
title
:
this
.
l
(
'batch'
),
align
:
'left'
,
key
:
"batch"
,
title
:
this
.
l
(
"batch"
),
align
:
"left"
,
easy
:
true
,
high
:
true
,
hide
:
true
},
{
key
:
'totalInventory'
,
title
:
this
.
l
(
'totalInventory'
),
align
:
'left'
,
key
:
"totalInventory"
,
title
:
this
.
l
(
"totalInventory"
),
align
:
"left"
,
width
:
120
,
hide
:
true
,
high
:
true
},
{
key
:
'total'
,
title
:
this
.
l
(
'total'
),
align
:
'left'
,
key
:
"total"
,
title
:
this
.
l
(
"total"
),
align
:
"left"
,
width
:
120
,
high
:
true
,
render
:
(
h
,
params
)
=>
{
return
h
(
'Tooltip'
,
"Tooltip"
,
{
props
:
{
content
:
'库存不足,总数小于'
+
params
.
row
.
minNum
+
'kg'
,
placement
:
'top'
,
content
:
"库存不足,总数小于"
+
params
.
row
.
minNum
+
"kg"
,
placement
:
"top"
,
disabled
:
params
.
row
.
total
>
params
.
row
.
minNum
?
true
:
false
},
class
:
params
.
row
.
total
>
params
.
row
.
minNum
?
''
:
'red'
class
:
params
.
row
.
total
>
params
.
row
.
minNum
?
""
:
"red"
},
params
.
row
.
total
)
)
;
}
},
{
key
:
'minNum'
,
title
:
this
.
l
(
'minNum'
),
align
:
'left'
,
key
:
"minNum"
,
title
:
this
.
l
(
"minNum"
),
align
:
"left"
,
width
:
120
,
hide
:
true
,
high
:
true
},
{
key
:
'unitPrice'
,
title
:
this
.
l
(
'unitPrice'
),
align
:
'left'
,
key
:
"unitPrice"
,
title
:
this
.
l
(
"unitPrice"
),
align
:
"left"
,
width
:
110
,
easy
:
true
,
high
:
true
},
{
key
:
'certificateOfApproval'
,
title
:
this
.
l
(
'certificateOfApproval'
),
align
:
'left'
,
key
:
"certificateOfApproval"
,
title
:
this
.
l
(
"certificateOfApproval"
),
align
:
"left"
,
easy
:
true
,
hide
:
true
,
high
:
true
},
{
key
:
'storeTitle'
,
title
:
this
.
l
(
'storeTitle'
),
align
:
'left'
,
key
:
"storeTitle"
,
title
:
this
.
l
(
"storeTitle"
),
align
:
"left"
,
high
:
true
,
width
:
110
,
tooltip
:
true
},
{
key
:
'location'
,
title
:
this
.
l
(
'location'
),
align
:
'left'
,
key
:
"location"
,
title
:
this
.
l
(
"location"
),
align
:
"left"
,
easy
:
true
,
high
:
true
,
hide
:
true
},
{
key
:
'category'
,
title
:
this
.
l
(
'category'
),
align
:
'left'
,
key
:
"category"
,
title
:
this
.
l
(
"category"
),
align
:
"left"
,
high
:
true
,
code
:
'mes_xingchi_resource.material.powderType'
code
:
"mes_xingchi_resource.material.powderType"
},
{
key
:
'reinspectionStatus'
,
title
:
this
.
l
(
'reinspectionStatus'
),
align
:
'left'
,
key
:
"reinspectionStatus"
,
title
:
this
.
l
(
"reinspectionStatus"
),
align
:
"left"
,
easy
:
true
,
high
:
true
,
hide
:
true
,
width
:
120
,
code
:
'mes_xingchi_resource.material.recheckState'
code
:
"mes_xingchi_resource.material.recheckState"
},
{
key
:
'creationTime'
,
title
:
this
.
l
(
'creationTime'
),
key
:
"creationTime"
,
title
:
this
.
l
(
"creationTime"
),
hide
:
true
,
align
:
'left'
align
:
"left"
},
{
key
:
'creatorUserId'
,
title
:
this
.
l
(
'creatorUserId'
),
key
:
"creatorUserId"
,
title
:
this
.
l
(
"creatorUserId"
),
hide
:
true
,
align
:
'left'
align
:
"left"
},
{
key
:
'lastModificationTime'
,
title
:
this
.
l
(
'lastModificationTime'
),
key
:
"lastModificationTime"
,
title
:
this
.
l
(
"lastModificationTime"
),
hide
:
true
,
align
:
'left'
align
:
"left"
},
{
key
:
'deletionTime'
,
title
:
this
.
l
(
'deletionTime'
),
key
:
"deletionTime"
,
title
:
this
.
l
(
"deletionTime"
),
hide
:
true
,
align
:
'left'
align
:
"left"
},
{
key
:
'deleterUserId'
,
title
:
this
.
l
(
'deleterUserId'
),
key
:
"deleterUserId"
,
title
:
this
.
l
(
"deleterUserId"
),
hide
:
true
,
align
:
'left'
align
:
"left"
},
{
key
:
'isDeleted'
,
title
:
this
.
l
(
'isDeleted'
),
key
:
"isDeleted"
,
title
:
this
.
l
(
"isDeleted"
),
hide
:
true
,
align
:
'left'
align
:
"left"
},
{
key
:
'lastModifierUserId'
,
title
:
this
.
l
(
'lastModifierUserId'
),
key
:
"lastModifierUserId"
,
title
:
this
.
l
(
"lastModifierUserId"
),
hide
:
true
,
align
:
'left'
align
:
"left"
},
{
title
:
'操作'
,
title
:
"操作"
,
width
:
170
,
align
:
'center'
,
align
:
"center"
,
render
:
(
h
,
params
)
=>
{
return
h
(
'div'
,
{
class
:
'action'
},
[
return
h
(
"div"
,
{
class
:
"action"
},
[
h
(
'op'
,
"op"
,
{
attrs
:
{
oprate
:
'detail'
oprate
:
"detail"
},
on
:
{
click
:
()
=>
this
.
setNum
(
params
.
row
)
}
},
'设置最低库存'
"设置最低库存"
)
// h(
// 'a',
...
...
@@ -308,98 +299,100 @@ export default {
// },
// '删除'
// )
])
])
;
}
}
],
setNumForm
:
{
coding
:
''
,
name
:
''
,
coding
:
""
,
name
:
""
,
id
:
null
,
minNum
:
0
}
}
}
;
},
mounted
()
{},
created
()
{},
created
()
{
this
.
tdHeight
=
window
.
innerHeight
-
260
},
methods
:
{
addOk
()
{
this
.
$refs
.
grid
.
load
()
this
.
addModal
=
false
this
.
detailModal
=
false
this
.
editModal
=
false
this
.
setNumModal
=
false
this
.
inventoryModal
=
false
this
.
curId
=
0
this
.
$refs
.
grid
.
load
()
;
this
.
addModal
=
false
;
this
.
detailModal
=
false
;
this
.
editModal
=
false
;
this
.
setNumModal
=
false
;
this
.
inventoryModal
=
false
;
this
.
curId
=
0
;
},
detail
(
id
)
{
this
.
detailModal
=
true
this
.
curId
=
id
this
.
detailModal
=
true
;
this
.
curId
=
id
;
},
edit
(
id
)
{
this
.
editModal
=
true
this
.
curId
=
id
this
.
editModal
=
true
;
this
.
curId
=
id
;
},
remove
(
id
)
{
this
.
deletelModal
=
true
this
.
curId
=
id
this
.
deletelModal
=
true
;
this
.
curId
=
id
;
},
removeOk
()
{
Api
.
delete
({
id
:
this
.
curId
}).
then
(
(
r
)
=>
{
Api
.
delete
({
id
:
this
.
curId
}).
then
(
r
=>
{
if
(
r
.
success
)
{
this
.
$refs
.
grid
.
load
()
this
.
deletelModal
=
false
this
.
$Message
.
success
(
'删除成功'
)
this
.
$refs
.
grid
.
load
()
;
this
.
deletelModal
=
false
;
this
.
$Message
.
success
(
"删除成功"
);
}
else
{
this
.
$Message
.
error
(
'删除失败'
)
this
.
$Message
.
error
(
"删除失败"
);
}
})
})
;
},
removeCancel
()
{
this
.
deletelModal
=
false
this
.
deletelModal
=
false
;
},
setNum
(
val
)
{
this
.
setNumModal
=
true
this
.
setNumModal
=
true
;
this
.
setNumForm
=
{
coding
:
val
.
code
,
name
:
val
.
name
,
id
:
val
.
id
,
minNum
:
val
.
minNum
}
}
;
// this.setNumForm.coding=val.coding
// this.setNumForm.name=val.name
// this.setNumForm.id=val.id
// this.setNumForm.minNum=val.minNum
},
setNumOk
()
{
Api
.
setminnum
(
this
.
setNumForm
).
then
(
(
r
)
=>
{
Api
.
setminnum
(
this
.
setNumForm
).
then
(
r
=>
{
if
(
r
.
success
)
{
this
.
$refs
.
grid
.
load
()
this
.
setNumModal
=
false
this
.
$Message
.
success
(
'设置成功'
)
this
.
$refs
.
grid
.
load
()
;
this
.
setNumModal
=
false
;
this
.
$Message
.
success
(
"设置成功"
);
}
else
{
this
.
$Message
.
error
(
'设置失败'
)
this
.
$Message
.
error
(
"设置失败"
);
}
})
})
;
},
cancel
()
{
this
.
curId
=
0
this
.
addModal
=
false
this
.
detailModal
=
false
this
.
editModal
=
false
this
.
deletedlModal
=
false
this
.
setNumModal
=
false
this
.
inventoryModal
=
false
this
.
curId
=
0
;
this
.
addModal
=
false
;
this
.
detailModal
=
false
;
this
.
editModal
=
false
;
this
.
deletedlModal
=
false
;
this
.
setNumModal
=
false
;
this
.
inventoryModal
=
false
;
},
l
(
key
)
{
let
vkey
=
'MaterialPowder'
+
'.'
+
key
return
this
.
$t
(
vkey
)
||
key
let
vkey
=
"MaterialPowder"
+
"."
+
key
;
return
this
.
$t
(
vkey
)
||
key
;
},
storeIds
(
val
)
{
this
.
easySearch
.
storeId
.
value
=
val
this
.
$refs
.
grid
.
easySearch
()
this
.
easySearch
.
storeId
.
value
=
val
;
this
.
$refs
.
grid
.
easySearch
()
;
}
}
}
}
;
</
script
>
pages/resource/material/scraper/index.vue
View file @
7dbc480f
...
...
@@ -4,7 +4,7 @@
<StoreHouseLeft
@
storeIds=
"storeIds"
c
></StoreHouseLeft>
</Sider>
<Content
class=
"content"
>
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
:conditions=
"easySearch"
>
<DataGrid
:columns=
"columns"
ref=
"grid"
:action=
"action"
:conditions=
"easySearch"
:height=
"tdHeight"
>
<template
slot=
"searchForm"
>
<Search
/>
</
template
>
...
...
@@ -82,6 +82,7 @@ export default {
deletelModal
:
false
,
setNumModal
:
false
,
inventoryModal
:
false
,
tdHeight
:
""
,
curId
:
0
,
easySearch
:
{
keys
:
{
op
:
'code'
,
value
:
''
,
default
:
true
},
...
...
@@ -259,6 +260,7 @@ export default {
},
mounted
()
{},
created
()
{
this
.
tdHeight
=
window
.
innerHeight
-
260
},
methods
:
{
addOk
()
{
...
...
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