Skip to content

T
topsun-bpm
Commit 6d8fb5c9 authored by 刘学辉's avatar 刘学辉
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 2d8dc0bd d61c26e6
Show whitespace changes
Inline Side-by-side
Showing with 306 additions and 182 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.js
View file @ 6d8fb5c9
......@@ -188,14 +188,14 @@ var tableArray = [
}
},
{
display: "含税金额", name: "kzwi1", width: 120, minwidth: 120, type: "string", align: "left",
display: "含税金额", name: "kzwi1", width: 120, minwidth: 120, type: "money", align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
type: 'text'
}
},
{
display: "含税金额（本位币）", name: "kzwi11", width: 120, minwidth: 120, type: "string", align: "left",
display: "含税金额（本位币）", name: "kzwi11", width: 120, minwidth: 120, type: "money", align: "left",
render:function(item){
var money = 0;
if (item.waers === "CNY"){
......@@ -239,10 +239,10 @@ var tableArray = [
name: "zepPtdamount1",
width: 120,
minwidth: 120,
type: "string",
type: "money",
align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
type: 'text'
}
},
......@@ -251,10 +251,10 @@ var tableArray = [
name: "zepPtdamount",
width: 120,
minwidth: 120,
type: "string",
type: "money",
align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
type: 'text'
}
},
......@@ -511,8 +511,10 @@ function loadGrid(obj) {
return item;
},
onAfterShowData:function (){
if ("financeNode" === subProcUnitId){
initFinancialAuditGridData();
}
}
});
UICtrl.setSearchAreaToggle(obj.gridManager);
......@@ -642,6 +644,7 @@ function getZepItemNo() {
function businessJudgmentUnit() {
var isApply = isApplyProcUnit();
if (isApply) {
$("#approvalMoney").hide();
$("#financialAudit").hide();
$("#financialAudit_sapReturn").hide();
$("#capitalPost").hide();
......@@ -698,7 +701,7 @@ function initFinancialAuditGridData(){
var secondRows = _secondGrid.currentData.Rows;
$.each(datas, function (i, data) {
$.each(secondRows, function (i, row) {
if (data.zepItemno === row.zepItemno && row.zepPtdamount1===0){
if (data.zepItemno === row.zepItemno && (row.zepPdamount1===0 || Public.isBlank(row.zepPtdamount1))){
_secondGrid.updateRow(row,{
zepPtdamount1:data.kzwi1,
zepPtdamount:data.kzwi11
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.jsp
View file @ 6d8fb5c9
......@@ -48,12 +48,12 @@
<x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepFtamount" required="false" label="申请总金额（本位币）" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFtamount1" required="false" label="申请总金额" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFtamount" 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"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepPtamount" required="false" label="审批总金额（本位币）" labelCol="2" fieldCol="2"/>
<x:inputC name="zepPtamount1" required="false" label="审批总金额" labelCol="2" fieldCol="2"/>
<div class="hg-form-row" 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>
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.js
View file @ 6d8fb5c9
......@@ -248,7 +248,7 @@ var tableArray = [
}
},
{
display: "含税金额", name: "kzwi1", width: 120, minwidth: 120, type: "string", align: "left",
display: "含税金额", name: "kzwi1", width: 120, minwidth: 120, type: "money", align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
type: 'text'
......@@ -274,7 +274,7 @@ var tableArray = [
}
},
{
display: "含税金额（本位币）", name: "kzwi11", width: 120, minwidth: 120, type: "string", align: "left",
display: "含税金额（本位币）", name: "kzwi11", width: 120, minwidth: 120, type: "money", align: "left",
//"公司代码等于1000币别等于CNY时，默认等于含税金额；
// 公司代码等于1000币别不等于CNY时，等于含税金额*币别对应的汇率"
render:function(item){
......@@ -288,7 +288,7 @@ var tableArray = [
}
},
{
display: "税额（本位币）", name: "kwetr1", width: 120, minwidth: 120, type: "string", align: "left",
display: "税额（本位币）", name: "kwetr1", width: 120, minwidth: 120, type: "money", align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
type: 'text'
......@@ -300,14 +300,14 @@ var tableArray = [
}
},
{
display: "不含税金额（本位币）", name: "netwr1", width: 120, minwidth: 120, type: "string", align: "left",
display: "不含税金额（本位币）", name: "netwr1", width: 120, minwidth: 120, type: "money", align: "left",
//等于含税金额（本位币）减去税额（本位币）
render:function(item){
return item.netwr1 = MathUtil.sub(item.kzwi11,item.kwetr1);
}
},
{
display: "税额", name: "kwetr", width: 120, minwidth: 120, type: "string", align: "left",
display: "税额", name: "kwetr", width: 120, minwidth: 120, type: "money", align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
type: 'text'
......@@ -319,7 +319,7 @@ var tableArray = [
}
},
{
display: "不含税金额", name: "netwr", width: 120, minwidth: 120, type: "string", align: "left",
display: "不含税金额", name: "netwr", width: 120, minwidth: 120, type: "money", align: "left",
//等于含税金额减去税额
render:function(item){
return item.netwr = MathUtil.sub(item.kzwi1,item.kwetr);
......@@ -357,7 +357,7 @@ var tableArray = [
name: "zepPdamount1",
width: 120,
minwidth: 120,
type: "string",
type: "money",
align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
......@@ -365,7 +365,7 @@ var tableArray = [
}
},
{
display: "税额（审批）", name: "zepPdtax1", width: 120, minwidth: 120, type: "string", align: "left",
display: "税额（审批）", name: "zepPdtax1", width: 120, minwidth: 120, type: "money", align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
type: 'text'
......@@ -376,7 +376,7 @@ var tableArray = [
name: "zepPtdamount1",
width: 120,
minwidth: 120,
type: "string",
type: "money",
align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
......@@ -388,7 +388,7 @@ var tableArray = [
name: "zepPdamount",
width: 120,
minwidth: 120,
type: "string",
type: "money",
align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
......@@ -400,7 +400,7 @@ var tableArray = [
name: "zepPdtax",
width: 120,
minwidth: 120,
type: "string",
type: "money",
align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
......@@ -412,7 +412,7 @@ var tableArray = [
name: "zepPtdamount",
width: 120,
minwidth: 120,
type: "string",
type: "money",
align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
......@@ -665,8 +665,10 @@ function loadGrid(obj) {
return item;
},
onAfterShowData:function (){
if ("financeNode" === subProcUnitId){
initFinancialAuditGridData();
}
}
});
UICtrl.setSearchAreaToggle(obj.gridManager);
......@@ -795,6 +797,7 @@ function getZepItemNo() {
function businessJudgmentUnit() {
var isApply = isApplyProcUnit();
if (isApply) {
$("#approvalMoney").hide();
$("#financialAudit").hide();
$("#financialAudit_sapReturn").hide();
$("#capitalPost").hide();
......@@ -861,7 +864,7 @@ function initFinancialAuditGridData(){
var secondRows = _secondGrid.currentData.Rows;
$.each(datas, function (i, data) {
$.each(secondRows, function (i, row) {
if (data.zepItemno === row.zepItemno && row.zepPdamount1===0){
if (data.zepItemno === row.zepItemno && (row.zepPdamount1===0 || Public.isBlank(row.zepPdamount1))){
_secondGrid.updateRow(row,{
zepPdamount1:data.netwr,
zepPdtax1:data.kwetr,
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/costReimbursement.jsp
View file @ 6d8fb5c9
......@@ -26,15 +26,11 @@
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="zepNo" required="false" readonly="true" label="EP流程单号" labelCol="2" maxLength="64" fieldCol="2"/>
<x:inputC name="zepFcrdate" required="false" readonly="true" wrapper="date" label="付款申请创建日期" labelCol="2"
fieldCol="2"/>
<x:inputC name="zepFtype" required="false" readonly="true" label="EP付款申请类别" labelCol="2" maxLength="64"
fieldCol="2"
/>
<x:inputC name="zepFcrdate" required="false" readonly="true" wrapper="date" label="付款申请创建日期" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFtype" required="false" readonly="true" label="EP付款申请类别" labelCol="2" maxLength="64" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepFtypename" required="false" readonly="true" label="EP付款申请类别名称" labelCol="2" maxLength="64"
fieldCol="2"/>
<x:inputC name="zepFtypename" required="false" readonly="true" label="EP付款申请类别名称" labelCol="2" maxLength="64" fieldCol="2"/>
<x:inputC name="bukrs" required="true" label="公司代码" labelCol="2" fieldCol="2" wrapper="select"/>
<x:inputC name="butxt" required="false" readonly="true" label="公司代码名称" labelCol="2" fieldCol="2"/>
</div>
......@@ -48,22 +44,24 @@
<x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepFtamount" required="false" label="申请总金额（本位币）" labelCol="2" fieldCol="2"/>
<x:inputC name="zepPtamount" required="false" label="审批总金额（本位币）" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFtamount" required="false" readonly="true" label="申请总金额（本位币）" labelCol="2" fieldCol="2" mask="positiveMoney"/>
<x:inputC name="zepFttax" required="false" readonly="true" label="申请总税额（本位币）" labelCol="2" fieldCol="2" mask="positiveMoney"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepFttax" required="false" label="申请总税额（本位币）" labelCol="2" fieldCol="2"/>
<x:inputC name="zepPttax" required="false" label=" 审批总税额（本位币）" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFttax1" 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"/>
</div>
<div id="approvalMoney">
<div class="hg-form-row">
<x:inputC name="zepFtamount1" required="false" label="申请总金额" labelCol="2" fieldCol="2"/>
<x:inputC name="zepPtamount1" required="false" label="审批总金额" labelCol="2" fieldCol="2"/>
<x:inputC name="zepPtamount" required="false" readonly="true" label="审批总金额（本位币）" labelCol="2" fieldCol="2" mask="positiveMoney"/>
<x:inputC name="zepPttax" required="false" readonly="true" label=" 审批总税额（本位币）" labelCol="2" fieldCol="2" mask="positiveMoney"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepFttax1" required="false" label="申请总税额" labelCol="2" fieldCol="2"/>
<x:inputC name="zepPttax1" required="false" label="审批总税额" labelCol="2" fieldCol="2"/>
<x:inputC name="zepPttax1" 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 class="blank_div clearfix"></div>
<x:title title="报销人填写" name="group"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/employeeLoan.js
View file @ 6d8fb5c9
......@@ -144,7 +144,7 @@ var tableArray = [
}
},
{
display: "含税金额", name: "kzwi1", width: 120, minwidth: 120, type: "string", align: "left",
display: "含税金额", name: "kzwi1", width: 120, minwidth: 120, type: "money", align: "left",
editor: {
type: 'text',required: true
},
......@@ -174,7 +174,7 @@ var tableArray = [
}
},
{
display: "含税金额（本位币）", name: "kzwi11", width: 120, minwidth: 120, type: "string", align: "left",
display: "含税金额（本位币）", name: "kzwi11", width: 120, minwidth: 120, type: "money", align: "left",
render:function(item){
var money = 0;
if (item.waers === "CNY"){
......@@ -219,16 +219,24 @@ var tableArray = [
name: "zepPtdamount1",
width: 120,
minwidth: 120,
type: "string",
type: "money",
align: "left",
editor: {
type: "text",
mask: 'nnnnnnnnn.nn',
}
},
{
display: "含税金额（审批-本位币）",
name: "zepPtdamount",
width: 120,
minwidth: 120,
type: "string",
type: "money",
align: "left",
editor: {
type: "text",
mask: 'nnnnnnnnn.nn',
}
},
{
display: "是否付款", name: "zepPay", width: 120, minwidth: 120, type: "string", align: "left",
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/employeeLoan.jsp
View file @ 6d8fb5c9
......@@ -40,12 +40,12 @@
<x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="6"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepFtamount" required="false" label="申请总金额（本位币）" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFtamount1" required="false" label="申请总金额" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFtamount" 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"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepPtamount" required="false" label="审批总金额（本位币）" labelCol="2" fieldCol="2"/>
<x:inputC name="zepPtamount1" required="false" label="审批总金额" labelCol="2" fieldCol="2"/>
<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>
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.js
View file @ 6d8fb5c9
......@@ -121,17 +121,22 @@ var tableArray = [
},
{
display: "含税金额", name: "kzwi1", width: 120, minwidth: 120, type: "string", align: "left",
display: "含税金额", name: "kzwi1", width: 120, minwidth: 120, type: "money", align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
type: 'text'
}
},
{
display: "含税金额（本位币）", name: "kzwi11", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
type: 'text'
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;
}
}
]
......@@ -154,10 +159,10 @@ var tableArray = [
name: "zepPtdamount1",
width: 120,
minwidth: 120,
type: "string",
type: "money",
align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
type: 'text'
}
},
......@@ -166,10 +171,10 @@ var tableArray = [
name: "zepPtdamount",
width: 120,
minwidth: 120,
type: "string",
type: "money",
align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
type: 'text'
}
},
......@@ -305,7 +310,7 @@ function loadGrid(obj) {
toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: function () {
tableArray.forEach((item) => {
UICtrl.addGridRow(item.gridManager, {zepItemno: getZepItemNo()});
UICtrl.addGridRow(item.gridManager, {zepItemno: getZepItemNo(),zepBptype:"K",zepBptypename:"供应商"});
});
},
deleteHandler: function () {
......@@ -331,7 +336,7 @@ function loadGrid(obj) {
checkbox: true,
fixedCellHeight: true,
selectRowButtonOnly: true,
onAfterEdit: totalMoney,
//onAfterEdit: totalMoney,
onBeforeCheckRow: function (checked, data) {
//同时选定或取消所有表格中的对应行
tableArray.forEach((item) => {
......@@ -365,6 +370,27 @@ function loadGrid(obj) {
// })
// })
return false;//阻止默认事件
},
onAfterEdit:function (item) {
if(item.column.name == "waers"
|| item.column.name == "kursf"
|| item.column.name == "kzwi1"){
totalGrid();
}
if(item.column.name == "zepPtdamount1"
|| item.column.name == "zepPtdamount"){
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_secondGrid != null){
var secondRows = _secondGrid.currentData.Rows;
totalFinancialAuditGrid(secondRows);
}
}
return item;
},
onAfterShowData:function (){
if ("financeNode" === subProcUnitId){
initFinancialAuditGridData();
}
}
});
UICtrl.setSearchAreaToggle(obj.gridManager);
......@@ -416,10 +442,10 @@ function initialize() {
});
useArrayTable(loadGrid);
})
$("#zepFtypename").val("付款申请流程");
$("#zepFtype").val("C");
$("#butxt").val("广州市宝绅科技应用有限公司");
$("#bukrs").val("1000");
// $("#zepFtypename").val("付款申请流程");
// $("#zepFtype").val("C");
// $("#butxt").val("广州市宝绅科技应用有限公司");
// $("#bukrs").val("1000");
}
......@@ -456,8 +482,6 @@ function getExtendedData(processAction) {
tableArray.forEach((item) => {
console.log(item)
});
debugger
//回退、打回、转交时，不需要验证必填项是否已经填写；
if (processAction == ProcessAction.BACK
|| processAction == ProcessAction.REPLENISH
......@@ -496,7 +520,6 @@ function getTableDataAll(obj) {
//调用数组
function useArrayTable(func, ...data) {
debugger
const results = tableArray.map((item) => {
return func(item, ...data);
});
......@@ -518,6 +541,7 @@ function getZepItemNo() {
function businessJudgmentUnit() {
var isApply = isApplyProcUnit();
if (isApply) {
$("#approvalMoney").hide();
$("#financialAudit").hide();
$("#financialAudit_sapReturn").hide();
$("#capitalPost").hide();
......@@ -545,3 +569,57 @@ function nodeController(){
$("#paymentAccomplish_sapReturn").hide();
}
}
function totalGrid(money) {
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
if (_grid != null){
var data = _grid.getData(),
zepFtamount1 = 0,//申请总金额
zepFtamount = 0;//申请总金额（本位币）
var _kzwi1 = 0;
var _kzwi11 = 0;
$.each(data, function (i, o) {
_kzwi1 = o['kzwi1'] + '';
_kzwi11 = o['kzwi11'] + '';
zepFtamount1 = MathUtil.add(zepFtamount1, _kzwi1);
zepFtamount = MathUtil.add(zepFtamount, _kzwi11);
$('#zepFtamount1').val(zepFtamount1);
$('#zepFtamount').val(zepFtamount);
});
}
}
function initFinancialAuditGridData(){
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_grid != null && _secondGrid != null){
var datas = _grid.getData();
if (datas.length > 0 && _secondGrid.currentData != null){
var secondRows = _secondGrid.currentData.Rows;
$.each(datas, function (i, data) {
$.each(secondRows, function (i, row) {
if (data.zepItemno === row.zepItemno && (row.zepPtdamount1===0 || Public.isBlank(row.zepPtdamount1))){
_secondGrid.updateRow(row,{
zepPtdamount1:data.kzwi1,
zepPtdamount:data.kzwi11
})
}
});
});
totalFinancialAuditGrid(secondRows);
}
}
}
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);
});
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/payApply.jsp
View file @ 6d8fb5c9
......@@ -5,7 +5,6 @@
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date"/>
<x:script src='/javaScript/math.js'/>
<x:script src='/biz/topsun/sap/costReimbursement/payApply.js'/>
</head>
<body>
......@@ -27,29 +26,33 @@
<x:hidden name="personMemberName"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="zepNo" required="false" label="EP流程单号" labelCol="2" maxLength="64" fieldCol="2"/>
<x:inputC name="zepFcrdate" required="false" wrapper="date" label="付款申请创建日期" labelCol="2"
fieldCol="2"/>
<x:inputC name="zepFtype" required="false" label="EP付款申请类别" labelCol="2" maxLength="64"
fieldCol="2"
/>
<x:inputC name="zepFtypename" required="false" label="EP付款申请类别名称" labelCol="2" maxLength="64"
fieldCol="2"/>
<x:inputC name="zepNo" required="false" readonly="true" label="EP流程单号" labelCol="2" maxLength="64" fieldCol="2"/>
<x:inputC name="zepFcrdate" required="false" readonly="true" wrapper="date" label="付款申请创建日期" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFtype" required="false" readonly="true" label="EP付款申请类别" labelCol="2" maxLength="64" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepFtypename" required="false" readonly="true" label="EP付款申请类别名称" labelCol="2" maxLength="64" fieldCol="2"/>
<x:inputC name="bukrs" required="false" label="公司代码" labelCol="2" fieldCol="2" wrapper="select"/>
<x:inputC name="butxt" required="false" readonly="true" label="公司代码名称" labelCol="2" fieldCol="2"/>
<x:inputC name="zepDepart" required="false" label="EP部门代码" labelCol="2" fieldCol="2"/>
<x:inputC name="zepDepartname" required="false" label="EP部门名称" labelCol="2" fieldCol="2"/>
<x:inputC name="zepAppli" required="false" label="EP流程申请人代码" labelCol="2" fieldCol="2"/>
<x:inputC name="zepAppliname" required="false" label="EP流程申请人" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFcrdate" wrapper="date" required="false" label="付款申请创建日期" labelCol="2"
fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepDepart" required="false" readonly="true" label="EP部门代码" labelCol="2" fieldCol="2"/>
<x:inputC name="zepDepartname" required="false" readonly="true" label="EP部门名称" labelCol="2" fieldCol="2"/>
<x:inputC name="zepAppli" required="false" readonly="true" label="EP流程申请人代码" labelCol="2" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepAppliname" required="false" readonly="true" label="EP流程申请人" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFcrdate" wrapper="date" readonly="true" required="false" label="付款申请创建日期" labelCol="2" fieldCol="2"/>
<x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFtamount" required="false" label="申请总金额（本位币）" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFtamount1" required="false" label="申请总金额" labelCol="2" fieldCol="2"/>
<x:inputC name="zepPtamount" required="false" label="审批总金额（本位币）" labelCol="2" fieldCol="2"/>
<x:inputC name="zepPtamount1" required="false" label="审批总金额" labelCol="2" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepFtamount" 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"/>
</div>
<div class="hg-form-row" 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 class="blank_div clearfix"></div>
<x:title title="报销人填写" name="group"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/refundApply.js
View file @ 6d8fb5c9
......@@ -89,17 +89,22 @@ var tableArray = [
}
},
{
display: "含税金额", name: "kzwi1", width: 120, minwidth: 120, type: "string", align: "left",
display: "含税金额", name: "kzwi1", width: 120, minwidth: 120, type: "money", align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
type: 'text'
}
},
{
display: "含税金额（本位币）", name: "kzwi11", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
type: 'text'
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;
}
},
]
......@@ -117,58 +122,15 @@ var tableArray = [
type: 'text'
}
},
{
display: "不含税金额（审批）",
name: "zepPdamount1",
width: 120,
minwidth: 120,
type: "string",
align: "left",
editor: {
type: 'text'
}
},
{
display: "税额（审批）", name: "zepPdtax1", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
type: 'text'
}
},
{
display: "含税金额（审批）",
name: "zepPtdamount1",
width: 120,
minwidth: 120,
type: "string",
type: "money",
align: "left",
editor: {
type: 'text'
}
},
{
display: "不含税金额（审批-本位币）",
name: "zepPdamount",
width: 120,
minwidth: 120,
type: "string",
align: "left",
editor: {
type: 'text'
}
},
{
display: "税额（审批-本位币）",
name: "zepPdtax",
width: 120,
minwidth: 120,
type: "string",
align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
type: 'text'
}
},
......@@ -177,10 +139,10 @@ var tableArray = [
name: "zepPtdamount",
width: 120,
minwidth: 120,
type: "string",
type: "money",
align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
type: 'text'
}
},
......@@ -308,7 +270,7 @@ function loadGrid(obj) {
toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: function () {
tableArray.forEach((item) => {
UICtrl.addGridRow(item.gridManager, {zepItemno: getZepItemNo()});
UICtrl.addGridRow(item.gridManager, {zepItemno: getZepItemNo(),zepBptype:"D",zepBptypename:"客户"});
});
},
deleteHandler: function () {
......@@ -334,9 +296,8 @@ function loadGrid(obj) {
checkbox: true,
fixedCellHeight: true,
selectRowButtonOnly: true,
onAfterEdit:totalMoney,
//onAfterEdit:totalMoney,
onBeforeCheckRow: function (checked, data) {
debugger
//同时选定或取消所有表格中的对应行
tableArray.forEach((item) => {
let rows = item.gridManager.rows;
......@@ -354,7 +315,6 @@ function loadGrid(obj) {
// console.log(b)
// $(b).addClass("l-checked")
// debugger
//同时全选、同时取消全选
// tableArray.forEach((item) => {
// let hrow=$(item.gridManager.element);//全选框
......@@ -369,6 +329,27 @@ function loadGrid(obj) {
// })
// })
return false;//阻止默认事件
},
onAfterEdit:function (item) {
if(item.column.name == "waers"
|| item.column.name == "kursf"
|| item.column.name == "kzwi1"){
totalGrid();
}
if(item.column.name == "zepPtdamount1"
|| item.column.name == "zepPtdamount"){
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_secondGrid != null){
var secondRows = _secondGrid.currentData.Rows;
totalFinancialAuditGrid(secondRows);
}
}
return item;
},
onAfterShowData:function (){
if ("financeNode" === subProcUnitId){
initFinancialAuditGridData();
}
}
});
UICtrl.setSearchAreaToggle(obj.gridManager);
......@@ -378,7 +359,6 @@ function loadGrid(obj) {
function totalMoney(data) {
// alert(data.column.name);
// debugger
// data=data.record;
var totals=0;
if (data.column.name=="kzwi1") {
......@@ -420,10 +400,10 @@ function initialize() {
});
useArrayTable(loadGrid);
})
$("#zepFtypename").val("客户退款申请流程");
$("#zepFtype").val("E");
$("#butxt").val("广州市宝绅科技应用有限公司");
$("#bukrs").val("1000");
// $("#zepFtypename").val("客户退款申请流程");
// $("#zepFtype").val("E");
// $("#butxt").val("广州市宝绅科技应用有限公司");
// $("#bukrs").val("1000");
}
function bindQueryEvent() {
......@@ -460,8 +440,6 @@ function getExtendedData(processAction) {
tableArray.forEach((item) => {
console.log(item)
});
debugger
//回退、打回、转交时，不需要验证必填项是否已经填写；
if (processAction == ProcessAction.BACK
|| processAction == ProcessAction.REPLENISH
......@@ -500,7 +478,6 @@ function getTableDataAll(obj) {
//调用数组
function useArrayTable(func, ...data) {
debugger
const results = tableArray.map((item) => {
return func(item, ...data);
});
......@@ -523,6 +500,7 @@ function getZepItemNo() {
function businessJudgmentUnit() {
var isApply = isApplyProcUnit();
if (isApply) {
$("#approvalMoney").hide();
$("#financialAudit").hide();
$("#financialAudit_sapReturn").hide();
$("#capitalPost").hide();
......@@ -550,3 +528,57 @@ function nodeController(){
$("#paymentAccomplish_sapReturn").hide();
}
}
function totalGrid(money) {
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
if (_grid != null){
var data = _grid.getData(),
zepFtamount1 = 0,//申请总金额
zepFtamount = 0;//申请总金额（本位币）
var _kzwi1 = 0;
var _kzwi11 = 0;
$.each(data, function (i, o) {
_kzwi1 = o['kzwi1'] + '';
_kzwi11 = o['kzwi11'] + '';
zepFtamount1 = MathUtil.add(zepFtamount1, _kzwi1);
zepFtamount = MathUtil.add(zepFtamount, _kzwi11);
$('#zepFtamount1').val(zepFtamount1);
$('#zepFtamount').val(zepFtamount);
});
}
}
function initFinancialAuditGridData(){
var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
var _secondGrid = UICtrl.getGridManager('#financialAuditGrid');
if (_grid != null && _secondGrid != null){
var datas = _grid.getData();
if (datas.length > 0 && _secondGrid.currentData != null){
var secondRows = _secondGrid.currentData.Rows;
$.each(datas, function (i, data) {
$.each(secondRows, function (i, row) {
if (data.zepItemno === row.zepItemno && (row.zepPtdamount1===0 || Public.isBlank(row.zepPtdamount1))){
_secondGrid.updateRow(row,{
zepPtdamount1:data.kzwi1,
zepPtdamount:data.kzwi11
})
}
});
});
totalFinancialAuditGrid(secondRows);
}
}
}
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);
});
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/refundApply.jsp
View file @ 6d8fb5c9
......@@ -4,7 +4,6 @@
<html>
<head>
<x:base include="layout,dialog,grid,tree,combox,commonTree,date"/>
<x:script src='/javaScript/math.js'/>
<x:script src='/biz/topsun/sap/costReimbursement/refundApply.js'/>
</head>
<body>
......@@ -26,33 +25,33 @@
<x:hidden name="personMemberName"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="zepNo" required="false" label="EP流程单号" labelCol="2" maxLength="64" fieldCol="2"/>
<x:inputC name="zepFcrdate" required="false" wrapper="date" label="付款申请创建日期" labelCol="2"
fieldCol="2"/>
<x:inputC name="zepFtype" required="false" label="EP付款申请类别" labelCol="2" maxLength="64"
fieldCol="2"
/>
<x:inputC name="zepFtypename" required="false" label="EP付款申请类别名称" labelCol="2" maxLength="64"
fieldCol="2"/>
<x:inputC name="zepNo" required="false" readonly="true" label="EP流程单号" labelCol="2" maxLength="64" fieldCol="2"/>
<x:inputC name="zepFcrdate" required="false" readonly="true" wrapper="date" label="付款申请创建日期" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFtype" required="false" readonly="true" label="EP付款申请类别" labelCol="2" maxLength="64" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepFtypename" required="false" readonly="true" label="EP付款申请类别名称" labelCol="2" maxLength="64" fieldCol="2"/>
<x:inputC name="bukrs" required="false" label="公司代码" labelCol="2" fieldCol="2" wrapper="select"/>
<x:inputC name="butxt" required="false" readonly="true" label="公司代码名称" labelCol="2" fieldCol="2"/>
<x:inputC name="zepDepart" required="false" label="EP部门代码" labelCol="2" fieldCol="2"/>
<x:inputC name="zepDepartname" required="false" label="EP部门名称" labelCol="2" fieldCol="2"/>
<x:inputC name="zepAppli" required="false" label="EP流程申请人代码" labelCol="2" fieldCol="2"/>
<x:inputC name="zepAppliname" required="false" label="EP流程申请人" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFcrdate" wrapper="date" required="false" label="付款申请创建日期" labelCol="2"
fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepDepart" required="false" readonly="true" label="EP部门代码" labelCol="2" fieldCol="2"/>
<x:inputC name="zepDepartname" required="false" readonly="true" label="EP部门名称" labelCol="2" fieldCol="2"/>
<x:inputC name="zepAppli" required="false" readonly="true" label="EP流程申请人代码" labelCol="2" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepAppliname" required="false" readonly="true" label="EP流程申请人" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFcrdate" wrapper="date" readonly="true" required="false" label="付款申请创建日期" labelCol="2" fieldCol="2"/>
<x:inputC name="zepTxt" required="false" label="付款申请内容" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFtamount" required="false" label="申请总金额（本位币）" labelCol="2" fieldCol="2"/>
<x:inputC name="zepFtamount1" required="false" label="申请总金额" labelCol="2" fieldCol="2"/>
<x:inputC name="zepPtamount" required="false" label="审批总金额（本位币）" labelCol="2" fieldCol="2"/>
<x:inputC name="zepPtamount1" required="false" label="审批总金额" labelCol="2" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:inputC name="zepFtamount" 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"/>
</div>
<div class="hg-form-row" 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 class="blank_div clearfix"></div>
<x:title title="报销人填写" name="group"/>
......
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