Commit 88598660 authored by 鲁鑫's avatar 鲁鑫

财务付款相关付款方式数据字典

parent 3d95d4a6
......@@ -223,6 +223,7 @@ var tableArray = [
type: 'text'
}
},
{display: "", name: "zlsch", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{
display: "付款方式", name: "zlschTextView", width: 200, minwidth: 120, type: "string", align: "left",
editor: {
......@@ -232,7 +233,7 @@ var tableArray = [
valueField: 'zlsch',
required: true,
render: function (item) {
return item.zlsch;
return item.zlschTextView;
}
},
},
......@@ -477,39 +478,46 @@ function loadGrid(obj) {
|| item.column.name == "ebelp"){
totalGrid();
}
var check = true;
if (item.column.name == "zepPtdamount1"){
var value = item.value;
var zepItemno = item.record.zepItemno;
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_grid != null){
var datas = _grid.getData();
var datas = _grid.currentData.Rows;
if (datas.length > 0){
$.each(datas, function (i, data) {
if (data.zepItemno == zepItemno && (MathUtil.compare(value,data.kzwi1) > 0)){
Public.tip("含税金额(审批)不能大于含税金额")
check = false;
$.each(_secondGrid.getData(), function (i, row) {
if (data.zepItemno = row.zepItemno){
_secondGrid.updateRow(row,{
zepPtdamount1:data.kzwi1,
})
}
})
if (data.zepItemno == zepItemno) {
if (MathUtil.compare(value,data.kzwi1) > 0){
Public.tip("含税金额(审批)不能大于含税金额")
$.each(_secondGrid.currentData.Rows, function (i, row) {
if (data.zepItemno = row.zepItemno){
_secondGrid.updateRow(row,{
zepPtdamount1:data.kzwi1,
zepPtdamount:MathUtil.mul(data.kzwi1,data.kursf)
})
}
})
}else {
$.each(_secondGrid.currentData.Rows, function (i, row) {
if (data.zepItemno = row.zepItemno){
_secondGrid.updateRow(row,{
zepPtdamount:MathUtil.mul(row.zepPtdamount1,data.kursf)
})
}
})
}
}
});
totalFinancialAuditGrid(_secondGrid.currentData.Rows);
}
}
}
if(item.column.name == "zepPtdamount1"
|| item.column.name == "zepPtdamount"){
if(item.column.name == "zepPtdamount"){
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_secondGrid != null){
var secondRows = _secondGrid.currentData.Rows;
if (check){
totalFinancialAuditGrid(secondRows);
}
totalFinancialAuditGrid(secondRows);
}
}
//是否付款选择“N”,“原因代码”和“银企直连标志”非必填
......@@ -760,7 +768,7 @@ function nodeController(){
function totalGrid(money) {
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
if (_grid != null){
var data = _grid.getData(),
var data = _grid.currentData.Rows,
zepFtamount1 = 0,//申请总金额
zepFtamount = 0;//申请总金额(本位币)
var _kzwi1 = 0;
......@@ -780,7 +788,7 @@ function initFinancialAuditGridData(){
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_grid != null && _secondGrid != null){
var datas = _grid.getData();
var datas = _grid.currentData.Rows;
if (datas.length > 0 && _secondGrid.currentData != null){
var secondRows = _secondGrid.currentData.Rows;
$.each(datas, function (i, data) {
......
......@@ -432,6 +432,7 @@ var tableArray = [
// type: 'text'
// }
},
{display: "", name: "zlsch", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{
display: "付款方式", name: "zlschTextView", width: 200, minwidth: 120, type: "string", align: "left",
editor: {
......@@ -441,7 +442,7 @@ var tableArray = [
valueField: 'zlsch',
required: true,
render: function (item) {
return item.zlsch;
return item.zlschTextView;
}
},
},
......@@ -666,13 +667,13 @@ function loadGrid(obj) {
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_grid != null){
var datas = _grid.getData();
var datas = _grid.currentData.Rows;
if (datas.length > 0){
$.each(datas, function (i, data) {
if (data.zepItemno == zepItemno && (MathUtil.compare(value,data.kzwi1) > 0)){
check = false;
Public.tip("含税金额(审批)不能大于含税金额")
$.each(_secondGrid.getData(), function (i, row) {
$.each(_secondGrid.currentData.Rows, function (i, row) {
if (data.zepItemno = row.zepItemno){
_secondGrid.updateRow(row,{
zepPtdamount1:data.kzwi1,
......@@ -697,7 +698,7 @@ function loadGrid(obj) {
//先计算值
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
if (_grid != null){
var datas = _grid.getData();
var datas = _grid.currentData.Rows;
if (datas.length > 0 && secondRows.length > 0){
$.each(datas, function (i, data) {
$.each(secondRows, function (i, row) {
......@@ -1070,7 +1071,7 @@ function nodeController(){
function totalGrid(money) {
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
if (_grid != null){
var data = _grid.getData(),
var data = _grid.currentData.Rows,
zepFtamount1 = 0,//申请总金额
zepFtamount = 0,//申请总金额(本位币)
zepFttax = 0,//申请总税额(本位币)
......@@ -1100,7 +1101,7 @@ function initFinancialAuditGridData(){
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_grid != null && _secondGrid != null){
var datas = _grid.getData();
var datas = _grid.currentData.Rows;
if (datas.length > 0 && _secondGrid.currentData != null){
var secondRows = _secondGrid.currentData.Rows;
$.each(datas, function (i, data) {
......@@ -1147,7 +1148,7 @@ function totalZepMount(secondRows){
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_grid != null && _secondGrid != null){
var datas = _grid.getData();
var datas = _grid.currentData.Rows;
}
}
......
......@@ -255,6 +255,7 @@ var tableArray = [
mask: 'nnnnnnnnn.nn',
}
},
{display: "", name: "zlsch", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{
display: "付款方式", name: "zlschTextView", width: 200, minwidth: 120, type: "string", align: "left",
editor: {
......@@ -264,7 +265,7 @@ var tableArray = [
valueField: 'zlsch',
required: true,
render: function (item) {
return item.zlsch;
return item.zlschTextView;
}
},
},
......@@ -499,23 +500,43 @@ function loadGrid(obj) {
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_grid != null){
var datas = _grid.getData();
var datas = _grid.currentData.Rows;
if (datas.length > 0){
$.each(datas, function (i, data) {
if (data.zepItemno == zepItemno && (MathUtil.compare(value,data.kzwi1) > 0)){
Public.tip("含税金额(审批)不能大于含税金额")
$.each(_secondGrid.getData(), function (i, row) {
if (data.zepItemno = row.zepItemno){
_secondGrid.updateRow(row,{
zepPtdamount1:data.kzwi1,
})
}
})
if (data.zepItemno == zepItemno) {
if (MathUtil.compare(value,data.kzwi1) > 0){
Public.tip("含税金额(审批)不能大于含税金额")
$.each(_secondGrid.currentData.Rows, function (i, row) {
if (data.zepItemno = row.zepItemno){
_secondGrid.updateRow(row,{
zepPtdamount1:data.kzwi1,
zepPtdamount:MathUtil.mul(data.kzwi1,data.kursf)
})
}
})
}else {
$.each(_secondGrid.currentData.Rows, function (i, row) {
if (data.zepItemno = row.zepItemno){
_secondGrid.updateRow(row,{
zepPtdamount:MathUtil.mul(row.zepPtdamount1,data.kursf)
})
}
})
}
}
});
totalFinancialAuditGrid(_secondGrid.currentData.Rows);
}
}
}
if(item.column.name == "zepPtdamount"){
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_secondGrid != null){
var secondRows = _secondGrid.currentData.Rows;
totalFinancialAuditGrid(secondRows);
}
}
//是否付款选择“N”,“原因代码”和“银企直连标志”非必填
if (item.column.name == "zepPay" && obj.node == "financialAuditGrid"){
if (item.value == "Y"){
......@@ -547,6 +568,18 @@ $(document).ready(function () {
nodeController();
});
function totalFinancialAuditGrid(data){
var zepPtamount = 0,//审批总金额(本位币)
zepPtamount1 = 0;//审批总金额
$.each(data, function (i, o) {
var _zepPtdamount = o['zepPtdamount'] + '';
var _zepPtdamount1 = o['zepPtdamount1'] + '';
zepPtamount = MathUtil.add(zepPtamount, _zepPtdamount);
zepPtamount1 = MathUtil.add(zepPtamount1, _zepPtdamount1);
$('#zepPtamount').val(zepPtamount);
$('#zepPtamount1').val(zepPtamount1);
});
}
function initialize() {
$('#employeeLoanList').fileList({
......@@ -766,12 +799,12 @@ function totalGrid(money) {
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_grid != null && _secondGrid != null){
var data = _grid.getData(),
var data = _grid.currentData.Rows,
zepFtamount1 = 0,//申请总金额
zepFtamount = 0,//申请总金额(本位币)
zepPtamount1 = 0,//审批总金额
zepPtamount = 0;//审批总金额(本位币)
var secondData = _secondGrid.getData();
var secondData = _secondGrid.currentData.Rows;
var _kzwi1 = 0;
var _kzwi11 = 0;
var _zepPtdamount1 = 0;
......
......@@ -249,8 +249,9 @@ var tableArray = [
type: 'text'
}
},
{display: "", name: "zlsch", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{
display: "付款方式代码", name: "zlschTextView", width: 200, minwidth: 120, type: "string", align: "left",
display: "付款方式", name: "zlschTextView", width: 200, minwidth: 120, type: "string", align: "left",
editor: {
type: 'dictionary',
data: {name: 'zlsch'},
......@@ -258,7 +259,7 @@ var tableArray = [
valueField: 'zlsch',
required: true,
render: function (item) {
return item.zlsch;
return item.zlschTextView;
}
},
},
......@@ -492,39 +493,46 @@ function loadGrid(obj) {
|| item.column.name == "kzwi1"){
totalGrid();
}
var check = true;
if (item.column.name == "zepPtdamount1"){
var value = item.value;
var zepItemno = item.record.zepItemno;
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_grid != null){
var datas = _grid.getData();
var datas = _grid.currentData.Rows;
if (datas.length > 0){
$.each(datas, function (i, data) {
if (data.zepItemno == zepItemno && (MathUtil.compare(value,data.kzwi1) > 0)){
Public.tip("含税金额(审批)不能大于含税金额")
check = false;
$.each(_secondGrid.getData(), function (i, row) {
if (data.zepItemno = row.zepItemno){
_secondGrid.updateRow(row,{
zepPtdamount1:data.kzwi1,
})
}
})
if (data.zepItemno == zepItemno) {
if (MathUtil.compare(value,data.kzwi1) > 0){
Public.tip("含税金额(审批)不能大于含税金额")
$.each(_secondGrid.currentData.Rows, function (i, row) {
if (data.zepItemno = row.zepItemno){
_secondGrid.updateRow(row,{
zepPtdamount1:data.kzwi1,
zepPtdamount:MathUtil.mul(data.kzwi1,data.kursf)
})
}
})
}else {
$.each(_secondGrid.currentData.Rows, function (i, row) {
if (data.zepItemno = row.zepItemno){
_secondGrid.updateRow(row,{
zepPtdamount:MathUtil.mul(row.zepPtdamount1,data.kursf)
})
}
})
}
}
});
totalFinancialAuditGrid(_secondGrid.currentData.Rows);
}
}
}
if(item.column.name == "zepPtdamount1"
|| item.column.name == "zepPtdamount"){
if(item.column.name == "zepPtdamount"){
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_secondGrid != null){
var secondRows = _secondGrid.currentData.Rows;
if (check){
totalFinancialAuditGrid(secondRows);
}
totalFinancialAuditGrid(secondRows);
}
}
//是否付款选择“N”,“原因代码”和“银企直连标志”非必填
......@@ -795,7 +803,7 @@ function nodeController(){
function totalGrid(money) {
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
if (_grid != null){
var data = _grid.getData(),
var data = _grid.currentData.Rows,
zepFtamount1 = 0,//申请总金额
zepFtamount = 0;//申请总金额(本位币)
var _kzwi1 = 0;
......@@ -815,7 +823,7 @@ function initFinancialAuditGridData(){
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_grid != null && _secondGrid != null){
var datas = _grid.getData();
var datas = _grid.currentData.Rows;
if (datas.length > 0 && _secondGrid.currentData != null){
var secondRows = _secondGrid.currentData.Rows;
$.each(datas, function (i, data) {
......
......@@ -436,6 +436,7 @@ var tableArray = [
type: 'text'
}
},
{display: "", name: "zlsch", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{
display: "付款方式", name: "zlschTextView", width: 200, minwidth: 120, type: "string", align: "left",
editor: {
......@@ -445,7 +446,7 @@ var tableArray = [
valueField: 'zlsch',
required: true,
render: function (item) {
return item.zlsch;
return item.zlschTextView;
}
},
},
......@@ -573,7 +574,11 @@ function loadGrid(obj) {
});
})
totalGrid();
initFinancialAuditGridData();
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_secondGrid != null){
var secondRows = _secondGrid.currentData.Rows;
totalFinancialAuditGrid(secondRows);
}
},
copyHandler: {
id: 'copyHandler', text: '复制', img: 'fa-copy', click: function () {
......@@ -660,13 +665,13 @@ function loadGrid(obj) {
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_grid != null){
var datas = _grid.getData();
var datas = _grid.currentData.Rows;
if (datas.length > 0){
$.each(datas, function (i, data) {
if (data.zepItemno == zepItemno && (MathUtil.compare(value,data.kzwi1) > 0)){
Public.tip("含税金额(审批)不能大于含税金额")
check = false;
$.each(_secondGrid.getData(), function (i, row) {
$.each(_secondGrid.currentData.Rows, function (i, row) {
if (data.zepItemno = row.zepItemno){
_secondGrid.updateRow(row,{
zepPtdamount1:data.kzwi1,
......@@ -688,6 +693,50 @@ function loadGrid(obj) {
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_secondGrid != null){
var secondRows = _secondGrid.currentData.Rows;
//先计算值
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
if (_grid != null){
var datas = _grid.currentData.Rows;
if (datas.length > 0 && secondRows.length > 0){
$.each(datas, function (i, data) {
$.each(secondRows, function (i, row) {
if (data.zepItemno === row.zepItemno ){
var mwskzTextView = data.mwskzTextView;//税率
var waers = data.waers;//币别
var kursf = data.kursf;//汇率
//编辑含税金额审批,税额审批、不含税金额审批变化。
if (item.column.name == "zepPtdamount1" && check){
//税额计算
//等于含税金额/(1+税码对应的税率)*税码对应税率,可手工修改
var value = MathUtil.div(item.record.zepPtdamount1, MathUtil.add(1 , mwskzTextView));
var zepPdtax1 = MathUtil.mul(value, mwskzTextView).toFixed(2);
//不含税金额=含税金额-税额
var zepPdamount1 = MathUtil.sub(item.record.zepPtdamount1,zepPdtax1);
obj.gridManager.updateRow(item.record, {
zepPdtax1: zepPdtax1,//税额(审批)
zepPdamount1: zepPdamount1,//不含税金额(审批)
zepPdamount: MathUtil.mul(zepPdamount1,kursf),//不含税金额(审批-本位币)
zepPdtax: MathUtil.mul(zepPdtax1,kursf),//税额(审批-本位币)
zepPtdamount: MathUtil.add(MathUtil.mul(zepPdamount1,kursf),MathUtil.mul(zepPdtax1,kursf))//含税金额(审批-本位币)
});
}
//编辑税额,含税金额审批=不含税金额审批-修改后的税额
if (item.column.name == "zepPdtax1"){
//不含税金额=含税金额-税额
var zepPdamount1 = MathUtil.sub(item.record.zepPtdamount1,item.record.zepPdtax1);
obj.gridManager.updateRow(item.record, {
zepPdamount1: zepPdamount1,//不含税金额(审批)
zepPdtax: MathUtil.mul(item.record.zepPdtax1,kursf),//税额(审批-本位币)
zepPdamount: MathUtil.sub(item.record.zepPtdamount,MathUtil.mul(item.record.zepPdtax1,kursf)),//不含税金额(审批-本位币)
});
}
}
});
});
}
}
if (check){
totalFinancialAuditGrid(secondRows);
}
......@@ -977,7 +1026,7 @@ function nodeController(){
function totalGrid(money) {
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
if (_grid != null){
var data = _grid.getData(),
var data = _grid.currentData.Rows,
zepFtamount1 = 0,//申请总金额
zepFtamount = 0,//申请总金额(本位币)
zepFttax = 0,//申请总税额(本位币)
......@@ -1007,7 +1056,7 @@ function initFinancialAuditGridData(){
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_grid != null && _secondGrid != null){
var datas = _grid.getData();
var datas = _grid.currentData.Rows;
if (datas.length > 0 && _secondGrid.currentData != null){
var secondRows = _secondGrid.currentData.Rows;
$.each(datas, function (i, data) {
......
......@@ -196,6 +196,7 @@ var tableArray = [
type: 'text'
}
},
{display: "", name: "zlsch", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{
display: "付款方式", name: "zlschTextView", width: 200, minwidth: 120, type: "string", align: "left",
editor: {
......@@ -205,7 +206,7 @@ var tableArray = [
valueField: 'zlsch',
required: true,
render: function (item) {
return item.zlsch;
return item.zlschTextView;
}
},
},
......@@ -392,39 +393,46 @@ function loadGrid(obj) {
|| item.column.name == "kzwi1"){
totalGrid();
}
var check = true;
if (item.column.name == "zepPtdamount1"){
var value = item.value;
var zepItemno = item.record.zepItemno;
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_grid != null){
var datas = _grid.getData();
var datas = _grid.currentData.Rows;
if (datas.length > 0){
$.each(datas, function (i, data) {
if (data.zepItemno == zepItemno && (MathUtil.compare(value,data.kzwi1) > 0)){
Public.tip("含税金额(审批)不能大于含税金额")
check = false;
$.each(_secondGrid.getData(), function (i, row) {
if (data.zepItemno = row.zepItemno){
_secondGrid.updateRow(row,{
zepPtdamount1:data.kzwi1,
})
}
})
if (data.zepItemno == zepItemno) {
if (MathUtil.compare(value,data.kzwi1) > 0){
Public.tip("含税金额(审批)不能大于含税金额")
$.each(_secondGrid.currentData.Rows, function (i, row) {
if (data.zepItemno = row.zepItemno){
_secondGrid.updateRow(row,{
zepPtdamount1:data.kzwi1,
zepPtdamount:MathUtil.mul(data.kzwi1,data.kursf)
})
}
})
}else {
$.each(_secondGrid.currentData.Rows, function (i, row) {
if (data.zepItemno = row.zepItemno){
_secondGrid.updateRow(row,{
zepPtdamount:MathUtil.mul(row.zepPtdamount1,data.kursf)
})
}
})
}
}
});
totalFinancialAuditGrid(_secondGrid.currentData.Rows);
}
}
}
if(item.column.name == "zepPtdamount1"
|| item.column.name == "zepPtdamount"){
if(item.column.name == "zepPtdamount"){
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_secondGrid != null){
var secondRows = _secondGrid.currentData.Rows;
if (check){
totalFinancialAuditGrid(secondRows);
}
totalFinancialAuditGrid(secondRows);
}
}
//是否付款选择“N”,“原因代码”和“银企直连标志”非必填
......@@ -696,7 +704,7 @@ function nodeController(){
function totalGrid(money) {
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
if (_grid != null){
var data = _grid.getData(),
var data = _grid.currentData.Rows,
zepFtamount1 = 0,//申请总金额
zepFtamount = 0;//申请总金额(本位币)
var _kzwi1 = 0;
......@@ -716,7 +724,7 @@ function initFinancialAuditGridData(){
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_grid != null && _secondGrid != null){
var datas = _grid.getData();
var datas = _grid.currentData.Rows;
if (datas.length > 0 && _secondGrid.currentData != null){
var secondRows = _secondGrid.currentData.Rows;
$.each(datas, function (i, data) {
......
......@@ -24,6 +24,7 @@ public class SapCostReimbursementDetailApplicationImpl extends BaseApplication i
QueryDescriptor queryDescriptor = this.sqlExecutorDao.getQuery(QUERY_XML_FILE_PATH, "slicedSapCostReimbursementDetail");
QueryModel queryModel = this.sqlExecutorDao.getQueryModel(queryDescriptor, query);
queryModel.putDictionary("mwskz", DictUtil.getDictionary("mwskz"));
queryModel.putDictionary("zlsch", DictUtil.getDictionary("zlsch"));
return this.sqlExecutorDao.executeQuery(queryModel);
}
@Autowired
......
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