From ad9443c7e1a81acdac3eaad1b92885b3c7c7380c Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Mon, 19 Aug 2024 15:28:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=A3=80=E6=9F=A5=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/property/propertychange/change.html     | 14 ++++++++++----
 .../property/propertychange/changeproperty.html    |  4 ++--
 .../property/propertychange/list/property.html     |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/change.html b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/change.html
index b3ed723..f0c8c97 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/change.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/change.html
@@ -48,15 +48,21 @@
             </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">
-                <input name="username" required th:field="*{username}" class="form-control" type="text">
+                <input name="maintainUser" required th:field="*{maintainUser}" class="form-control" type="text">
             </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">
-                <input name="part" required th:field="*{part}" class="form-control" type="text">
+                <input name="maintainDepart" required th:field="*{maintainDepart}" class="form-control" type="text">
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">备注：</label>
+            <div class="col-sm-8">
+                <textarea name="maintainRemark" class="form-control">[[*{maintainRemark}]]</textarea>
             </div>
         </div>
     </form>
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html
index ebd79da..08fff1a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/changeproperty.html
@@ -94,10 +94,10 @@
                     formatter: function(value, row, index) {
                         var actions = [];
                         if (row.destoryState===null){
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>变更</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>维修</a> ');
                             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>');
                         }else{
-                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" disabled><i class="fa fa-edit"></i>变更</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" disabled><i class="fa fa-edit"></i>维修</a> ');
                             actions.push('<a class="btn btn-danger btn-xs ' + destoryFlag + '" href="javascript:void(0)" disabled><i class="fa fa-remove"></i>报废</a>');
                         }
                         return actions.join('');
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 477135a..570c94a 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
@@ -105,7 +105,7 @@
                     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> ');
+                        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> ');
                         return actions.join('');
                     }
                 }]