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/reimburseOnline/reimburseOnline.js | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
index facf1af..8ce8423 100644
--- a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
+++ b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
@@ -90,15 +90,15 @@
,{field: 'orderNum', align: 'center',title: '鎶ラ攢鍗曞彿',width: 320,hide: false}
,{field: 'orderId$', align: 'center',title: '椤圭洰鍙�',hide: false}
,{field: 'name$', align: 'center',title: '瀹㈡埛淇℃伅',hide: false}
- ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide: false}
- ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide: false}
,{field: 'status$', align: 'center',title: '鐘舵��',hide: false}
- ,{field: 'memberId$', align: 'center',title: '涓氬姟鍛�',hide: false}
+ ,{field: 'memberId$', align: 'center',title: '瀹℃牳鑺傜偣',hide: true}
,{field: 'settle$', align: 'center',title: '杩涘害', style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
- ,{field: 'user$', align: 'center',title: '鍒涘缓浜哄憳',hide: false}
+ ,{align: 'center', title: '鎶ラ攢鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160}
+ ,{field: 'user$', align: 'center',title: '鍒涘缓浜哄憳',hide: true}
,{field: 'updateUserId$', align: 'center',title: '鏇存柊浜哄憳',hide: false}
// // ,{field: 'checkDataStatus$', align: 'center',title: '鎶ヤ环鏁版嵁'}
- ,{align: 'center', title: '鎶ラ攢鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160}
+ ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide: true}
+ ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide: false}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:350}
]],
request: {
@@ -310,7 +310,7 @@
type: 1,
title: false,
area: '2100px',
- offset: [top2 + 'px', (left - 1730 + $a.outerWidth()) + 'px'],
+ offset: [top2 + 'px', (left - 1430 + $a.outerWidth()) + 'px'],
shade: .01,
shadeClose: true,
fixed: false,
@@ -327,7 +327,7 @@
cellMinWidth: 100,
cols: [[
// {type: 'numbers'},
- {field: 'occupation', title: '浜嬬敱', width: 100},
+ {field: 'occupation', title: '浜嬬敱', width: 200},
// {field: 'expenseType', title: '璐圭敤绫诲瀷', width: 100},
{field: 'expenseType$', title: '璐圭敤绫诲瀷', width: 100},
{field: 'taxRate', title: '绋庣巼', width: 60},
@@ -347,7 +347,7 @@
{field: 'deptId', title: '鍒楁敮閮ㄩ棬', width: 120},
{field: 'updateTime', title: '鏇存柊鏃ユ湡', width: 100},
// {field: 'updateUserId', title: '鏇存柊浜哄憳ID', width: 160},
- {field: 'updateUserName', title: '鏇存柊浜哄憳鍚嶅瓧'},
+ {field: 'updateUserName', title: '鏇存柊浜哄憳鍚嶅瓧', width: 80},
// {field: 'creationTime', title: '鍒涘缓鏃ユ湡', width: 160}
]],
request: {
--
Gitblit v1.9.1