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
862306c7
Commit
862306c7
authored
Sep 02, 2020
by
仇晓婷
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
产品和工单默认图片
parent
5b32ebb1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
445 additions
and
381 deletions
+445
-381
chan_Pin.png
assets/imgicon/chan_Pin.png
+0
-0
orderlist.vue
pages/produce/orderlist.vue
+407
-344
index.vue
pages/technology/productMix/product/index.vue
+38
-37
No files found.
assets/imgicon/chan_Pin.png
0 → 100644
View file @
862306c7
233 KB
pages/produce/orderlist.vue
View file @
862306c7
<
template
>
<div
class=
"aps-r"
>
<DataGrid
:columns=
"columns"
ref=
"grid"
:batch=
"false"
:type=
"typeInfo"
:span=
"6"
:lazy=
"true"
:conditions=
"easySearch"
:action=
"action"
:gutter=
"40"
>
<div
class=
"aps-r"
>
<DataGrid
:columns=
"columns"
ref=
"grid"
:batch=
"false"
:type=
"typeInfo"
:span=
"6"
:lazy=
"true"
:conditions=
"easySearch"
:action=
"action"
:gutter=
"40"
>
<template
slot=
"easySearch"
>
<Form
ref=
"formInline"
:model=
"easySearch"
inline
>
<FormItem
prop=
"keys"
>
<Input
placeholder=
"请输入订单编号/产品名称/图号"
v-model=
"easySearch.keys.value"
v-width=
"260"
clearable
/>
<Input
placeholder=
"请输入订单编号/产品名称/图号"
v-model=
"easySearch.keys.value"
v-width=
"260"
clearable
/>
</FormItem>
<FormItem>
<Button
type=
"primary"
@
click=
"search"
>
查询
</Button>
...
...
@@ -18,7 +33,10 @@
<Button
:icon=
"iconInfo"
shape=
"circle"
:title=
"titleInfo"
@
click=
"changeShwo"
></Button>
</
template
>
<
template
slot=
"card"
slot-scope=
"{row}"
>
<div
class=
"body"
@
click=
"toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.routingDetailId,row.quantity,row.status,row.mesCode,row.productName,row.drawnNumber)"
>
<div
class=
"body"
@
click=
"toExecute(row.id,row.orderId,row.executeId,row.routingHeaderId,row.routingDetailId,row.quantity,row.status,row.mesCode,row.productName,row.drawnNumber)"
>
<Row
class=
"title-i"
>
<Col
:span=
"10"
class=
"order-code"
>
<Ellipsis
:text=
"row.productName"
:lines=
"1"
tooltip
transfer
/>
...
...
@@ -30,7 +48,13 @@
<div
class=
"statuBg"
:style=
"tdStyle(row.status)"
></div>
<div
class=
"boxTitle"
>
<div
class=
"text"
>
<state
code=
"taskList.status"
ref=
"state"
:value=
"row.status"
type=
"text"
:color=
"false"
></state>
<state
code=
"taskList.status"
ref=
"state"
:value=
"row.status"
type=
"text"
:color=
"false"
></state>
</div>
</div>
</Col>
...
...
@@ -38,7 +62,18 @@
<div
class=
"panel-text"
>
<Row>
<Col
span=
"8"
>
<img
:src=
"getUrl(row.productUrl)"
width=
"120"
height=
"120"
:title=
"row.productUrl"
style=
"border:#cacbd0 dashed 1px"
onerror=
"this.src='/imgicon/noPic_product.png';"
/>
<div
class=
"img-i"
>
<img
:src=
"downUrl +row.productUrl"
v-if=
"row.productUrl"
/>
<img
src=
"@/assets/imgicon/chan_Pin.png"
v-else
width=
"100%"
height=
"100%"
/>
</div>
<!--
<img
:src=
"getUrl(row.productUrl)"
width=
"120"
height=
"120"
:title=
"row.productUrl"
style=
"border:#cacbd0 dashed 1px"
onerror=
"this.src='/imgicon/noPic_product.png';"
/>
-->
</Col>
<Col
span=
"16"
class=
"row"
>
<p>
{{
l
(
"beginTime"
)
}}
:
{{
row
.
beginTime
}}
</p>
...
...
@@ -57,17 +92,33 @@
<Row
class=
"rowBottom"
>
<Col
span=
"14"
>
{{
l
(
"drawnNumber"
)
}}
:
{{
row
.
drawnNumber
}}
</Col>
<Col
span=
"10"
class=
"tr"
>
<Icon
type=
"md-alert"
size=
"18"
color=
"#FFA000"
v-if=
"getStatus(row.status)&&getTimes(row.endTime)
<86400
&&
getTimes
(
row
.
endTime
)
>
0" />
<span
style=
"color:#FFA000"
v-if=
"getStatus(row.status)&&getTimes(row.endTime)
<86400
&&
getTimes
(
row
.
endTime
)
>
0">预警
</span>
<Icon
type=
"md-timer"
size=
"18"
color=
"#FE7777"
v-if=
"getStatus(row.status)&&compareTime(row.endTime)"
/>
<span
style=
"color:#FE7777"
v-if=
"getStatus(row.status)&&compareTime(row.endTime)"
>
超期
</span>
<Icon
type=
"md-alert"
size=
"18"
color=
"#FFA000"
v-if=
"getStatus(row.status)&&getTimes(row.endTime)
<86400
&&
getTimes
(
row
.
endTime
)
>
0"
/>
<span
style=
"color:#FFA000"
v-if=
"getStatus(row.status)&&getTimes(row.endTime)
<86400
&&
getTimes
(
row
.
endTime
)
>
0"
>预警
</span>
<Icon
type=
"md-timer"
size=
"18"
color=
"#FE7777"
v-if=
"getStatus(row.status)&&compareTime(row.endTime)"
/>
<span
style=
"color:#FE7777"
v-if=
"getStatus(row.status)&&compareTime(row.endTime)"
>
超期
</span>
</Col>
</Row>
</div>
</div>
</
template
>
</DataGrid>
</div>
</div>
</template>
<
script
>
...
...
@@ -76,7 +127,7 @@ import Search from "./search";
export
default
{
name
:
"starOrder"
,
components
:
{
Search
Search
,
},
data
()
{
return
{
...
...
@@ -84,15 +135,16 @@ export default {
easySearch
:
{
keys
:
{
op
:
"mesCode,productName,drawnNumber"
,
value
:
null
}
value
:
null
,
},
},
downUrl
:
fileUrlDown
,
columns
:
[{
columns
:
[
{
title
:
this
.
l
(
"mesCode"
),
key
:
"mesCode"
,
width
:
240
,
align
:
"left"
align
:
"left"
,
},
{
key
:
"status"
,
...
...
@@ -100,40 +152,40 @@ export default {
align
:
"center"
,
high
:
true
,
code
:
"taskList.status"
,
width
:
120
width
:
120
,
},
{
key
:
"productName"
,
title
:
this
.
l
(
"productName"
),
align
:
"left"
,
high
:
true
high
:
true
,
},
{
key
:
"drawnNumber"
,
title
:
this
.
l
(
"drawnNumber"
),
align
:
"left"
,
high
:
true
high
:
true
,
},
{
key
:
"quantity"
,
title
:
this
.
l
(
"quantity"
),
align
:
"right"
,
width
:
120
,
high
:
true
high
:
true
,
},
{
key
:
"beginTime"
,
title
:
this
.
l
(
"beginTime"
),
align
:
"center"
,
width
:
180
,
high
:
true
high
:
true
,
},
{
key
:
"endTime"
,
title
:
this
.
l
(
"endTime"
),
align
:
"center"
,
width
:
180
,
high
:
true
high
:
true
,
},
{
title
:
"操作"
,
...
...
@@ -141,13 +193,17 @@ export default {
width
:
140
,
align
:
"center"
,
render
:
(
h
,
params
)
=>
{
return
h
(
"div"
,
{
class
:
"action"
},
[
return
h
(
"div"
,
{
class
:
"action"
,
},
[
h
(
"op"
,
{
"op"
,
{
attrs
:
{
oprate
:
"edit"
oprate
:
"edit"
,
},
on
:
{
click
:
()
=>
...
...
@@ -162,29 +218,27 @@ export default {
params
.
row
.
mesCode
,
params
.
row
.
productName
,
params
.
row
.
drawnNumber
)
}
),
},
},
"查看"
)
]);
}
}
),
]
);
},
},
],
typeInfo
:
"card"
,
iconInfo
:
"md-apps"
,
titleInfo
:
"卡片模式"
,
nowTime
:
new
Date
().
getTime
()
//页面当前打开时间
nowTime
:
new
Date
().
getTime
(),
//页面当前打开时间
};
},
created
()
{
let
oldStr
=
localStorage
.
getItem
(
"admin"
);
let
userlist
=
this
.
$store
.
getters
.
getUser
(
2
);
},
async
fetch
({
store
,
params
})
{
async
fetch
({
store
,
params
})
{
await
store
.
dispatch
(
"loadDictionary"
);
// 加载数据字典
},
mounted
()
{
...
...
@@ -219,15 +273,15 @@ export default {
dispatchStatus
:
status
,
mesCode
:
mesCode
,
productName
:
productName
,
drawnNumber
:
drawnNumber
}
drawnNumber
:
drawnNumber
,
},
});
},
tdStyle
(
val
)
{
//动态根据状态值加载状态值对应的颜色
let
temDic
=
this
.
$store
.
getters
.
dictionaryByKey
(
"taskList.status"
);
let
temColor
=
"#666"
;
temDic
.
forEach
(
data
=>
{
temDic
.
forEach
((
data
)
=>
{
if
(
Number
(
data
.
code
)
==
val
)
{
temColor
=
data
.
color
;
}
...
...
@@ -293,8 +347,8 @@ export default {
l
(
key
)
{
let
vkey
=
"order_list"
+
"."
+
key
;
return
this
.
$t
(
vkey
)
||
key
;
}
}
},
},
};
</
script
>
...
...
@@ -336,7 +390,16 @@ export default {
.panel-text {
padding: 5px 8px;
.img-i {
width: 120px;
height: 120px;
overflow: hidden;
border: #cacbd0 dashed 1px;
img {
// width: 90px;
// height: 90px;
}
}
.row {
color: #666666;
padding-left: 10px;
...
...
pages/technology/productMix/product/index.vue
View file @
862306c7
...
...
@@ -40,7 +40,9 @@
<Row
class=
"row-down"
:gutter=
"10"
>
<Col
span=
"7"
>
<div
class=
"img-i"
>
<img
:src=
"downUrl +row.productUrl"
onerror=
"this.src='/imgicon/noPic_product.png';"
/>
<img
:src=
"downUrl +row.productUrl"
v-if=
"row.productUrl"
/>
<!-- onerror="this.src='/imgicon/chan_Pin.png'" -->
<img
src=
"@/assets/imgicon/chan_Pin.png"
v-else
width=
"100%"
height=
"100%"
/>
</div>
</Col>
<Col
span=
"17"
class=
"c"
>
...
...
@@ -84,20 +86,20 @@ import Search from "./search";
export
default
{
name
:
"list"
,
components
:
{
Search
Search
,
},
head
:
{
title
:
""
,
author
:
"henq"
,
description
:
"product_info 5/20/2020 3:13:51 PM"
description
:
"product_info 5/20/2020 3:13:51 PM"
,
},
props
:
{
parent
:
{
id
:
Number
,
parentName
:
String
,
ids
:
String
,
bomId
:
Number
}
bomId
:
Number
,
}
,
},
data
()
{
return
{
...
...
@@ -106,7 +108,7 @@ export default {
easySearch
:
{
keys
:
{
op
:
"mmcode,name"
,
value
:
null
},
levelId
:
{
op
:
"In"
,
value
:
this
.
id
},
upId
:
{
op
:
"In"
,
value
:
0
}
upId
:
{
op
:
"In"
,
value
:
0
}
,
},
modal
:
false
,
title
:
"新增"
,
...
...
@@ -119,19 +121,19 @@ export default {
title
:
this
.
$t
(
"id"
),
hide
:
true
,
align
:
"left"
,
high
:
true
high
:
true
,
},
{
title
:
this
.
l
(
"name"
),
key
:
"name"
,
align
:
"left"
align
:
"left"
,
},
{
key
:
"mmcode"
,
title
:
this
.
l
(
"mmcode"
),
align
:
"center"
,
high
:
true
high
:
true
,
},
{
key
:
"productUrl"
,
...
...
@@ -144,39 +146,39 @@ export default {
"a"
,
{
attrs
:
{
oprate
:
"detail"
oprate
:
"detail"
,
// href: this.fileUrlPath,
// target: "_blank"
},
on
:
{
click
:
()
=>
{
this
.
downFile
(
params
.
row
.
productUrl
);
}
}
}
,
}
,
},
"查看图片"
)
)
,
]);
}
}
,
},
{
key
:
"levelTitle"
,
title
:
this
.
l
(
"levelTitle"
),
align
:
"left"
,
high
:
true
high
:
true
,
},
{
key
:
"drawingNo"
,
title
:
this
.
l
(
"drawingNo"
),
align
:
"right"
,
high
:
true
high
:
true
,
},
{
key
:
"madeCompanyTitle"
,
title
:
this
.
l
(
"madeCompanyTitle"
),
align
:
"center"
,
width
:
260
,
high
:
true
high
:
true
,
},
{
title
:
"操作"
,
...
...
@@ -190,8 +192,8 @@ export default {
{
attrs
:
{
oprate
:
"edit"
},
on
:
{
click
:
()
=>
this
.
bom
(
params
.
row
)
}
click
:
()
=>
this
.
bom
(
params
.
row
)
,
}
,
},
"BOM"
),
...
...
@@ -200,8 +202,8 @@ export default {
{
attrs
:
{
oprate
:
"edit"
},
on
:
{
click
:
()
=>
this
.
edit
(
params
.
row
)
}
click
:
()
=>
this
.
edit
(
params
.
row
)
,
}
,
},
"编辑"
),
...
...
@@ -209,7 +211,7 @@ export default {
"op"
,
{
attrs
:
{
oprate
:
"delete"
},
on
:
{
click
:
()
=>
this
.
remove
(
params
.
row
)
}
on
:
{
click
:
()
=>
this
.
remove
(
params
.
row
)
}
,
},
"删除"
),
...
...
@@ -218,18 +220,18 @@ export default {
{
attrs
:
{
oprate
:
"view"
},
on
:
{
click
:
()
=>
this
.
view
(
params
.
row
)
}
click
:
()
=>
this
.
view
(
params
.
row
)
,
}
,
},
"详情"
)
)
,
]);
}
}
}
,
}
,
],
typeInfo
:
"card"
,
iconInfo
:
"md-apps"
,
titleInfo
:
"卡片模式"
titleInfo
:
"卡片模式"
,
};
},
mounted
()
{
...
...
@@ -314,8 +316,7 @@ export default {
this
.
fullscreen
=
true
;
},
remove
(
row
)
{
Api
.
delete
(
row
.
bomId
).
then
(
r
=>
{
Api
.
delete
(
row
.
bomId
).
then
((
r
)
=>
{
if
(
r
.
success
)
{
this
.
$refs
.
grid
.
load
();
this
.
$Message
.
success
(
"删除成功"
);
...
...
@@ -329,19 +330,19 @@ export default {
l
(
key
)
{
let
vkey
=
"product_info"
+
"."
+
key
;
return
this
.
$t
(
vkey
)
||
key
;
}
}
,
},
watch
:
{
"parent.id"
(
v
)
{
if
(
v
)
{
let
data
=
{
levelId
:
{
op
:
"In"
,
value
:
this
.
parent
.
ids
},
upId
:
{
op
:
"In"
,
value
:
0
}
upId
:
{
op
:
"In"
,
value
:
0
}
,
};
this
.
$refs
.
grid
.
reload
(
data
);
}
}
}
}
,
}
,
};
</
script
>
<
style
lang=
"less"
>
...
...
@@ -369,7 +370,7 @@ export default {
height: 90px;
margin-right: 15px;
// overflow: hidden;
img{
img
{
width: 90px;
height: 90px;
}
...
...
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