Commit c2678360 authored by 鲁鑫's avatar 鲁鑫

采购申请总账科目数据字典

parent b6afb014
......@@ -9,7 +9,7 @@
</head>
<body>
<div class="container-fluid">
<x:billTitle title="采购申请" needStatus="true" needPerson="true"/>
<x:billTitle title="服务类采购申请" needStatus="true" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="id"/>
<x:hidden name="version"/>
......
......@@ -45,6 +45,7 @@ function initPurchaseListGrid() {
, {display: "id", name: "id", width: "140", align: "left", type: "string", hide: true}
, {display: "需求跟踪编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "center"}
, {display: "PR类型", name: "bsartTextView", width: 150, minWidth: 60, type: "string", align: "center"}
, {display: "科目分配类别", name: "knttpTextView", width: 150, minWidth: 60, type: "string", align: "center"}
, {display: "采购申请编号", name: "banfn", width: 150, minWidth: 60, type: "string", align: "center"}
, {display: "批准时间", name: "frgdt", width: 200, minWidth: 60, type: "date", align: "center"}
, {display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"}
......
......@@ -9,7 +9,7 @@
</head>
<body>
<div class="container-fluid">
<x:billTitle title="采购申请" needStatus="true" needPerson="true"/>
<x:billTitle title="固定资产采购申请" needStatus="true" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="id"/>
<x:hidden name="version"/>
......
......@@ -214,12 +214,28 @@ function getGridColumns() {
columns.push({
display: "成本中心", name: "kostlName", width: "200", align: "left", type: "string",
},);
//填订单类型是Z01或者Z02的
columns.push({
display: "订单号", name: "aufnr", width: "200", align: "left", type: "string",
});
columns.push({
display: "总账科目", name: "sakto", width: "100", align: "left", type: "string",
editor: {type: 'text', required: true}
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "dictionary",
getParam: function (item) {
return {
fieldName: "SAKTO",
filterValue:'6600'
}
},
back: {
SAKNR:'sakto',
}
},
}
},);
columns.push({
display: "申请日期", name: "badat", width: "100", align: "left", type: "string",
......@@ -452,6 +468,9 @@ function getGridColumns() {
// },
// }
});
columns.push({
display: "总账科目", name: "sakto", width: "200", align: "left", type: "string",
},);
columns.push({
display: "申请日期", name: "badat", width: "100", align: "left", type: "string",
editor: {required: false, type: "date"}
......
......@@ -9,7 +9,7 @@
</head>
<body>
<div class="container-fluid">
<x:billTitle title="采购申请" needStatus="true" needPerson="true"/>
<x:billTitle title="非资产消耗性采购申请" needStatus="true" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="id"/>
<x:hidden name="version"/>
......
......@@ -94,7 +94,7 @@ public class NonOrderStorageApplicationImpl extends FlowBroker implements NonOrd
BizBillStatus status = approvePassed() ? BizBillStatus.COMPLETED : BizBillStatus.ABORTED;
NonOrderStorage nonOrderStorage = nonOrderStorageRepository.findOne(bizId);
nonOrderStorage.setStatusId(status.getId());
this.sendSapCenterData(nonOrderStorage);
//this.sendSapCenterData(nonOrderStorage);
nonOrderStorageRepository.save(nonOrderStorage);
}
......
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