From ecdf97582b8de96eeae34c54fe5d710961d5ba13 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Thu, 20 Jun 2024 14:50:13 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=BB=B4=E4=BF=AE=E5=95=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/system/TdIndentureController.java  |  3 ++
 .../templates/system/indenture/add.html       | 47 +++++--------------
 .../templates/system/indenture/edit.html      | 43 +++++------------
 .../templates/system/indenture/indenture.html | 14 +++---
 4 files changed, 34 insertions(+), 73 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java
index 0726032..bcac3d0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/TdIndentureController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.web.controller.system.system;
 
+import java.util.Date;
 import java.util.List;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -87,6 +88,8 @@ public class TdIndentureController extends BaseController
     @ResponseBody
     public AjaxResult addSave(TdIndenture tdIndenture)
     {
+        tdIndenture.setCreateStaffid(getLoginName());
+        tdIndenture.setCreateDate(new Date());
         return toAjax(tdIndentureService.insertTdIndenture(tdIndenture));
     }
 
diff --git a/ruoyi-admin/src/main/resources/templates/system/indenture/add.html b/ruoyi-admin/src/main/resources/templates/system/indenture/add.html
index 0383f98..00329e8 100644
--- a/ruoyi-admin/src/main/resources/templates/system/indenture/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/indenture/add.html
@@ -10,17 +10,17 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">维修商名称：</label>
+                        <label class="col-sm-4 control-label is-required">维修单位名称：</label>
                         <div class="col-sm-8">
-                            <input name="indentureName" placeholder="请输入维修商名称" class="form-control" type="text">
+                            <input name="indentureName" required placeholder="请输入维修商名称" class="form-control" type="text">
                         </div>
                     </div>
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">维修商地址：</label>
+                        <label class="col-sm-4 control-label is-required">维修单位地址：</label>
                         <div class="col-sm-8">
-                            <input name="indentureAddress" placeholder="请输入维修商地址" class="form-control" type="text">
+                            <input name="indentureAddress" required  placeholder="请输入维修商地址" class="form-control" type="text">
                         </div>
                     </div>
                 </div>
@@ -28,17 +28,17 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">维修商座机：</label>
+                        <label class="col-sm-4 control-label is-required">维修单位座机：</label>
                         <div class="col-sm-8">
-                            <input name="indenturePhone" placeholder="请输入维修商座机" class="form-control" type="text">
+                            <input name="indenturePhone" required placeholder="请输入维修商座机" class="form-control" type="text">
                         </div>
                     </div>
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">维修商手机：</label>
+                        <label class="col-sm-4 control-label is-required">维修单位手机：</label>
                         <div class="col-sm-8">
-                            <input name="indentureMobile" placeholder="请输入维修商手机" class="form-control" type="text">
+                            <input name="indentureMobile" required placeholder="请输入维修商手机" class="form-control" type="text">
                         </div>
                     </div>
                 </div>
@@ -46,7 +46,7 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">联系人：</label>
+                        <label class="col-sm-4 control-label">联系人姓名：</label>
                         <div class="col-sm-8">
                             <input name="indentureLinkman" placeholder="请输入联系人" class="form-control" type="text">
                         </div>
@@ -54,9 +54,9 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">联系人电话：</label>
+                        <label class="col-sm-4 control-label">联系人座机：</label>
                         <div class="col-sm-8">
-                            <input name="linkmanPhone" placeholder="请输入联系人电话" class="form-control" type="text">
+                            <input name="linkmanPhone" placeholder="请输入联系人座机" class="form-control" type="text">
                         </div>
                     </div>
                 </div>
@@ -72,37 +72,16 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">维修商状态：</label>
+                        <label class="col-sm-4 control-label">维修单位状态：</label>
                         <div class="col-sm-8">
                             <select name="indentureState" class="form-control" th:with="type=${@dict.getType('sys_normal_disable')}">
-                                <option value="">请选择</option>
+                                <option value="">---请选择---</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </div>
                     </div>
                 </div>
             </div>
-            <div class="row">
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">创建人：</label>
-                        <div class="col-sm-8">
-                            <input name="createStaffid" class="form-control" readonly th:value="${sysuser.userName}" type="text">
-                        </div>
-                    </div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">创建时间：</label>
-                        <div class="col-sm-8">
-                            <div class="input-group date">
-                                <input name="createDate" 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>
-            </div>
             <div class="row">
                 <div class="col-sm-12">
                     <div class="form-group">
