From bb71b47a43244e6db57cbc3cd0223bc5a64023d7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 10:40:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/webapp/static/js/reimburseOnline/reimburseOnline.js | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
index 8ce8423..b0f1f28 100644
--- a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
+++ b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
@@ -330,18 +330,18 @@
{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},
@@ -467,8 +467,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