From 44e91f8e7b4c2afd1da950a68a488f4d5451cede Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 23 十一月 2022 13:17:18 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/plan/plan.js |   38 ++++++++++++++++++--------------------
 1 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 7e684c5..7bbcd81 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -139,17 +139,17 @@
             {type: 'checkbox'}
             // ,{field: 'id', align: 'center',title: 'ID'}
             // ,{field: 'hostId$', align: 'center',title: '鎵�灞炲晢鎴�'}
-            ,{field: 'userId$', align: 'center',title: '涓氬姟鍛�'}
-            ,{field: 'planType$', align: 'center',title: '涓氬姟绫诲瀷'}
-            ,{field: 'name', align: 'center',title: '鍞墠瑙勫垝鐢宠鍗曞悕绉�'}
-            ,{field: 'planNeed$', align: 'center',title: '鎵�闇�'}
-            ,{field: 'deptId$', align: 'center',title: '鎵�灞為儴闂�'}
-            ,{field: 'orderId$', align: 'center',title: '璺熻釜椤圭洰'}
-            ,{field: 'cstmrId$', align: 'center',title: '鐢叉柟鍗曚綅'}
-            ,{field: 'uuid', align: 'center',title: '瑙勫垝鍗曚唬鍙�'}
-            ,{field: 'appleTime$', align: 'center',title: '鐢宠鏃ユ湡'}
+            ,{field: 'userId$', align: 'left',title: '涓氬姟鍛�'}
+            ,{field: 'planType$', align: 'left',title: '涓氬姟绫诲瀷', width: 150}
+            ,{field: 'name', align: 'left',title: '鍞墠瑙勫垝鐢宠鍗曞悕绉�', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'planMore',}
+            ,{field: 'uuid', align: 'left',title: '瑙勫垝鍗曞彿', width: 100}
+            ,{field: 'planNeed$', align: 'left',title: '鎵�闇�', templet:function(d){return emptyShow(d.planNeed$)}}
+            ,{field: 'deptId$', align: 'left',title: '鎵�灞為儴闂�'}
+            ,{field: 'orderId$', align: 'left',title: '璺熻釜椤圭洰', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'orderMore'}
+            // ,{field: 'cstmrId$', align: 'left',title: '鐢叉柟鍗曚綅', width: 220, style: 'color: #1890ff;cursor:pointer', event: 'cstmrMore'}
+            ,{field: 'appleTime$', align: 'left',title: '鐢宠鏃ユ湡', hide: true}
             // ,{field: 'beItem$', align: 'center',title: '绔嬮」'}
-            ,{field: 'planner', align: 'center',title: '瑙勫垝鍛�', templet:function(d){return emptyShow(d.planner)}}
+            // ,{field: 'planner', align: 'left',title: '瑙勫垝鍛�', templet:function(d){return emptyShow(d.planner)}}
             // ,{field: 'finishTime$', align: 'center',title: '瀹屾垚鏃堕棿'}
             // ,{field: 'form', align: 'center',title: '琛ㄥ崟鍐呭'}
             // ,{field: 'change$', align: 'center',title: '鏇存敼鏂规'}
@@ -162,9 +162,10 @@
             // ,{field: 'settleMsg', align: 'center',title: '瀹℃牳杩涘害'}
             // ,{field: 'comment', align: 'center',title: '璇勮'}
             // ,{field: 'status$', align: 'center',title: '鐘舵��'}
-            ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
-            ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
-            ,{field: 'memo', align: 'center',title: '娉ㄩ噴', hide: true}
+            ,{field: 'createTime$', align: 'left',title: '娣诲姞鏃ユ湡', width: 160, hide: false}
+            ,{field: 'updateBy$', align: 'left',title: '淇敼浜�'}
+            ,{field: 'updateTime$', align: 'left',title: '淇敼鏃堕棿', hide: true}
+            ,{field: 'memo', align: 'left',title: '娉ㄩ噴', hide: true}
 
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
         ]],
@@ -500,13 +501,7 @@
     // 鎼滅储
     form.on('submit(search)', function (data) {
         pageCurr = 1;
-        tableReload();
-    });
-
-    // 閲嶇疆
-    form.on('submit(reset)', function (data) {
-        pageCurr = 1;
-        clearFormVal($('#search-box'));
+        pageCount = 0;
         tableReload();
     });
 
@@ -697,6 +692,9 @@
         $.each($('#search-box [name]').serializeArray(), function() {
             searchData[this.name] = this.value;
         });
+        if (treeCond) {
+            searchData[treeCond.key] = treeCond.val;
+        }
         tableIns.reload({
             where: searchData,
             page: {curr: pageCurr}

--
Gitblit v1.9.1