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
6f7d2086
Commit
6f7d2086
authored
Oct 16, 2020
by
renjintao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
数据包追溯
parent
89ab7cb6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
192 additions
and
216 deletions
+192
-216
basicView.vue
pages/qc/dataTrace/components/basicView.vue
+100
-131
reviewCount.vue
pages/qc/dataTrace/components/reviewCount.vue
+92
-85
No files found.
pages/qc/dataTrace/components/basicView.vue
View file @
6f7d2086
<
template
>
<div
class=
""
>
<Form
:label-width=
"190"
inline
>
<div
class=
"orderDetail"
>
<Row>
<Col
span=
"12"
>
<FormItem
label=
"订单编号:"
style=
"width:100%"
>
<h3>
{{
baseData
.
mesCode
}}
</h3>
</FormItem>
<Col
span=
"8"
>
<span
class=
"fwBold"
>
{{
l
(
'mesCode'
)
}}
</span>
<p>
{{
baseData
.
mesCode
}}
</p>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"产品名称:"
style=
"width:100%"
>
<h4>
{{
baseData
.
productName
}}
</h4>
</FormItem>
<Col
span=
"8"
>
<span
class=
"fwBold"
>
{{
l
(
'taskType'
)
}}
</span>
<p>
<state
code=
"plan.order.taskType"
:value=
"baseData.taskType"
type=
"text"
></state>
</p>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"产品图号:"
style=
"width:100%"
>
<h4>
{{
baseData
.
drawnNumber
}}
</h4>
</FormItem>
<Col
span=
"8"
>
<span
class=
"fwBold"
>
{{
l
(
'quantity'
)
}}
</span>
<p>
{{
baseData
.
quantity
}}
</p>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"任务类型:"
style=
"width:100%"
>
<state
code=
"plan.order.taskType"
:value=
"baseData.taskType+''"
type=
"text"
></state>
</FormItem>
</Col>
<Col
span=
"8"
class=
""
>
<FormItem
label=
"阶段:"
style=
"width:100%"
>
<state
code=
"plan.order.stage"
:value=
"baseData.stage+''"
type=
"text"
></state>
</FormItem>
</Col>
<Col
span=
"8"
class=
""
>
<FormItem
label=
"材料:"
style=
"width:100%"
>
<state
code=
"plan.order.material"
:value=
"baseData.materialId+''"
type=
"text"
></state>
</FormItem>
</Col>
<Col
span=
"8"
class=
""
>
<FormItem
label=
"数量:"
style=
"width:100%"
>
<span>
{{
baseData
.
quantity
}}
</span>
</FormItem>
</Col>
<Col
span=
"8"
class=
""
>
<FormItem
label=
"工艺方法:"
style=
"width:100%"
>
<state
code=
"plan.order.routingMethod"
:value=
"baseData.routing_Method+''"
type=
"text"
></state>
</FormItem>
</Col>
<Col
span=
"8"
class=
""
>
<FormItem
label=
"甲方客户:"
style=
"width:100%"
>
<state
code=
"plan.order.guestName"
:value=
"baseData.guestName+''"
type=
"text"
></state>
</FormItem>
</Col>
<Col
span=
"8"
class=
""
>
<FormItem
label=
"外包络尺寸(mm):"
style=
"width:100%"
>
<span>
{{
baseData
.
outer_Envelope_Size
}}
</span>
</FormItem>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"开始时间:"
style=
"width:100%"
>
<span>
{{
baseData
.
demandStartDate
}}
</span>
</FormItem>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"完成时间:"
style=
"width:100%"
>
<span>
{{
baseData
.
demandFinishDate
}}
</span>
</FormItem>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"任务节点要求:"
style=
"width:100%"
>
<span>
{{
baseData
.
taskRequire
}}
</span>
</FormItem>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"厂内责任机关:"
style=
"width:100%"
>
<span>
{{
baseData
.
functionaryOffice
}}
</span>
</FormItem>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"厂内责任主体部门:"
style=
"width:100%"
>
<state
code=
"plan.order.mainDepartment"
:value=
"baseData.mainDepartmentId+''"
type=
"text"
></state>
</FormItem>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"3D打印承制单位:"
style=
"width:100%"
>
<state
code=
"plan.order.printSupply"
:value=
"baseData.printSupply+''"
type=
"text"
></state>
</FormItem>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"甲方投产输入文件(编号):"
style=
"width:100%"
>
<span>
{{
baseData
.
putintDocmentCode
}}
</span>
</FormItem>
</Row>
<Row>
<Col
span=
"8"
>
<span
class=
"fwBold"
>
{{
l
(
'status'
)
}}
</span>
<p>
<state
code=
"plan.order.status"
:value=
"baseData.status"
type=
"text"
></state>
</p>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"甲方技术输入文件(编号):"
style=
"width:100%"
>
<span>
{{
baseData
.
technologyDocmentCode
}}
</span>
</FormItem>
<Col
span=
"8"
>
<span
class=
"fwBold"
>
{{
l
(
'productName'
)
}}
</span>
<p>
{{
baseData
.
productName
}}
</p>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"外部图号/模型号:"
style=
"width:100%"
>
<span>
{{
baseData
.
outerDrawnNumber
}}
</span>
</FormItem>
<Col
span=
"8"
>
<span
class=
"fwBold"
>
{{
l
(
'drawnNumber'
)
}}
</span>
<p>
{{
baseData
.
drawnNumber
}}
</p>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"模型版本:"
style=
"width:100%"
>
<span>
{{
baseData
.
modelVersion
}}
</span>
</FormItem>
</Row>
<Row>
<Col
span=
"8"
>
<span
class=
"fwBold"
>
{{
l
(
'batchNumber'
)
}}
</span>
<p>
{{
baseData
.
batchNumber
}}
</p>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"甲方任务号:"
style=
"width:100%"
>
<span>
{{
baseData
.
taskCode
}}
</span>
</FormItem>
<Col
span=
"8"
>
<span
class=
"fwBold"
>
{{
l
(
'projectNumber'
)
}}
</span>
<p>
{{
baseData
.
projectNumber
}}
</p>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"甲方设计人员:"
style=
"width:100%"
>
<span>
{{
baseData
.
designer
}}
</span>
</FormItem>
<Col
span=
"8"
>
<span
class=
"fwBold"
>
{{
l
(
'urgencyLevel'
)
}}
</span>
<p>
<state
code=
"plan.order.urgencyLevel"
:value=
"baseData.urgencyLevel"
type=
"text"
></state>
</p>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"厂内机关负责人:"
style=
"width:100%"
>
<span>
{{
baseData
.
officeFunctionary
}}
</span>
</FormItem>
</Row>
<Row>
<Col
span=
"8"
>
<span
class=
"fwBold"
>
{{
l
(
'demandStartDate'
)
}}
</span>
<p>
<DTSpan
type=
"date"
v-model=
"baseData.demandStartDate"
></DTSpan>
</p>
</Col>
<Col
span=
"8"
>
<span
class=
"fwBold"
>
{{
l
(
'demandFinishDate'
)
}}
</span>
<p>
<DTSpan
type=
"date"
v-model=
"baseData.demandFinishDate"
></DTSpan>
</p>
</Col>
<Col
span=
"8"
>
<span
class=
"fwBold"
>
{{
l
(
'taskRequire'
)
}}
</span>
<p>
{{
baseData
.
taskRequire
}}
</p>
</Col>
<Col
span=
"12"
class=
""
>
<FormItem
label=
"厂内主工艺人员:"
style=
"width:100%"
>
<span>
{{
baseData
.
mainRoutingPeople
}}
</span>
</FormItem>
</Row>
<Row
class=
"lastRow"
>
<Col
span=
"24"
>
<span
class=
"fwBold"
>
{{
l
(
'remark'
)
}}
</span>
<p>
{{
baseData
.
remark
}}
</p>
</Col>
</Row>
</Form>
</div>
</div>
</
template
>
<
script
>
export
default
{
props
:
[
'baseData'
],
data
()
{
return
{
themeBg
:
'light'
,
basicData
:{},
themeBg
:
'light'
,
basicData
:
{},
}
},
methods
:
{
l
(
key
)
{
key
=
"mes_plan"
+
"."
+
key
;
return
this
.
$t
(
key
);
}
},
}
</
script
>
<
style
scoped
>
<
style
lang=
"less"
>
.orderDetail {
line-height: 30px;
width: 90%;
margin: 0 auto;
.ivu-row {
padding-top: 20px;
padding-bottom: 20px;
border-bottom: #ccc solid 1px;
}
.lastRow {
border-bottom: none;
}
}
</
style
>
pages/qc/dataTrace/components/reviewCount.vue
View file @
6f7d2086
<
template
>
<div
class=
"reve_cont"
>
<div
class=
"reve_cont"
>
<Row>
<Col
span=
"4"
>
<Menu
:active-name=
"actNum"
ref=
"actNum"
class=
"menuBg"
@
on-select=
"openView"
:theme=
"themeBg"
>
...
...
@@ -15,22 +15,27 @@
</Menu>
</Col>
<Col
span=
"20"
class=
"revieweBox"
>
<basicView
ref=
"basicView"
:baseData=
"basicData"
v-show=
"basicmodal"
/>
<basicView
ref=
"basicView"
:baseData=
"basicData"
v-show=
"basicmodal"
/>
<mainView
ref=
"mainView"
:baseData=
"basicData"
v-show=
"mainmodal"
/>
<!--
<dispatched
ref=
"dispatched"
:baseData=
"basicData"
v-show=
"dispatchedmodal"
/>
-->
</Col>
</Row>
</div>
</div>
</
template
>
<
script
>
import
service
from
'@/plugins/request'
import
basicView
from
'./basicView.vue'
;
import
mainView
from
'./mainView.vue'
;
import
dispatched
from
'./dispatched.vue'
;
export
default
{
components
:{
basicView
,
mainView
,
dispatched
},
components
:
{
basicView
,
mainView
,
dispatched
},
props
:
{
basicData
:
null
,
basicData
:
null
,
actValue
:
{
type
:
Number
,
default
:
1
...
...
@@ -41,21 +46,21 @@ export default {
},
data
()
{
return
{
actNum
:
'1'
,
themeBg
:
'light'
,
actNum
:
'1'
,
themeBg
:
'light'
,
basicmodal
:
true
,
mainmodal
:
false
,
dispatchedmodal
:
false
,
headerid
:
''
,
//暂存传字段
routingType
:
''
,
//工艺类型(主/专业)
diHeaderid
:
''
,
//暂存传字段
diRoutingType
:
''
,
//工艺类型(主/专业)
disexecuteid
:
0
,
mainexecuteid
:
0
headerid
:
''
,
//暂存传字段
routingType
:
''
,
//工艺类型(主/专业)
diHeaderid
:
''
,
//暂存传字段
diRoutingType
:
''
,
//工艺类型(主/专业)
disexecuteid
:
0
,
mainexecuteid
:
0
}
},
mounted
(){
this
.
$nextTick
(()
=>
{
mounted
()
{
this
.
$nextTick
(()
=>
{
this
.
actNum
==
this
.
$route
.
path
.
slice
(
1
)
this
.
$refs
.
actNum
.
updateActiveName
();
// this.shop = this.$route.path.slice(1)
...
...
@@ -63,30 +68,30 @@ export default {
})
},
methods
:
{
loaddata
(
pamasId
){
this
.
basicmodal
=
true
;
this
.
mainmodal
=
false
;
loaddata
(
pamasId
)
{
this
.
basicmodal
=
true
;
this
.
mainmodal
=
false
;
// this.dispatchedmodal= false;
// console.warn(pamasId) 获取主工艺信息 10030
let
url
=
`
${
designUrl
}
/orderrouting/getordersheaderinfo?orderId=`
+
pamasId
;
if
(
pamasId
)
{
if
(
pamasId
)
{
service
.
get
(
`
${
url
}
`
).
then
((
response
)
=>
{
console
.
log
(
response
)
if
(
response
.
result
.
length
>
0
)
{
if
(
response
.
result
[
0
])
{
if
(
response
.
result
.
length
>
0
)
{
if
(
response
.
result
[
0
])
{
this
.
$refs
.
mainView
.
craftData
=
response
.
result
[
0
];
this
.
headerid
=
response
.
result
[
0
].
id
;
this
.
routingType
=
response
.
result
[
0
].
routingType
;
this
.
getmainorder
(
pamasId
)
}
if
(
response
.
result
[
1
])
{
if
(
response
.
result
[
1
])
{
this
.
$refs
.
dispatched
.
craftData
=
response
.
result
[
1
];
this
.
diHeaderid
=
response
.
result
[
1
].
id
;
this
.
diRoutingType
=
response
.
result
[
1
].
routingType
;
this
.
getdisorder
(
pamasId
)
}
this
.
$refs
.
dispatched
.
getmaterialsupport
(
pamasId
)
}
else
{
//
this.$refs.dispatched.getmaterialsupport(pamasId)
}
else
{
console
.
log
(
'获取工艺信息为空.'
)
this
.
$refs
.
mainView
.
craftData
=
{};
this
.
$refs
.
dispatched
.
craftData
=
{};
...
...
@@ -95,21 +100,21 @@ export default {
}
},
// 获取产品号和设备id orderexecute/getorderproductandequip 10050
getmainorder
(
pamasId
){
getmainorder
(
pamasId
)
{
let
headerid
=
this
.
headerid
;
let
routingType
=
this
.
routingType
;
let
url01
=
`
${
PlanUrl
}
/orderexecute/getorderproductandequip?orderId=`
+
pamasId
+
`&headerid=`
+
headerid
+
`&routingType=`
+
routingType
;
let
url01
=
`
${
PlanUrl
}
/orderexecute/getorderproductandequip?orderId=`
+
pamasId
+
`&headerid=`
+
headerid
+
`&routingType=`
+
routingType
;
service
.
get
(
`
${
url01
}
`
).
then
((
res
)
=>
{
if
(
res
.
success
)
{
if
(
res
.
result
.
equipids
)
{
if
(
res
.
success
)
{
if
(
res
.
result
.
equipids
)
{
let
equipids
=
res
.
result
.
equipids
;
this
.
mainexecuteid
=
res
.
result
.
executeid
;
this
.
$refs
.
mainView
.
getlistall
(
equipids
)
this
.
$refs
.
mainView
.
getqc
(
this
.
mainexecuteid
);
let
bandleList
=
res
.
result
.
productCode
;
let
codeList
=
[];
// 编号List
bandleList
.
map
((
item
,
index
)
=>
{
let
codeList
=
[];
// 编号List
bandleList
.
map
((
item
,
index
)
=>
{
codeList
.
push
(
item
.
productcodes
)
})
this
.
$refs
.
mainView
.
mainCodeList
=
codeList
...
...
@@ -125,28 +130,27 @@ export default {
console
.
log
(
err
)
})
},
getdisorder
(
pamasId
){
getdisorder
(
pamasId
)
{
let
diHeaderid
=
this
.
diHeaderid
;
let
diRoutingType
=
this
.
diRoutingType
;
let
url02
=
`
${
PlanUrl
}
/orderexecute/getorderproductandequip?orderId=`
+
pamasId
+
`&headerid=`
+
diHeaderid
+
`&routingType=`
+
diRoutingType
;
let
url02
=
`
${
PlanUrl
}
/orderexecute/getorderproductandequip?orderId=`
+
pamasId
+
`&headerid=`
+
diHeaderid
+
`&routingType=`
+
diRoutingType
;
service
.
get
(
`
${
url02
}
`
).
then
((
res
)
=>
{
if
(
res
.
success
)
{
if
(
res
.
result
.
equipids
)
{
if
(
res
.
success
)
{
if
(
res
.
result
.
equipids
)
{
let
equipids
=
res
.
result
.
equipids
;
this
.
disexecuteid
=
res
.
result
.
executeid
;
this
.
$refs
.
dispatched
.
getlistall
(
equipids
)
this
.
$refs
.
dispatched
.
getqc
(
this
.
disexecuteid
);
let
bandleList
=
res
.
result
.
productCode
;
let
boardList
=
[];
// 板次List
bandleList
.
map
((
item
,
index
)
=>
{
let
boardList
=
[];
// 板次List
bandleList
.
map
((
item
,
index
)
=>
{
boardList
.
push
(
item
.
boardNumber
)
})
this
.
$refs
.
dispatched
.
disCodeList
=
boardList
console
.
warn
(
boardList
)
}
else
{
}
else
{
console
.
log
(
'获取专业工艺信息数据为空.'
)
}
}
else
{
...
...
@@ -157,10 +161,10 @@ export default {
})
},
// 更换左侧
openView
(
v
){
if
(
v
==
2
)
{
this
.
basicmodal
=
false
;
this
.
mainmodal
=
true
;
openView
(
v
)
{
if
(
v
==
2
)
{
this
.
basicmodal
=
false
;
this
.
mainmodal
=
true
;
// this.dispatchedmodal= false;
this
.
$refs
.
mainView
.
getqc
(
this
.
mainexecuteid
);
}
...
...
@@ -170,18 +174,18 @@ export default {
// // this.dispatchedmodal= true;
// this.$refs.dispatched.getqc(this.disexecuteid);
// }
else
{
this
.
basicmodal
=
true
;
this
.
mainmodal
=
false
;
else
{
this
.
basicmodal
=
true
;
this
.
mainmodal
=
false
;
// this.dispatchedmodal= false;
}
},
},
watch
:{
watch
:
{
basicData
:
{
handler
(
v
,
o
)
{
this
.
loaddata
(
v
.
id
)
if
(
v
)
{
if
(
v
)
{
this
.
actNum
==
'1'
this
.
openView
(
1
)
}
...
...
@@ -191,15 +195,18 @@ export default {
},
}
</
script
>
<
style
scoped
>
.menuBg
{
.menuBg
{
background
:
none
;
height
:
630px
;
}
.menuBg
.ivu-menu-item
{
.menuBg
.ivu-menu-item
{
color
:
#000
;
}
.revieweBox
{
.revieweBox
{
padding
:
0
0
0
60px
;
height
:
630px
;
}
...
...
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