1

src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/EquipmentInfoDto/EquipmentInfoOutput.cs

@@ -107,6 +107,12 @@ namespace YunDa.ISAS.DataTransferObject.GeneralInformation.EquipmentInfoDto
         /// 检验记录
         /// </summary>
         public virtual string VerificationRecords { get; set; }
+        /// <summary>
+        /// 维修记录
+        /// </summary>
+        public virtual string MaintenanceRecord { get; set; }
+
+        
     }
     [AutoMapFrom(typeof(EquipmentInfo))]
     public class EquipmentInfoSimpleOutput : EntityDto<Guid>

src/YunDa.Application/YunDa.ISAS.DataTransferObject/GeneralInformation/ProtectionDeviceInfoDto/BoardCardInfoDto/BoardCardInfoOutput.cs

@@ -68,6 +68,10 @@ namespace YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoD
         /// </summary>
         public virtual string VerificationRecords { get; set; }
 
+        /// <summary>
+        /// 维修记录
+        /// </summary>
+        public virtual string MaintenanceRecord { get; set; }
         /// <summary>
         /// 备注
         /// </summary>

src/YunDa.Application/YunDa.ISAS.DataTransferObject/YunDa.ISAS.DataTransferObject.xml

@@ -6199,6 +6199,11 @@
             </summary>
         </member>
         <!-- Badly formed XML comment ignored for member "P:YunDa.ISAS.DataTransferObject.GeneralInformation.EquipmentInfoDto.EquipmentInfoOutput.VerificationRecords" -->
+        <member name="P:YunDa.ISAS.DataTransferObject.GeneralInformation.EquipmentInfoDto.EquipmentInfoOutput.MaintenanceRecord">
+            <summary>
+            维修记录
+            </summary>
+        </member>
         <member name="P:YunDa.ISAS.DataTransferObject.GeneralInformation.EquipmentInfoDto.EquipmentInfoSimpleOutput.SeqNo">
             <summary>
             顺序号
@@ -14482,6 +14487,11 @@
             检验记录
             </summary>
         </member>
+        <member name="P:YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto.BoardCardInfoOutput.MaintenanceRecord">
+            <summary>
+            维修记录
+            </summary>
+        </member>
         <member name="P:YunDa.SOMS.DataTransferObject.GeneralInformation.ProtectionDeviceInfoDto.BoardCardInfoOutput.Remark">
             <summary>
             备注

src/YunDa.Web/YunDa.SOMS.Web.MVC/Views/GeneralInformation/ProtectionDevice.cshtml

@@ -140,6 +140,12 @@
                             <textarea class="form-control" placeholder="请输入检验记录" v-model="verificationRecords" name="verificationRecords"></textarea>
                         </div>
                     </div>
+                    <div class="form-group col-sm-6">
+                        <label class="col-sm-3 control-label">维修记录：</label>
+                        <div class="col-sm-9">
+                            <textarea class="form-control" placeholder="请输入维修记录" v-model="maintenanceRecord" name="maintenanceRecord"></textarea>
+                        </div>
+                    </div>
                     <!-- 是否启用 -->
                     <div class="form-group col-sm-6">
                         <label class="col-sm-3 control-label">是否启用：</label>
@@ -258,6 +264,13 @@
                                         <textarea class="form-control" placeholder="检验记录" v-model="verificationRecords"></textarea>
                                     </div>
                                 </div>
+                                <div class="form-group col-sm-6">
+                                    <label class="col-sm-3 control-label">维修记录：</label>
+                                    <div class="col-sm-9">
+                                        <textarea class="form-control" placeholder="维修记录" v-model="maintenanceRecord"></textarea>
+                                    </div>
+                                </div>
+                                
                                 <div class="form-group col-sm-6">
                                     <label class="col-sm-3 control-label">备注：</label>
                                     <div class="col-sm-9">

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({