Skip to content

T
topsun-bpm
Commit c79589aa authored by 1650842865's avatar 1650842865
Browse files
Options

费用报销相关解决删除明细，不计算汇总的bug；付款申请把供应商信息放在主表，可一次性添加多个行项目；采购申请增加按照短文本查询

parent 7122eb0a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 384 additions and 216 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.js
View file @ c79589aa
...@@ -452,7 +452,6 @@ function loadGrid(obj) { ...@@ -452,7 +452,6 @@ function loadGrid(obj) {
item.gridManager.deleteRow(o); item.gridManager.deleteRow(o);
}); });
}) })
totalGrid();
initFinancialAuditGridData(); initFinancialAuditGridData();
}, },
copyHandler: { copyHandler: {
...@@ -602,7 +601,7 @@ function loadGrid(obj) { ...@@ -602,7 +601,7 @@ function loadGrid(obj) {
} }
if(item.column.name == "zepPtdamount"){ if(item.column.name == "zepPtdamount"){
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid'); var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_secondGrid != null){ if (_secondGrid != null && _secondGrid.currentData != null){
var secondRows = _secondGrid.currentData.Rows; var secondRows = _secondGrid.currentData.Rows;
totalFinancialAuditGrid(secondRows); totalFinancialAuditGrid(secondRows);
} }
...@@ -645,6 +644,7 @@ function loadGrid(obj) { ...@@ -645,6 +644,7 @@ function loadGrid(obj) {
} }
} }
} }
totalGrid();
} }
}); });
UICtrl.setSearchAreaToggle(obj.gridManager); UICtrl.setSearchAreaToggle(obj.gridManager);
...@@ -912,10 +912,10 @@ function nodeController(){ ...@@ -912,10 +912,10 @@ function nodeController(){
function totalGrid(money) { function totalGrid(money) {
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid'); var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var zepFtamount1 = 0,//申请总金额
zepFtamount = 0;//申请总金额（本位币）
if (_grid != null){ if (_grid != null){
var data = _grid.currentData.Rows, var data = _grid.rows;
zepFtamount1 = 0,//申请总金额
zepFtamount = 0;//申请总金额（本位币）
var _kzwi1 = 0; var _kzwi1 = 0;
var _kzwi11 = 0; var _kzwi11 = 0;
$.each(data, function (i, o) { $.each(data, function (i, o) {
...@@ -923,10 +923,10 @@ function totalGrid(money) { ...@@ -923,10 +923,10 @@ function totalGrid(money) {
_kzwi11 = o['kzwi11'] + ''; _kzwi11 = o['kzwi11'] + '';
zepFtamount1 = MathUtil.add(zepFtamount1, _kzwi1); zepFtamount1 = MathUtil.add(zepFtamount1, _kzwi1);
zepFtamount = MathUtil.add(zepFtamount, _kzwi11); zepFtamount = MathUtil.add(zepFtamount, _kzwi11);
$('#zepFtamount1').val(zepFtamount1);
$('#zepFtamount').val(zepFtamount);
}); });
} }
$('#zepFtamount1').val(zepFtamount1);
$('#zepFtamount').val(zepFtamount);
} }
function initFinancialAuditGridData(){ function initFinancialAuditGridData(){
...@@ -959,9 +959,9 @@ function totalFinancialAuditGrid(data){ ...@@ -959,9 +959,9 @@ function totalFinancialAuditGrid(data){
var _zepPtdamount1 = o['zepPtdamount1'] + ''; var _zepPtdamount1 = o['zepPtdamount1'] + '';
zepPtamount = MathUtil.add(zepPtamount, _zepPtdamount); zepPtamount = MathUtil.add(zepPtamount, _zepPtdamount);
zepPtamount1 = MathUtil.add(zepPtamount1, _zepPtdamount1); zepPtamount1 = MathUtil.add(zepPtamount1, _zepPtdamount1);
$('#zepPtamount').val(zepPtamount);
$('#zepPtamount1').val(zepPtamount1);
}); });
$('#zepPtamount').val(zepPtamount);
$('#zepPtamount1').val(zepPtamount1);
} }
function reloadGrid(){ function reloadGrid(){
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.js
View file @ c79589aa
...@@ -561,24 +561,18 @@ function loadGrid(obj) { ...@@ -561,24 +561,18 @@ function loadGrid(obj) {
gridManager: _grid, gridManager: _grid,
idFieldName: 'reimbursementDetailId', idFieldName: 'reimbursementDetailId',
onSuccess: function () { onSuccess: function () {
tableArray.forEach((item) => {
var data = item.gridManager.getSelectedRows();
$.each(data, function (i, o) {
item.gridManager.deleteRow(o);
});
})
reloadGrid(); reloadGrid();
} }
}); });
tableArray.forEach((item) => { //totalGrid();
// if (item.node != "reimbursementApplierGrid"){
// var data = item.gridManager.getSelectedRows();
// $.each(data, function (i, o) {
// item.gridManager.deleteRow(o);
// });
// }
var data = item.gridManager.getSelectedRows();
$.each(data, function (i, o) {
item.gridManager.deleteRow(o);
});
})
totalGrid();
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid'); var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_secondGrid != null){ if (_secondGrid != null && _secondGrid.currentData != null){
var secondRows = _secondGrid.currentData.Rows; var secondRows = _secondGrid.currentData.Rows;
totalFinancialAuditGrid(secondRows); totalFinancialAuditGrid(secondRows);
} }
...@@ -814,6 +808,7 @@ function loadGrid(obj) { ...@@ -814,6 +808,7 @@ function loadGrid(obj) {
} }
} }
} }
totalGrid();
}, },
}); });
UICtrl.setSearchAreaToggle(obj.gridManager); UICtrl.setSearchAreaToggle(obj.gridManager);
...@@ -1166,12 +1161,12 @@ function nodeController(){ ...@@ -1166,12 +1161,12 @@ function nodeController(){
function totalGrid(money) { function totalGrid(money) {
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid'); var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var zepFtamount1 = 0,//申请总金额
zepFtamount = 0,//申请总金额（本位币）
zepFttax = 0,//申请总税额（本位币）
zepFttax1 = 0;//申请总税额
if (_grid != null){ if (_grid != null){
var data = _grid.currentData.Rows, var data = _grid.rows;
zepFtamount1 = 0,//申请总金额
zepFtamount = 0,//申请总金额（本位币）
zepFttax = 0,//申请总税额（本位币）
zepFttax1 = 0;//申请总税额
var _kzwi1 = 0; var _kzwi1 = 0;
var _kzwi11 = 0; var _kzwi11 = 0;
var _kwetr1 = 0; var _kwetr1 = 0;
...@@ -1185,12 +1180,12 @@ function totalGrid(money) { ...@@ -1185,12 +1180,12 @@ function totalGrid(money) {
zepFtamount = MathUtil.add(zepFtamount, _kzwi11); zepFtamount = MathUtil.add(zepFtamount, _kzwi11);
zepFttax = MathUtil.add(zepFttax, _kwetr1); zepFttax = MathUtil.add(zepFttax, _kwetr1);
zepFttax1 = MathUtil.add(zepFttax1, _kwetr); zepFttax1 = MathUtil.add(zepFttax1, _kwetr);
$('#zepFtamount1').val(zepFtamount1);
$('#zepFtamount').val(zepFtamount);
$('#zepFttax').val(zepFttax);
$('#zepFttax1').val(zepFttax1);
}); });
} }
$('#zepFtamount1').val(zepFtamount1);
$('#zepFtamount').val(zepFtamount);
$('#zepFttax').val(zepFttax);
$('#zepFttax1').val(zepFttax1);
} }
function initFinancialAuditGridData(){ function initFinancialAuditGridData(){
...@@ -1233,11 +1228,11 @@ function totalFinancialAuditGrid(data){ ...@@ -1233,11 +1228,11 @@ function totalFinancialAuditGrid(data){
zepPttax = MathUtil.add(zepPttax, _zepPdtax); zepPttax = MathUtil.add(zepPttax, _zepPdtax);
zepPtamount1 = MathUtil.add(zepPtamount1, _zepPtdamount1); zepPtamount1 = MathUtil.add(zepPtamount1, _zepPtdamount1);
zepPttax1 = MathUtil.add(zepPttax1, _zepPdtax1); zepPttax1 = MathUtil.add(zepPttax1, _zepPdtax1);
$('#zepPtamount').val(zepPtamount);
$('#zepPttax').val(zepPttax);
$('#zepPtamount1').val(zepPtamount1);
$('#zepPttax1').val(zepPttax1);
}); });
$('#zepPtamount').val(zepPtamount);
$('#zepPttax').val(zepPttax);
$('#zepPtamount1').val(zepPtamount1);
$('#zepPttax1').val(zepPttax1);
} }
function totalZepMount(secondRows){ function totalZepMount(secondRows){
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/employeeLoan.js
View file @ c79589aa
...@@ -423,18 +423,12 @@ function loadGrid(obj) { ...@@ -423,18 +423,12 @@ function loadGrid(obj) {
} }
}); });
tableArray.forEach((item) => { tableArray.forEach((item) => {
// if (item.node != "reimbursementApplierGrid"){
// var data = item.gridManager.getSelectedRows();
// $.each(data, function (i, o) {
// item.gridManager.deleteRow(o);
// });
// }
var data = item.gridManager.getSelectedRows(); var data = item.gridManager.getSelectedRows();
$.each(data, function (i, o) { $.each(data, function (i, o) {
item.gridManager.deleteRow(o); item.gridManager.deleteRow(o);
}); });
}) })
totalGrid(); //totalGrid();
}, },
copyHandler: { copyHandler: {
id: 'copyHandler', text: '复制', img: 'fa-copy', click: function () { id: 'copyHandler', text: '复制', img: 'fa-copy', click: function () {
...@@ -589,6 +583,7 @@ function loadGrid(obj) { ...@@ -589,6 +583,7 @@ function loadGrid(obj) {
} }
} }
} }
totalGrid();
}, },
}); });
UICtrl.setSearchAreaToggle(obj.gridManager); UICtrl.setSearchAreaToggle(obj.gridManager);
...@@ -605,14 +600,16 @@ $(document).ready(function () { ...@@ -605,14 +600,16 @@ $(document).ready(function () {
function totalFinancialAuditGrid(data){ function totalFinancialAuditGrid(data){
var zepPtamount = 0,//审批总金额（本位币） var zepPtamount = 0,//审批总金额（本位币）
zepPtamount1 = 0;//审批总金额 zepPtamount1 = 0;//审批总金额
$.each(data, function (i, o) { if (data.length > 0){
var _zepPtdamount = o['zepPtdamount'] + ''; $.each(data, function (i, o) {
var _zepPtdamount1 = o['zepPtdamount1'] + ''; var _zepPtdamount = o['zepPtdamount'] + '';
zepPtamount = MathUtil.add(zepPtamount, _zepPtdamount); var _zepPtdamount1 = o['zepPtdamount1'] + '';
zepPtamount1 = MathUtil.add(zepPtamount1, _zepPtdamount1); zepPtamount = MathUtil.add(zepPtamount, _zepPtdamount);
$('#zepPtamount').val(zepPtamount); zepPtamount1 = MathUtil.add(zepPtamount1, _zepPtdamount1);
$('#zepPtamount1').val(zepPtamount1); });
}); }
$('#zepPtamount').val(zepPtamount);
$('#zepPtamount1').val(zepPtamount1);
} }
function initialize() { function initialize() {
...@@ -876,13 +873,13 @@ function nodeController(){ ...@@ -876,13 +873,13 @@ function nodeController(){
function totalGrid(money) { function totalGrid(money) {
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid'); var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid'); var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
var zepFtamount1 = 0,//申请总金额
zepFtamount = 0,//申请总金额（本位币）
zepPtamount1 = 0,//审批总金额
zepPtamount = 0;//审批总金额（本位币）
if (_grid != null && _secondGrid != null){ if (_grid != null && _secondGrid != null){
var data = _grid.currentData.Rows, var data = _grid.rows;
zepFtamount1 = 0,//申请总金额 var secondData = _secondGrid.rows;
zepFtamount = 0,//申请总金额（本位币）
zepPtamount1 = 0,//审批总金额
zepPtamount = 0;//审批总金额（本位币）
var secondData = _secondGrid.currentData.Rows;
var _kzwi1 = 0; var _kzwi1 = 0;
var _kzwi11 = 0; var _kzwi11 = 0;
var _zepPtdamount1 = 0; var _zepPtdamount1 = 0;
...@@ -892,17 +889,18 @@ function totalGrid(money) { ...@@ -892,17 +889,18 @@ function totalGrid(money) {
_kzwi11 = o['kzwi11'] + ''; _kzwi11 = o['kzwi11'] + '';
zepFtamount1 = MathUtil.add(zepFtamount1, _kzwi1); zepFtamount1 = MathUtil.add(zepFtamount1, _kzwi1);
zepFtamount = MathUtil.add(zepFtamount, _kzwi11); zepFtamount = MathUtil.add(zepFtamount, _kzwi11);
$('#zepFtamount1').val(zepFtamount1);
$('#zepFtamount').val(zepFtamount);
}); });
$.each(secondData, function (i, o) { $.each(secondData, function (i, o) {
_zepPtdamount1 = o['zepPtdamount1'] + ''; _zepPtdamount1 = o['zepPtdamount1'] + '';
_zepPtdamount = o['zepPtdamount'] + ''; _zepPtdamount = o['zepPtdamount'] + '';
zepPtamount1 = MathUtil.add(zepPtamount1, _zepPtdamount1); zepPtamount1 = MathUtil.add(zepPtamount1, _zepPtdamount1);
zepPtamount = MathUtil.add(zepPtamount, _zepPtdamount); zepPtamount = MathUtil.add(zepPtamount, _zepPtdamount);
$('#zepPtamount1').val(zepPtamount1);
$('#zepPtamount').val(zepPtamount);
}); });
$('#zepFtamount1').val(zepFtamount1);
$('#zepFtamount').val(zepFtamount);
$('#zepPtamount1').val(zepPtamount1);
$('#zepPtamount').val(zepPtamount);
} }
} }
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.jsp
View file @ c79589aa
...@@ -57,9 +57,18 @@ ...@@ -57,9 +57,18 @@
<x:inputC name="zepFtamount1" required="false" readonly="true" label="申请总金额" labelCol="2" fieldCol="2" mask="positiveMoney"/> <x:inputC name="zepFtamount1" required="false" readonly="true" label="申请总金额" labelCol="2" fieldCol="2" mask="positiveMoney"/>
<x:inputC name="text1" required="false" readonly="true" label="月结方式" labelCol="2" fieldCol="2"/> <x:inputC name="text1" required="false" readonly="true" label="月结方式" labelCol="2" fieldCol="2"/>
</div> </div>
<div class="hg-form-row" id="approvalMoney"> <div class="hg-form-row">
<x:inputC name="zepPtamount" required="false" readonly="true" label="审批总金额（本位币）" labelCol="2" fieldCol="2" mask="positiveMoney"/> <x:inputC name="partner" required="true" label="BP(合作伙伴)" labelCol="2" fieldCol="2" wrapper="select"/>
<x:inputC name="zepPtamount1" required="false" readonly="true" label="审批总金额" labelCol="2" fieldCol="2" mask="positiveMoney"/> <x:inputC name="koinh" required="true" readonly="true" label="BP账号名称" labelCol="2" fieldCol="2" />
<x:inputC name="bankn" required="true" label="BP银行账号" labelCol="2" fieldCol="2" wrapper="select"/>
</div>
<div class="hg-form-row" >
<x:hidden name="swift"/>
<x:inputC name="bankl" required="true" readonly="true" label="BP联行号" labelCol="2" fieldCol="2" />
<div id="approvalMoney">
<x:inputC name="zepPtamount" required="false" readonly="true" label="审批总金额（本位币）" labelCol="2" fieldCol="2" mask="positiveMoney"/>
<x:inputC name="zepPtamount1" required="false" readonly="true" label="审批总金额" labelCol="2" fieldCol="2" mask="positiveMoney"/>
</div>
</div> </div>
</div> </div>
<div class="blank_div clearfix"></div> <div class="blank_div clearfix"></div>
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyDetail.js 0 → 100644
View file @ c79589aa
var gridManager = null, refreshFlag = false;
$(document).ready(function () {
initUI();
initGrid();
}
);
function initUI() {
UICtrl.initDefaultLayout();
}
function initGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
});
gridManager = UICtrl.grid('#belnrgrid', {
columns: [
{
display: "采购发票号", name: "BELNR2", width: 120, minwidth: 120, type: "string", align: "left",
},
{
display: "采购发票行", name: "BUZEI", width: 120, minwidth: 120, type: "string", align: "left",
},
// {
// display: "采购发票行信息", name: "ZRSEG_ITEM", width: 300, minwidth: 120, type: "string", align: "left",
// },
{
display: "币别", name: "WAERS", width: 120, minwidth: 120, type: "string", align: "left",
},
{
display: "汇率", name: "KURSF", width: 120, minwidth: 120, type: "string", align: "left",
},
{
display: "含税金额", name: "KZWI1", width: 120, minwidth: 120, type: "money", align: "left",
},
{
display: "含税金额（本位币）", name: "KZWI11", width: 120, minwidth: 120, type: "money", align: "left",
render:function(item){
var money = 0;
if (item.WAERS === "CNY"){
money=item.KZWI1;
}else {
money=MathUtil.mul(item.KZWI1,item.KURSF);
}
return item.KZWI11 = money;
}
}
],
dataAction: 'server',
url: web_app.name + '/sapCostReimbursement/getPartnerInvs.ajax?',
parms: {
zepFtype:"C",
bukrs:$("#bukrs").val(),
partner:$("#partner").val()
},
toolbar: toolbarOptions,
width: '99.8%',
height: 400,
pageSize: 20,
heightDiff: -4,
sortName: 'num',
sortOrder: 'asc',
checkbox: true,
usePager: false,
rownumbers: true,
enabledEdit: true,
fixedCellHeight: true,
selectRowButtonOnly: true,
enableObjectBag: true,
}
);
UICtrl.setSearchAreaToggle(gridManager);
}
function reloadDetailGrid() {
gridManager.loadData();
}
function query(obj) {
var param = $(obj).formToJSON();
UICtrl.gridSearch(gridManager, param);
}
function resetForm(obj) {
$(obj).formClean();
reloadDetailGrid();
}
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyDetail.jsp 0 → 100644
View file @ c79589aa
<%@ page contentType="text/html; charset=utf-8" language="java" %>
<%@ taglib uri="/WEB-INF/taglib.tld" prefix="x" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<html>
<head>
<x:base include="layout,dialog,grid,tree,dateTime,combox,attachment,commonTree,comboDialog"/>
<script src='<c:url value="/biz/topsun/sap/costReimbursement/payApplyDetail.js"/>' type="text/javascript"></script>
</head>
<body>
<div class="container-fluid">
<div position="center" title="">
<form class="hg-form" method="post" action="" id="queryMainForm">
<x:hidden name="zepFtype" value="K"/>
<x:hidden name="partner"/>
<x:hidden name="bukrs"/>
</form>
</div>
<div id="belnrgrid"></div>
</div>
</body>
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/refundApply.js
View file @ c79589aa
...@@ -96,16 +96,37 @@ var tableArray = [ ...@@ -96,16 +96,37 @@ var tableArray = [
{ {
display: "币别", name: "waers", width: 120, minwidth: 120, type: "string", align: "left", display: "币别", name: "waers", width: 120, minwidth: 120, type: "string", align: "left",
editor: { editor: {
required: false, type: "select",
type: 'text' data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "WAERS"}
},
back: {
WAERS: "waers",
}
},
} }
}, },
{ {
display: "汇率", name: "kursf", width: 120, minwidth: 120, type: "string", align: "left", display: "汇率", name: "kursf", width: 120, minwidth: 120, type: "string", align: "left",
editor: { editor: {
mask: 'nn.nn', type: "text",
type: 'text'
} }
// editor: {
// required: false, type: "select",
// data: {
// type: 'system',
// name: "dictionary",
// getParam: function (item) {
// return {fieldName: "KURSF"}
// },
// back: {
// KURSF: "kursf",
// }
// },
// }
}, },
{ {
display: "含税金额", name: "kzwi1", width: 120, minwidth: 120, type: "money", align: "left", display: "含税金额", name: "kzwi1", width: 120, minwidth: 120, type: "money", align: "left",
...@@ -303,7 +324,7 @@ function loadGrid(obj) { ...@@ -303,7 +324,7 @@ function loadGrid(obj) {
toolbarOptions = UICtrl.getDefaultToolbarOptions({ toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: function () { addHandler: function () {
tableArray.forEach((item) => { tableArray.forEach((item) => {
UICtrl.addGridRow(item.gridManager, {zepItemno: getZepItemNo(),zepBptype:"D",zepBptypename:"客户",zlsch:"T", UICtrl.addGridRow(item.gridManager, {zepItemno: getZepItemNo(),zepBptype:"D",zepBptypename:"客户",zlsch:"T",waers: 'CNY', kursf: 1.00,
zlschTextView:"T-电汇"}); zlschTextView:"T-电汇"});
}); });
}, },
...@@ -322,18 +343,11 @@ function loadGrid(obj) { ...@@ -322,18 +343,11 @@ function loadGrid(obj) {
} }
}); });
tableArray.forEach((item) => { tableArray.forEach((item) => {
// if (item.node != "reimbursementApplierGrid"){
// var data = item.gridManager.getSelectedRows();
// $.each(data, function (i, o) {
// item.gridManager.deleteRow(o);
// });
// }
var data = item.gridManager.getSelectedRows(); var data = item.gridManager.getSelectedRows();
$.each(data, function (i, o) { $.each(data, function (i, o) {
item.gridManager.deleteRow(o); item.gridManager.deleteRow(o);
}); });
}) })
totalGrid();
initFinancialAuditGridData(); initFinancialAuditGridData();
}, },
copyHandler: { copyHandler: {
...@@ -490,6 +504,7 @@ function loadGrid(obj) { ...@@ -490,6 +504,7 @@ function loadGrid(obj) {
} }
} }
} }
totalGrid();
} }
}); });
UICtrl.setSearchAreaToggle(obj.gridManager); UICtrl.setSearchAreaToggle(obj.gridManager);
...@@ -779,10 +794,10 @@ function nodeController(){ ...@@ -779,10 +794,10 @@ function nodeController(){
function totalGrid(money) { function totalGrid(money) {
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid'); var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var zepFtamount1 = 0,//申请总金额
zepFtamount = 0;//申请总金额（本位币）
if (_grid != null){ if (_grid != null){
var data = _grid.currentData.Rows, var data = _grid.rows;
zepFtamount1 = 0,//申请总金额
zepFtamount = 0;//申请总金额（本位币）
var _kzwi1 = 0; var _kzwi1 = 0;
var _kzwi11 = 0; var _kzwi11 = 0;
$.each(data, function (i, o) { $.each(data, function (i, o) {
...@@ -790,19 +805,19 @@ function totalGrid(money) { ...@@ -790,19 +805,19 @@ function totalGrid(money) {
_kzwi11 = o['kzwi11'] + ''; _kzwi11 = o['kzwi11'] + '';
zepFtamount1 = MathUtil.add(zepFtamount1, _kzwi1); zepFtamount1 = MathUtil.add(zepFtamount1, _kzwi1);
zepFtamount = MathUtil.add(zepFtamount, _kzwi11); zepFtamount = MathUtil.add(zepFtamount, _kzwi11);
$('#zepFtamount1').val(zepFtamount1);
$('#zepFtamount').val(zepFtamount);
}); });
} }
$('#zepFtamount1').val(zepFtamount1);
$('#zepFtamount').val(zepFtamount);
} }
function initFinancialAuditGridData(){ function initFinancialAuditGridData(){
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid'); var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid'); var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_grid != null && _secondGrid != null){ if (_grid != null && _secondGrid != null){
var datas = _grid.currentData.Rows; var datas = _grid.rows;
if (datas.length > 0 && _secondGrid.currentData != null){ if (datas.length > 0 && _secondGrid.currentData != null){
var secondRows = _secondGrid.currentData.Rows; var secondRows = _secondGrid.rows;
$.each(datas, function (i, data) { $.each(datas, function (i, data) {
$.each(secondRows, function (i, row) { $.each(secondRows, function (i, row) {
if (data.zepItemno === row.zepItemno && (row.zepPtdamount1===0 || Public.isBlank(row.zepPtdamount1))){ if (data.zepItemno === row.zepItemno && (row.zepPtdamount1===0 || Public.isBlank(row.zepPtdamount1))){
...@@ -826,9 +841,9 @@ function totalFinancialAuditGrid(data){ ...@@ -826,9 +841,9 @@ function totalFinancialAuditGrid(data){
var _zepPtdamount1 = o['zepPtdamount1'] + ''; var _zepPtdamount1 = o['zepPtdamount1'] + '';
zepPtamount = MathUtil.add(zepPtamount, _zepPtdamount); zepPtamount = MathUtil.add(zepPtamount, _zepPtdamount);
zepPtamount1 = MathUtil.add(zepPtamount1, _zepPtdamount1); zepPtamount1 = MathUtil.add(zepPtamount1, _zepPtdamount1);
$('#zepPtamount').val(zepPtamount);
$('#zepPtamount1').val(zepPtamount1);
}); });
$('#zepPtamount').val(zepPtamount);
$('#zepPtamount1').val(zepPtamount1);
} }
function reloadGrid(){ function reloadGrid(){
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @ c79589aa
...@@ -182,7 +182,7 @@ function initRaube(mtart) { ...@@ -182,7 +182,7 @@ function initRaube(mtart) {
function initSale(mtart){ function initSale(mtart){
if (mtart == "ZZCP" && $("#businessUsageV").prop("checked")){ if (mtart == "ZZCP" && $("#businessUsageV").prop("checked")){
saleAndMtartRequired(true); saleAndMtartRequired(true);
}else if (mtart == "ZBCP" && $("#businessUsageV").prop("checked")){ }else if ((mtart == "ZBCP" || mtart == "ZSHB") && $("#businessUsageV").prop("checked")){
UICtrl.setElRequiredFlag("#tragr",true); UICtrl.setElRequiredFlag("#tragr",true);
UICtrl.setElRequiredFlag("#ladgrName",true); UICtrl.setElRequiredFlag("#ladgrName",true);
} else { } else {
...@@ -443,7 +443,7 @@ function saleMustInput(flag) { //销售必输项 ...@@ -443,7 +443,7 @@ function saleMustInput(flag) { //销售必输项
if (mtart == "ZZCP"){ if (mtart == "ZZCP"){
saleAndMtartRequired(flag) saleAndMtartRequired(flag)
} }
if (mtart == "ZBCP"){ if (mtart == "ZBCP" || mtart == "ZSHB"){
UICtrl.setElRequiredFlag("#tragr",flag); UICtrl.setElRequiredFlag("#tragr",flag);
UICtrl.setElRequiredFlag("#ladgrName",flag); UICtrl.setElRequiredFlag("#ladgrName",flag);
} }
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseList.jsp
View file @ c79589aa
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<x:inputC name="billCode" label="单据编号" labelCol="1"/> <x:inputC name="billCode" label="单据编号" labelCol="1"/>
<x:inputC name="banfn" label="申购单号" labelCol="1"/> <x:inputC name="banfn" label="申购单号" labelCol="1"/>
<x:inputC name="matnr" label="产品编码" labelCol="1"/> <x:inputC name="matnr" label="产品编码" labelCol="1"/>
<x:inputC name="txz01" label="短文本" labelCol="1"/>
</div> </div>
<div class="hg-form-row"> <div class="hg-form-row">
<div class="col-xs-4 col-sm-1"> <div class="col-xs-4 col-sm-1">
......
topsun/src/main/java/com/huigou/topsun/controller/ResourceSearchController.java
View file @ c79589aa
...@@ -639,10 +639,9 @@ public class ResourceSearchController { ...@@ -639,10 +639,9 @@ public class ResourceSearchController {
String param = sdo.getString("paramValue"); String param = sdo.getString("paramValue");
String BUKRS = sdo.getString("BUKRS"); String BUKRS = sdo.getString("BUKRS");
String PARTNER = sdo.getString("PARTNER"); String PARTNER = sdo.getString("PARTNER");
String ZYL03 = sdo.getString("ZYL03");
String ZEP_FTYPE = sdo.getString("ZEP_FTYPE"); String ZEP_FTYPE = sdo.getString("ZEP_FTYPE");
List<Map<String, String>> mapList = new ArrayList<>(); List<Map<String, String>> mapList = new ArrayList<>();
mapList = sapPaymentApplication.getPartnerInvs(BUKRS,PARTNER,ZEP_FTYPE,ZYL03); mapList = sapPaymentApplication.getPartnerInvs(BUKRS,PARTNER,ZEP_FTYPE);
return sapDictionaryApplication.initEasySearchModel( mapList, param, sdo); return sapDictionaryApplication.initEasySearchModel( mapList, param, sdo);
} }
......
topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/controller/SapCostReimbursementController.java
View file @ c79589aa
...@@ -9,6 +9,7 @@ import com.huigou.topsun.sap.costReimbursement.application.SapCostReimbursementD ...@@ -9,6 +9,7 @@ import com.huigou.topsun.sap.costReimbursement.application.SapCostReimbursementD
import com.huigou.topsun.sap.costReimbursement.domain.SapCostReimbursement; import com.huigou.topsun.sap.costReimbursement.domain.SapCostReimbursement;
import com.huigou.topsun.sap.costReimbursement.domain.query.SapCostReimbursementQueryRequest; import com.huigou.topsun.sap.costReimbursement.domain.query.SapCostReimbursementQueryRequest;
import com.huigou.topsun.sap.costReimbursement.domain.vo.PaymentReceiptVo; import com.huigou.topsun.sap.costReimbursement.domain.vo.PaymentReceiptVo;
import com.huigou.topsun.sap.sapApplication.application.SapPaymentApplication;
import com.huigou.uasp.annotation.ControllerMapping; import com.huigou.uasp.annotation.ControllerMapping;
import com.huigou.uasp.annotation.SkipAuth; import com.huigou.uasp.annotation.SkipAuth;
import com.huigou.uasp.bmp.common.BizBillStatus; import com.huigou.uasp.bmp.common.BizBillStatus;
...@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -22,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import java.io.IOException;
import java.util.*; import java.util.*;
...@@ -39,6 +41,8 @@ public class SapCostReimbursementController extends CommonController { ...@@ -39,6 +41,8 @@ public class SapCostReimbursementController extends CommonController {
SapCostReimbursementApplication costReimbursementApplication; SapCostReimbursementApplication costReimbursementApplication;
@Autowired @Autowired
SapCostReimbursementDetailApplication costReimbursementDetailApplication; SapCostReimbursementDetailApplication costReimbursementDetailApplication;
@Autowired
private SapPaymentApplication sapPaymentApplication;
public String forwardCostReimbursementList(){ public String forwardCostReimbursementList(){
...@@ -228,4 +232,20 @@ public class SapCostReimbursementController extends CommonController { ...@@ -228,4 +232,20 @@ public class SapCostReimbursementController extends CommonController {
Map<String, Object> map = costReimbursementApplication.queryKostlByPersonCode(personCode); Map<String, Object> map = costReimbursementApplication.queryKostlByPersonCode(personCode);
return toResult(map); return toResult(map);
} }
public String showAddPayApplyDetail(){
SDO sdo = this.getSDO();
String partner = sdo.getString("partner");
String bukrs = sdo.getString("bukrs");
this.putAttribute("partner",partner);
this.putAttribute("bukrs",bukrs);
return forward("payApplyDetail");
}
public String getPartnerInvs() {
SDO sdo = this.getSDO();
SapCostReimbursementQueryRequest queryRequest = sdo.toQueryRequest(SapCostReimbursementQueryRequest.class);
List<Map<String, String>> mapList = sapPaymentApplication.getPartnerInvs(queryRequest.getBukrs(),queryRequest.getPartner(),queryRequest.getZepFtype());
return packGridDataAndResult(mapList);
}
} }
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/domain/SapCostReimbursement.java
View file @ c79589aa
...@@ -238,6 +238,30 @@ public class SapCostReimbursement extends FlowBillAbstractEntity { ...@@ -238,6 +238,30 @@ public class SapCostReimbursement extends FlowBillAbstractEntity {
@Column(name = "finished_date") @Column(name = "finished_date")
private Date finishedDate; private Date finishedDate;
/**
* BP
*/
@Column(name = "PARTNER")
private String partner;
/**
* BP银行账号
*/
@Column(name = "BANKN")
private String bankn;
/**
* BP账号名称
*/
@Column(name = "KOINH")
private String koinh;
/**
* BP联行号
*/
@Column(name = "BANKL")
private String bankl;
@Override @Override
protected String getCodeRuleId() { protected String getCodeRuleId() {
return "sapCostReimbursement"; return "sapCostReimbursement";
......
topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/domain/query/SapCostReimbursementQueryRequest.java
View file @ c79589aa
...@@ -141,5 +141,7 @@ public class SapCostReimbursementQueryRequest extends QueryAbstractRequest { ...@@ -141,5 +141,7 @@ public class SapCostReimbursementQueryRequest extends QueryAbstractRequest {
private String belnr1; private String belnr1;
private String partner;
} }
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/SapPaymentApplication.java
View file @ c79589aa
...@@ -58,8 +58,7 @@ public interface SapPaymentApplication { ...@@ -58,8 +58,7 @@ public interface SapPaymentApplication {
* @param BUKRS * @param BUKRS
* @param PARTNER * @param PARTNER
* @param ZEP_FTYPE * @param ZEP_FTYPE
* @param ZYL03
* @return * @return
*/ */
List<Map<String, String>> getPartnerInvs(String BUKRS,String PARTNER,String ZEP_FTYPE, String ZYL03); List<Map<String, String>> getPartnerInvs(String BUKRS,String PARTNER,String ZEP_FTYPE);
} }
topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/impl/SapPaymentApplicationImpl.java
View file @ c79589aa
...@@ -158,7 +158,7 @@ public class SapPaymentApplicationImpl implements SapPaymentApplication { ...@@ -158,7 +158,7 @@ public class SapPaymentApplicationImpl implements SapPaymentApplication {
} }
@Override @Override
public List<Map<String, String>> getPartnerInvs(String BUKRS,String PARTNER,String ZEP_FTYPE, String ZYL03) { public List<Map<String, String>> getPartnerInvs(String BUKRS,String PARTNER,String ZEP_FTYPE) {
Map<String,Object> param = new HashMap<>(); Map<String,Object> param = new HashMap<>();
param.put("BUKRS",BUKRS); param.put("BUKRS",BUKRS);
param.put("PARTNER",PARTNER); param.put("PARTNER",PARTNER);
......
topsun/src/main/resources/config/topsun/sap/sapPurchase/sapPurchase.xml
View file @ c79589aa
...@@ -73,6 +73,7 @@ ...@@ -73,6 +73,7 @@
</sql-query> </sql-query>
<condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/> <condition column="bill_code" name="billCode" type="java.lang.String" symbol="like" alias="t"/>
<condition column="matnr" name="matnr" type="java.lang.String" symbol="like" alias="it"/> <condition column="matnr" name="matnr" type="java.lang.String" symbol="like" alias="it"/>
<condition column="txz01" name="txz01" type="java.lang.String" symbol="like" alias="it"/>
<condition column="lgobe" name="lgobe" type="java.lang.String" symbol="like" alias="it"/> <condition column="lgobe" name="lgobe" type="java.lang.String" symbol="like" alias="it"/>
<condition column="banfn" name="banfn" type="java.lang.String" symbol="like" alias="t"/> <condition column="banfn" name="banfn" type="java.lang.String" symbol="like" alias="t"/>
<condition column="status" name="statusKind" type="java.lang.Integer" symbol="in" alias="t"/> <condition column="status" name="statusKind" type="java.lang.Integer" symbol="in" alias="t"/>
......
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