From 3925d9587584b514d70bb79b4fd176c9d5db38c7 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 28 八月 2023 12:53:03 +0800
Subject: [PATCH] #出差完善

---
 src/main/webapp/static/js/businessTrip/businessTrip.js |   32 ++++++++++++--------------------
 1 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/static/js/businessTrip/businessTrip.js b/src/main/webapp/static/js/businessTrip/businessTrip.js
index 6dc5bb3..18dabfd 100644
--- a/src/main/webapp/static/js/businessTrip/businessTrip.js
+++ b/src/main/webapp/static/js/businessTrip/businessTrip.js
@@ -27,38 +27,30 @@
             // {type: 'checkbox'},
             {field: 'id', align: 'center',title: 'ID',hide: true}
             ,{field: 'businessTripReasons', align: 'center',title: '鍑哄樊浜嬬敱',hide: false}
-            ,{field: 'businessTransportation', align: 'center',title: '浜ら�氬伐鍏�',hide: false}
-            ,{field: 'businessReturn', align: 'center',title: '鍗曠▼寰�杩�',hide: false}
-            ,{field: 'businessStartProvince', align: 'center',title: '鍑哄彂鐪�',hide: true}
-            ,{field: 'businessStartCity', align: 'center',title: '鍑哄彂甯�',hide: true}
-            ,{field: 'businessStartDistrict', align: 'center',title: '鍑哄彂鍘�',hide: true}
-            ,{field: 'businessStartTown', align: 'center',title: '鍑哄彂闀�',hide: true}
+            ,{field: 'businessTransportation$', align: 'center',title: '浜ら�氬伐鍏�',hide: false}
+            ,{field: 'businessReturn$', align: 'center',title: '鍗曠▼寰�杩�',hide: false}
             ,{field: 'businessStartAddr', align: 'center',title: '鍑哄彂鍦�', templet:function(d){return emptyShow(d.businessStartAddr)},hide: true}
             ,{field: 'businessStartAddr$', align: 'center',title: '鍑哄彂鍦�',hide: false}
-            ,{field: 'businessEndProvince', align: 'center',title: '鐩殑鐪�',hide: true}
-            ,{field: 'businessEndCity', align: 'center',title: '鐩殑甯�',hide: true}
-            ,{field: 'businessEndDistrict', align: 'center',title: '鐩殑鍘�',hide: true}
-            ,{field: 'businessEndTown', align: 'center',title: '鐩殑闀�',hide: true}
             ,{field: 'businessEndAddr', align: 'center',title: '鐩殑鍦�', templet:function(d){return emptyShow(d.businessEndAddr)},hide: true}
-            ,{field: 'businessEndAddrr$', align: 'center',title: '鐩殑鍦�',hide: false}
-            ,{field: 'businessStartTimeDay$', align: 'center',title: '鍑哄彂鏃ユ湡',hide: false}
-            ,{field: 'businessEndTimeDay$', align: 'center',title: '缁撴潫鏃ユ湡',hide: false}
+            ,{field: 'businessEndAddr$', align: 'center',title: '鐩殑鍦�',hide: false}
+            ,{field: 'businessStartTimeDay$', align: 'center',title: '鍑哄彂鏃ユ湡',hide: false,width: 165}
+            ,{field: 'businessEndTimeDay$', align: 'center',title: '缁撴潫鏃ユ湡',hide: false,width: 165}
             ,{field: 'businessDuration', align: 'center',title: '鍑哄樊鏃堕暱',hide: false}
             ,{field: 'businessTripDays', align: 'center',title: '鍑哄樊澶╂暟',hide: false}
-            ,{field: 'businessNotes', align: 'center',title: '鍑哄樊澶囨敞',hide: false}
             ,{field: 'businessPeers', align: 'center',title: '鍑鸿浜�',hide: false}
             ,{field: 'businessPeersId', align: 'center',title: '鍚岃浜篒D',hide: true}
             ,{field: 'carNumber', align: 'center',title: '鑷┚绉佸杞﹁溅鐗屽彿',hide: false}
             ,{field: 'kilometers', align: 'center',title: '鑷┚绉佸杞﹁绋嬫槑缁嗗強鍏噷鏁�',hide: false}
-            ,{field: 'userId', align: 'center',title: '鍒涘缓浜�',hide: false}
-            ,{field: 'deptId', align: 'center',title: '鎵�灞為儴闂�',hide: false}
+            ,{field: 'userId$', align: 'center',title: '鐢宠浜�',hide: false}
+            ,{field: 'deptId$', align: 'center',title: '鎵�灞為儴闂�',hide: false}
             ,{field: 'hostId', align: 'center',title: 'hostId',hide: true}
-            ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide: false}
-            ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide: false}
-            ,{field: 'updateId', align: 'center',title: '鏇存柊浜哄憳ID',hide: true}
-            ,{field: 'settle', align: 'center',title: '杩涘害',hide: false}
+            ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide: false,width: 125}
+            ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide: false,width: 125}
+            ,{field: 'updateId$', align: 'center',title: '鏇存柊浜哄憳',hide: false}
+            ,{field: 'settle$', align: 'center',title: '杩涘害',hide: false}
             ,{field: 'status$', align: 'center',title: '鐘舵��',hide: false}
             ,{field: 'businessTripType', align: 'center',title: '绫诲瀷',hide: true}
+            ,{field: 'businessNotes', align: 'center',title: '鍑哄樊澶囨敞',hide: false}
 
             ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
         ]],

--
Gitblit v1.9.1