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 | 149 +++++++++++++++++++++++++++++--------------------
1 files changed, 89 insertions(+), 60 deletions(-)
diff --git a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
index 88ea097..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}
@@ -298,7 +299,7 @@
});
break;
case "edit":
- showEditForm(data);
+ showEditModel(data);
break;
case "look":
var $a = $(obj.tr).find('a[lay-event="look"]');
@@ -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,31 +455,53 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'occupation', title: '浜嬬敱', width: 100},
+ {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},
// {field: 'updateUserId', title: '鏇存柊浜哄憳ID', width: 160},
{field: 'updateUserName', title: '鏇存柊浜哄憳鍚嶅瓧'},
// {field: 'creationTime', title: '鍒涘缓鏃ユ湡', width: 160}
+ {align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
]],
- done: function (res) {
+ done: function (res, curr, count) {
$(layero).find('.layui-table-view').css('margin', '0');
+ var options = this;
+
+ // 鑾峰彇褰撳墠琛屾暟鎹�
+ table.getRowData = function(elem){
+ var index = $(elem).closest('tr').data('index');
+ return table.cache[options.id][index] || {};
+ };
+
+ $('.input-occupation').on('text', function(){
+ var value = this.value; // 鑾峰彇閫変腑椤� value
+ var data = table.getRowData(this);
+ console.log(value);
+ console.log("value------===");
+ xxDataList.forEach(res => {
+ if (data.id === res.id){
+ console.log(res)
+ res.occupation = value;
+ }
+ })
+
+ });
},
size: ''
};
@@ -559,6 +584,7 @@
// 琛ㄥ崟鎻愪氦浜嬩欢
form.on('submit(matEditSubmit)', function (data) {
let selectList = matXmSelect.getValue();
+ console.log(selectList)
for (let i = 0; i<selectList.length; i++) {
let item = selectList[i];
// 鏌ヨ鐗╂枡璇︽儏
@@ -570,13 +596,16 @@
success: function (res) {
if (res.code === 200){
var bige=true;
- for (var j = 0; j < xxDataList.length; j++) {
- if (xxDataList[j].matnr === res.data.matnr && xxDataList[j].batch === res.data.batch) {
- bige=false;
- break;
- }
- }
+ // console.log("-------2.1-------")
+ // for (var j = 0; j < xxDataList.length; j++) {
+ // if (xxDataList[j].expenseType === res.data.expenseType && xxDataList[j].batch === res.data.batch) {
+ // bige=false;
+ // console.log("-------2.2-------")
+ // break;
+ // }
+ // }
if (bige){
+ // console.log("-------2.3-------")
xxDataList.push(res.data);
insTbSSXM.reload({data: xxDataList, page: {curr: 1}});
}
@@ -690,44 +719,44 @@
// });
// }
- // 鏇存柊form
- function showEditForm(mData) {
- admin.open({
- type: 1,
- area: '800px',
- title: '鏍镐环淇℃伅缂栬緫',
- content: $('#editStatus').html(),
- success: function (layero, dIndex) {
- form.val('editStatusDetail', mData);
- form.render('select')
- form.on('submit(editSubmit)', function (data) {
- var loadIndex = layer.load(2);
- $.ajax({
- url: baseUrl+"/reimburseOnline/updateForm/auth",
- headers: {'token': localStorage.getItem('token')},
- data: data.field,
- method: 'POST',
- traditional:true,
- success: function (res) {
- if (res.code === 200){
- layer.closeAll();
- tableReload(false);
- } else if (res.code === 403){
- top.location.href = baseUrl+"/";
- } else {
- layer.msg(res.msg)
- }
- }
- })
- layer.close(loadIndex);
- layer.close(dIndex);
- return false;
- });
- $(layero).children('.layui-layer-content').css('overflow', 'visible');
- layui.form.render('select');
- }
- });
- }
+ // // 鏇存柊form
+ // function showEditForm(mData) {
+ // admin.open({
+ // type: 1,
+ // area: '800px',
+ // title: '鏍镐环淇℃伅缂栬緫',
+ // content: $('#editStatus').html(),
+ // success: function (layero, dIndex) {
+ // form.val('editStatusDetail', mData);
+ // form.render('select')
+ // form.on('submit(editSubmit)', function (data) {
+ // var loadIndex = layer.load(2);
+ // $.ajax({
+ // url: baseUrl+"/reimburseOnline/updateForm/auth",
+ // headers: {'token': localStorage.getItem('token')},
+ // data: data.field,
+ // method: 'POST',
+ // traditional:true,
+ // success: function (res) {
+ // if (res.code === 200){
+ // layer.closeAll();
+ // tableReload(false);
+ // } else if (res.code === 403){
+ // top.location.href = baseUrl+"/";
+ // } else {
+ // layer.msg(res.msg)
+ // }
+ // }
+ // })
+ // layer.close(loadIndex);
+ // layer.close(dIndex);
+ // return false;
+ // });
+ // $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ // layui.form.render('select');
+ // }
+ // });
+ // }
});
--
Gitblit v1.9.1