From 13f19983232912c11510b8ef52f2e135b361094e Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Tue, 26 Sep 2023 10:44:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E5=92=8C?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/base/affairs/add.html | 62 ++++++++++---------
 .../templates/base/affairs/edit.html          | 49 ++++++++-------
 2 files changed, 58 insertions(+), 53 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 1112731..d564a89 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/add.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/add.html
@@ -10,7 +10,7 @@
             <input name="method" type="hidden" id="method" class="form-control" />
             <div class="row">
             <div class="form-group col-sm-12 col-md-12">
-                <label class="col-sm-3 control-label">类型：</label>
+                <label class="col-sm-3 control-label is-required">类型：</label>
                 <div class="col-sm-8">
                     <select required name="type" id="type-selector" class="form-control m-b">
                         <option value="">请选择</option>
@@ -22,31 +22,31 @@
                 </div>
             </div>
             <div class="form-group col-sm-12 col-md-12">
-                <label class="col-sm-3 control-label" id="target">目标项：</label>
+                <label class="col-sm-3 control-label is-required" id="target">目标项：</label>
                 <div class="col-sm-8">
                     <textarea required name="target" class="form-control"></textarea>
                 </div>
             </div>
             <div class="form-group col-sm-12 col-md-12">
-                <label class="col-sm-3 control-label" id="shotName">简写：</label>
+                <label class="col-sm-3 control-label is-required" id="shotName">简写：</label>
                 <div class="col-sm-8">
                     <input required name="shotName" class="form-control" />
                 </div>
             </div>
             <div class="form-group col-sm-12 col-md-12">
-                <label class="col-sm-3 control-label" id="demand">目标要求：</label>
+                <label class="col-sm-3 control-label is-required" id="demand">目标要求：</label>
                 <div class="col-sm-8">
-                    <textarea name="demand" class="form-control"></textarea>
+                    <textarea name="demand" required class="form-control"></textarea>
                 </div>
             </div>
             <div class="form-group col-sm-12 col-md-12 dy " style="display: none">
-                <label class="col-sm-3 control-label" >标准要求：</label>
+                <label class="col-sm-3 control-label is-required" >标准要求：</label>
                 <div class="col-sm-8">
-                    <textarea name="method1" id="method1" class="form-control"></textarea>
+                    <textarea required name="method1" id="method1" class="form-control"></textarea>
                 </div>
             </div>
             <div class="form-group col-sm-12 col-md-12">
-                <label class="col-sm-3 control-label" id="detailed">工作任务：</label>
+                <label class="col-sm-3 control-label is-required" id="detailed">工作任务：</label>
                 <div class="col-sm-8">
                     <textarea required name="detailed" class="form-control"></textarea>
                 </div>
@@ -59,7 +59,7 @@
                 </div>
             </div>
             <div class="form-group col-sm-12 col-md-12">
-                <label class="col-sm-3 control-label" id="score">达标分：</label>
+                <label class="col-sm-3 control-label is-required" id="score">达标分：</label>
                 <div class="col-sm-8">
                     <input required name="score" class="form-control" type="number"/>
                 </div>
@@ -71,14 +71,14 @@
                 </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>
+                <label class="col-sm-3 control-label is-required" >考核方式：</label>
                 <div class="col-sm-8">
-                    <input name="method2" id="method2" class="form-control" />
+                    <input required name="method2" id="method2" class="form-control" />
                 </div>
             </div>
                 <div class="form-group col-sm-12 col-md-12 row">
                    <div class="col-sm-6 col-md-6">
-                       <label class="col-sm-6 control-label">负责人：</label>
+                       <label class="col-sm-6 control-label is-required">负责人：</label>
                        <div class="col-sm-6">
                            <select required name="head" id="head" class="form-control m-b">
                                <option value="">请选择</option>
@@ -88,7 +88,7 @@
                     <div class="col-sm-6 col-md-6">
                         <label class="col-sm-4 control-label">审核人：</label>
                         <div class="col-sm-6">
-                            <select required name="reviewed" id="reviewed" class="form-control m-b">
+                            <select name="reviewed" id="reviewed" class="form-control m-b">
                                 <option value="">请选择</option>
                             </select>
                         </div>
@@ -99,7 +99,7 @@
                         <label class="col-sm-6 control-label">完成截止时间：</label>
                         <div class="col-sm-6">
                             <div class="input-group date">
-                                <input required name="finishDate" readonly class="form-control" placeholder="yyyy-MM-dd" type="text">
+                                <input name="finishDate" readonly class="form-control" placeholder="yyyy-MM-dd" type="text">
                                 <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
                             </div>
                         </div>
@@ -117,22 +117,24 @@
                     </div>
 
                 </div>
