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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
index b0d1191..8ce8423 100644
--- a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
+++ b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
@@ -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