From 211840b64fa1132d76d6dff6c779e9ba2c0c450f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 07 四月 2022 19:13:54 +0800
Subject: [PATCH] 优化自动化代码

---
 src/main/resources/generater/admin/list.ftl |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/generater/admin/list.ftl b/src/main/resources/generater/admin/list.ftl
index 31e4386..fe300e6 100644
--- a/src/main/resources/generater/admin/list.ftl
+++ b/src/main/resources/generater/admin/list.ftl
@@ -8,19 +8,19 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="viewport"
           content="width=device-width,user-scalable=yes, minimum-scale=0.4, initial-scale=0.8,target-densitydpi=low-dpi"/>
-    <link rel="stylesheet" href="./css/font.css">
-    <link rel="stylesheet" href="./css/xadmin.css">
-    <script src="./lib/layui/layui.js" charset="utf-8"></script>
-    <link rel="stylesheet" href="./css/theme3049.min.css">
-    <script src="./js/vue.min.js" type="text/javascript" charset="utf-8"></script>
-    <script type="text/javascript" src="./js/xadmin.js"></script>
-    <script src="./js/http.js" type="text/javascript" charset="utf-8"></script>
+    <link rel="stylesheet" href="../css/font.css">
+    <link rel="stylesheet" href="../css/xadmin.css">
+    <script src="../lib/layui/layui.js" charset="utf-8"></script>
+    <link rel="stylesheet" href="../css/theme3049.min.css">
+    <script src="../js/vue.min.js" type="text/javascript" charset="utf-8"></script>
+    <script type="text/javascript" src="../js/xadmin.js"></script>
+    <script src="../js/http.js" type="text/javascript" charset="utf-8"></script>
     <script type="text/javascript" src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
     <!--[if lt IE 9]>
     <script src="https://cdn.staticfile.org/html5shiv/r29/html5.min.js"></script>
     <script src="https://cdn.staticfile.org/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
-    <script src="./js/utils.js"></script>
+    <script src="../js/utils.js"></script>
 </head>
 
 <body>
@@ -145,9 +145,9 @@
 
 <script>
     var tableIns = null;
+    var app=null;
     $(function () {
-
-        var app = new Vue({
+        app = new Vue({
             el: "#app",
             data: {
                 key: '',
@@ -170,7 +170,7 @@
                                 <#list searchFormRows as row >
                                     <#if (row.type=="Text" && row.params.inputType=="DATE")>
                                 laydate.render({
-                                    elem: "intput[name=${row.key}]" //鎸囧畾鍏冪礌
+                                    elem: "input[name=${row.key}]" //鎸囧畾鍏冪礌
                                 });
                                     </#if>
                                 </#list>
@@ -189,8 +189,10 @@
                                  <#list showFileds as field >
                                     <#if field.showType=='TEXT'>
                                     {field: '${field.identifier}', width: 120, sort: false, title: "${field.title}"},
+                                    <#elseif field.showType=='DATETIME'>
+                                    {field: '${field.identifier}', width: 150, sort: false, title: "${field.title}"},
                                     <#elseif field.showType=='SWITCH'>
-                                    {field: '${field.identifier}', width: 120, sort: false, title: "${field.title}",templet:function(res){
+                                    {field: '${field.identifier}', width: 80, sort: false, title: "${field.title}",templet:function(res){
                                          if(res.${field.identifier}){
                                              return " <input type=\"checkbox\" checked='true'  disabled  lay-skin=\"switch\"";
                                          }else{
@@ -269,6 +271,7 @@
                              if (res.code == 0) {
                                  //濉厖鏁版嵁
                                  $("${request.fillTarget}").empty();
+                                 $("${request.fillTarget}").append("<option value=''>璇烽�夋嫨</option>");
                                  for (var i = 0; i < res.data.length; i++) {
                                      var html = "<option value='" + res.data[i].key + "'>";
                                      html += res.data[i].value + "</option>";
@@ -316,9 +319,16 @@
                 },
                 </#if>
                 search: function (params) {
+
+                    var ps = {};
+                    for (var key in params) {
+                        if (params[key].length > 0) {
+                            ps[key] = params[key];
+                        }
+                    }
                     //鏁版嵁閲嶈浇
                     tableIns.reload({
-                        where: params,
+                        where: ps,
                         page: {
                             curr: 1 //閲嶆柊浠庣 1 椤靛紑濮�
                         }

--
Gitblit v1.8.0