From 0c5245ef9b9f0defda4c30d1d3e72983ab60b368 Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Mon, 18 Mar 2024 08:27:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/orderGroup/orderGroupDetailData.vue | 94 ++++++++++--------- .../base/orderManage/orderDetailData.vue | 74 ++++++++------- 2 files changed, 89 insertions(+), 79 deletions(-) diff --git a/src/views/order/base/orderGroup/orderGroupDetailData.vue b/src/views/order/base/orderGroup/orderGroupDetailData.vue index 33b9b60b..1c9b34d3 100644 --- a/src/views/order/base/orderGroup/orderGroupDetailData.vue +++ b/src/views/order/base/orderGroup/orderGroupDetailData.vue @@ -3,34 +3,35 @@
- 集团编码: {{orderGroupMsg.code}} + 集团编码: {{ orderGroupMsg.code }}
- 返回 + 返回
订单名称
-
{{orderGroupMsg.name}}
+
{{ orderGroupMsg.name }}
产品名称
-
{{orderGroupMsg.productName}}
+
{{ orderGroupMsg.productName }}
产品规格
-
{{orderGroupMsg.specifications}}
+
{{ orderGroupMsg.specifications }}
客户
-
{{orderGroupMsg.customerName}}
+
{{ orderGroupMsg.customerName }}
包装要求
-
{{getDictDataLabel(DICT_TYPE.PACK_SPEC, orderGroupMsg.packReq)}}
+
{{ getDictDataLabel(DICT_TYPE.PACK_SPEC, orderGroupMsg.packReq) }}
交货时间
-
{{ parseTime(orderGroupMsg.deliveTime)}}
+
{{ parseTime(orderGroupMsg.deliveTime) }}
 @@ -40,15 +41,15 @@
计划加工数量
-
{{orderGroupMsg.planQuantity}}
+
{{ orderGroupMsg.planQuantity }}
加工平方数(平方米)
-
{{orderGroupMsg.planArea}}
+
{{ orderGroupMsg.planArea }}
状态
-
{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderGroupMsg.status)}}
+
{{ getDictDataLabel(DICT_TYPE.ORDER_STATUS, orderGroupMsg.status) }}
实际开始时间
@@ -62,15 +63,15 @@
实际生产数量
-
{{orderGroupMsg.actualquantity }}
+
{{ orderGroupMsg.actualquantity }}
完成比%
-
{{orderGroupMsg.completeRate}}
+
{{ orderGroupMsg.completeRate }}
废片数量
-
{{orderGroupMsg.nokQuantity}}
+
{{ orderGroupMsg.nokQuantity }}
@@ -78,21 +79,21 @@
- 厂务订单编码: {{item.code}} + 厂务订单编码: {{ item.code }}
订单名称
-
{{item.name}}
+
{{ item.name }}
产品名称
-
{{item.productName}}
+
{{ item.productName }}
产品规格
-
{{item.specifications}}
+
{{ item.specifications }}
创建时间
@@ -110,19 +111,19 @@
计划加工数量
-
{{item.planQuantity}}
+
{{ item.planQuantity }}
加工平方数(平方米)
-
{{item.planArea}}
+
{{ item.planArea }}
预计用时(时)
-
{{item.expectTime}}
+
{{ item.expectTime }}
状态
-
{{getDictDataLabel(DICT_TYPE.ORDER_STATUS, item.status)}}
+
{{ getDictDataLabel(DICT_TYPE.ORDER_STATUS, item.status) }}
实际开始时间
@@ -136,15 +137,15 @@
实际生产数量
-
{{item.actualQuantity }}
+
{{ item.actualQuantity }}
完成比%
-
{{item.completeProp}}
+
{{ item.completeProp }}
废片数量
-
{{item.nokQuantity}}
+
{{ item.nokQuantity }}
@@ -153,13 +154,8 @@ 工单信息
- +
@@ -192,14 +188,14 @@ const tableProps = [ filter: publicFormatter('workshop') }, { - prop: 'planQuantity', - label: '计划加工量', - width: 100 + prop: 'planAssignmentQuantity', + label: '计划分配数量', + width: 110 }, { - prop: 'actualQuantity', - label: '实际加工量', - width: 100 + prop: 'actualAssignmentQuantity', + label: '实际分配数量', + width: 110 }, { prop: 'actualArea', @@ -266,16 +262,16 @@ export default { id: this.orderGroupId }).then(res => { this.orderGroupMsg = res.data - if ( res.data.orderIdNum && res.data.orderIdNum > 0) { + if (res.data.orderIdNum && res.data.orderIdNum > 0) { this.orderMsg = res.data.orderDetailVOS - }else{ + } else { this.orderMsg = [] } }) }, // 返回 returnOrderManage() { - this.$router.push({path: '/order/base/order-group'}) + this.$router.push({ path: '/order/base/order-group' }) } } } @@ -285,43 +281,51 @@ export default { height: calc(100vh - 120px - 8px); background-color: rgb(242, 244, 249); overflow: auto; - .box1, .box2 { + + .box1, + .box2 { background-color: #fff; border-radius: 9px; + .blodTip { height: 16px; font-size: 14px; font-weight: 600; - color: rgba(0,0,0,0.85); + color: rgba(0, 0, 0, 0.85); margin-bottom: 8px; } + .lightTip { height: 16px; font-size: 14px; font-weight: 400; - color: rgba(102,102,102,0.75); + color: rgba(102, 102, 102, 0.75); margin-bottom: 12px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } } + .box2 { height: 415px; padding: 12px 16px 0; margin: 8px 0; } + .box1 { height: 215px; padding: 16px 16px 0 16px; } + .boxTitle { display: inline-block; font-size: 16px; font-weight: 400; color: #000000; - margin:0 10px 20px 0; + margin: 0 10px 20px 0; } + .blueTitle { content: ''; display: inline-block; diff --git a/src/views/order/base/orderManage/orderDetailData.vue b/src/views/order/base/orderManage/orderDetailData.vue index 13616609..0faa81db 100644 --- a/src/views/order/base/orderManage/orderDetailData.vue +++ b/src/views/order/base/orderManage/orderDetailData.vue @@ -1,28 +1,31 @@ @@ -125,14 +123,14 @@ const tableProps1 = [ filter: publicFormatter('workshop') }, { - prop: 'planQuantity', - label: '计划加工量', - width: 100 + prop: 'planAssignmentQuantity', + label: '计划分配数量', + width: 110 }, { - prop: 'actualQuantity', - label: '实际加工量', - width: 100 + prop: 'actualAssignmentQuantity', + label: '实际分配数量', + width: 110 }, { prop: 'actualArea', @@ -193,13 +191,13 @@ export default { processFlowName: '' } }, - components:{ TopTab }, + components: { TopTab }, mounted() { window.addEventListener('resize', () => { this.tableH = this.tableHeight(510) / 2 }) - if (this.$route.query.orderIdString && this.$route.query.orderIdString!=='undefined') { - getOrderList({ids:this.$route.query.orderIdString}).then(res => { + if (this.$route.query.orderIdString && this.$route.query.orderIdString !== 'undefined') { + getOrderList({ ids: this.$route.query.orderIdString }).then(res => { this.orderIdList = res.data.map(item => { return { id: item.id, @@ -211,7 +209,7 @@ export default { }) this.isSingle = false console.log('aaaaa') - }else{ + } else { this.orderId = this.$route.query.orderId this.isSingle = true this.getMsg() @@ -253,40 +251,48 @@ export default {