@ -2,7 +2,7 @@
* @ Author : zwq
* @ Date : 2021 - 11 - 18 14 : 16 : 25
* @ LastEditors : DY
* @ LastEditTime : 2023 - 1 1- 23 18 : 45 : 1 5
* @ LastEditTime : 2023 - 1 2- 22 16 : 02 : 2 5
* @ Description :
-- >
< template >
@ -12,86 +12,153 @@
: wrapper - closable = "false"
class = "drawer"
size = "50%" > -- >
< div class = " app- container">
< div class = " container">
<!-- < small -title slot = "title" :no-padding ="true" >
{ { isdetail ? '详情' : ! dataForm . id ? '新增' : '编辑' } }
< / s m a l l - t i t l e > - - >
< el -button style = "float: right" type = "primary" @click ="goback()" > 返回 < / el -button >
< div v-show ="workOrderButton.length" >
< el -button v-for ="(work, index) in workOrderButton" :key="index" type="primary" @click="init(work.id, true)" > {{ work.name }} < / el -button >
< / div >
< div class = "content" >
< div >
< h1 > 工单编码 : { { dataForm . code } } < / h1 >
< / div >
< small -title
style = "margin: 16px 0; padding-left: 8px"
: no - padding = "true" >
基本信息
< / s m a l l - t i t l e >
< div class = "formContent" >
< el -row :gutter ="20" >
< el -col :span ="8" > 工单名称 : { { dataForm . name } } < / e l - c o l >
< el -col :span ="8" > 工单来源 : { { dataForm . triggerOrigin === 1 ? 'MES' : dataForm . triggerOrigin === 2 ? 'ERP' : '' } } < / e l - c o l >
< el -col :span ="8" > 所属订单 :
< span v-for ="(item, index) in orderList" :key="index" style="margin-right: 10px" > {{ item.orderName }} < / span >
< / e l - c o l >
< / e l - r o w >
< el -row :gutter ="20" >
< el -col :span ="8" > 产品名称 : { { dataForm . productName } } < / e l - c o l >
< el -col :span ="8" > 规 格 : { { dataForm . specifications } } < / e l - c o l >
< el -col :span ="8" > 计划生产数量 : { { dataForm . planQuantity } } < / e l - c o l >
< / e l - r o w >
< el -row :gutter ="20" >
< el -col :span ="8" > 预计用时 ( 小时 ) : { { dataForm . remainingTime } } < / e l - c o l >
< el -col :span ="8" > 计划投入数量 : { { dataForm . planAssignQuantity } } < / e l - c o l >
< el -col :span ="8" > 优先级 : { { fitlerP ( dataForm . priority ) } } < / e l - c o l >
< / e l - r o w >
< el -row :gutter ="20" >
< el -col :span ="8" > 负责人 : { { dataForm . workers } } < / e l - c o l >
< el -col :span ="8" > 关联产线 :
< span v-for ="(item, index) in dataForm.productLineNames" :key="index" style="margin-right: 10px" > {{ item }} < / span >
< / e l - c o l >
< el -col :span ="8" > 物料计算方式 : { { dataForm . materialMethod === 1 ? '产品基础' : dataForm . materialMethod === 2 ? '工艺扩展' : '' } } < / e l - c o l >
< / e l - r o w >
< el -row :gutter ="20" >
< el -col :span ="8" > 关联工艺 : { { dataForm . processFlowName } } < / e l - c o l >
< / e l - r o w >
< div class = "card" >
< div class = "boxTitle" >
< span class = "blueTitle" > < / span >
< span > 工单编码 : { { dataForm . code } } < / span >
< / div >
< el -button style = "float: right" type = "primary" size = "small" plain @click ="goback()" >
< svg -icon icon -class = " return " / > 返回
< / e l - b u t t o n >
< div class = "formContent" >
< el -row :gutter ="20" >
< el -col :span ="3" >
< div class = "blodTip" > 工单名称 < / div >
< div class = "lightTip" > { { dataForm . name } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 工单来源 < / div >
< div class = "lightTip" > { { dataForm . triggerOrigin === 1 ? 'MES' : dataForm . triggerOrigin === 2 ? 'ERP' : '' } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 所属订单 < / div >
< div class = "lightTip" >
< span v-for ="(item, index) in orderList" :key="index" style="margin-right: 10px" > {{ item.orderName }} < / span >
< / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 产品名称 < / div >
< div class = "lightTip" > { { dataForm . productName } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 规 格 < / div >
< div class = "lightTip" > { { dataForm . specifications } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 计划生产数量 < / div >
< div class = "lightTip" > { { dataForm . planQuantity } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 预计用时 ( 小时 ) < / div >
< div class = "lightTip" > { { dataForm . remainingTime } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 计划投入数量 < / div >
< div class = "lightTip" > { { dataForm . planAssignQuantity } } < / div >
< / e l - c o l >
< / e l - r o w >
< el -row :gutter ="20" >
< el -col :span ="3" >
< div class = "blodTip" > 优先级 < / div >
< div class = "lightTip" > { { fitlerP ( dataForm . priority ) } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 负责人 < / div >
< div class = "lightTip" > { { dataForm . workers } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 关联产线 < / div >
< div class = "lightTip" >
< span v-for ="(item, index) in dataForm.productLineNames" :key="index" style="margin-right: 10px" > {{ item }} < / span >
< / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 物料计算方式 < / div >
< div class = "lightTip" > { { dataForm . materialMethod === 1 ? '产品基础' : dataForm . materialMethod === 2 ? '工艺扩展' : '' } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 关联工艺 < / div >
< div class = "lightTip" > { { dataForm . processFlowName } } < / div >
< / e l - c o l >
< / e l - r o w >
< / div >
< / div >
< small -title
style = "margin: 16px 0; padding-left: 8px"
: no - padding = "true" >
生产信息
< / s m a l l - t i t l e >
< div class = "formContent" >
< el -row :gutter ="20" >
< el -col :span ="8" > 工单创建时间 : { { parseTime ( dataForm . createTime ) } } < / e l - c o l >
< el -col :span ="8" > 计划开始时间 : { { parseTime ( dataForm . planStartTime ) } } < / e l - c o l >
< el -col :span ="8" > 计划完成时间 : { { parseTime ( dataForm . planFinishTime ) } } < / e l - c o l >
< / e l - r o w >
< el -row :gutter ="20" >
< el -col :span ="8" > 预计结束时间 : { { parseTime ( dataForm . computeFinishTime ) } } < / e l - c o l >
< el -col :span ="8" > 实际开始时间 : { { parseTime ( dataForm . startProduceTime ) } } < / e l - c o l >
< el -col :span ="8" > 实际完成时间 : { { parseTime ( dataForm . finishProduceTime ) } } < / e l - c o l >
< / e l - r o w >
< el -row :gutter ="20" >
< el -col :span ="8" > 工单状态 : { { fitlerS ( dataForm . status ) } } < / e l - c o l >
< el -col :span ="8" > 实际投入数量 : { { dataForm . assignQuantity } } < / e l - c o l >
< el -col :span ="8" > 实际生产数量 : { { dataForm . actualQuantity } } < / e l - c o l >
< / e l - r o w >
< el -row :gutter ="20" >
< el -col :span ="8" > 废片数量 : { { dataForm . nokQuantity } } < / e l - c o l >
< el -col :span ="8" > 检测瑕疵数 : { { } } < / e l - c o l >
< / e l - r o w >
< div class = "card" >
<!-- < small -title
style = "margin: 16px 0; padding-left: 8px"
: no - padding = "true" >
生产信息
< / s m a l l - t i t l e > - - >
< div class = "boxTitle" >
< span class = "blueTitle" > < / span >
< span > 生产信息 < / span >
< / div >
< div class = "formContent" >
< el -row :gutter ="20" >
< el -col :span ="3" >
< div class = "blodTip" > 工单创建时间 < / div >
< div class = "lightTip" > { { parseTime ( dataForm . createTime ) } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 计划开始时间 < / div >
< div class = "lightTip" > { { parseTime ( dataForm . planStartTime ) } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 计划完成时间 < / div >
< div class = "lightTip" > { { parseTime ( dataForm . planFinishTime ) } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 预计结束时间 < / div >
< div class = "lightTip" > { { parseTime ( dataForm . computeFinishTime ) } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 实际开始时间 < / div >
< div class = "lightTip" > { { parseTime ( dataForm . startProduceTime ) } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 实际完成时间 < / div >
< div class = "lightTip" > { { parseTime ( dataForm . finishProduceTime ) } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 工单状态 < / div >
< div class = "lightTip" > { { fitlerS ( dataForm . status ) } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 实际投入数量 < / div >
< div class = "lightTip" > { { dataForm . assignQuantity } } < / div >
< / e l - c o l >
< / e l - r o w >
< el -row :gutter ="20" >
< el -col :span ="3" >
< div class = "blodTip" > 实际生产数量 < / div >
< div class = "lightTip" > { { dataForm . actualQuantity } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 废片数量 < / div >
< div class = "lightTip" > { { dataForm . nokQuantity } } < / div >
< / e l - c o l >
< el -col :span ="3" >
< div class = "blodTip" > 检测瑕疵数 < / div >
< div class = "lightTip" > { { } } < / div >
< / e l - c o l >
< / e l - r o w >
< / div >
< / div >
< div class = "attr-list" >
< small -title
style = "margin: 16px 0; padding-left: 8px"
: no - padding = "true" >
订单相关信息
< / s m a l l - t i t l e >
< div class = "card" style = "padding-bottom: 16px; margin-bottom: 10px" >
< div class = "boxTitle" >
< span class = "blueTitle" > < / span >
< span > 订单相关信息 < / span >
< / div >
< base -table
: table - props = "tableProps"
: page = "listQuery.pageNo"
@ -114,12 +181,11 @@
@ pagination = "getList" / > -- >
< / div >
< div class = "attr-list" >
< small -title
style = "margin: 16px 0; padding-left: 8px"
: no - padding = "true" >
预计用料信息
< / s m a l l - t i t l e >
< div class = "card" style = "padding-bottom: 16px;" >
< div class = "boxTitle" >
< span class = "blueTitle" > < / span >
< span > 预计用料信息 < / span >
< / div >
< base -table
: table - props = "tableProps1"
: page = "listQuery1.pageNo"
@ -228,7 +294,8 @@ export default {
visible : false ,
isdetail : false ,
workOrderButton : [ ] ,
processFlowList : [ ]
processFlowList : [ ] ,
/ / t a b l e H : t h i s . t a b l e H e i g h t ( 5 1 0 ) / 2
} ;
} ,
created ( ) {
@ -391,59 +458,12 @@ export default {
} ;
< / script >
< style scoped >
. drawer >>> . el - drawer {
border - radius : 8 px 0 0 8 px ;
display : flex ;
flex - direction : column ;
}
. drawer >>> . el - form - item _ _label {
padding : 0 ;
}
. drawer >>> . el - drawer _ _header {
margin : 0 ;
padding : 32 px 32 px 24 px ;
border - bottom : 1 px solid # dcdfe6 ;
}
. drawer >>> . el - drawer _ _body {
flex : 1 ;
height : 1 px ;
display : flex ;
flex - direction : column ;
}
. drawer >>> . content {
padding : 10 px 24 px ;
flex : 1 ;
display : flex ;
flex - direction : column ;
/* height: 100%; */
}
. drawer >>> . visual - part {
flex : 1 auto ;
max - height : 76 vh ;
overflow : hidden ;
overflow - y : scroll ;
padding - right : 10 px ; /* 调整滚动条样式 */
}
. drawer >>> . el - form ,
. drawer >>> . attr - list {
padding : 0 16 px ;
}
. drawer - body _ _footer {
display : flex ;
justify - content : flex - end ;
padding : 18 px ;
}
. formContent {
font - size : 16 px ;
line - height : 1.5 ;
margin - bottom : 10 px ;
width : 100 % ;
padding : 0 14 px ;
}
. action _btn {
float : right ;
@ -453,4 +473,43 @@ export default {
. add {
color : # 0 b58ff ;
}
. blodTip {
height : 16 px ;
font - size : 14 px ;
font - weight : 600 ;
color : rgba ( 0 , 0 , 0 , 0.85 ) ;
margin - bottom : 8 px ;
}
. lightTip {
height : 16 px ;
font - size : 14 px ;
font - weight : 400 ;
color : rgba ( 102 , 102 , 102 , 0.75 ) ;
margin - bottom : 12 px ;
}
. container {
background - color : rgb ( 242 , 244 , 249 ) ;
}
. card {
padding : 16 px 16 px 0 16 px ;
background - color : # fff ;
border - radius : 9 px ;
}
. boxTitle {
display : inline - block ;
font - size : 16 px ;
font - weight : 400 ;
color : # 000000 ;
margin : 0 10 px 20 px 0 ;
}
. blueTitle {
content : '' ;
display : inline - block ;
width : 4 px ;
height : 18 px ;
background - color : # 0 B58FF ;
border - radius : 1 px ;
margin - right : 8 px ;
vertical - align : bottom ;
}
< / style >