宗教活动管理修改

ruoyi-admin/src/main/resources/templates/religion/place/add.html

@@ -22,8 +22,8 @@
                         <label class="col-sm-4 control-label is-required">宗教类别：</label>
                         <div class="col-sm-8">
                             <select name="religionType" class="form-control" required th:with="type=${@dict.getType('religion_type')}">
-                                <option value="">请选择宗教类别</option>
-                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                <!--<option value="">请选择宗教类别</option>-->
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" ></option>
                             </select>
                         </div>
                     </div>
@@ -35,7 +35,7 @@
                         <label class="col-sm-4 control-label is-required">场所类别：</label>
                         <div class="col-sm-8">
                             <select name="placeCategory" class="form-control" required th:with="type=${@dict.getType('category_type')}">
-                                <option value="">请选择场所类别</option>
+                                <!--<option value="">请选择场所类别</option>-->
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </div>
@@ -63,7 +63,7 @@
                     </div>
                 </div>
             </div>
-            
+
             <h4 class="form-header h4">负责人信息</h4>
             <div class="row">
                 <div class="col-sm-6">
@@ -76,25 +76,25 @@
                 </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">
                             <div class="input-group">
-                                <input name="chargePhone" placeholder="请输入负责人电话" class="form-control" type="text" maxlength="32">
+                                <input name="chargePhone" placeholder="请输入联系电话" class="form-control" type="text" maxlength="32" required>
                                 <span class="input-group-addon"><i class="fa fa-mobile"></i></span>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-            
+
             <h4 class="form-header h4">场所面积</h4>
             <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">
                             <div class="input-group">
-                                <input name="placeArea" placeholder="请输入占地面积" class="form-control" type="number" step="0.01">
+                                <input name="placeArea" placeholder="请输入场所面积" class="form-control" type="number" step="0.01">
                                 <span class="input-group-addon">平方米</span>
                             </div>
                         </div>
@@ -112,7 +112,7 @@
                     </div>
                 </div>
             </div>
-            
+
             <h4 class="form-header h4">批准与登记信息</h4>
             <div class="row">
                 <div class="col-sm-6">
@@ -174,7 +174,7 @@
                     </div>
                 </div>
             </div>
-            
+
             <h4 class="form-header h4">法人资格信息</h4>
             <div class="row">
                 <div class="col-sm-6">
@@ -201,7 +201,7 @@
                     </div>
                 </div>
             </div>
-            
+
             <h4 class="form-header h4">地理位置信息</h4>
             <div class="row">
                 <div class="col-sm-6">
@@ -223,7 +223,7 @@
             </div>
         </form>
     </div>
-    
+
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: datetimepicker-js" />
     <style>
@@ -231,12 +231,12 @@
         input.error, select.error {
             border-color: #dd4b39 !important;
         }
-        
+
         /* 必填项校验失败时 placeholder 变红 */
         input.error::placeholder, select.error::placeholder {
             color: #dd4b39 !important;
         }
-        
+
         /* 隐藏默认的错误提示文字 */
         label.error {
             display: none !important;
@@ -244,7 +244,7 @@
     </style>
     <script th:inline="javascript">
         var prefix = ctx + "religion/place";
-        
+
         $("#form-place-add").validate({
             onkeyup: false,
             errorElement: "label",
@@ -315,14 +315,14 @@
             },
             focusCleanup: true
         });
-        
+
         function submitHandler() {
             if ($.validate.form()) {
                 var data = $("#form-place-add").serializeArray();
                 $.operate.save(prefix + "/add", data);
             }
         }
