From f87f993b52fd0b8000c2dc0410f0e510a66a3bf2 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Tue, 20 Aug 2024 15:58:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/property/data/propertyinfo.html     |  4 ++--
 .../property/ementChange/ementChange.html      | 18 ++++++++++++++----
 .../property/ementDestory/ementList.html       | 11 +++++++----
 .../property/ementdata/propertyEment.html      | 11 ++---------
 .../system/property/property/edit.html         |  2 +-
 .../system/property/property/property.html     | 13 ++++++++++---
 .../property/propertychange/list/property.html | 13 ++++++++++---
 .../propertydestory/list/property.html         | 13 ++++++++++---
 8 files changed, 56 insertions(+), 29 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html b/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html
index d756c80..1d022cf 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/data/propertyinfo.html
@@ -23,8 +23,8 @@
                                 </select>
                             </li>
                             <li>
-                                <label>使用人：</label>
-                                <input type="text" name="username"/>
+                                <label>设备品牌：</label>
+                                <input type="text" name="propertyBrand"/>
                             </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementChange.html b/ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementChange.html
index 6082d8f..3d318ef 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementChange.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementChange.html
@@ -15,12 +15,22 @@
                             <input type="text" name="id"/>
                         </li>
                         <li>
-                            <label>设备品牌：</label>
-                            <input type="text" name="propertyBrand"/>
+                            <label>名称：</label>
+                            <input type="text" name="name"/>
                         </li>
                         <li>
-                            <label>密品型号：</label>
-                            <input type="text" name="propertyNo"/>
+                            <label>维修状态：</label>
+                            <select name="maintainState" th:with="type=${@dict.getType('sys_maintain_state')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </li>
+                        <li>
+                            <label>报废状态：</label>
+                            <select name="destoryType" th:with="type=${@dict.getType('sys_baofei_type')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
                         </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
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 25b8fab..d1bac35 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
@@ -15,12 +15,15 @@
                             <input type="text" name="id"/>
                         </li>
                         <li>
-                            <label>设备品牌：</label>
-                            <input type="text" name="propertyBrand"/>
+                            <label>名称：</label>
+                            <input type="text" name="name"/>
                         </li>
                         <li>
-                            <label>密品型号：</label>
-                            <input type="text" name="propertyNo"/>
+                            <label>销毁状态：</label>
+                            <select name="destoryState" th:with="type=${@dict.getType('sys_property_destory')}">
+                                <option value="">所有</option>
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
                         </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementdata/propertyEment.html b/ruoyi-admin/src/main/resources/templates/system/property/ementdata/propertyEment.html
index 7f9bd2d..16a1c57 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/ementdata/propertyEment.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/ementdata/propertyEment.html
@@ -16,15 +16,8 @@
                             <input type="hidden" name="useId" th:value="*{useId}"/>
                         </li>
                         <li>
-                            <label>密品种类：</label>
-                            <select name="propertyType" th:with="type=${@dict.getType('sys_sm_property')}">
-                                <option value="">所有</option>
-                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                            </select>
-                        </li>
-                        <li>
-                            <label>使用人：</label>
-                            <input type="text" name="username"/>
+                            <label>名称：</label>
+                            <input type="text" name="name"/>
                         </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
index a63d909..4c2ebda 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
@@ -37,7 +37,7 @@
                 </div>
             </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label is-required">使用部门：</label>
+                <label class="col-sm-3 control-label is-required">使用单位：</label>
                 <div class="col-sm-8">
                     <div class="input-group">
                         <input class="form-control" required type="text" name="useDepart" onclick="selectDeptTree()" id="treeName" th:field="*{useDepart}">
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/property.html b/ruoyi-admin/src/main/resources/templates/system/property/property/property.html
index 46afcde..43d8232 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/property/property.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/property/property.html
@@ -11,7 +11,7 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>单位名称：</label>
+                                <label>使用单位：</label>
                                 <input type="text" name="frameworkId"/>
                             </li>
                             <li>
@@ -27,6 +27,13 @@
                                     </option>
                                 </select>
                             </li>
+                            <li>
+                                <label>密品分类：</label>
+                                <select name="secretsType" th:with="type=${@dict.getType('sys_secrets_type')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </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>
@@ -109,7 +116,7 @@
                 },
                 {
                     field: 'useDepart',
-                    title: '使用部门'
+                    title: '使用单位'
                 },
                 {
                     field: 'userName',
@@ -121,7 +128,7 @@
                 },
                 {
                     field: 'recoverDate',
-                    title: '配发日期'
+                    title: '登记日期'
                 },
                 {
                     title: '操作',
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html
index f8a4706..e431433 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html
@@ -11,8 +11,8 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>单位名称：</label>
-                                <input type="text" name="frameworkId"/>
+                                <label>使用单位：</label>
+                                <input type="text" name="useDepart"/>
                             </li>
                             <li>
                                 <label>密品编号：</label>
@@ -27,6 +27,13 @@
                                     </option>
                                 </select>
                             </li>
+                            <li>
+                                <label>密品分类：</label>
+                                <select name="secretsType" th:with="type=${@dict.getType('sys_secrets_type')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </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>
@@ -94,7 +101,7 @@
                 },
                 {
                     field: 'useDepart',
-                    title: '使用部门'
+                    title: '使用单位'
                 },
                 {
                     field: 'userName',
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 216ba5a..459a9ea 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
@@ -11,8 +11,8 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>单位名称：</label>
-                                <input type="text" name="frameworkId"/>
+                                <label>使用单位：</label>
+                                <input type="text" name="useDepart"/>
                             </li>
                             <li>
                                 <label>密品编号：</label>
@@ -27,6 +27,13 @@
                                     </option>
                                 </select>
                             </li>
+                            <li>
+                                <label>密品分类：</label>
+                                <select name="secretsType" th:with="type=${@dict.getType('sys_secrets_type')}">
+                                    <option value="">所有</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                </select>
+                            </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>
@@ -94,7 +101,7 @@
                 },
                 {
                     field: 'useDepart',
-                    title: '使用部门'
+                    title: '使用单位'
                 },
                 {
                     field: 'userName',