From 8562adbb94b3ac3c0d18bceee46f2f5cde596ae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E7=9D=BFAMD7950X?= <774114798@qq.com> Date: Tue, 10 Dec 2024 15:53:13 +0800 Subject: [PATCH] 1 --- .../EquipmentInfoDto/EquipmentInfoOutput.cs | 6 ++++ .../BoardCardInfoDto/BoardCardInfoOutput.cs | 4 +++ .../YunDa.ISAS.DataTransferObject.xml | 10 ++++++ .../ProtectionDevice.cshtml | 13 ++++++++ .../GeneralInformation/ProtectionDevice.js | 32 +++++++++++++++++-- 5 files changed, 63 insertions(+), 2 deletions(-) diff --git a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/EquipmentInfoDto/EquipmentInfoOutput.cs b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/EquipmentInfoDto/EquipmentInfoOutput.cs index 2c4bfcf..e519015 100644 --- a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/EquipmentInfoDto/EquipmentInfoOutput.cs +++ b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/EquipmentInfoDto/EquipmentInfoOutput.cs @@ -107,6 +107,12 @@ namespace YunDa.ISAS.DataTransferObject.GeneralInformation.EquipmentInfoDto /// 检验记录 /// public virtual string VerificationRecords { get; set; } + /// + /// 维修记录 + /// + public virtual string MaintenanceRecord { get; set; } + + } [AutoMapFrom(typeof(EquipmentInfo))] public class EquipmentInfoSimpleOutput : EntityDto diff --git a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/ProtectionDeviceInfoDto/BoardCardInfoDto/BoardCardInfoOutput.cs b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/ProtectionDeviceInfoDto/BoardCardInfoDto/BoardCardInfoOutput.cs index 4599f22..54591d8 100644 --- a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/ProtectionDeviceInfoDto/BoardCardInfoDto/BoardCardInfoOutput.cs +++ b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/ProtectionDeviceInfoDto/BoardCardInfoDto/BoardCardInfoOutput.cs @@ -68,6 +68,10 @@ namespace YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoD /// public virtual string VerificationRecords { get; set; } + /// + /// 维修记录 + /// + public virtual string MaintenanceRecord { get; set; } /// /// 备注 /// diff --git a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/YunDa.ISAS.DataTransferObject.xml b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/YunDa.ISAS.DataTransferObject.xml index bf3128b..627dfe8 100644 --- a/src/YunDa.Application/YunDa.ISAS.DataTransferObject/YunDa.ISAS.DataTransferObject.xml +++ b/src/YunDa.Application/YunDa.ISAS.DataTransferObject/YunDa.ISAS.DataTransferObject.xml @@ -6199,6 +6199,11 @@ + + + 维修记录 + + 顺序号 @@ -14482,6 +14487,11 @@ 检验记录 + + + 维修记录 + + 备注 diff --git a/src/YunDa.Web/YunDa.SOMS.Web.MVC/Views/GeneralInformation/ProtectionDevice.cshtml b/src/YunDa.Web/YunDa.SOMS.Web.MVC/Views/GeneralInformation/ProtectionDevice.cshtml index effc1ee..f96f4d0 100644 --- a/src/YunDa.Web/YunDa.SOMS.Web.MVC/Views/GeneralInformation/ProtectionDevice.cshtml +++ b/src/YunDa.Web/YunDa.SOMS.Web.MVC/Views/GeneralInformation/ProtectionDevice.cshtml @@ -140,6 +140,12 @@ +
+ +
+ +
+
@@ -258,6 +264,13 @@
+
+ +
+ +
+
+
diff --git a/src/YunDa.Web/YunDa.SOMS.Web.MVC/wwwroot/view-resources/Views/GeneralInformation/ProtectionDevice.js b/src/YunDa.Web/YunDa.SOMS.Web.MVC/wwwroot/view-resources/Views/GeneralInformation/ProtectionDevice.js index 5ee39a4..8876371 100644 --- a/src/YunDa.Web/YunDa.SOMS.Web.MVC/wwwroot/view-resources/Views/GeneralInformation/ProtectionDevice.js +++ b/src/YunDa.Web/YunDa.SOMS.Web.MVC/wwwroot/view-resources/Views/GeneralInformation/ProtectionDevice.js @@ -220,6 +220,20 @@ var protectionDeviceList = { valign: 'middle', visible: true }, + { + field: 'equipmentInfo', // 装置检验结果 + title: '维修记录', + align: 'center', + valign: 'middle', + visible: true, + formatter: function (value) { + if (value) { + return value.maintenanceRecord + } + return null; + } + }, + { field: 'isActive', // 是否在用 title: '状态', @@ -269,6 +283,7 @@ var protectionDeviceList = { verificationPerson: '', verificationDate: null, verificationRecords: '', + maintenanceRecord:"", manufacturerValues: [], // 从 API 加载的厂商选项 format: '', language: '' @@ -299,7 +314,8 @@ var protectionDeviceList = { factorySerialNumber: this.factorySerialNumber, verificationPerson: this.verificationPerson, verificationDate: this.verificationDate ? new Date(this.verificationDate) : null, - verificationRecords: this.verificationRecords + verificationRecords: this.verificationRecords, + maintenanceRecord: this.maintenanceRecord, }; //console.log(data) isas.ajax({ @@ -666,6 +682,16 @@ var boardCardInfoList = { return value ? value : "-"; } }, + { + field: 'maintenanceRecord', // 检验记录 + title: '维修记录', + align: 'center', + valign: 'middle', + visible: true, + formatter: function (value, row, index) { + return value ? value : "-"; + } + }, { field: 'remark', // 备注 title: '备注', @@ -719,6 +745,7 @@ var boardCardInfoList = { verificationPerson: '', verificationDate: null, verificationRecords: '', + maintenanceRecord:'', remark: '', isActive: true, format: '', @@ -756,7 +783,8 @@ var boardCardInfoList = { verificationRecords: this.verificationRecords, remark: this.remark, isActive: this.isActive, - protectionDeviceInfoId: boardCardInfoList.protectionDeviceInfoId + protectionDeviceInfoId: boardCardInfoList.protectionDeviceInfoId, + maintenanceRecord: this.maintenanceRecord, }; isas.ajax({