Skip to content

T
topsun-bpm
Commit c4406e1d authored by wanghang's avatar wanghang
Browse files
Options

12

parent 7ae5a7e9
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 37 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.js
View file @ c4406e1d
...@@ -14,6 +14,22 @@ function loadNonProdApplyListGrid() { ...@@ -14,6 +14,22 @@ function loadNonProdApplyListGrid() {
addHandler() addHandler()
}, },
deleteHandler: deleteHandler, deleteHandler: deleteHandler,
testHandler: {id: 'basicInfoMaintenance', text: '基本信息维护', img: 'fa-music', className: 'btn-gray',
click: function () {
let result=DataUtil.getUpdateRow(gridManager);
if(result.status!==3){
Public.tip("请选择一条已审核后数据！")
return false;
}
UICtrl.addTabItem({
tabid: 'showNonProdApplyNext',
text: "非产品/非本成品类物料主数据维护申请详情",
url: web_app.name + '/sapNonProdApply/forwardNonProdApplyNext.do?bizId='+result.id
});
}
}
}); });
gridManager = UICtrl.grid("#nonProdApplyListGrid", { gridManager = UICtrl.grid("#nonProdApplyListGrid", {
columns: [ columns: [
...@@ -74,14 +90,7 @@ function resetForm(obj) { ...@@ -74,14 +90,7 @@ function resetForm(obj) {
} }
//重写DataUtil的getUpdateRowId函数、它默认取行的id列
DataUtil.getUpdateRowId = function (gridManager) {
var result = DataUtil.getUpdateRow(gridManager);
if (result) {
return result.proofingMakeId;
}
return result;
}
//删除按钮 //删除按钮
function deleteHandler() { function deleteHandler() {
...@@ -110,10 +119,10 @@ function doView(id) { ...@@ -110,10 +119,10 @@ function doView(id) {
}); });
} }
function next(){ // function next(){
UICtrl.addTabItem({ // UICtrl.addTabItem({
tabid: 'showNonProdApplyNext', // tabid: 'showNonProdApplyNext',
text: "非产品/非本成品类物料主数据维护申请详情", // text: "非产品/非本成品类物料主数据维护申请详情",
url: web_app.name + '/sapNonProdApply/forwardNonProdApplyNext.do?isDetailPage=true' // url: web_app.name + '/sapNonProdApply/forwardNonProdApplyNext.do?isDetailPage=true'
}); // });
} // }
\ No newline at end of file \ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyList.jsp
View file @ c4406e1d
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</head> </head>
<body> <body>
<div class="container-fluid"> <div class="container-fluid">
<x:button value="next" onclick="next()" icon="fa-save"/> <%-- <x:button value="next" onclick="next()" icon="fa-save"/>--%>
<div class="ui-hide"> <div class="ui-hide">
<x:select name="processType" dictionary="processType"/> <x:select name="processType" dictionary="processType"/>
<x:select name="yesorno" dictionary="yesorno"/> <x:select name="yesorno" dictionary="yesorno"/>
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @ c4406e1d
$(document).ready(function () { $(document).ready(function () {
initializate() initializate()
loadGrid();
}) })
function initializate() { function initializate() {
$("#a").show();
$('input[name="maintenanceType"]').change(function() { $('input[name="maintenanceType"]').change(function() {
if ($(this).is(':checked')) { if ($(this).is(':checked')) {
console.log($(this).val()); // 输出选中的值 console.log($(this).val()); // 输出选中的值
...@@ -43,3 +43,41 @@ function initializate() { ...@@ -43,3 +43,41 @@ function initializate() {
} }
function loadGrid() {
resourceGridManager = UICtrl.grid("#businessPersonnelListGrid", {
columns: [
{ display: "部门", name: "version", width: 200, minWidth: 60, type: "string", align: "left" },
{ display: "部门人员", name: "resourceName", width: 200, minWidth: 60, type: "string", align: "left",
editor: {
required: true, type: "select",
data: {
type: 'system',
name: "resourceNameGroup",
back: {
id: "resourceId",
gxmc:"resourceName",
version:"version",
},
getParam: function () {
return {paramValue: $("#processType").val()}
},
},
}
}
],
dataAction: "server",
url: web_app.name + '/process/slicedProcessResourceList.ajax',
parms:{processId:$("#processId").val()},
pageSize: 20,
usePager: false,
enabledEdit: true,
width: "100%",
height: "300",
heightDiff: -8,
fixedCellHeight: true,
selectRowButtonOnly: true
});
UICtrl.setSearchAreaToggle(resourceGridManager);
}
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.jsp
View file @ c4406e1d
...@@ -6,32 +6,36 @@ ...@@ -6,32 +6,36 @@
<x:base include="layout,dialog,grid,tree,combox,commonTree,date"/> <x:base include="layout,dialog,grid,tree,combox,commonTree,date"/>
<x:script src='/biz/topsun/sap/nonProdApply/nonProdApplyNext.js'/> <x:script src='/biz/topsun/sap/nonProdApply/nonProdApplyNext.js'/>
</head> </head>
<style> <%--<style>--%>
.box { <%-- .box {--%>
display: none; <%-- display: none;--%>
} <%-- }--%>
</style> <%--</style>--%>
<body> <body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页--> <x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:billTitle title="非产品/非本成品类物料主数据维护申请表" needStatus="false" needPerson="true"/> <x:billTitle title="非产品/非本成品类物料主数据维护申请表" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm"> <form class="hg-form" method="post" action="" id="submitForm">
<div style="text-align: right;padding-right: 50px;" class="btn-group" >
<button id="save" title="" type="button" class="btn btn-gray"><i
class="fa fa-save"></i>保存
</button>
<button id="back" title="" type="button" class="btn btn-gray"><i
class="fa fa-reply"></i>回退
</button>
<button id="showChart" title="" type="button" class="btn btn-gray" ><i
class="fa fa-sitemap"></i>分发
</button>
</div>
<x:hidden name="id"/> <x:hidden name="id"/>
<%-- <x:hidden name="billCode"/>--%>
<%-- <x:hidden name="fillinDate" type="datetime"/>--%>
<%-- <x:hidden name="fullId"/>--%>
<%-- <x:hidden name="organId"/>--%>
<%-- <x:hidden name="organName"/>--%>
<%-- <x:hidden name="deptId"/>--%>
<%-- <x:hidden name="deptName"/>--%>
<%-- <x:hidden name="positionId"/>--%>
<%-- <x:hidden name="positionName"/>--%>
<%-- <x:hidden name="personMemberId"/>--%>
<%-- <x:hidden name="personMemberName"/>--%>
<x:title title="基本信息" name="group"/> <x:title title="基本信息" name="group"/>
<div class="hg-form-cols"> <div class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
<x:inputC name="billCode" label="申请单编号" labelCol="1" readonly="true" fieldCol="2"/> <x:inputC name="billCode" label="申请单编号" labelCol="1" readonly="true" fieldCol="2"/>
<x:inputC name="approvalStatus" label="批准状态" readonly="true" labelCol="1" fieldCol="2"/> <x:selectC name="statusId" label="批准状态" dictionary="bizBillStatus" disabled="true" labelCol="1"
fieldCol="2"/>
<x:inputC name="personMemberName" label="填写人" readonly="true" labelCol="1" fieldCol="2"/> <x:inputC name="personMemberName" label="填写人" readonly="true" labelCol="1" fieldCol="2"/>
<x:inputC name="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/> <x:inputC name="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div> </div>
...@@ -82,6 +86,10 @@ ...@@ -82,6 +86,10 @@
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1" <x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11"/> fieldCol="11"/>
</div> </div>
<div class="hg-form-row">
<x:title title="业务人员" name="group"/>
<div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div>
</div> </div>
<div class="hg-form-cols"> <div class="hg-form-cols">
<div class="hg-form-row"> <div class="hg-form-row">
...@@ -119,7 +127,7 @@ ...@@ -119,7 +127,7 @@
<x:inputC name="tragr" label="运输组" labelCol="1" fieldCol="2"/> <x:inputC name="tragr" label="运输组" labelCol="1" fieldCol="2"/>
</div> </div>
</div> </div>
<div class="hg-form-cols" style="display: none" id="a"> <div class="hg-form-cols" style="display: none">
<div class="hg-form-row"> <div class="hg-form-row">
<x:inputC name="werks" label="工厂" labelCol="1" fieldCol="2"/> <x:inputC name="werks" label="工厂" labelCol="1" fieldCol="2"/>
<x:inputC name="bstme" label="采购计量单位" labelCol="1" fieldCol="2"/> <x:inputC name="bstme" label="采购计量单位" labelCol="1" fieldCol="2"/>
...@@ -226,6 +234,13 @@ ...@@ -226,6 +234,13 @@
</div> </div>
</div> </div>
</form> </form>
</body> </body>
</html> </html>
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/controller/NonProdApplyController.java
View file @ c4406e1d
...@@ -72,7 +72,10 @@ public class NonProdApplyController extends CommonController { ...@@ -72,7 +72,10 @@ public class NonProdApplyController extends CommonController {
} }
public String forwardNonProdApplyNext(){ public String forwardNonProdApplyNext(){
return forward("nonProdApplyNext"); SDO sdo = this.getSDO();
String id = sdo.getBizId();
NonProdApplyBaseInfo nonProdApplyBaseInfo = nonProdApplyApplication.loadNonProdApplyBaseInfoById(id);
return forward("nonProdApplyNext",nonProdApplyBaseInfo);
} }
} }
......
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