From 34f99d106551b51bf2af3bbd40c64624a3af25eb Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 09 九月 2023 09:43:57 +0800
Subject: [PATCH] #

---
 src/main/webapp/static/js/reimburseOnline/reimburseOnline.js |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
index 42e40a7..827a3ed 100644
--- a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
+++ b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
@@ -89,6 +89,7 @@
             ,{field: 'checkData', align: 'center',title: '鏄惁鍐茶处',hide: false}
             ,{field: 'orderNum', align: 'center',title: '鎶ラ攢鍗曞彿',width: 320, style: 'color: #1890ff;cursor:pointer', event: 'more',hide: false}
             ,{field: 'planId$', align: 'center',title: '椤圭洰鍙�',hide: false}
+            ,{field: 'name', align: 'center',title: '瀹㈡埛淇℃伅',hide: false}
             ,{field: 'settle', align: 'center',title: '杩涘害',hide: false}
             ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿',hide: false}
             ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿',hide: false}
@@ -394,6 +395,7 @@
                 var isExpAdd = !expTpe;
                 // 鍥炴樉鏁版嵁
                 form.val('editForm', expTpe);
+                console.log(expTpe)
                 if (expTpe) {
                     // $('#orderNo').attr("disabled", "disabled");
                 }
@@ -421,7 +423,8 @@
                             orderNo: data.field.planId,
                             templateName: data.field.templateName,
                             checkData: data.field.checkData,
-                            reimburseOnlineDetls: nList
+                            reimburseOnlineDetls: nList,
+                            name: data.field.name
                         }),
                         contentType:'application/json;charset=UTF-8',
                         method: 'POST',
@@ -452,22 +455,22 @@
                     cellMinWidth: 100,
                     cols: [[
                         {type: 'numbers', title: '#'},
-                        {field: 'occupation', title: '浜嬬敱', width: 100, style: 'color: blue;font-weight: bold', templet: '#occupation'},
+                        {field: 'occupation', title: '浜嬬敱', width: 100, style: 'color: blue;font-weight: bold', edit:true},
                         // {field: 'expenseType', title: '璐圭敤绫诲瀷', width: 100},
                         {field: 'expenseType$', title: '璐圭敤绫诲瀷', width: 100},
-                        {field: 'taxRate', title: '绋庣巼', width: 60},
-                        {field: 'untaxedAmountInLocalCurrency', title: '鏈◣鏈竵閲戦', width: 120},
-                        {field: 'untaxedAmount', title: '鏈◣閲戦', width: 100},
-                        {field: 'taxAmount', title: '绋庨', width: 60},
-                        {field: 'invoiceValue', title: '鍙戠エ閲戦', width: 100},
-                        {field: 'invoiceAmountInLocalCurrency', title: '鍙戠エ鏈竵閲戦', width: 120},
-                        {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: 'taxRate', title: '绋庣巼', width: 60, edit: true},
+                        {field: 'untaxedAmountInLocalCurrency', title: '鏈◣鏈竵閲戦', width: 120, edit: true},
+                        {field: 'untaxedAmount', title: '鏈◣閲戦', width: 100, edit: true},
+                        {field: 'taxAmount', title: '绋庨', width: 60, edit: true},
+                        {field: 'invoiceValue', title: '鍙戠エ閲戦', width: 100, edit: true},
+                        {field: 'invoiceAmountInLocalCurrency', title: '鍙戠エ鏈竵閲戦', width: 120, edit: true},
+                        {field: 'reimbursementRatio', title: '鎶ラ攢姣斾緥', width: 100, edit: true},
+                        {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: 'cashierConfirmationAmount', title: '鍑虹撼纭閲戦', width: 120},
+                        {field: 'cashierConfirmationAmount', title: '鍑虹撼纭閲戦', width: 120, edit: true},
                         {field: 'userId', title: '鍒楁敮浜哄憳', width: 120},
                         {field: 'deptId', title: '鍒楁敮閮ㄩ棬', width: 120},
                         {field: 'updateTime', title: '鏇存柊鏃ユ湡', width: 100},

--
Gitblit v1.9.1