Commit 5711734b authored by 鲁鑫's avatar 鲁鑫

固定资产采购申请验证绑定的资产编号与采购数量是否一致;物料申请流程标题优化

parent 9bde5ca1
......@@ -14,7 +14,7 @@
<form class="hg-form" method="post" action="" id="queryMainForm">
<div class="hg-form-row">
<x:hidden name="werks"/>
<x:inputC name="paramValue" label="查询条件" labelCol="2" fieldCol="4" required="false"/>
<x:inputC name="paramValue" label="查询条件" labelCol="2" fieldCol="4" required="true"/>
</div>
<x:searchButtons/>
</form>
......
......@@ -125,6 +125,7 @@ function initItemGrid() {
if ($clicked.is('a.bindAnln1')) {// 绑定资产编号
var id =$clicked.data('id');
var werks =$clicked.data('werks');
var menge =$clicked.data('menge');
UICtrl.showAjaxDialog({
title: '绑定',
height: 500,
......@@ -133,6 +134,10 @@ function initItemGrid() {
ok: function(d){
var _self = this;
var rows = gridManager.getSelectedRows();
if (rows.length != menge){
Public.tip("资产号数量必须与采购数量("+menge+")一致");
return false;
}
var anln1s = [];
var anln1 = "";
if (rows.length>0){
......@@ -320,6 +325,7 @@ function getGridColumns() {
html.push('<a class="bindAnln1" href="javascript:void(0);"');
html.push(' data-id="', item.id, '"');
html.push(' data-werks="', item.werks, '"');
html.push(' data-menge="', item.menge, '"');
html.push(' data-name="', item.txz01, '">');
html.push('<i class="fa fa-location-arrow"></i>&nbsp;');
html.push('绑定资产编号');
......
......@@ -411,13 +411,13 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
String fillinDateStr = DateUtil.getDateFormat("yyyy-MM-dd HH:mm:ss", baseInfo.getFillinDate());
//设置标题
String title = "非产品/半成品类物料主数据";
switch (baseInfo.getMaintenanceType()){
case "new"://新增
title = title + "新增";
case "modify"://修改
title = title + "修改";
case "extend"://扩展
title = title + "扩展";
String maintenanceType = baseInfo.getMaintenanceType();
if ("new".equals(maintenanceType)){
title = title + "新增";
} else if ("modify".equals(maintenanceType)) {
title = title + "修改";
} else if ("extend".equals(maintenanceType)) {
title = title + "扩展";
}
return String.format("%s-%s(%s)", title, baseInfo.getBillCode(), fillinDateStr);
}
......
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