From ec695b4fbbf1f81edb87cbe20713c90feaede4eb Mon Sep 17 00:00:00 2001
From: duxp <dxp18195149767@163.com>
Date: Tue, 26 Sep 2023 09:42:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/base/affairs/add.html   | 12 ++++++------
 .../main/resources/templates/base/affairs/day.html   |  2 +-
 .../main/resources/templates/base/affairs/edit.html  |  6 ++++++
 .../main/resources/templates/base/affairs/year.html  |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/cyx-admin/src/main/resources/templates/base/affairs/add.html b/cyx-admin/src/main/resources/templates/base/affairs/add.html
index c92314f..1112731 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/add.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/add.html
@@ -64,12 +64,12 @@
                     <input required name="score" class="form-control" type="number"/>
                 </div>
             </div>
-<!--            <div class="form-group dy" style="display: none">-->
-<!--                <label class="col-sm-3 control-label" id="unit">考核类别：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input required name="unit" class="form-control" />-->
-<!--                </div>-->
-<!--            </div>-->
+            <div class="form-group dy" style="display: none">
+                <label class="col-sm-3 control-label" id="examineType">考核类别：</label>
+                <div class="col-sm-8">
+                    <input required name="examineType" class="form-control" />
+                </div>
+            </div>
             <div class="form-group col-sm-12 col-md-12" id="dw" style="display: none">
                 <label class="col-sm-3 control-label" >考核方式：</label>
                 <div class="col-sm-8">
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/day.html b/cyx-admin/src/main/resources/templates/base/affairs/day.html
index d44f563..07fca26 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/day.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/day.html
@@ -213,7 +213,7 @@
                     title: '当前得分'
                 },
                 {
-                    field: 'unit',
+                    field: 'examineType',
                     title: '考核类别'
                 },
                 {
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/edit.html b/cyx-admin/src/main/resources/templates/base/affairs/edit.html
index 92da85f..5f7b936 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/edit.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/edit.html
@@ -76,6 +76,12 @@
                     <textarea name="method" rows="10" readonly="true" class="form-control">[[*{method}]]</textarea>
                 </div>
             </div>
+            <div class="form-group" th:if="*{type == '日常考核指标' || type == '季度考核指标'}">
+                <label class="col-sm-3 control-label">考核类别：</label>
+                <div class="col-sm-8">
+                    <input name="score" th:field="*{examineType}" class="form-control">
+                </div>
+            </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">负责人：</label>
                 <div class="col-sm-8">
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/year.html b/cyx-admin/src/main/resources/templates/base/affairs/year.html
index 826da21..9172cdd 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/year.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/year.html
@@ -207,7 +207,7 @@
                     title: '当前得分'
                 },
                 {
-                    field: 'unit',
+                    field: 'examineType',
                     title: '考核类别'
                 },
                 {