From 7f9d058a0e632be6a3daf6f46d26b69742db0720 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 08 十一月 2023 13:13:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/webapp/static/js/followUp/followUp.js | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/static/js/followUp/followUp.js b/src/main/webapp/static/js/followUp/followUp.js
index 039a92c..9b729ee 100644
--- a/src/main/webapp/static/js/followUp/followUp.js
+++ b/src/main/webapp/static/js/followUp/followUp.js
@@ -21,22 +21,23 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID',hide:true}
- ,{field: 'userId$', align: 'center',title: '鍒涘缓浜�'}
- ,{field: 'deptId$', align: 'center',title: '鎵�灞為儴闂�'}
+ // {type: 'checkbox'},
+ {field: 'id', align: 'center',title: 'ID',hide:true}
+ ,{field: 'orderId', align: 'center',title: '椤圭洰鍙�',hide:false}
+ ,{field: 'userId$', align: 'center',title: '涓氬姟鍛�',hide: false}
+ ,{field: 'deptId$', align: 'center',title: '鎵�灞為儴闂�',hide:true}
,{field: 'hostId', align: 'center',title: 'hostId',hide:true}
- ,{field: 'orderId$', align: 'center',title: '椤圭洰鍙�'}
+ ,{field: 'orderId$', align: 'center',title: '椤圭洰',hide:false}
,{field: 'director$', align: 'center',title: '璐熻矗浜�',hide:true}
- ,{field: 'workMsg', align: 'center',title: '浠诲姟鎻忚堪'}
- ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'workMsg', align: 'center',title: '蹇冨緱浣撲細',hide: false}
,{field: 'comment', align: 'center',title: '璇勮',hide:true}
,{field: 'createBy$', align: 'center',title: '鍒涘缓浜哄憳',hide:true}
- ,{field: 'updateBy$', align: 'center',title: '鏇存柊浜哄憳'}
- ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide:true}
- ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
+ ,{field: 'updateBy$', align: 'center',title: '鏇存柊浜哄憳',hide:true}
+ ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide:false}
+ ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide:true}
+ ,{field: 'memo', align: 'center',title: '澶囨敞',hide:true}
- ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ // ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:180}
]],
request: {
pageName: 'curr',
--
Gitblit v1.9.1