diff --git a/src/pages/proj/ProdCount.vue b/src/pages/proj/ProdCount.vue
index e30e322..06110d3 100644
--- a/src/pages/proj/ProdCount.vue
+++ b/src/pages/proj/ProdCount.vue
@@ -51,12 +51,12 @@
生产任务
- 设备工单号班次类型生产物料计划开始计划数(块)已生产(块)不合格(块)合格率状态开工人开始时间结束时间
+ 设备工单号班次类型生产物料物料规格物料型号计划开始计划数(块)已生产(块)不合格(块)合格率状态开工人开始时间结束时间
-
- {{e.device}}{{e.workorder_code}}{{e.team}}{{e.material_name}}{{e.planproducestart_date}}{{e.plan_qty}}{{e.real_qty}}{{e.unqualified_qty}}{{e.qualified_rate}}{{e.workorder_status}}{{e.operator}}{{e.realproducestart_date}}{{e.realproduceend_date}}
+ {{e.device}}{{e.workorder_code}}{{e.team}}{{e.material_name}}{{e.material_spec}}{{e.material_model}}{{e.planproducestart_date}}{{e.plan_qty}}{{e.real_qty}}{{e.unqualified_qty}}{{e.qualified_rate}}{{e.workorder_status}}{{e.operator}}{{e.realproducestart_date}}{{e.realproduceend_date}}
@@ -91,7 +91,7 @@ export default {
PersonnelMonthlyProduction: [],
ProductionTask: [],
ShiftProductionList: [],
- resData: {},
+ resData: {}
}
},
computed: {
@@ -615,20 +615,22 @@ export default {
line-height 32px
span
display inline-block
- width 6.2%
+ width 5%
text-align center
line-height 32px
font-size 14px
&:nth-child(4)
- width 10%
+ width 16%
&:nth-child(5)
- width 10%
+ width 6.5%
&:nth-child(6)
- width 10%
- &:nth-child(12)
- width 10%
- &:nth-child(13)
- width 10%
+ width 6.5%
+ &:nth-child(7)
+ width 8%
+ &:nth-child(14)
+ width 9%
+ &:nth-child(15)
+ width 9%
.content-block-scroll
_wh(calc(100% - 0px), calc(100% - 113px))
margin 0 auto 25px auto
@@ -643,20 +645,22 @@ export default {
background rgba(38,47,82,0.50)
span
display inline-block
- width 6.2%
+ width 5%
font-size 12px
// padding 0 .1rem
text-align center
line-height 38px
box-sizing border-box
&:nth-child(4)
- width 10%
+ width 16%
&:nth-child(5)
- width 10%
+ width 6.5%
&:nth-child(6)
- width 10%
- &:nth-child(12)
- width 10%
- &:nth-child(13)
- width 10%
+ width 6.5%
+ &:nth-child(7)
+ width 8%
+ &:nth-child(14)
+ width 9%
+ &:nth-child(15)
+ width 9%