Skip to content

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

预付款选择供应商，一个PO带出汇总的金额

parent b24e78e8
Hide whitespace changes
Inline Side-by-side
Showing with 330 additions and 124 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.js
View file @ fe3adbd6
......@@ -34,156 +34,122 @@ var tableArray = [
align: "left",
},
{
display: "BP标识", name: "zepBptype", width: 120, minwidth: 120, type: "string", align: "left"
display: "BP标识", name: "zepBptype", width: 120, minwidth: 120, type: "string", align: "left", hide: true
},
{
display: "BP标识描述", name: "zepBptypename", width: 120, minwidth: 120, type: "string", align: "left",
/*editor: {
type: 'text'
}*/
display: "BP标识描述", name: "zepBptypename", width: 120, minwidth: 120, type: "string", align: "left", hide: true
},
{
display: "BP(合作伙伴)", name: "partner", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "getCusAndSuppliers",
getParam: function (item) {
return {
ZEP_BPTYPE: item.zepBptype,
BUKRS:$("#bukrs").val()
}
},
back: {
PARTNER: "partner",
NAME_ORG1: "koinh",
BANKL: "bankl",
BANKN: "bankn",
SWIFT: "swift",
}
},
}
display: "BP(合作伙伴)", name: "partner", width: 120, minwidth: 120, type: "string", align: "left", hide: true
},
{
display: "BP账号名称", name: "koinh", width: 120, minwidth: 120, type: "string", align: "left",
display: "BP账号名称", name: "koinh", width: 200, minwidth: 120, type: "string", align: "left", hide: true
},
{
display: "BP银行账号", name: "bankn", width: 200, minwidth: 120, type: "string", align: "left",
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "getCusAndBanks",
getParam: function (item) {
return {
ZEP_BPTYPE: item.zepBptype,
PARTNER:item.partner
}
},
back: {
BANKN: "bankn",
BANKL: "bankl",
SWIFT: "swift",
}
},
}
display: "BP银行账号", name: "bankn", width: 200, minwidth: 120, type: "string", align: "left", hide: true
},
{
display: "BP联行号", name: "bankl", width: 120, minwidth: 120, type: "string", align: "left",
display: "BP联行号", name: "bankl", width: 120, minwidth: 120, type: "string", align: "left", hide: true
},
{
display: "SWIFT/BIC", name: "swift", width: 120, minwidth: 120, type: "string", align: "left",
display: "SWIFT/BIC", name: "swift", width: 120, minwidth: 120, type: "string", align: "left", hide: true
},
// {
// display: "采购订单号", name: "ebeln", width: 120, minwidth: 120, type: "string", align: "left",
// },
// {
// display: "采购订单行", name: "ebelp", width: 120, minwidth: 120, type: "string", align: "left",
// editor: {
// required: true, type: "select",
// data: {
// type: 'system',
// name: "getPurchaseOrders",
// getParam: function (item) {
// return {
// ZEP_FTYPE: $("#zepFtype").val(),
// BUKRS:$("#bukrs").val(),
// PARTNER:item.partner,
// }
// },
// back: {
// EBELN: "ebeln",
// EBELP: "ebelp",
// MATNR: "matnr",
// TXZ01: "txz01",
// MENGE: "menge",
// TEXT1: "text1",
// MEINS: "meins",
// KBETR: "kbetr",
// MWSKZ: "mwskz",
// KWETR: "kwetr",
// WAERS: "waers",
// KURSF: "kursf",
// KZWI1: "kzwi1",
// KZWI11: "kzwi11",
// }
// },
// }
// },
// {
// display: "物料编码", name: "matnr", width: 130, minwidth: 120, type: "string", align: "left",
// },
// {
// display: "物料名称", name: "txz01", width: 200, minwidth: 120, type: "string", align: "left",
// },
// {
// display: "数量", name: "menge", width: 100, minwidth: 120, type: "string", align: "left",
// editor: {
// mask: 'nnnnnnnnn.nn',
// type: 'text'
// }
// },
// {
// display: "单位", name: "meins", width: 100, minwidth: 120, type: "string", align: "left",
// },
// {
// display: "含税单价", name: "kbetr", width: 100, minwidth: 120, type: "string", align: "left",
// },
// {
// display: "税码", name: "mwskz", width: 100, minwidth: 120, type: "string", align: "left",
// },
// {
// display: "税额", name: "kwetr", width: 100, minwidth: 120, type: "string", align: "left",
// },
/*{
display: "采购订单行信息", name: "zekpoItem", width: 300, minwidth: 120, type: "string", align: "left",
},*/
{
display: "采购订单号", name: "ebeln", width: 120, minwidth: 120, type: "string", align: "left",
},
{
display: "采购订单行", name: "ebelp", width: 120, minwidth: 120, type: "string", align: "left",
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "getPurchaseOrders",
getParam: function (item) {
return {
ZEP_FTYPE: $("#zepFtype").val(),
BUKRS:$("#bukrs").val(),
PARTNER:item.partner,
}
},
back: {
EBELN: "ebeln",
EBELP: "ebelp",
MATNR: "matnr",
TXZ01: "txz01",
MENGE: "menge",
TEXT1: "text1",
MEINS: "meins",
KBETR: "kbetr",
MWSKZ: "mwskz",
KWETR: "kwetr",
WAERS: "waers",
KURSF: "kursf",
KZWI1: "kzwi1",
KZWI11: "kzwi11",
}
},
}
},
{
display: "物料编码", name: "matnr", width: 130, minwidth: 120, type: "string", align: "left",
display: "币别", name: "waers", width: 120, minwidth: 120, type: "string", align: "left",
},
{
display: "物料名称", name: "txz01", width: 200, minwidth: 120, type: "string", align: "left",
display: "汇率", name: "kursf", width: 120, minwidth: 120, type: "string", align: "left",
},
{
display: "数量", name: "menge", width: 100, minwidth: 120, type: "string", align: "left",
editor: {
mask: 'nnnnnnnnn.nn',
type: 'text'
}
display: "不含税金额（本位币）", name: "netwr1", width: 120, minwidth: 120, type: "money", align: "left",
},
{
display: "单位", name: "meins", width: 100, minwidth: 120, type: "string", align: "left",
display: "税额（本位币）", name: "kwetr1", width: 120, minwidth: 120, type: "money", align: "left",
},
{
display: "含税单价", name: "kbetr", width: 100, minwidth: 120, type: "string", align: "left",
display: "含税金额（本位币）", name: "kzwi11", width: 120, minwidth: 120, type: "money", align: "left",
},
{
display: "税码", name: "mwskz", width: 100, minwidth: 120, type: "string", align: "left",
},
{
display: "税额", name: "kwetr", width: 100, minwidth: 120, type: "string", align: "left",
},
/*{
display: "采购订单行信息", name: "zekpoItem", width: 300, minwidth: 120, type: "string", align: "left",
},*/
{
display: "币别", name: "waers", width: 120, minwidth: 120, type: "string", align: "left",
display: "不含税金额", name: "netwr", width: 120, minwidth: 120, type: "money", align: "left",
},
{
display: "汇率", name: "kursf", width: 120, minwidth: 120, type: "string", align: "left",
display: "税额", name: "kwetr", width: 100, 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: "money", align: "left",
render:function(item){
var money = 0;
if (item.waers === "CNY"){
money=item.kzwi1;
}else {
money=MathUtil.mul(item.kzwi1,item.kursf).toFixed(2);
}
return item.kzwi11 = money;
}
},
{
display: "文本", name: "text1", width: 120, minwidth: 120, type: "money", align: "left",hide:true,
......@@ -412,17 +378,83 @@ function loadGrid(obj) {
if(obj.node==="reimbursementApplierGrid" && isApply) {//只有第一个表格含工具栏
toolbarOptions = UICtrl.getDefaultToolbarOptions({
addHandler: function () {
tableArray.forEach((item) => {
UICtrl.addGridRow(item.gridManager,
{
zepItemno: getZepItemNo(),
zepBptype:"K",
zepBptypename:"供应商",
zlsch:"T",
zlschTextView:"T-电汇",
// tableArray.forEach((item) => {
// UICtrl.addGridRow(item.gridManager,
// {
// zepItemno: getZepItemNo(),
// zepBptype:"K",
// zepBptypename:"供应商",
// zlsch:"T",
// zlschTextView:"T-电汇",
// }
// );
// });
var bukrs = $("#bukrs").val();
if (bukrs == null || bukrs == "") {
Public.tip("请先选择公司代码");
return;
}
var partner = $("#partner").val();
if (partner == null || partner == "") {
Public.tip("请先选择BP(合作伙伴)");
return;
}
UICtrl.showAjaxDialog({
title: '选择采购订单',
height: 400,
width: 1600,
url: web_app.name + '/sapCostReimbursement/showAddAdvancePaymentDetail.load',
param: {
bukrs: $("#bukrs").val(),
partner: $("#partner").val()
},
ok: function (d) {
var _self = this;
var rows = gridManager.getSelectedRows();
//var _grid = UICtrl.getGridManager('#reimbursementApplierGrid');
//var dates = _grid.currentData.Rows
for (var i = 0; i < rows.length; i++) {
var row = rows[i];
// if (dates != null && dates.length > 0) {
// for (let j = 0; j < dates.length; j++) {
// var data = dates[j];
// if (data.belnr2 == row.BELNR2 ) {
// Public.tip("采购发票号" + data.belnr2 +" 已选择，请取消勾选！");
// return false;
// }
// }
// }
tableArray.forEach((item) => {
UICtrl.addGridRow(item.gridManager,
{
zepItemno: getZepItemNo(),
zepBptype:"K",
zepBptypename:"供应商",
zlsch:"T",
zlschTextView:"T-电汇",
ebeln: row.EBELN,
ebelp: row.EBELP,
waers: row.WAERS,
kursf: row.KURSF,
netwr1: row.NETWR1,
kwetr1: row.KWETR1,
kzwi11: row.KZWI11,
mwskz: row.MWSKZ,
netwr: row.NETWR,
kwetr: row.KWETR,
kzwi1: row.KZWI1,
partner: $("#partner").val(),
koinh: $("#koinh").val(),
bankn: $("#bankn").val(),
bankl: $("#bankl").val(),
swift: $("#swift").val(),
});
});
}
);
});
//totalGrid();
_self.close();
},
})
},
deleteHandler: function () {
// tableArray.forEach((item) => {
......@@ -703,6 +735,44 @@ function bindQueryEvent() {
$('#zt012kText1').val(data.TEXT1);
}
});
$('#partner').searchbox({
type: "system", name: "getCusAndSuppliers",
getParam: function (item) {
return {
ZEP_BPTYPE: "K",
BUKRS:$("#bukrs").val()
}
},
onChange: function (value, data) {
var partner = $("#partner").val();
$('#partner').val(data.PARTNER);
$('#koinh').val(data.NAME_ORG1);
$("#text1").val(data.TEXT1);
if (Public.isBlank(value) || partner !== data.PARTNER) {
$('#bankn').val('');
$('#bankl').val('');
$('#swift').val('');
}
}
});
$('#bankn').searchbox({
type: "system", name: "getCusAndBanks",
getParam: function (item) {
return {
ZEP_BPTYPE: "K",
PARTNER: $("#partner").val()
}
},
onChange: function (value, data) {
$('#bankn').val(data.BANKN);
$('#bankl').val(data.BANKL);
$('#swift').val(data.SWIFT);
}
});
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePayment.jsp
View file @ fe3adbd6
......@@ -58,6 +58,15 @@
<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="partner" required="true" label="BP(合作伙伴)" labelCol="2" fieldCol="2" wrapper="select"/>
<x:inputC name="koinh" required="true" readonly="true" label="BP账号名称" labelCol="2" fieldCol="2" />
</div>
<div class="hg-form-row" >
<x:inputC name="bankn" required="true" label="BP银行账号" labelCol="2" fieldCol="2" wrapper="select"/>
<x:hidden name="swift"/>
<x:inputC name="bankl" required="true" readonly="true" label="BP联行号" labelCol="2" fieldCol="2" />
</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"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/costReimbursement/advancePaymentDetail.js 0 → 100644
View file @ fe3adbd6
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: "EBELN", width: 120, minwidth: 120, type: "string", align: "left",
},
{
display: "采购订单行", name: "EBELP", width: 120, 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: "NETWR1", width: 120, minwidth: 120, type: "money", align: "left",
},
{
display: "税额（本位币）", name: "KWETR1", width: 120, minwidth: 120, type: "money", align: "left",
},
{
display: "含税金额（本位币）", name: "KZWI11", width: 120, minwidth: 120, type: "money", align: "left",
},
{
display: "税码", name: "MWSKZ", width: 100, minwidth: 120, type: "string", align: "left",
},
{
display: "不含税金额", name: "NETWR", width: 120, minwidth: 120, type: "money", align: "left",
},
{
display: "税额", name: "KWETR", width: 100, minwidth: 120, type: "string", align: "left",
},
{
display: "含税金额", name: "KZWI1", width: 120, minwidth: 120, type: "money", align: "left",
},
],
dataAction: 'server',
url: web_app.name + '/sapCostReimbursement/getPurchaseOrders.ajax?',
parms: {
zepFtype:"D",
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/advancePaymentDetail.jsp 0 → 100644
View file @ fe3adbd6
<%@ 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/advancePaymentDetail.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="partner"/>
<x:hidden name="bukrs"/>
</form>
</div>
<div id="belnrgrid"></div>
</div>
</body>
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/costReimbursement/controller/SapCostReimbursementController.java
View file @ fe3adbd6
......@@ -246,6 +246,15 @@ public class SapCostReimbursementController extends CommonController {
return forward("payApplyDetail");
}
public String showAddAdvancePaymentDetail(){
SDO sdo = this.getSDO();
String partner = sdo.getString("partner");
String bukrs = sdo.getString("bukrs");
this.putAttribute("partner",partner);
this.putAttribute("bukrs",bukrs);
return forward("advancePaymentDetail");
}
public String getPartnerInvs() {
SDO sdo = this.getSDO();
SapCostReimbursementQueryRequest queryRequest = sdo.toQueryRequest(SapCostReimbursementQueryRequest.class);
......@@ -260,4 +269,11 @@ public class SapCostReimbursementController extends CommonController {
});
return packGridDataAndResult(mapList);
}
public String getPurchaseOrders() {
SDO sdo = this.getSDO();
SapCostReimbursementQueryRequest queryRequest = sdo.toQueryRequest(SapCostReimbursementQueryRequest.class);
List<Map<String, String>> mapList = sapPaymentApplication.getPurchaseOrders(queryRequest.getBukrs(),queryRequest.getPartner(),queryRequest.getZepFtype());
return packGridDataAndResult(mapList);
}
}
\ No newline at end of file
topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/SapPaymentApplication.java
View file @ fe3adbd6
......@@ -51,7 +51,7 @@ public interface SapPaymentApplication {
* @return
* @throws IOException
*/
List<Map<String,String>> getPurchaseOrders(String BUKRS,String PARTNER,String ZEP_FTYPE) throws IOException;
List<Map<String,String>> getPurchaseOrders(String BUKRS,String PARTNER,String ZEP_FTYPE);
/**
* 根据公司代码、BP(合作伙伴）、付款申请类别查询发票
......
topsun/src/main/java/com/huigou/topsun/sap/sapApplication/application/impl/SapPaymentApplicationImpl.java
View file @ fe3adbd6
......@@ -127,7 +127,7 @@ public class SapPaymentApplicationImpl implements SapPaymentApplication {
}
@Override
public List<Map<String, String>> getPurchaseOrders(String BUKRS, String PARTNER, String ZEP_FTYPE) throws IOException {
public List<Map<String, String>> getPurchaseOrders(String BUKRS, String PARTNER, String ZEP_FTYPE) {
Map<String,Object> param = new HashMap<>();
param.put("BUKRS",BUKRS);
param.put("PARTNER",PARTNER);
......
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