Skip to content

T
topsun-bpm
Commit b319723f authored by 鲁鑫's avatar 鲁鑫
Browse files
Options

费用报销6.04优化

parent 00788865
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 32 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.js
View file @ b319723f
...@@ -444,6 +444,14 @@ function loadGrid(obj) { ...@@ -444,6 +444,14 @@ function loadGrid(obj) {
reloadGrid(); reloadGrid();
} }
}); });
tableArray.forEach((item) => {
if (item.node != "reimbursementApplierGrid"){
var data = item.gridManager.getSelectedRows();
$.each(data, function (i, o) {
item.gridManager.deleteRow(o);
});
}
})
} }
}); });
} }
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.js
View file @ b319723f
...@@ -73,7 +73,10 @@ var tableArray = [ ...@@ -73,7 +73,10 @@ var tableArray = [
}, },
back: { back: {
PARTNER: "partner", PARTNER: "partner",
NAME_ORG1: "koinh" NAME_ORG1: "koinh",
BANKN: "bankn",
BANKL: "bankl",
SWIFT: "swift",
} }
}, },
} }
...@@ -120,7 +123,7 @@ var tableArray = [ ...@@ -120,7 +123,7 @@ var tableArray = [
{ {
display: "费用类型代码", name: "zepExtype", width: 120, minwidth: 120, type: "string", align: "left", display: "费用类型代码", name: "zepExtype", width: 120, minwidth: 120, type: "string", align: "left",
editor: { editor: {
required: false, type: "select", required: true, type: "select",
data: { data: {
type: 'system', type: 'system',
name: "dictionary", name: "dictionary",
...@@ -571,9 +574,6 @@ function loadGrid(obj) { ...@@ -571,9 +574,6 @@ function loadGrid(obj) {
}); });
}, },
deleteHandler: function () { deleteHandler: function () {
// tableArray.forEach((item) => {
//
// });
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid'); var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
DataUtil.delSelectedRows({ DataUtil.delSelectedRows({
action: 'sapCostReimbursement/deleteSapCostReimbursementDetails.ajax', action: 'sapCostReimbursement/deleteSapCostReimbursementDetails.ajax',
...@@ -584,6 +584,14 @@ function loadGrid(obj) { ...@@ -584,6 +584,14 @@ function loadGrid(obj) {
reloadGrid(); reloadGrid();
} }
}); });
tableArray.forEach((item) => {
if (item.node != "reimbursementApplierGrid"){
var data = item.gridManager.getSelectedRows();
$.each(data, function (i, o) {
item.gridManager.deleteRow(o);
});
}
})
}, },
copyHandler: { copyHandler: {
id: 'copyHandler', text: '复制', img: 'fa-copy', click: function () { id: 'copyHandler', text: '复制', img: 'fa-copy', click: function () {
...@@ -835,7 +843,7 @@ function businessJudgmentUnit() { ...@@ -835,7 +843,7 @@ function businessJudgmentUnit() {
var isApply = isApplyProcUnit(); var isApply = isApplyProcUnit();
if (isApply) { if (isApply) {
$("#approvalMoney").hide(); $("#approvalMoney").hide();
$("#financialAudit").hide(); //$("#financialAudit").hide();
$("#financialAudit_sapReturn").hide(); $("#financialAudit_sapReturn").hide();
$("#capitalPost").hide(); $("#capitalPost").hide();
$("#paymentAccomplish_sapReturn").hide(); $("#paymentAccomplish_sapReturn").hide();
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/employeeLoan.js
View file @ b319723f
...@@ -54,7 +54,10 @@ var tableArray = [ ...@@ -54,7 +54,10 @@ var tableArray = [
}, },
back: { back: {
PARTNER: "partner", PARTNER: "partner",
NAME_ORG1: "koinh" NAME_ORG1: "koinh",
BANKN: "bankn",
BANKL: "bankl",
SWIFT: "swift",
} }
}, },
} }
...@@ -203,7 +206,7 @@ var tableArray = [ ...@@ -203,7 +206,7 @@ var tableArray = [
{ {
display: "原因代码", name: "rstgrName", width: 120, minwidth: 120, type: "string", align: "left", display: "原因代码", name: "rstgrName", width: 120, minwidth: 120, type: "string", align: "left",
editor: { editor: {
required: true, type: "select", required: false, type: "select",
data: { data: {
type: 'system', type: 'system',
name: "dictionary", name: "dictionary",
...@@ -251,7 +254,7 @@ var tableArray = [ ...@@ -251,7 +254,7 @@ var tableArray = [
{ {
display: "是否付款", name: "zepPay", width: 120, minwidth: 120, type: "string", align: "left", display: "是否付款", name: "zepPay", width: 120, minwidth: 120, type: "string", align: "left",
editor: { editor: {
required: true, type: "select", required: false, type: "select",
data: { data: {
type: 'system', type: 'system',
name: "dictionary", name: "dictionary",
...@@ -399,7 +402,7 @@ function loadGrid(obj) { ...@@ -399,7 +402,7 @@ function loadGrid(obj) {
//财务审核 //财务审核
if ("financeNode" === subProcUnitId){ if ("financeNode" === subProcUnitId){
if (obj.node==="financialAuditGrid"){ if (obj.node==="financialAuditGrid"){
canEdit = false; canEdit = true;
} }
// else if (obj.node==="capitalPostGrid"){ // else if (obj.node==="capitalPostGrid"){
// canDelay = true; // canDelay = true;
...@@ -431,6 +434,14 @@ function loadGrid(obj) { ...@@ -431,6 +434,14 @@ function loadGrid(obj) {
reloadGrid(); reloadGrid();
} }
}); });
tableArray.forEach((item) => {
if (item.node != "reimbursementApplierGrid"){
var data = item.gridManager.getSelectedRows();
$.each(data, function (i, o) {
item.gridManager.deleteRow(o);
});
}
})
} }
}); });
} }
...@@ -507,6 +518,9 @@ $(document).ready(function () { ...@@ -507,6 +518,9 @@ $(document).ready(function () {
function initialize() { function initialize() {
$('#employeeLoanList').fileList({
bizId : $("#id").val()
});
//获取数据源初始化表格 //获取数据源初始化表格
Public.ajax(web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementDetailList.ajax', {reimbursementBaseInfoId: getId()}, function (data) { Public.ajax(web_app.name + '/sapCostReimbursement/slicedSapCostReimbursementDetailList.ajax', {reimbursementBaseInfoId: getId()}, function (data) {
//根据定义列拆除实体对象，封装成每个table对应的数据集 //根据定义列拆除实体对象，封装成每个table对应的数据集
...@@ -558,6 +572,9 @@ function bindQueryEvent() { ...@@ -558,6 +572,9 @@ function bindQueryEvent() {
*/ */
function setId(id) { function setId(id) {
$("#id").val(id); $("#id").val(id);
$('#employeeLoanList').fileList({
bizId : id
});
} }
/** /**
...@@ -632,6 +649,7 @@ function businessJudgmentUnit() { ...@@ -632,6 +649,7 @@ function businessJudgmentUnit() {
if (isApply) { if (isApply) {
//$("#financialAudit").hide(); //$("#financialAudit").hide();
$("#financialAudit_sapReturn").hide(); $("#financialAudit_sapReturn").hide();
$("#financialAuditGridDiv").hide();
$("#capitalPost").hide(); $("#capitalPost").hide();
$("#paymentAccomplish_sapReturn").hide(); $("#paymentAccomplish_sapReturn").hide();
return true; return true;
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/employeeLoan.jsp
View file @ b319723f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html> <html>
<head> <head>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date"/> <x:base include="layout,dialog,grid,tree,combox,commonTree,date,attachment"/>
<x:script src='/biz/topsun/sap/costReimbursement/employeeLoan.js'/> <x:script src='/biz/topsun/sap/costReimbursement/employeeLoan.js'/>
</head> </head>
<body> <body>
...@@ -57,32 +57,34 @@ ...@@ -57,32 +57,34 @@
</div> </div>
</div> </div>
<div style="padding-top: 15px;">
<x:fileList bizCode="employeeLoan" bizId="id" id="employeeLoanList" title="附件" />
</div>
<div class="blank_div clearfix"></div> <div class="blank_div clearfix"></div>
<x:title title="报销人填写" name="group"/> <x:title title="报销人填写" name="group"/>
<div id="reimbursementApplierGrid" style="margin: 2px;"> <div id="reimbursementApplierGrid" style="margin: 2px;"></div>
<div class="blank_div clearfix"></div>
<div id="financialAuditGridDiv">
<div id="financialAuditGrid" style="margin: 2px;"></div>
</div> </div>
<div id="financialAudit_sapReturn">
<div class="blank_div clearfix"></div> <div class="blank_div clearfix"></div>
<div id="financialAuditGrid" style="margin: 2px;"> <x:title title="财务已审核、sap回执" name="group"/>
</div> <div id="financialAudit_sapReturnGrid" style="margin: 2px;"></div>
<div class="blank_div clearfix"></div> </div>
<div id="financialAudit_sapReturn"> <div class="blank_div clearfix"></div>
<x:title title="财务已审核、sap回执" name="group"/> <%-- <div id="capitalPost">--%>
<div id="financialAudit_sapReturnGrid" style="margin: 2px;"> <%-- <x:title title="资金岗填写" name="group"/>--%>
</div> <%-- <div id="capitalPostGrid" style="margin: 2px;">--%>
</div>
<div class="blank_div clearfix"></div>
<%-- <div id="capitalPost">--%>
<%-- <x:title title="资金岗填写" name="group"/>--%>
<%-- <div id="capitalPostGrid" style="margin: 2px;">--%>
<%-- </div>--%>
<%-- </div>--%> <%-- </div>--%>
<div class="blank_div clearfix"></div> <%-- </div>--%>
<div id="paymentAccomplish_sapReturn"> <div class="blank_div clearfix"></div>
<x:title title="付款完成、sap回执" name="group"/> <div id="paymentAccomplish_sapReturn">
<div id="paymentAccomplish_sapReturnGrid" style="margin: 2px;"> <x:title title="付款完成、sap回执" name="group"/>
</div> <div id="paymentAccomplish_sapReturnGrid" style="margin: 2px;">
</div> </div>
</div>
</div> </div>
</form> </form>
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.js
View file @ b319723f
...@@ -418,6 +418,14 @@ function loadGrid(obj) { ...@@ -418,6 +418,14 @@ function loadGrid(obj) {
reloadGrid(); reloadGrid();
} }
}); });
tableArray.forEach((item) => {
if (item.node != "reimbursementApplierGrid"){
var data = item.gridManager.getSelectedRows();
$.each(data, function (i, o) {
item.gridManager.deleteRow(o);
});
}
})
} }
}); });
} }
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyNoPO.js
View file @ b319723f
...@@ -73,7 +73,10 @@ var tableArray = [ ...@@ -73,7 +73,10 @@ var tableArray = [
}, },
back: { back: {
PARTNER: "partner", PARTNER: "partner",
NAME_ORG1: "koinh" NAME_ORG1: "koinh",
BANKN: "bankn",
BANKL: "bankl",
SWIFT: "swift",
} }
}, },
} }
...@@ -120,7 +123,7 @@ var tableArray = [ ...@@ -120,7 +123,7 @@ var tableArray = [
{ {
display: "费用类型代码", name: "zepExtype", width: 120, minwidth: 120, type: "string", align: "left", display: "费用类型代码", name: "zepExtype", width: 120, minwidth: 120, type: "string", align: "left",
editor: { editor: {
required: false, type: "select", required: true, type: "select",
data: { data: {
type: 'system', type: 'system',
name: "dictionary", name: "dictionary",
...@@ -584,6 +587,14 @@ function loadGrid(obj) { ...@@ -584,6 +587,14 @@ function loadGrid(obj) {
reloadGrid(); reloadGrid();
} }
}); });
tableArray.forEach((item) => {
if (item.node != "reimbursementApplierGrid"){
var data = item.gridManager.getSelectedRows();
$.each(data, function (i, o) {
item.gridManager.deleteRow(o);
});
}
})
}, },
copyHandler: { copyHandler: {
id: 'copyHandler', text: '复制', img: 'fa-copy', click: function () { id: 'copyHandler', text: '复制', img: 'fa-copy', click: function () {
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/refundApply.js
View file @ b319723f
...@@ -365,6 +365,14 @@ function loadGrid(obj) { ...@@ -365,6 +365,14 @@ function loadGrid(obj) {
reloadGrid(); reloadGrid();
} }
}); });
tableArray.forEach((item) => {
if (item.node != "reimbursementApplierGrid"){
var data = item.gridManager.getSelectedRows();
$.each(data, function (i, o) {
item.gridManager.deleteRow(o);
});
}
})
} }
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment