lchao vor 5 Monaten
Ursprung
Commit
112a37c5bf

+ 20 - 19
qmjszx-admin/src/main/resources/templates/system/bill/bill.html

@@ -36,15 +36,15 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()">
-                    <i class="fa fa-plus"></i> 添加
-                </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
+<!--                <a class="btn btn-success" onclick="$.operate.add()">-->
+<!--                    <i class="fa fa-plus"></i> 添加-->
+<!--                </a>-->
+<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()">-->
+<!--                    <i class="fa fa-edit"></i> 修改-->
+<!--                </a>-->
+<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()">-->
+<!--                    <i class="fa fa-remove"></i> 删除-->
+<!--                </a>-->
                 <a class="btn btn-warning" onclick="$.table.exportExcel()">
                     <i class="fa fa-download"></i> 导出
                 </a>
@@ -100,16 +100,17 @@
                     field: 'remark',
                     title: '备注'
                 },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function(value, row, index) {
-                        var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }]
+                // {
+                //     title: '操作',
+                //     align: 'center',
+                //     formatter: function(value, row, index) {
+                //         var actions = [];
+                //         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                //         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                //         return actions.join('');
+                //     }
+                // }
+                ]
             };
             $.table.init(options);
         });

+ 58 - 66
qmjszx-admin/src/main/resources/templates/system/bill/edit.html

@@ -4,87 +4,79 @@
     <th:block th:include="include :: header('修改用户积分流水')" />
 </head>
 <body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-bill-edit" th:object="${sysUserBill}">
-            <input name="id" th:field="*{id}" type="hidden">
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">用户uid:</label>
-                    <div class="col-sm-8">
-                        <input name="userId" th:field="*{userId}" class="form-control" type="text" required>
-                    </div>
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+    <form class="form-horizontal m" id="form-bill-edit" th:object="${sysUserBill}">
+        <input name="id" th:field="*{id}" type="hidden">
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">用户uid:</label>
+                <div class="col-sm-8">
+                    <input name="userId" th:field="*{userId}" class="form-control" type="text" required>
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">0 = 支出 1 = 获得:</label>
-                    <div class="col-sm-8">
-                        <input name="pm" th:field="*{pm}" class="form-control" type="text" required>
-                    </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">0 = 支出 1 = 获得:</label>
+                <div class="col-sm-8">
+                    <input name="pm" th:field="*{pm}" class="form-control" type="text" required>
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">账单标题:</label>
-                    <div class="col-sm-8">
-                        <input name="title" th:field="*{title}" class="form-control" type="text" required>
-                    </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">账单标题:</label>
+                <div class="col-sm-8">
+                    <input name="title" th:field="*{title}" class="form-control" type="text" required>
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">明细数字:</label>
-                    <div class="col-sm-8">
-                        <input name="number" th:field="*{number}" class="form-control" type="text" required>
-                    </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">明细数字:</label>
+                <div class="col-sm-8">
+                    <input name="number" th:field="*{number}" class="form-control" type="text" required>
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">剩余:</label>
-                    <div class="col-sm-8">
-                        <input name="balance" th:field="*{balance}" class="form-control" type="text" required>
-                    </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">剩余:</label>
+                <div class="col-sm-8">
+                    <input name="balance" th:field="*{balance}" class="form-control" type="text" required>
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">积分剩余量:</label>
-                    <div class="col-sm-8">
-                        <input name="remainingNumber" th:field="*{remainingNumber}" class="form-control" type="text" required>
-                    </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label">积分用途:</label>
+                <div class="col-sm-8">
+                    <input name="useCategory" th:field="*{useCategory}" class="form-control" type="text">
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">积分用途:</label>
-                    <div class="col-sm-8">
-                        <input name="useCategory" th:field="*{useCategory}" class="form-control" type="text">
-                    </div>
+        </div>
+        <div class="col-xs-12">
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">备注:</label>
+                <div class="col-sm-8">
+                    <textarea name="remark" class="form-control" required>[[*{remark}]]</textarea>
                 </div>
             </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label is-required">备注:</label>