-        
+
         $(function() {
             // 初始化日期选择器
             $("input[name='approveTime']").datetimepicker({
@@ -331,14 +331,14 @@
                 autoclose: true,
                 todayBtn: true
             });
-            
+
             $("input[name='regTime']").datetimepicker({
                 format: "yyyy-mm-dd",
                 minView: "month",
                 autoclose: true,
                 todayBtn: true
             });
-            
+
             $("input[name='legalTime']").datetimepicker({
                 format: "yyyy-mm-dd",
                 minView: "month",

ruoyi-admin/src/main/resources/templates/religion/place/edit.html

@@ -8,7 +8,7 @@
     <div class="main-content">
         <form id="form-place-edit" class="form-horizontal" th:object="${place}">
             <input name="placeId" type="hidden" th:field="*{placeId}" />
-            
+
             <h4 class="form-header h4">基本信息</h4>
             <div class="row">
                 <div class="col-sm-6">
@@ -24,7 +24,7 @@
                         <label class="col-sm-4 control-label is-required">宗教类别：</label>
                         <div class="col-sm-8">
                             <select name="religionType" class="form-control" required th:with="type=${@dict.getType('religion_type')}">
-                                <option value="">请选择宗教类别</option>
+                                <!--<option value="">请选择宗教类别</option>-->
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{religionType}"></option>
                             </select>
                         </div>
@@ -36,8 +36,9 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">场所类别：</label>
                         <div class="col-sm-8">
+                            <!--<input name="placeCategory" placeholder="如：寺/观/清真寺/教堂" class="form-control" type="text" maxlength="64" th:field="*{placeCategory}">-->
                             <select name="placeCategory" class="form-control" required th:with="type=${@dict.getType('category_type')}">
-                                <option value="">请选择场所类别</option>
+                               <!-- <option value="">请选择场所类别</option>-->
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{placeCategory}"></option>
                             </select>
                         </div>
@@ -65,7 +66,7 @@
                     </div>
                 </div>
             </div>
-            
+
             <h4 class="form-header h4">负责人信息</h4>
             <div class="row">
                 <div class="col-sm-6">
@@ -78,25 +79,25 @@
                 </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">
                             <div class="input-group">
-                                <input name="chargePhone" placeholder="请输入负责人电话" class="form-control" type="text" maxlength="32" th:field="*{chargePhone}">
+                                <input name="chargePhone" placeholder="请输入联系电话" class="form-control" type="text" maxlength="32" th:field="*{chargePhone}" required>
                                 <span class="input-group-addon"><i class="fa fa-mobile"></i></span>
                             </div>
                         </div>
                     </div>
                 </div>
             </div>
-            
+
             <h4 class="form-header h4">场所面积</h4>
             <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">
                             <div class="input-group">
-                                <input name="placeArea" placeholder="请输入占地面积" class="form-control" type="number" step="0.01" th:field="*{placeArea}">
+                                <input name="placeArea" placeholder="请输入场所面积" class="form-control" type="number" step="0.01" th:field="*{placeArea}">
                                 <span class="input-group-addon">平方米</span>
                             </div>
                         </div>
@@ -114,7 +115,7 @@
                     </div>
                 </div>
             </div>
-            
+
             <h4 class="form-header h4">批准与登记信息</h4>
             <div class="row">
                 <div class="col-sm-6">
@@ -176,7 +177,7 @@
                     </div>
                 </div>
             </div>
-            
+
             <h4 class="form-header h4">法人资格信息</h4>
             <div class="row">
                 <div class="col-sm-6">
@@ -203,7 +204,7 @@
                     </div>
                 </div>
             </div>
-            
+
             <h4 class="form-header h4">地理位置信息</h4>
             <div class="row">
                 <div class="col-sm-6">
@@ -225,7 +226,7 @@
             </div>
         </form>
     </div>
-    
+
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: datetimepicker-js" />
     <style>
@@ -233,12 +234,12 @@
         input.error, select.error {
             border-color: #dd4b39 !important;
         }
-        
+
         /* 必填项校验失败时 placeholder 变红 */
         input.error::placeholder, select.error::placeholder {
             color: #dd4b39 !important;
         }
-        
+
         /* 隐藏默认的错误提示文字 */
         label.error {
             display: none !important;
@@ -246,7 +247,7 @@
     </style>
     <script th:inline="javascript">
         var prefix = ctx + "religion/place";
-        
+
         $("#form-place-edit").validate({
             onkeyup: false,
             errorElement: "label",
@@ -317,14 +318,14 @@
             },
             focusCleanup: true
         });
-        
+
         function submitHandler() {
             if ($.validate.form()) {
                 var data = $("#form-place-edit").serializeArray();
                 $.operate.save(prefix + "/edit", data);
             }
         }
-        
+
         $(function() {
             // 初始化日期选择器
             $("input[name='approveTime']").datetimepicker({
@@ -333,14 +334,14 @@
                 autoclose: true,
                 todayBtn: true
             });
-            
+
             $("input[name='regTime']").datetimepicker({
                 format: "yyyy-mm-dd",
                 minView: "month",
                 autoclose: true,
                 todayBtn: true
             });
-            
+
             $("input[name='legalTime']").datetimepicker({
                 format: "yyyy-mm-dd",
                 minView: "month",