From d5f4bba08427d7406773ba2d72c612fb6db24b90 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 2 Aug 2022 12:09:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=BB=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=A0=A1=E9=AA=8C=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/demo/table/subdata.html         | 33 +++++++++++++------
 1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/subdata.html b/ruoyi-admin/src/main/resources/templates/demo/table/subdata.html
index 57a4ade5f..99330d762 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/subdata.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/subdata.html
@@ -1,8 +1,11 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-	<th:block th:include="include :: header('主子表提交')" />
+    <th:block th:include="include :: header('主子表提交')" />
     <th:block th:include="include :: datetimepicker-css" />
+    <style type="text/css">
+        table label.error{position: inherit;}select + label.error{z-index:1;right:40px;}
+    </style>
 </head>
 <body class="gray-bg">
     <div class="main-content">
@@ -13,7 +16,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">客户名称：</label>
                         <div class="col-sm-8">
-                            <input name="name" placeholder="请输入客户名称" class="form-control" type="text" maxlength="30">
+                            <input name="name" placeholder="请输入客户名称" class="form-control" type="text" maxlength="30" required>
                         </div>
                     </div>
                 </div>
@@ -31,9 +34,9 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label is-required">手机号码：</label>
+                        <label class="col-sm-4 control-label">手机号码：</label>
                         <div class="col-sm-8">
-                            <input id="phonenumber" name="phonenumber" placeholder="请输入手机号码" class="form-control" type="text" maxlength="11">
+                            <input id="phonenumber" name="phonenumber" placeholder="请输入手机号码" class="form-control isPhone" type="text" maxlength="11">
                         </div>
                     </div>
                 </div>
@@ -127,7 +130,7 @@
 		            align: 'center',
 		            title: '商品名称',
 		            formatter: function(value, row, index) {
-		            	var html = $.common.sprintf("<input class='form-control' type='text' name='goods[%s].name' value='%s'>", index, value);
+		            	var html = $.common.sprintf("<input class='form-control goodsName' type='text' name='goods[%s].name' value='%s'>", index, value);
 		        		return html;
                     }
 		        },
@@ -136,7 +139,7 @@
 		            align: 'center',
 		            title: '商品重量',
 		            formatter: function(value, row, index) {
-		            	var html = $.common.sprintf("<input class='form-control' type='text' name='goods[%s].weight' value='%s'>", index, value);
+		            	var html = $.common.sprintf("<input class='form-control goodsWeight' type='text' name='goods[%s].weight' value='%s'>", index, value);
 		        		return html;
                     }
 		        },
@@ -179,11 +182,21 @@
 		    $.table.init(options);
 		});
 	    
-	    /* 主子表-提交 */
+        $.validator.addMethod("goodsName", function(value, element) {
+            return !this.optional(element);
+        }, "商品名称必填。");
+        
+        $.validator.addMethod("goodsWeight", function(value, element) {
+            return !this.optional(element) && (value <= 100 && value >= 0);
+        }, "商品重量长度区间0-100。");
+        
+        /* 主子表-提交 */
         function submitHandler(index, layero){
-        	var data = $("#form-add").serializeArray();
-        	alert(JSON.stringify(data))
-			$.operate.saveModal("/demo/operate/customer/add", data);
+            if ($.validate.form()) {
+                var data = $("#form-add").serializeArray();
+                alert(JSON.stringify(data))
+                $.operate.saveModal("/demo/operate/customer/add", data);
+            }
         }
 	    
         $("input[name='birthday']").datetimepicker({