-                <div class="form-group col-sm-12 col-md-12 dy" style="display: none">
-                    <label class="col-sm-3 control-label">部门：</label>
-                    <div class="col-sm-8">
-                        <select name="deptId" disabled id="deptId" class="form-control m-b">
-                            <option value="">请选择</option>
-                        </select>
-                    </div>
-                </div>
-                <div class="form-group col-sm-12 col-md-12">
-                    <label class="col-sm-3 control-label">支部：</label>
-                    <div class="col-sm-8">
-                        <select name="branchId" disabled id="branchId" class="form-control m-b">
-                            <option value="">请选择</option>
-                        </select>
-                    </div>
-                </div>
+<!--                <div class="form-group col-sm-12 col-md-12 dy" style="display: none">-->
+<!--                    <label class="col-sm-3 control-label">部门：</label>-->
+<!--                    <div class="col-sm-8">-->
+<!--                        <select name="deptId" disabled id="deptId" class="form-control m-b">-->
+<!--                            <option value="">请选择</option>-->
+<!--                        </select>-->
+<!--                    </div>-->
+<!--                </div>-->
+                <input type="hidden" name="deptId" id="deptId">
+                <input type="hidden" name="branchId" id="branchId">
+<!--                <div class="form-group col-sm-12 col-md-12">-->
+<!--                    <label class="col-sm-3 control-label">支部：</label>-->
+<!--                    <div class="col-sm-8">-->
+<!--                        <select name="branchId" disabled id="branchId" class="form-control m-b">-->
+<!--                            <option value="">请选择</option>-->
+<!--                        </select>-->
+<!--                    </div>-->
+<!--                </div>-->
                 <div class="form-group col-sm-12 col-md-12">
                     <label class="col-sm-3 control-label">备注：</label>
                     <div class="col-sm-8">
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 5f7b936..d792356 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/edit.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/edit.html
@@ -30,25 +30,25 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">目标项：</label>
                 <div class="col-sm-8">
-                    <input name="target" readonly="true" th:field="*{target}" class="form-control" type="text">
+                    <input name="target" required th:field="*{target}" 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="shotName" th:field="*{shotName}" class="form-control" type="text">
+                    <input name="shotName" required th:field="*{shotName}" 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="demand" readonly="true" class="form-control">[[*{demand}]]</textarea>
+                    <textarea name="demand" required class="form-control">[[*{demand}]]</textarea>
                 </div>
             </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label">评分细则：</label>
                 <div class="col-sm-8">
-                    <textarea name="detailed" rows="10" readonly="true" class="form-control">[[*{detailed}]]</textarea>
+                    <textarea name="detailed" required rows="3" class="form-control">[[*{detailed}]]</textarea>
                 </div>
             </div>
             <div class="form-group">
@@ -73,7 +73,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">考核方式：</label>
                 <div class="col-sm-8">
-                    <textarea name="method" rows="10" readonly="true" class="form-control">[[*{method}]]</textarea>
+                    <textarea name="method" rows="3" class="form-control">[[*{method}]]</textarea>
                 </div>
             </div>
             <div class="form-group" th:if="*{type == '日常考核指标' || type == '季度考核指标'}">
@@ -134,24 +134,26 @@
 <!--&lt;!&ndash;                    <input name="perId" th:field="*{perId}" class="form-control" type="text">&ndash;&gt;-->
 <!--                </div>-->
 <!--            </div>-->
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">部门：</label>
-                <div class="col-sm-8">
-                    <select name="deptId" th:field="*{deptId}" disabled id="deptId" class="form-control m-b">
-                        <option value="">请选择</option>
-                        <option th:each="item : ${deptList}" th:text="${item.deptName}" th:value="${item.deptId}"></option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">支部：</label>
-                <div class="col-sm-8">
-                    <select name="branchId" th:field="*{branchId}" disabled id="branchId" class="form-control m-b">
-                        <option value="">请选择</option>
-                        <option th:each="item : ${branchList}" th:text="${item.branchName}" th:value="${item.branchId}"></option>
-                    </select>
-                </div>
-            </div>
+            <input name="deptId" id="deptId" th:field="*{deptId}" type="hidden"/>
+            <input name="branchId" id="branchId" th:field="*{branchId}" type="hidden"/>
+<!--            <div class="form-group">    -->
+<!--                <label class="col-sm-3 control-label">部门：</label>-->
+<!--                <div class="col-sm-8">-->
+<!--                    <select name="deptId" th:field="*{deptId}" id="deptId" class="form-control m-b">-->
+<!--                        <option value="">请选择</option>-->
+<!--                        <option th:each="item : ${deptList}" th:text="${item.deptName}" th:value="${item.deptId}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--            <div class="form-group">    -->
+<!--                <label class="col-sm-3 control-label">支部：</label>-->
+<!--                <div class="col-sm-8">-->
+<!--                    <select name="branchId" th:field="*{branchId}" id="branchId" class="form-control m-b">-->
+<!--                        <option value="">请选择</option>-->
+<!--                        <option th:each="item : ${branchList}" th:text="${item.branchName}" th:value="${item.branchId}"></option>-->
+<!--                    </select>-->
+<!--                </div>-->
+<!--            </div>-->
             <div class="form-group">
                 <label class="col-sm-3 control-label">备注：</label>
                 <div class="col-sm-8">
@@ -178,6 +180,7 @@
                 success: function(res) {
                     $('#deptId').val(res.data.deptId)
                     $('#branchId').val(res.data.branchId)
+                    console.log($('#form-affairs-edit').serialize())
                 }
             });
         }