From ca129f54345a16ecd3cecf5a483f8642a96271ef Mon Sep 17 00:00:00 2001 From: lb Date: Fri, 15 Mar 2024 17:03:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?update=20core-worker=E7=9A=84=E5=85=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=8E=B7=E5=8F=96=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/specialEquipment/basic/FireFighthing.vue | 3 ++- src/views/specialEquipment/basic/Manage.vue | 3 ++- src/views/specialEquipment/basic/Safety.vue | 3 +-- src/views/specialEquipment/check/Content-add.vue | 5 ++++- src/views/specialEquipment/check/Content-edit.vue | 5 ++++- src/views/specialEquipment/components/EquipmentInfoForm.vue | 3 ++- src/views/specialEquipment/components/manageDrawerForm.vue | 5 ++++- src/views/specialEquipment/maintain/PlanConfig--add.vue | 3 ++- src/views/specialEquipment/maintain/Repair--add.vue | 3 ++- .../maintain/WaitingList--add--unplanned.vue | 3 ++- .../specialEquipment/maintain/WaitingListPlanned--edit.vue | 3 ++- 11 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/views/specialEquipment/basic/FireFighthing.vue b/src/views/specialEquipment/basic/FireFighthing.vue index 0da17657..7bb37319 100644 --- a/src/views/specialEquipment/basic/FireFighthing.vue +++ b/src/views/specialEquipment/basic/FireFighthing.vue @@ -251,7 +251,8 @@ export default { select: true, label: '负责人', prop: 'responsiblePeopleId', - url: '/base/core-worker/listAll', + url: '/base/core-worker/workerList', + // url: '/base/core-worker/listAll', }, ], [ diff --git a/src/views/specialEquipment/basic/Manage.vue b/src/views/specialEquipment/basic/Manage.vue index b8329090..e9b34803 100644 --- a/src/views/specialEquipment/basic/Manage.vue +++ b/src/views/specialEquipment/basic/Manage.vue @@ -244,7 +244,8 @@ export default { select: true, label: '负责人', prop: 'responsiblePeopleId', - url: '/base/core-worker/listAll', + url: '/base/core-worker/workerList', + // url: '/base/core-worker/listAll', }, ], [{ input: true, label: '备注', prop: 'remark' }], diff --git a/src/views/specialEquipment/basic/Safety.vue b/src/views/specialEquipment/basic/Safety.vue index 01a23622..63c5abf8 100644 --- a/src/views/specialEquipment/basic/Safety.vue +++ b/src/views/specialEquipment/basic/Safety.vue @@ -120,7 +120,6 @@ import { createEquipment, updateEquipment, deleteEquipment, - getEquipment, getEquipmentPage, exportEquipmentExcel, } from '@/api/base/equipment'; @@ -244,7 +243,7 @@ export default { select: true, label: '负责人', prop: 'responsiblePeopleId', - url: '/base/core-worker/listAll', + url: '/base/core-worker/workerList', }, ], [{ input: true, label: '备注', prop: 'remark' }], diff --git a/src/views/specialEquipment/check/Content-add.vue b/src/views/specialEquipment/check/Content-add.vue index d5c9142d..67aeab10 100644 --- a/src/views/specialEquipment/check/Content-add.vue +++ b/src/views/specialEquipment/check/Content-add.vue @@ -164,7 +164,10 @@ export default { })) ); } - const workerlist = await this.$axios('/base/core-worker/listAll'); + const workerlist = await this.$axios( + // '/base/core-worker/listAll' + '/base/core-worker/workerList' + ); if (workerlist.code == 0) { inspectorList = inspectorList.concat( workerlist.data.map((item) => ({ diff --git a/src/views/specialEquipment/check/Content-edit.vue b/src/views/specialEquipment/check/Content-edit.vue index 073ae25d..1a7c8326 100644 --- a/src/views/specialEquipment/check/Content-edit.vue +++ b/src/views/specialEquipment/check/Content-edit.vue @@ -555,7 +555,10 @@ export default { })) ); } - const workerlist = await this.$axios('/base/core-worker/listAll'); + const workerlist = await this.$axios( + '/base/core-worker/workerList' + // '/base/core-worker/listAll' + ); if (workerlist.code == 0) { inspectorList = inspectorList.concat( workerlist.data.map((item) => ({ diff --git a/src/views/specialEquipment/components/EquipmentInfoForm.vue b/src/views/specialEquipment/components/EquipmentInfoForm.vue index c670b036..4eeb2ff9 100644 --- a/src/views/specialEquipment/components/EquipmentInfoForm.vue +++ b/src/views/specialEquipment/components/EquipmentInfoForm.vue @@ -356,7 +356,8 @@ export default { async getRpList() { this.formLoading = true; const { code, data } = await this.$axios( - '/base/core-worker/listAll' + '/base/core-worker/workerList' + // '/base/core-worker/listAll' ); // debugger; if (code == 0) { diff --git a/src/views/specialEquipment/components/manageDrawerForm.vue b/src/views/specialEquipment/components/manageDrawerForm.vue index 13eac654..038b1a36 100644 --- a/src/views/specialEquipment/components/manageDrawerForm.vue +++ b/src/views/specialEquipment/components/manageDrawerForm.vue @@ -182,7 +182,10 @@ export default { async getRpList() { this.formLoading = true; - const { code, data } = await this.$axios('/base/core-worker/listAll'); + const { code, data } = await this.$axios( + '/base/core-worker/workerList' + // '/base/core-worker/listAll' + ); // debugger; if (code == 0) { this.rpList = data; diff --git a/src/views/specialEquipment/maintain/PlanConfig--add.vue b/src/views/specialEquipment/maintain/PlanConfig--add.vue index 54f0479c..caf26fc3 100644 --- a/src/views/specialEquipment/maintain/PlanConfig--add.vue +++ b/src/views/specialEquipment/maintain/PlanConfig--add.vue @@ -390,7 +390,8 @@ export default { const urls = [ '/base/core-production-line/listAll', '/base/core-department/listAll', - '/base/core-worker/listAll', + '/base/core-worker/workerList', + // '/base/core-worker/listAll', ]; let res; switch (source) { diff --git a/src/views/specialEquipment/maintain/Repair--add.vue b/src/views/specialEquipment/maintain/Repair--add.vue index 8e75ae17..bb68e5dc 100644 --- a/src/views/specialEquipment/maintain/Repair--add.vue +++ b/src/views/specialEquipment/maintain/Repair--add.vue @@ -639,7 +639,8 @@ export default { ); /** worker */ const workerList = await this.$axios({ - url: '/base/core-worker/listAll', + url: '/base/core-worker/workerList', + // url: '/base/core-worker/listAll', }); list = list.concat( (workerList.data || []).map((item) => ({ diff --git a/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue b/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue index b4d9d4ca..068c0137 100644 --- a/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue +++ b/src/views/specialEquipment/maintain/WaitingList--add--unplanned.vue @@ -326,7 +326,8 @@ export default { const urls = [ '/base/core-production-line/listAll', '/base/core-department/listAll', - '/base/core-worker/listAll', + '/base/core-worker/workerList', + // '/base/core-worker/listAll', ]; let res; switch (source) { diff --git a/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue b/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue index 8ec59282..af30a0fd 100644 --- a/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue +++ b/src/views/specialEquipment/maintain/WaitingListPlanned--edit.vue @@ -598,7 +598,8 @@ export default { const urls = [ '/base/core-production-line/listAll', '/base/core-department/listAll', - '/base/core-worker/listAll', + '/base/core-worker/workerList', + // '/base/core-worker/listAll', ]; let res; switch (source) { 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 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BF=AE=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 {