Commit 5b736052 authored by 鲁鑫's avatar 鲁鑫

费用报销相关总金额计算优化

parent 37c4cac0
...@@ -231,7 +231,7 @@ var tableArray = [ ...@@ -231,7 +231,7 @@ var tableArray = [
data: {name: 'zlsch'}, data: {name: 'zlsch'},
textField: 'zlschTextView', textField: 'zlschTextView',
valueField: 'zlsch', valueField: 'zlsch',
required: true, required: false,
render: function (item) { render: function (item) {
return item.zlschTextView; return item.zlschTextView;
} }
...@@ -347,7 +347,7 @@ function loadGrid(obj) { ...@@ -347,7 +347,7 @@ function loadGrid(obj) {
}else if (obj.node==="financialAuditGrid" }else if (obj.node==="financialAuditGrid"
//|| obj.node==="capitalPostGrid" //|| obj.node==="capitalPostGrid"
){ ){
canDelay = true; //canDelay = true;
} }
} }
var subProcUnitId = getSubProcUnitId(); var subProcUnitId = getSubProcUnitId();
...@@ -359,6 +359,7 @@ function loadGrid(obj) { ...@@ -359,6 +359,7 @@ function loadGrid(obj) {
columns.some(column => { columns.some(column => {
if (//column.name == "rstgrName" || if (//column.name == "rstgrName" ||
column.name == "zepPay" column.name == "zepPay"
|| column.name == "zlschTextView"
//|| column.name == "zepBank" //|| column.name == "zepBank"
){ ){
column.editor.required = true; column.editor.required = true;
...@@ -418,6 +419,22 @@ function loadGrid(obj) { ...@@ -418,6 +419,22 @@ function loadGrid(obj) {
}) })
totalGrid(); totalGrid();
initFinancialAuditGridData(); initFinancialAuditGridData();
},
copyHandler: {
id: 'copyHandler', text: '复制', img: 'fa-copy', click: function () {
tableArray.forEach((item) => {
//var row = DataUtil.getSelectedRow(item.gridManager);
var row = item.gridManager.getSelectedRow();
if (!row) {
Public.tip("请勾选一条数据");
return;
}
var newRow = JSON.parse(JSON.stringify(row));
newRow.zepItemno = getZepItemNo();
newRow.reimbursementDetailId = null;
UICtrl.addGridRow(item.gridManager, newRow);
});
}
} }
}); });
} }
......
...@@ -440,7 +440,7 @@ var tableArray = [ ...@@ -440,7 +440,7 @@ var tableArray = [
data: {name: 'zlsch'}, data: {name: 'zlsch'},
textField: 'zlschTextView', textField: 'zlschTextView',
valueField: 'zlsch', valueField: 'zlsch',
required: true, required: false,
render: function (item) { render: function (item) {
return item.zlschTextView; return item.zlschTextView;
} }
...@@ -526,6 +526,7 @@ function loadGrid(obj) { ...@@ -526,6 +526,7 @@ function loadGrid(obj) {
columns.some(column => { columns.some(column => {
if (//column.name == "rstgrName" || if (//column.name == "rstgrName" ||
column.name == "zepPay" column.name == "zepPay"
|| column.name == "zlschTextView"
//|| column.name == "zepBank" //|| column.name == "zepBank"
){ ){
column.editor.required = true; column.editor.required = true;
......
...@@ -263,7 +263,7 @@ var tableArray = [ ...@@ -263,7 +263,7 @@ var tableArray = [
data: {name: 'zlsch'}, data: {name: 'zlsch'},
textField: 'zlschTextView', textField: 'zlschTextView',
valueField: 'zlsch', valueField: 'zlsch',
required: true, required: false,
render: function (item) { render: function (item) {
return item.zlschTextView; return item.zlschTextView;
} }
...@@ -383,6 +383,7 @@ function loadGrid(obj) { ...@@ -383,6 +383,7 @@ function loadGrid(obj) {
columns.some(column => { columns.some(column => {
if (//column.name == "rstgrName" || if (//column.name == "rstgrName" ||
column.name == "zepPay" column.name == "zepPay"
|| column.name == "zlschTextView"
//|| column.name == "zepBank" //|| column.name == "zepBank"
){ ){
column.editor.required = true; column.editor.required = true;
...@@ -434,6 +435,22 @@ function loadGrid(obj) { ...@@ -434,6 +435,22 @@ function loadGrid(obj) {
}); });
}) })
totalGrid(); totalGrid();
},
copyHandler: {
id: 'copyHandler', text: '复制', img: 'fa-copy', click: function () {
tableArray.forEach((item) => {
//var row = DataUtil.getSelectedRow(item.gridManager);
var row = item.gridManager.getSelectedRow();
if (!row) {
Public.tip("请勾选一条数据");
return;
}
var newRow = JSON.parse(JSON.stringify(row));
newRow.zepItemno = getZepItemNo();
newRow.reimbursementDetailId = null;
UICtrl.addGridRow(item.gridManager, newRow);
});
}
} }
}); });
} }
......
...@@ -71,10 +71,10 @@ var tableArray = [ ...@@ -71,10 +71,10 @@ var tableArray = [
} }
}, },
{ {
display: "BP账号名称", name: "koinh", width: 120, minwidth: 120, type: "string", align: "left", display: "BP账号名称", name: "koinh", width: 200, minwidth: 120, type: "string", align: "left",
}, },
{ {
display: "BP银行账号", name: "bankn", width: 120, minwidth: 120, type: "string", align: "left", display: "BP银行账号", name: "bankn", width: 200, minwidth: 120, type: "string", align: "left",
editor: { editor: {
required: true, type: "select", required: true, type: "select",
data: { data: {
...@@ -257,7 +257,7 @@ var tableArray = [ ...@@ -257,7 +257,7 @@ var tableArray = [
data: {name: 'zlsch'}, data: {name: 'zlsch'},
textField: 'zlschTextView', textField: 'zlschTextView',
valueField: 'zlsch', valueField: 'zlsch',
required: true, required: false,
render: function (item) { render: function (item) {
return item.zlschTextView; return item.zlschTextView;
} }
...@@ -370,7 +370,7 @@ function loadGrid(obj) { ...@@ -370,7 +370,7 @@ function loadGrid(obj) {
}else if (obj.node==="financialAuditGrid" }else if (obj.node==="financialAuditGrid"
//|| obj.node==="capitalPostGrid" //|| obj.node==="capitalPostGrid"
){ ){
canDelay = true; //canDelay = true;
} }
} }
var subProcUnitId = getSubProcUnitId(); var subProcUnitId = getSubProcUnitId();
...@@ -382,6 +382,7 @@ function loadGrid(obj) { ...@@ -382,6 +382,7 @@ function loadGrid(obj) {
columns.some(column => { columns.some(column => {
if (//column.name == "rstgrName" || if (//column.name == "rstgrName" ||
column.name == "zepPay" column.name == "zepPay"
|| column.name == "zlschTextView"
//|| column.name == "zepBank" //|| column.name == "zepBank"
){ ){
column.editor.required = true; column.editor.required = true;
...@@ -433,6 +434,22 @@ function loadGrid(obj) { ...@@ -433,6 +434,22 @@ function loadGrid(obj) {
}); });
}) })
totalGrid(); totalGrid();
},
copyHandler: {
id: 'copyHandler', text: '复制', img: 'fa-copy', click: function () {
tableArray.forEach((item) => {
//var row = DataUtil.getSelectedRow(item.gridManager);
var row = item.gridManager.getSelectedRow();
if (!row) {
Public.tip("请勾选一条数据");
return;
}
var newRow = JSON.parse(JSON.stringify(row));
newRow.zepItemno = getZepItemNo();
newRow.reimbursementDetailId = null;
UICtrl.addGridRow(item.gridManager, newRow);
});
}
} }
}); });
} }
...@@ -491,7 +508,9 @@ function loadGrid(obj) { ...@@ -491,7 +508,9 @@ function loadGrid(obj) {
onAfterEdit:function (item) { onAfterEdit:function (item) {
if(item.column.name == "waers" if(item.column.name == "waers"
|| item.column.name == "kursf" || item.column.name == "kursf"
|| item.column.name == "kzwi1"){ || item.column.name == "kzwi1"
|| item.column.name == "belnr2"
){
totalGrid(); totalGrid();
} }
if (item.column.name == "zepPtdamount1"){ if (item.column.name == "zepPtdamount1"){
...@@ -826,7 +845,7 @@ function businessJudgmentUnit() { ...@@ -826,7 +845,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();
......
...@@ -444,7 +444,7 @@ var tableArray = [ ...@@ -444,7 +444,7 @@ var tableArray = [
data: {name: 'zlsch'}, data: {name: 'zlsch'},
textField: 'zlschTextView', textField: 'zlschTextView',
valueField: 'zlsch', valueField: 'zlsch',
required: true, required: false,
render: function (item) { render: function (item) {
return item.zlschTextView; return item.zlschTextView;
} }
...@@ -511,7 +511,7 @@ function loadGrid(obj) { ...@@ -511,7 +511,7 @@ function loadGrid(obj) {
}else if (obj.node==="financialAuditGrid" }else if (obj.node==="financialAuditGrid"
//|| obj.node==="capitalPostGrid" //|| obj.node==="capitalPostGrid"
){ ){
canDelay = true; //canDelay = true;
} }
} }
var subProcUnitId = getSubProcUnitId(); var subProcUnitId = getSubProcUnitId();
...@@ -523,6 +523,7 @@ function loadGrid(obj) { ...@@ -523,6 +523,7 @@ function loadGrid(obj) {
columns.some(column => { columns.some(column => {
if (//column.name == "rstgrName" || if (//column.name == "rstgrName" ||
column.name == "zepPay" column.name == "zepPay"
|| column.name == "zlschTextView"
//|| column.name == "zepBank" //|| column.name == "zepBank"
){ ){
column.editor.required = true; column.editor.required = true;
......
...@@ -204,7 +204,7 @@ var tableArray = [ ...@@ -204,7 +204,7 @@ var tableArray = [
data: {name: 'zlsch'}, data: {name: 'zlsch'},
textField: 'zlschTextView', textField: 'zlschTextView',
valueField: 'zlsch', valueField: 'zlsch',
required: true, required: false,
render: function (item) { render: function (item) {
return item.zlschTextView; return item.zlschTextView;
} }
...@@ -270,7 +270,7 @@ function loadGrid(obj) { ...@@ -270,7 +270,7 @@ function loadGrid(obj) {
}else if (obj.node==="financialAuditGrid" }else if (obj.node==="financialAuditGrid"
//|| obj.node==="capitalPostGrid" //|| obj.node==="capitalPostGrid"
){ ){
canDelay = true; //canDelay = true;
} }
} }
var subProcUnitId = getSubProcUnitId(); var subProcUnitId = getSubProcUnitId();
...@@ -282,6 +282,7 @@ function loadGrid(obj) { ...@@ -282,6 +282,7 @@ function loadGrid(obj) {
columns.some(column => { columns.some(column => {
if (//column.name == "rstgrName" || if (//column.name == "rstgrName" ||
column.name == "zepPay" column.name == "zepPay"
|| column.name == "zlschTextView"
//|| column.name == "zepBank" //|| column.name == "zepBank"
){ ){
column.editor.required = true; column.editor.required = true;
...@@ -334,6 +335,22 @@ function loadGrid(obj) { ...@@ -334,6 +335,22 @@ function loadGrid(obj) {
}) })
totalGrid(); totalGrid();
initFinancialAuditGridData(); initFinancialAuditGridData();
},
copyHandler: {
id: 'copyHandler', text: '复制', img: 'fa-copy', click: function () {
tableArray.forEach((item) => {
//var row = DataUtil.getSelectedRow(item.gridManager);
var row = item.gridManager.getSelectedRow();
if (!row) {
Public.tip("请勾选一条数据");
return;
}
var newRow = JSON.parse(JSON.stringify(row));
newRow.zepItemno = getZepItemNo();
newRow.reimbursementDetailId = null;
UICtrl.addGridRow(item.gridManager, newRow);
});
}
} }
}); });
} }
......
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