From bc4f79e162d84b8ade3cd39f311c93df232ce7fc Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 15 十二月 2023 17:00:40 +0800
Subject: [PATCH] # 大屏显示-1
---
src/main/webapp/static/js/reimburseOnline/reimburseOnline.js | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
index b0d1191..84d64fb 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,27 +327,27 @@
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},
+ {field: 'taxRate$', title: '绋庣巼', width: 60},
{field: 'untaxedAmountInLocalCurrency', title: '鏈◣鏈竵閲戦', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'untaxedAmount', title: '鏈◣閲戦', width: 100},
{field: 'taxAmount', title: '绋庨', width: 60},
{field: 'invoiceValue', title: '鍙戠エ閲戦', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'invoiceAmountInLocalCurrency', title: '鍙戠エ鏈竵閲戦', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
- {field: 'reimbursementRatio', title: '鎶ラ攢姣斾緥', width: 100},
+ {field: 'reimbursementRatio$', title: '鎶ラ攢姣斾緥', width: 100},
{field: 'reimbursementAmount', title: '鎶ラ攢閲戦', width: 100},
{field: 'reimbursementAmountInLocalCurrency', title: '鎶ラ攢鏈竵閲戦', width: 120},
{field: 'cashierConfirmationAmount', title: '鍑虹撼纭閲戦', width: 120},
- {field: 'cashierCurrency', title: '鍑虹撼甯佺', width: 100},
- {field: 'departureTime', title: '鍑哄彂鏃ユ湡', width: 100},
+ // {field: 'cashierCurrency', title: '鍑虹撼甯佺', width: 100},
+ // {field: 'departureTime', title: '鍑哄彂鏃ユ湡', width: 100},
{field: 'cashierConfirmationAmount', title: '鍑虹撼纭閲戦', width: 120},
{field: 'userId', title: '鍒楁敮浜哄憳', width: 120},
{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: {
@@ -393,6 +393,9 @@
success: function (layero, dIndex) {
$(layero).children('.layui-layer-content').css('overflow', 'visible');
var isExpAdd = !expTpe;
+ if (expTpe){
+ document.getElementById('orderDisplay').style.display = 'none';
+ }
// 鍥炴樉鏁版嵁
form.val('editForm', expTpe);
console.log(expTpe)
@@ -467,8 +470,8 @@
{field: 'reimbursementAmount', title: '鎶ラ攢閲戦', width: 100, edit: true},
{field: 'reimbursementAmountInLocalCurrency', title: '鎶ラ攢鏈竵閲戦', width: 120, edit: true},
{field: 'cashierConfirmationAmount', title: '鍑虹撼纭閲戦', width: 120, edit: true},
- {field: 'cashierCurrency', title: '鍑虹撼甯佺', width: 100, edit: true},
- {field: 'departureTime', title: '鍑哄彂鏃ユ湡', width: 100},
+ // {field: 'cashierCurrency', title: '鍑虹撼甯佺', width: 100, edit: true},
+ // {field: 'departureTime', title: '鍑哄彂鏃ユ湡', width: 100},
{field: 'cashierConfirmationAmount', title: '鍑虹撼纭閲戦', width: 120, edit: true},
{field: 'userId', title: '鍒楁敮浜哄憳', width: 120},
{field: 'deptId', title: '鍒楁敮閮ㄩ棬', width: 120},
--
Gitblit v1.9.1