diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java
index c7e8952..163f46f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java
@@ -62,4 +62,14 @@ public class TdPropertyDestoryListController extends BaseController {
         mmap.put("useId",useId);
         return "system/property/propertydestory/destoryproperty";
     }
+    /**
+     * 密品条目
+     */
+    @RequiresPermissions("system:destory:detail")
+    @GetMapping("/destoryDetail/{useId}")
+    public String destoryDetail(@PathVariable("useId") String useId, ModelMap mmap)
+    {
+        mmap.put("useId",useId);
+        return "system/property/ementDestory/ementList";
+    }
 }
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementDestory.html b/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementDestory.html
index 566549b..a22721c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementDestory.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementDestory.html
@@ -1,10 +1,76 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
 <head>
-    <meta charset="UTF-8">
-    <title>Title</title>
+    <th:block th:include="include :: header('更改设备登记')" />
+    <th:block th:include="include :: datetimepicker-css" />
 </head>
-<body>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-info-edit" th:object="${tdPropertyEment}">
+        <input name="id" th:field="*{id}" type="hidden">
+        <div class="form-group">
+            <label class="col-sm-3 control-label">登记编号：</label>
+            <div class="col-sm-8">
+                <input name="id" disabled th:field="*{id}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">名称：</label>
+            <div class="col-sm-8">
+                <input name="name" disabled th:field="*{name}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">销毁部门：</label>
+            <div class="col-sm-8">
+                <input name="destoryDepart" required th:field="*{destoryDepart}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">销毁人员：</label>
+            <div class="col-sm-8">
+                <input name="destoryUser" required th:field="*{destoryUser}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label is-required">销毁日期：</label>
+            <div class="col-sm-8">
+                <div class="input-group date">
+                    <input name="destoryDate" required th:value="${#dates.format(tdPropertyEment.destoryDate, 'yyyy-MM-dd')}" class="form-control" placeholder="yyyy-MM-dd" type="text">
+                    <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">销毁状态：</label>
+            <div class="col-sm-8">
+                <select name="destoryState" class="form-control m-b" th:with="type=${@dict.getType('sys_property_destory')}">
+                    <option value="">---请选择---</option>
+                    <option  th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{destoryState}"></option>
+                </select>
+            </div>
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: datetimepicker-js" />
+<script th:inline="javascript">
+    var prefix = ctx + "system/ementDestory";
+    $("#form-info-edit").validate({
+        focusCleanup: true
+    });
 
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/update", $('#form-info-edit').serialize());
+        }
+    }
+
+    $("input[name='destoryDate']").datetimepicker({
+        format: "yyyy-mm-dd",
+        minView: "month",
+        autoclose: true
+    });
+</script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementList.html b/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementList.html
index 566549b..25b8fab 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementList.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementList.html
@@ -1,10 +1,114 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <meta charset="UTF-8">
-    <title>Title</title>
+    <th:block th:include="include :: header('设备登记列表')" />
 </head>
-<body>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>登记编号：</label>
+                            <input type="text" name="id"/>
+                        </li>
+                        <li>
+                            <label>设备品牌：</label>
+                            <input type="text" name="propertyBrand"/>
+                        </li>
+                        <li>
+                            <label>密品型号：</label>
+                            <input type="text" name="propertyNo"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
 
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-danger" onclick="closeItem()">
+                <i class="fa fa-reply-all"></i> 关闭
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-striped">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<script th:inline="javascript">
+    var editFlag = [[${@permission.hasPermi('system:destoryproperty:change')}]];
+    var destoryFlag = [[${@permission.hasPermi('system:destoryproperty:destory')}]];
+    var removeFlag = [[${@permission.hasPermi('system:destoryproperty:remove')}]];
+    var propertyTypeDatas = [[${@dict.getType('sys_sm_property')}]];
+    var destoryTypeDatas = [[${@dict.getType('sys_property_destory')}]];
+    var prefix = ctx + "system/ementDestory";
+
+    $(function() {
+        var options = {
+            url: prefix + "/list",
+            updateUrl: prefix + "/edit/{id}",
+            destoryUrl: prefix + "/destory/{id}",
+            queryParams: queryParams,
+            modalName: "设备登记",
+            columns: [
+                {
+                    field: 'id',
+                    title: '登记编号'
+                },
+                {
+                    field: 'name',
+                    title: '名称'
+                },
+                {
+                    field: 'destoryState',
+                    title: '销毁状态',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(destoryTypeDatas, value);
+                    }
+                },
+                {
+                    field: 'destoryDepart',
+                    title: '销毁部门'
+                },
+                {
+                    field: 'destoryUser',
+                    title: '销毁人员'
+                },
+                {
+                    field: 'destoryDate',
+                    title: '销毁日期'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-danger btn-xs ' + destoryFlag + '" href="javascript:void(0)" onclick="destory(\'' + row.id + '\')"><i class="fa fa-remove"></i>销毁</a>');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+
+
+    function queryParams(params) {
+        var search = $.table.queryParams(params);
+        search.useId = [[${useId}]];
+        return search;
+    }
+
+    function destory(id) {
+        var url = prefix + '/destory/' + id;
+        $.modal.open("密品报废", url);
+    }
+</script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html b/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html
index a149c5f..216ba5a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html
@@ -113,7 +113,8 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-info btn-xs ' + listFlag + '" href="javascript:void(0)" onclick="detail(\'' + row.useId + '\')"><i class="fa fa-list-ul"></i>密品销毁</a> ');
+                        var rowData = encodeURIComponent(JSON.stringify(row));
+                        actions.push('<a class="btn btn-info btn-xs ' + listFlag + '" href="javascript:void(0)" data-row=\'' + rowData + '\' onclick="detail(this)"><i class="fa fa-list-ul"></i>密品销毁</a> ');
                         return actions.join('');
                     }
                 }]
@@ -162,10 +163,16 @@
                 }
             }
         })
-        /*密品列表-详细*/
-        function detail(useId) {
-            var url = prefix + '/detail/' + useId;
-            $.modal.openTab("密品列表数据", url);
+        function detail(element) {
+            var rowData = $(element).data('row');
+            var row = JSON.parse(decodeURIComponent(rowData));
+            if (row.secretsType == '1'){
+                var url = prefix + '/detail/' + row.useId;
+                $.modal.openTab("涉密信息设备销毁列表", url);
+            }else{
+                var url = prefix + '/destoryDetail/' + row.useId;
+                $.modal.openTab("涉密设备销毁列表", url);
+            }
         }
     </script>
 </body>