-                    <div class="col-sm-8">
-                        <textarea name="remark" class="form-control" required>[[*{remark}]]</textarea>
-                    </div>
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "system/bill";
-        $("#form-bill-edit").validate({
-            focusCleanup: true
-        });
+        </div>
+    </form>
+</div>
+<th:block th:include="include :: footer" />
+<script th:inline="javascript">
+    var prefix = ctx + "system/bill";
+    $("#form-bill-edit").validate({
+        focusCleanup: true
+    });
 
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-bill-edit').serialize());
-            }
+    function submitHandler() {
+        if ($.validate.form()) {
+            $.operate.save(prefix + "/edit", $('#form-bill-edit').serialize());
         }
-    </script>
+    }
+</script>
 </body>
 </html>

+ 21 - 21
qmjszx-admin/src/main/resources/templates/system/mall/add.html

@@ -9,9 +9,9 @@
         <form class="form-horizontal m" id="form-mall-add">
             <div class="col-xs-12">
                 <div class="form-group">
-                    <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="goodsName" class="form-control" type="text">
+                        <input name="goodsName" class="form-control" type="text" required>
                     </div>
                 </div>
             </div>
@@ -35,25 +35,6 @@
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">商品图片:</label>
-                    <div class="col-sm-8">
-                        <input type="hidden" name="goodsImg">
-                        <div class="file-loading">
-                            <input class="form-control file-upload" id="goodsImg" name="file" type="file">
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">商品说明:</label>
-                    <div class="col-sm-8">
-                        <input name="goodsDescribe" class="form-control" type="text">
-                    </div>
-                </div>
-            </div>
-            <div class="col-xs-12">
-                <div class="form-group">
                     <label class="col-sm-3 control-label">计量单位:</label>
                     <div class="col-sm-8">
                         <input name="goodsUnit" class="form-control" type="text">
@@ -108,6 +89,25 @@
                     </div>
                 </div>
             </div>
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">商品图片:</label>
+                    <div class="col-sm-8">
+                        <input type="hidden" name="goodsImg">
+                        <div class="file-loading">
+                            <input class="form-control file-upload" id="goodsImg" name="file" type="file">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">商品说明:</label>
+                    <div class="col-sm-8">
+                        <textarea name="goodsDescribe" class="form-control" required></textarea>
+                    </div>
+                </div>
+            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />

+ 21 - 21
qmjszx-admin/src/main/resources/templates/system/mall/edit.html

@@ -10,9 +10,9 @@
             <input name="id" th:field="*{id}" type="hidden">
             <div class="col-xs-12">
                 <div class="form-group">
-                    <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="goodsName" th:field="*{goodsName}" class="form-control" type="text">
+                        <input name="goodsName" th:field="*{goodsName}" class="form-control" type="text" required>
                     </div>
                 </div>
             </div>
@@ -36,25 +36,6 @@
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-3 control-label">商品图片:</label>
-                    <div class="col-sm-8">
-                        <input type="hidden" name="goodsImg" th:field="*{goodsImg}">
-                       <div class="file-loading">
-                            <input class="form-control file-upload" id="goodsImg" name="file" type="file">
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="col-xs-12">
-                <div class="form-group">
-                    <label class="col-sm-3 control-label">商品说明:</label>
-                    <div class="col-sm-8">
-                        <input name="goodsDescribe" th:field="*{goodsDescribe}" class="form-control" type="text">
-                    </div>
-                </div>
-            </div>
-            <div class="col-xs-12">
-                <div class="form-group">
                     <label class="col-sm-3 control-label">计量单位:</label>
                     <div class="col-sm-8">
                         <input name="goodsUnit" th:field="*{goodsUnit}" class="form-control" type="text">
@@ -109,6 +90,25 @@
                     </div>
                 </div>
             </div>
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">商品图片:</label>
+                    <div class="col-sm-8">
+                        <input type="hidden" name="goodsImg" th:field="*{goodsImg}">
+                        <div class="file-loading">
+                            <input class="form-control file-upload" id="goodsImg" name="file" type="file">
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12">
+                <div class="form-group">
+                    <label class="col-sm-3 control-label">商品说明:</label>
+                    <div class="col-sm-8">
+                        <textarea name="goodsDescribe" class="form-control" type="text">[[*{goodsDescribe}]]</textarea>
+                    </div>
+                </div>
+            </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />