From 29cfba4aa2e41fb15cacb500c3e2d9ae7c652d08 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 21 十一月 2023 08:57:20 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/reimburseOnline/reimburseOnline.js | 65 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
index daab1de..b0f1f28 100644
--- a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
+++ b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
@@ -87,18 +87,18 @@
{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80,hide: true}
,{field: 'templateName', align: 'center',title: '鎶ラ攢绫诲瀷',hide: false}
,{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}
+ ,{field: 'orderNum', align: 'center',title: '鎶ラ攢鍗曞彿',width: 320,hide: false}
+ ,{field: 'orderId$', align: 'center',title: '椤圭洰鍙�',hide: false}
+ ,{field: 'name$', align: 'center',title: '瀹㈡埛淇℃伅',hide: false}
,{field: 'status$', align: 'center',title: '鐘舵��',hide: false}
- ,{field: 'memberId$', align: 'center',title: '涓氬姟鍛�',hide: false}
- ,{field: 'user$', 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}
+ ,{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,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: {
@@ -420,11 +420,10 @@
data: JSON.stringify({
reimburseId: Number(data.field.id),
docType: Number(data.field.docType),
- orderNo: data.field.planId,
+ orderId: data.field.orderId,
templateName: data.field.templateName,
checkData: data.field.checkData,
- reimburseOnlineDetls: nList,
- name: data.field.name
+ reimburseOnlineDetls: nList
}),
contentType:'application/json;charset=UTF-8',
method: 'POST',
@@ -455,22 +454,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: 'departureTime', title: '鍑哄彂鏃ユ湡', width: 100},
- {field: 'cashierConfirmationAmount', title: '鍑虹撼纭閲戦', width: 120},
+ {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, edit: true},
{field: 'userId', title: '鍒楁敮浜哄憳', width: 120},
{field: 'deptId', title: '鍒楁敮閮ㄩ棬', width: 120},
{field: 'updateTime', title: '鏇存柊鏃ユ湡', width: 100},
--
Gitblit v1.9.1