From ee79438c5615c60a98d587c894881d34bf13e9f6 Mon Sep 17 00:00:00 2001 From: JR <3573153686@qq.com> Date: Fri, 25 Jul 2025 15:29:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=87=A0=E4=B8=AAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- klp-ui/src/views/mes/dv/checkplan/index.vue | 4 +- klp-ui/src/views/mes/dv/checkrecord/index.vue | 38 ++++++++++++++++++- klp-ui/src/views/mes/dv/machinery/index.vue | 8 ++-- .../src/views/mes/dv/maintenrecord/line.vue | 33 ++++++++++++++-- klp-ui/src/views/mes/dv/repair/index.vue | 8 ++-- klp-ui/src/views/mes/dv/subject/index.vue | 4 +- 6 files changed, 78 insertions(+), 17 deletions(-) diff --git a/klp-ui/src/views/mes/dv/checkplan/index.vue b/klp-ui/src/views/mes/dv/checkplan/index.vue index c51cbc7d..bf557eea 100644 --- a/klp-ui/src/views/mes/dv/checkplan/index.vue +++ b/klp-ui/src/views/mes/dv/checkplan/index.vue @@ -176,7 +176,7 @@ - + diff --git a/klp-ui/src/views/mes/dv/checkrecord/index.vue b/klp-ui/src/views/mes/dv/checkrecord/index.vue index 92aedc64..d2851eb1 100644 --- a/klp-ui/src/views/mes/dv/checkrecord/index.vue +++ b/klp-ui/src/views/mes/dv/checkrecord/index.vue @@ -226,6 +226,7 @@ import MachinerySelectSingle from "@/components/machinerySelect/single.vue"; import CheckplanSelect from "@/components/dvplanSelect/index.vue"; import CheckRecordLine from "./line.vue"; import UserSingleSelect from "@/components/userSelect/single.vue" +import {formatDate} from "@/utils"; export default { name: "Checkrecord", dicts: ['mes_order_status'], @@ -255,7 +256,19 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - planId: null, planCode: null, planName: null, planType: null, machineryId: null, machineryCode: null, machineryName: null, machineryBrand: null, machinerySpec: null, checkTime: null, nickName: null, status: null, }, + planId: null, + planCode: null, + planName: null, + planType: null, + machineryId: null, + machineryCode: null, + machineryName: null, + machineryBrand: null, + machinerySpec: null, + checkTime: null, + nickName: null, + status: null, + }, // 表单参数 form: {}, // 表单校验 @@ -291,7 +304,28 @@ export default { // 表单重置 reset() { this.form = { - recordId: null, planId: null, planCode: null, planName: null, planType: null, machineryId: null, machineryCode: null, machineryName: null, machineryBrand: null, machinerySpec: null, checkTime: this.formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"), status: "PREPARE", remark: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null }; + recordId: null, + planId: null, + planCode: null, + planName: null, + planType: null, + machineryId: null, + machineryCode: null, + machineryName: null, + machineryBrand: null, + machinerySpec: null, + checkTime: formatDate(new Date(),"yyyy-MM-dd HH:mm:ss"), + status: "PREPARE", + remark: null, + attr1: null, + attr2: null, + attr3: null, + attr4: null, + createBy: null, + createTime: null, + updateBy: null, + updateTime: null + }; this.form.userId= this.$store.state.user.id; this.form.nickName= this.$store.state.user.nick; this.form.userName= this.$store.state.user.name; diff --git a/klp-ui/src/views/mes/dv/machinery/index.vue b/klp-ui/src/views/mes/dv/machinery/index.vue index 3bdbf114..9d25b900 100644 --- a/klp-ui/src/views/mes/dv/machinery/index.vue +++ b/klp-ui/src/views/mes/dv/machinery/index.vue @@ -85,7 +85,7 @@ v-hasPermi="['mes:dv:machinery:remove']" >删除 - + 删除 - 标签打印 + >标签打印--> diff --git a/klp-ui/src/views/mes/dv/maintenrecord/line.vue b/klp-ui/src/views/mes/dv/maintenrecord/line.vue index e3e4bbcf..d5284f9a 100644 --- a/klp-ui/src/views/mes/dv/maintenrecord/line.vue +++ b/klp-ui/src/views/mes/dv/maintenrecord/line.vue @@ -91,7 +91,7 @@ - + @@ -149,7 +149,16 @@ export default { queryParams: { pageNum: 1, pageSize: 10, - recordId: null, subjectId: null, subjectCode: null, subjectName: null, subjectType: null, subjectContent: null, subjectStandard: null, maintenStatus: null, maintenResult: null, }, + recordId: null, + subjectId: null, + subjectCode: null, + subjectName: null, + subjectType: null, + subjectContent: null, + subjectStandard: null, + maintenStatus: null, + maintenResult: null, + }, // 表单参数 form: {}, // 表单校验 @@ -188,7 +197,25 @@ export default { // 表单重置 reset() { this.form = { - lineId: null, recordId: null, subjectId: null, subjectCode: null, subjectName: null, subjectType: null, subjectContent: null, subjectStandard: null, maintenStatus: "0", maintenResult: null, attr1: null, attr2: null, attr3: null, attr4: null, createBy: null, createTime: null, updateBy: null, updateTime: null }; + lineId: null, + recordId: null, + subjectId: null, + subjectCode: null, + subjectName: null, + subjectType: null, + subjectContent: null, + subjectStandard: null, + maintenStatus: "0", + maintenResult: null, + attr1: null, + attr2: null, + attr3: null, + attr4: null, + createBy: null, + createTime: null, + updateBy: null, + updateTime: null + }; this.resetForm("form"); }, /** 搜索按钮操作 */ diff --git a/klp-ui/src/views/mes/dv/repair/index.vue b/klp-ui/src/views/mes/dv/repair/index.vue index b53cdecc..a529e9be 100644 --- a/klp-ui/src/views/mes/dv/repair/index.vue +++ b/klp-ui/src/views/mes/dv/repair/index.vue @@ -166,7 +166,7 @@ - + @@ -208,7 +208,7 @@ v-model="form.requireDate" style="width: 187px" type="date" - value-format="yyyy-MM-dd" + value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择报修日期"> @@ -219,7 +219,7 @@ v-model="form.finishDate" style="width: 187px" type="date" - value-format="yyyy-MM-dd" + value-format="yyyy-MM-dd " placeholder="请选择维修完成日期"> diff --git a/klp-ui/src/views/mes/dv/subject/index.vue b/klp-ui/src/views/mes/dv/subject/index.vue index 20ade1df..a4d00c0b 100644 --- a/klp-ui/src/views/mes/dv/subject/index.vue +++ b/klp-ui/src/views/mes/dv/subject/index.vue @@ -133,7 +133,7 @@ - + From ea1777e65e91c959499a5c57dc7d545d9d17f2b7 Mon Sep 17 00:00:00 2001 From: JR <3573153686@qq.com> Date: Fri, 25 Jul 2025 15:51:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A0=91=E5=BD=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/klp/common/core/domain/TreeEntity.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/klp-common/src/main/java/com/klp/common/core/domain/TreeEntity.java b/klp-common/src/main/java/com/klp/common/core/domain/TreeEntity.java index 97eea7c5..3302c3f3 100644 --- a/klp-common/src/main/java/com/klp/common/core/domain/TreeEntity.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/TreeEntity.java @@ -35,8 +35,6 @@ public class TreeEntity extends BaseEntity { */ @TableField(exist = false) private List children = new ArrayList<>(); - /** 显示顺序 */ - private Integer orderNum; /** 祖级列表 */ @TableField(exist = false)