From 56aa10ece15119e278af85d8a55a1a82e8277b31 Mon Sep 17 00:00:00 2001 From: qiuhongwu Date: Mon, 26 Feb 2024 15:01:53 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=81=8C=E5=B7=A5?= =?UTF-8?q?=E8=BF=9C=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/heli/hlvuestyle/equipSelect.vue | 2 -- .../mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/equipSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/equipSelect.vue index 1ed44ad8..4f447155 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/equipSelect.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/equipSelect.vue @@ -42,8 +42,6 @@ const gitlist = async () => { if (propsmodelValue.value) { valueName.value = propsmodelValue.value const initialUser = await EquipApi.getEquip(valueName.value) - console.log(initialUser); - // 查找初始用户是否已经在 eqyipList 中 let foundInitialUserInList = false for (const eqyip of eqyipList.value) { diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue index 731df74e..124d1179 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue @@ -64,14 +64,15 @@ const gitlist = async () => { let foundInitialUserInList = false for (const user of userList.value) { if (user.id === initialUser.id) { + propsmodelValue.value=initialUser.username+' '+initialUser.nickname foundInitialUserInList = true break } } // 如果初始用户不在列表中，则将其添加到列表开头 if (!foundInitialUserInList && !userSelectList.value.length) { - userList.value.unshift(initialUser) + propsmodelValue.value=initialUser.username+' '+initialUser.nickname } // loading.value = false } From bdbd390cd54127261ccf0ec07fc1664ec1a9d436 Mon Sep 17 00:00:00 2001 From: zengchenxi Date: Mon, 26 Feb 2024 15:07:00 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=E3=80=91?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF=E4=BD=BF=E7=94=A8=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heli/dal/dataobject/projectorder/ProjectOrderSubDO.java | 3 +++ .../heli/dal/mysql/projectorder/ProjectOrderSubMapper.java | 4 +++- .../src/views/heli/projectorder/startprint.vue | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java index 0f314495..ba4ac689 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/projectorder/ProjectOrderSubDO.java @@ -80,4 +80,7 @@ public class ProjectOrderSubDO extends BaseDO { @TableField(exist = false) private String projectOrderCode; + + @TableField(exist = false) + private String deviceName; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java index 0261b9e6..2d1c3c06 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/projectorder/ProjectOrderSubMapper.java @@ -2,6 +2,7 @@ package com.chanko.yunxi.mes.module.heli.dal.mysql.projectorder; import com.chanko.yunxi.mes.framework.mybatis.core.mapper.BaseMapperX; import com.chanko.yunxi.mes.module.heli.dal.dataobject.composition.CompositionDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.equip.EquipDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderSubDO; import com.github.yulichang.wrapper.MPJLambdaWrapper; @@ -20,7 +21,8 @@ public interface ProjectOrderSubMapper extends BaseMapperX { default List selectListByProjectOrderId(Long projectOrderId) { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(ProjectOrderSubDO.class) - .select("b.name as compositionName", "p.code as projectOrderCode") + .select("b.name as compositionName", "p.code as projectOrderCode", "e.name as deviceName") + .leftJoin(EquipDO.class, "e", EquipDO::getId, ProjectOrderSubDO::getDeviceModel) .leftJoin(ProjectOrderDO.class, "p", ProjectOrderDO::getId, ProjectOrderSubDO::getProjectOrderId) .leftJoin(CompositionDO.class, "b", CompositionDO::getId, ProjectOrderSubDO::getCompositionId) .disableSubLogicDel() diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue index 206adfdc..16ddbc30 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/projectorder/startprint.vue @@ -115,7 +115,7 @@ {{ idx+1 }} {{item.name}} - {{item.deviceModel}} + {{item.deviceName}} {{item.amount}} {{item.compositionName}} From ec44c553382a88f9674dd87f1d1b0ec9a1947e47 Mon Sep 17 00:00:00 2001 From: qiuhongwu Date: Mon, 26 Feb 2024 15:13:10 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mes-ui-admin-vue3/src/layout/components/warnmessage.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue b/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue index 8dea5f46..2ca8b230 100644 --- a/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue +++ b/mes-ui/mes-ui-admin-vue3/src/layout/components/warnmessage.vue @@ -1,8 +1,8 @@ - + - +