From 3982c30cbae5cd2d8f37e19858a95f6d4d3c2f15 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 16 Jun 2020 13:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E5=AD=90=E8=A1=A8=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=8F=E5=8F=B7&=E9=98=B2=E6=AD=A2insertRo?=
 =?UTF-8?q?w=E6=95=B0=E6=8D=AE=E8=A2=AB=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/demo/table/subdata.html         | 68 ++++++++++++++++---
 1 file changed, 58 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 aa1e9492..ba30bfc9 100644
--- a/ruoyi-admin/src/main/resources/templates/demo/table/subdata.html
+++ b/ruoyi-admin/src/main/resources/templates/demo/table/subdata.html
@@ -81,6 +81,7 @@
     </div>
     <th:block th:include="include :: footer" />
     <th:block th:include="include :: datetimepicker-js" />
+    <script th:src="@{/js/jquery.tmpl.js}"></script>
 	<script th:inline="javascript">
 	    $(function() {
 		    var options = {
@@ -92,6 +93,11 @@
 		        columns: [{
 		            checkbox: true
 		        },
+		        {
+		        	field: 'index',
+		        	align: 'center',
+                    title: "序号"
+                },
 		        {
 		            field: 'name',
 		            align: 'center',
@@ -124,8 +130,8 @@
 		            align: 'center',
 		            title: '商品种类',
 		            formatter: function(value, row, index) {
-		            	var html = $.common.sprintf("<select class='form-control' name='goods[%s].type'><option value=''>所有</option><option value='0'>寒性</option><option value='1'>热性</option></select>", index);
-		        		return html;
+		        		var data = [{ index: index, type: value }];
+		                return $("#goodsTypeTpl").tmpl(data).html();
                     }
 		        }]
 		    };
@@ -146,29 +152,71 @@
         
         function addColumn(){
         	var count = $("#" + table.options.id).bootstrapTable('getData').length;
-        	var randomId = 100 + ~~(Math.random() * 100)
+        	
+			var params = new Array();
+			for (var dataIndex = 0; dataIndex <= count; dataIndex++) {
+			    var columns = $('#' + table.options.id + ' tr[data-index="' + dataIndex + '"] td');
+			    var obj = new Object();
+			    for (var i = 0; i < columns.length; i++) {
+			        var inputValue = $(columns[i]).find('input');
+			        var selectValue = $(columns[i]).find('select');
+			        var key = table.options.columns[i].field;
+			        if ($.common.isNotEmpty(inputValue.val())) {
+			            obj[key] = inputValue.val();
+			        } else if ($.common.isNotEmpty(selectValue.val())) {
+			            obj[key] = selectValue.val();
+			        } else {
+			            obj[key] = "";
+			        }
+			    }
+			    params.push({ index: dataIndex, row: obj });
+			}
+			$("#" + table.options.id).bootstrapTable("updateRow", params);
+        	
         	$("#" + table.options.id).bootstrapTable('insertRow', {
         		index: count,
                 row: {
-                	name: '商品' + randomId,
-                	weight: 20 + randomId,
-                	price: 1 + + randomId + .2,
-                	type: 10 + randomId,
+                	index: $.table.serialNumber(count),
+                	name: "",
+                	weight: "",
+                	price: "",
+                	type: "",
                 }
         	})
+        	resetIndex();
         }
         
         function delColumn(){
-        	var ids = $.table.selectColumns("name");
+        	var ids = $.table.selectColumns("index");
         	if (ids.length == 0) {
     			$.modal.alertWarning("请至少选择一条记录");
     			return;
     		}
         	$("#" + table.options.id).bootstrapTable('remove', {
-        	    field: 'name',
+        	    field: 'index',
         	    values: ids
         	})
+        	resetIndex();
+        }
+        
+        function resetIndex() {
+            var count = $("#" + table.options.id).bootstrapTable('getData').length;
+            for (var index = 0; index <= count; index++) {
+                // 重置序号
+                $("#" + table.options.id).bootstrapTable('updateRow', { index: index, row: { index: parseInt(index + 1) } })
+            }
         }
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
+
+<!-- 查询方式 -->
+<script id="goodsTypeTpl" type="text/x-jquery-tmpl">
+<div>
+<select class='form-control' name='goods[${index}].type'>
+    <option value="">所有</option>
+    <option value="0" {{if type==="0"}}selected{{/if}}>寒性</option>
+    <option value="1" {{if type==="1"}}selected{{/if}}>热性</option>
+</select>
+</div>
+</script>
\ No newline at end of file