Skip to content

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

1.含税金额审批目前可以自由修改。优化为：限制只能改小，不能改大（跟含税金额相比）。 

2.是否付款选择“N”，“原因代码”和“银企直连标志”非必填
parent 4662687f
Hide whitespace changes
Inline Side-by-side
Showing with 364 additions and 149 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.js
View file @ e646d018
......@@ -163,6 +163,22 @@ var tableArray = [
columns: [
{display: "", name: "rstgr", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "是否付款", name: "zepPay", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "ZEP_PAY"}
},
back: {
ZEP_PAY: "zepPay",
}
},
}
},
{
display: "原因代码", name: "rstgrName", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
......@@ -207,22 +223,6 @@ var tableArray = [
type: 'text'
}
},
{
display: "是否付款", name: "zepPay", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "ZEP_PAY"}
},
back: {
ZEP_PAY: "zepPay",
}
},
}
},
{
display: "付款方式代码", name: "zlsch", width: 120, minwidth: 120, type: "string", align: "left",
/*editor: {
......@@ -478,14 +478,58 @@ 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();
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(item.column.name == "zepPtdamount1"
|| item.column.name == "zepPtdamount"){
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_secondGrid != null){
var secondRows = _secondGrid.currentData.Rows;
totalFinancialAuditGrid(secondRows);
if (check){
totalFinancialAuditGrid(secondRows);
}
}
}
//是否付款选择“N”，“原因代码”和“银企直连标志”非必填
if (item.column.name == "zepPay" && obj.node == "financialAuditGrid"){
if (item.value == "Y"){
zepPayFlag = true;
}
if (item.value == "N"){
zepPayFlag = false;
}
var columns = obj.columns;
columns.some(column => {
if (column.name == "rstgrName" ||
column.name == "zepBank" ){
column.editor.required = zepPayFlag;
}
})
UICtrl.setGridColumns(obj.gridManager,columns);
}
return item;
},
onAfterShowData:function (){
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.js
View file @ e646d018
......@@ -329,6 +329,22 @@ var tableArray = [
columns: [
{display: "", name: "rstgr", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "是否付款", name: "zepPay", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "ZEP_PAY"}
},
back: {
ZEP_PAY: "zepPay",
}
},
}
},
{
display: "原因代码", name: "rstgrName", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
......@@ -416,22 +432,6 @@ var tableArray = [
// type: 'text'
// }
},
{
display: "是否付款", name: "zepPay", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "ZEP_PAY"}
},
back: {
ZEP_PAY: "zepPay",
}
},
}
},
{
display: "付款方式代码", name: "zlsch", width: 120, minwidth: 120, type: "string", align: "left",
/*editor: {
......@@ -505,6 +505,7 @@ var tableArray = [
}
]
var isAllData = true;
var zepPayFlag = false,changed = false;
//创建表格（参数、列、插入的节点、数据源）
......@@ -661,6 +662,31 @@ function loadGrid(obj) {
obj.gridManager.updateRow(item.record, {kwetr: kwetr,kzwi11: money,kwetr1: kwetr1});
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();
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) {
if (data.zepItemno = row.zepItemno){
_secondGrid.updateRow(row,{
zepPtdamount1:data.kzwi1,
})
}
})
}
});
}
}
}
if(item.column.name == "zepPdamount1"
|| item.column.name == "zepPdtax1"
|| item.column.name == "zepPtdamount1"
......@@ -683,7 +709,7 @@ function loadGrid(obj) {
var waers = data.waers;//币别
var kursf = data.kursf;//汇率
//编辑含税金额审批，税额审批、不含税金额审批变化。
if (item.column.name == "zepPtdamount1"){
if (item.column.name == "zepPtdamount1" && check){
//税额计算
//等于含税金额/(1+税码对应的税率）*税码对应税率，可手工修改
var value = MathUtil.div(item.record.zepPtdamount1, MathUtil.add(1 , mwskzTextView));
......@@ -715,9 +741,28 @@ function loadGrid(obj) {
});
}
}
totalFinancialAuditGrid(secondRows);
if (check){
totalFinancialAuditGrid(secondRows);
}
}
}
if (item.column.name == "zepPay" && obj.node == "financialAuditGrid"){
if (item.value == "Y"){
zepPayFlag = true;
}
if (item.value == "N"){
zepPayFlag = false;
}
var columns = obj.columns;
columns.some(column => {
if (column.name == "rstgrName" ||
column.name == "zepBank" ){
column.editor.required = zepPayFlag;
}
})
UICtrl.setGridColumns(obj.gridManager,columns);
}
return item;
},
onAfterShowData:function (){
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/employeeLoan.js
View file @ e646d018
......@@ -191,6 +191,22 @@ var tableArray = [
columns: [
{display: "", name: "rstgr", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "是否付款", name: "zepPay", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "ZEP_PAY"}
},
back: {
ZEP_PAY: "zepPay",
}
},
}
},
{
display: "原因代码", name: "rstgrName", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
......@@ -239,22 +255,7 @@ var tableArray = [
mask: 'nnnnnnnnn.nn',
}
},
{
display: "是否付款", name: "zepPay", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "ZEP_PAY"}
},
back: {
ZEP_PAY: "zepPay",
}
},
}
},
{
display: "付款方式代码", name: "zlsch", width: 120, minwidth: 120, type: "string", align: "left",
/*editor: {
......@@ -504,6 +505,46 @@ function loadGrid(obj) {
|| item.column.name == "kzwi1"){
totalGrid();
}
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();
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,
})
}
})
}
});
}
}
}
//是否付款选择“N”，“原因代码”和“银企直连标志”非必填
if (item.column.name == "zepPay" && obj.node == "financialAuditGrid"){
if (item.value == "Y"){
zepPayFlag = true;
}
if (item.value == "N"){
zepPayFlag = false;
}
var columns = obj.columns;
columns.some(column => {
if (column.name == "rstgrName" ||
column.name == "zepBank" ){
column.editor.required = zepPayFlag;
}
})
UICtrl.setGridColumns(obj.gridManager,columns);
}
return item;
}
});
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.js
View file @ e646d018
......@@ -189,6 +189,22 @@ var tableArray = [
columns: [
{display: "", name: "rstgr", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "是否付款", name: "zepPay", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "ZEP_PAY"}
},
back: {
ZEP_PAY: "zepPay",
}
},
}
},
{
display: "原因代码", name: "rstgrName", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
......@@ -233,22 +249,6 @@ var tableArray = [
type: 'text'
}
},
{
display: "是否付款", name: "zepPay", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "ZEP_PAY"}
},
back: {
ZEP_PAY: "zepPay",
}
},
}
},
{
display: "付款方式代码", name: "zlsch", width: 120, minwidth: 120, type: "string", align: "left",
render:function (item){
......@@ -489,14 +489,58 @@ 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();
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(item.column.name == "zepPtdamount1"
|| item.column.name == "zepPtdamount"){
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_secondGrid != null){
var secondRows = _secondGrid.currentData.Rows;
totalFinancialAuditGrid(secondRows);
if (check){
totalFinancialAuditGrid(secondRows);
}
}
}
//是否付款选择“N”，“原因代码”和“银企直连标志”非必填
if (item.column.name == "zepPay" && obj.node == "financialAuditGrid"){
if (item.value == "Y"){
zepPayFlag = true;
}
if (item.value == "N"){
zepPayFlag = false;
}
var columns = obj.columns;
columns.some(column => {
if (column.name == "rstgrName" ||
column.name == "zepBank" ){
column.editor.required = zepPayFlag;
}
})
UICtrl.setGridColumns(obj.gridManager,columns);
}
return item;
},
onAfterShowData:function (){
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApplyNoPO.js
View file @ e646d018
......@@ -333,6 +333,22 @@ var tableArray = [
columns: [
{display: "", name: "rstgr", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "是否付款", name: "zepPay", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "ZEP_PAY"}
},
back: {
ZEP_PAY: "zepPay",
}
},
}
},
{
display: "原因代码", name: "rstgrName", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
......@@ -420,22 +436,6 @@ var tableArray = [
type: 'text'
}
},
{
display: "是否付款", name: "zepPay", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "ZEP_PAY"}
},
back: {
ZEP_PAY: "zepPay",
}
},
}
},
{
display: "付款方式代码", name: "zlsch", width: 120, minwidth: 120, type: "string", align: "left",
/*editor: {
......@@ -664,6 +664,31 @@ function loadGrid(obj) {
obj.gridManager.updateRow(item.record, {kwetr: kwetr,kzwi11: money,kwetr1: kwetr1});
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();
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(item.column.name == "zepPdamount1"
|| item.column.name == "zepPdtax1"
|| item.column.name == "zepPtdamount1"
......@@ -674,9 +699,28 @@ function loadGrid(obj) {
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_secondGrid != null){
var secondRows = _secondGrid.currentData.Rows;
totalFinancialAuditGrid(secondRows);
if (check){
totalFinancialAuditGrid(secondRows);
}
}
}
//是否付款选择“N”，“原因代码”和“银企直连标志”非必填
if (item.column.name == "zepPay" && obj.node == "financialAuditGrid"){
if (item.value == "Y"){
zepPayFlag = true;
}
if (item.value == "N"){
zepPayFlag = false;
}
var columns = obj.columns;
columns.some(column => {
if (column.name == "rstgrName" ||
column.name == "zepBank" ){
column.editor.required = zepPayFlag;
}
})
UICtrl.setGridColumns(obj.gridManager,columns);
}
return item;
},
onAfterShowData:function (){
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/refundApply.js
View file @ e646d018
......@@ -136,6 +136,22 @@ var tableArray = [
columns: [
{display: "", name: "rstgr", width: 80, minwidth: 80, type: "string", align: "left", hide: true},
{display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
{
display: "是否付款", name: "zepPay", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "ZEP_PAY"}
},
back: {
ZEP_PAY: "zepPay",
}
},
}
},
{
display: "原因代码", name: "rstgrName", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
......@@ -180,22 +196,6 @@ var tableArray = [
type: 'text'
}
},
{
display: "是否付款", name: "zepPay", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {fieldName: "ZEP_PAY"}
},
back: {
ZEP_PAY: "zepPay",
}
},
}
},
{
display: "付款方式代码", name: "zlsch", width: 120, minwidth: 120, type: "string", align: "left",
render:function (item){
......@@ -226,53 +226,6 @@ var tableArray = [
},
]
},
// {
// parms: {},
// node: "capitalPostGrid",
// gridManager: null,
// data: null,
// columns: [
// {display: "EP流程子序号", name: "zepItemno", width: 80, minwidth: 80, type: "string", align: "left"},
// {
// display: "付款银行账号", name: "bankn1", width: 120, minwidth: 120, type: "string", align: "left",
// editor: {
// required: false, type: "select",
// data: {
// type: 'system',
// name: "getCompanyAndBankInfos",
// getParam: function (item) {
// return {
// BUKRS: $("#bukrs").val()
// }
// },
// back: {
// BANKN1: "bankn1",
// TEXT1: "zt012kText1",
// }
// },
// }
// },
// {
// display: "付款银行账号名称",
// name: "zt012kText1",
// width: 120,
// minwidth: 120,
// type: "string",
// align: "left",
// editor: {
//
// type: 'text'
// }
// },
// {
// display: "付款附言", name: "zepTxt1", width: 120, minwidth: 120, type: "string", align: "left",
// editor: {
//
// type: 'text'
// }
// },
// ]
// }
{
parms: {},
node: "financialAudit_sapReturnGrid",
......@@ -436,14 +389,58 @@ 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();
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(item.column.name == "zepPtdamount1"
|| item.column.name == "zepPtdamount"){
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_secondGrid != null){
var secondRows = _secondGrid.currentData.Rows;
totalFinancialAuditGrid(secondRows);
if (check){
totalFinancialAuditGrid(secondRows);
}
}
}
//是否付款选择“N”，“原因代码”和“银企直连标志”非必填
if (item.column.name == "zepPay" && obj.node == "financialAuditGrid"){
if (item.value == "Y"){
zepPayFlag = true;
}
if (item.value == "N"){
zepPayFlag = false;
}
var columns = obj.columns;
columns.some(column => {
if (column.name == "rstgrName" ||
column.name == "zepBank" ){
column.editor.required = zepPayFlag;
}
})
UICtrl.setGridColumns(obj.gridManager,columns);
}
return item;
},
onAfterShowData:function (){
......
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