diff --git a/ruoyi-admin/src/main/resources/templates/system/indenture/edit.html b/ruoyi-admin/src/main/resources/templates/system/indenture/edit.html
index 05e3c8c..7fc07eb 100644
--- a/ruoyi-admin/src/main/resources/templates/system/indenture/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/indenture/edit.html
@@ -11,17 +11,17 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">维修商名称：</label>
+                        <label class="col-sm-4 control-label is-required">维修单位名称：</label>
                         <div class="col-sm-8">
-                            <input name="indentureName" th:field="*{indentureName}" class="form-control" type="text">
+                            <input name="indentureName"  required th:field="*{indentureName}" class="form-control" type="text">
                         </div>
                     </div>
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">维修商地址：</label>
+                        <label class="col-sm-4 control-label is-required">维修单位地址：</label>
                         <div class="col-sm-8">
-                            <input name="indentureAddress" th:field="*{indentureAddress}" class="form-control" type="text">
+                            <input name="indentureAddress" required th:field="*{indentureAddress}" class="form-control" type="text">
                         </div>
                     </div>
                 </div>
@@ -29,17 +29,17 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">维修商座机：</label>
+                        <label class="col-sm-4 control-label is-required">维修单位座机：</label>
                         <div class="col-sm-8">
-                            <input name="indenturePhone" th:field="*{indenturePhone}" class="form-control" type="text">
+                            <input name="indenturePhone" required th:field="*{indenturePhone}" class="form-control" type="text">
                         </div>
                     </div>
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">维修商手机：</label>
+                        <label class="col-sm-4 control-label is-required">维修单位手机：</label>
                         <div class="col-sm-8">
-                            <input name="indentureMobile" th:field="*{indentureMobile}" class="form-control" type="text">
+                            <input name="indentureMobile" required th:field="*{indentureMobile}" class="form-control" type="text">
                         </div>
                     </div>
                 </div>
@@ -47,7 +47,7 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">联系人：</label>
+                        <label class="col-sm-4 control-label">联系人姓名：</label>
                         <div class="col-sm-8">
                             <input name="indentureLinkman" th:field="*{indentureLinkman}" class="form-control" type="text">
                         </div>
@@ -55,7 +55,7 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">联系人电话：</label>
+                        <label class="col-sm-4 control-label">联系人座机：</label>
                         <div class="col-sm-8">
                             <input name="linkmanPhone" th:field="*{linkmanPhone}" class="form-control" type="text">
                         </div>
@@ -73,7 +73,7 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">维修商状态：</label>
+                        <label class="col-sm-4 control-label">维修单位状态：</label>
                         <div class="col-sm-8">
                             <select name="indentureState" class="form-control" th:with="type=${@dict.getType('sys_normal_disable')}">
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{indentureState}"></option>
@@ -82,27 +82,6 @@
                     </div>
                 </div>
             </div>
-            <div class="row">
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">创建时间：</label>
-                        <div class="col-sm-8">
-                            <div class="input-group date">
-                                <input name="createDate" disabled th:value="${#dates.format(tdIndenture.createDate, '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>
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">创建人：</label>
-                        <div class="col-sm-8">
-                            <input name="createStaffid" readonly th:field="*{createStaffid}" class="form-control" type="text">
-                        </div>
-                    </div>
-                </div>
-            </div>
             <div class="row">
                 <div class="col-sm-12">
                     <div class="form-group">
diff --git a/ruoyi-admin/src/main/resources/templates/system/indenture/indenture.html b/ruoyi-admin/src/main/resources/templates/system/indenture/indenture.html
index 10f395c..ee70295 100644
--- a/ruoyi-admin/src/main/resources/templates/system/indenture/indenture.html
+++ b/ruoyi-admin/src/main/resources/templates/system/indenture/indenture.html
@@ -71,30 +71,30 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
-                modalName: "维修商",
+                modalName: "维修单位",
                 columns: [{
                     checkbox: true
                 },
                 {
                     field: 'indentureId',
-                    title: '维修商id',
+                    title: '维修单位id',
                     visible: false
                 },
                 {
                     field: 'indentureName',
-                    title: '维修商名称'
+                    title: '维修单位名称'
                 },
                 {
                     field: 'indentureAddress',
-                    title: '维修商地址'
+                    title: '维修单位地址'
                 },
                 {
                     field: 'indenturePhone',
-                    title: '维修商座机'
+                    title: '维修单位座机'
                 },
                 {
                     field: 'indentureMobile',
-                    title: '维修商手机'
+                    title: '维修单位手机'
                 },
                 {
                     field: 'indentureLinkman',
@@ -110,7 +110,7 @@
                 },
                 {
                     field: 'indentureState',
-                    title: '维修商状态',
+                    title: '维修单位状态',
                     formatter: function(value, row, index) {
                        return $.table.selectDictLabel(indentureStateDatas, value);
                     }