Skip to content

T
topsun-bpm
Commit 45f1a04b authored by 鲁鑫's avatar 鲁鑫
Browse files
Options

原材料创建时默认部分数据

parent 12b03586
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1288 additions and 6554 deletions
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyClass.jsp deleted 100644 → 0
View file @ 12b03586
<%@ page language="java" contentType="text/html; charset=utf-8" %>
<%@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,combox,commonTree,date"/>
<x:script src='/biz/topsun/sap/nonProdApply/nonProdApplyClass.js'/>
</head>
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非半成品类物料分类信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
<x:hidden name="meId"/> <!--状态-->
<div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
<button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i
class="fa fa-save"></i>保存
</button>
<button id="submit" title="" type="button" onclick="saveForm(1)" class="btn btn-gray"><i
class="fa fa-check-circle-o"></i>提交
</button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i
class="fa fa-reply"></i>撤销
</button>
</div>
<br/>
<div class=" border-left-top" style="margin-top: 20px;display: none;" id="causeBox">
<div class=" gray-bg">
<div class="col-xs-2 " style="text-align: center;margin-top: 30px">
<h4>驳回历史</h4>
</div>
<div class="hg-form-cols" id="cause-details-box"></div>
</div>
</div>
<x:hidden name="applyDeptId"/>
<x:hidden name="id"/>
<x:hidden name="businessCode"/>
<x:title title="基本信息" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="billCode" label="申请单编号" labelCol="1" readonly="true" 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="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType" disabled="true"/>
</div>
</div>
<x:title title="物品总体内容" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="2"/>
<x:inputC name="applicableStandard" label="适用标准(国标)" labelCol="1" fieldCol="2"/>
<x:selectC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
<x:inputC name="specifications" label="规格" labelCol="1" fieldCol="2"/>
<x:inputC name="material" label="材质" labelCol="1" fieldCol="2"/>
<x:inputC name="design" label="版式" labelCol="1" fieldCol="2"/>
<x:inputC name="size" label="尺码" labelCol="1" fieldCol="2"/>
<x:inputC name="brand" label="品牌" labelCol="1" fieldCol="2"/>
<x:selectC name="itemAttributes" label="物品属性" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
<x:inputC name="materialUsage" label="用途" labelCol="1" fieldCol="8"/>
</div>
</div>
<x:title title="维护分类信息" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="klart" label="类类型" labelCol="1" fieldCol="5" readonly="true" value="023"/>
<x:inputC name="classify" label="分类" labelCol="1" fieldCol="5" readonly="true" value="Z_YCL"/>
</div>
</div>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:hidden name="businessUsage"/>
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11" disabled="true"/>
</div>
<div class="hg-form-row" id="businessPersonnelList">
<!--x:title title="业务人员" name="group"/-->
<div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div>
</div>
<%--div-- class="hg-form-cols">
<div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div>
</div--%>
</form>
<form class="hg-form" method="post" action="" style="display: none;" id="auditForm">
<div class=" border-left-top" style="margin-top: 10px;">
<div class=" gray-bg">
<div class="col-xs-2 " style="text-align: center;margin-top: 30px">
<span>部门数据审核</span>
</div>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:checkboxListC name="auditDept" label="驳回部门" list="auditDeptMap" labelCol="2"
fieldCol="10"/>
</div>
<div id="rejectReasonBox"></div>
<div style="text-align: center">
<div class="btn-group" style="margin: 15px 0px 15px 0px;">
<button id="reject" title="" type="button" onclick="rejectForm()" class="btn btn-gray"><i
class="fa fa-reply"></i>驳回
</button>
<button id="exPass" title="" type="button" class="btn btn-gray"><i
class="fa fa-mail-forward"></i>检查通过
</button>
<button id="send" title="" type="button" onclick="distributeForm()"
class="btn btn-gray"><i
class="fa fa-send-o"></i>传输
</button>
</div>
</div>
</div>
</div>
</div>
</form>
<div class="blank_div clearfix" ></div>
</div>
</body>
</html>
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyCost.jsp deleted 100644 → 0
View file @ 12b03586
<%@ page language="java" contentType="text/html; charset=utf-8" %>
<%@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,combox,commonTree,date"/>
<x:script src='/biz/topsun/sap/nonProdApply/nonProdApplyCost.js'/>
</head>
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非半成品类物料成本信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="meId"/> <!--状态-->
<x:hidden name="active"/> <!--状态-->
<div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
<button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i
class="fa fa-save"></i>保存
</button>
<button id="submit" title="" type="button" onclick="saveForm(1)" class="btn btn-gray"><i
class="fa fa-check-circle-o"></i>提交
</button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i
class="fa fa-reply"></i>撤销
</button>
</div>
<br/>
<div class=" border-left-top" style="margin-top: 20px;display: none;" id="causeBox">
<div class=" gray-bg">
<div class="col-xs-2 " style="text-align: center;margin-top: 30px">
<h4>驳回历史</h4>
</div>
<div class="hg-form-cols" id="cause-details-box"></div>
</div>
</div>
<x:hidden name="applyDeptId"/>
<x:hidden name="id"/>
<x:hidden name="businessCode"/>
<x:title title="基本信息" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="billCode" label="申请单编号" labelCol="1" readonly="true" 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="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType" disabled="true"/>
</div>
</div>
<x:title title="物品总体内容" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="2"/>
<x:inputC name="applicableStandard" label="适用标准(国标)" labelCol="1" fieldCol="2"/>
<x:selectC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
<x:inputC name="specifications" label="规格" labelCol="1" fieldCol="2"/>
<x:inputC name="material" label="材质" labelCol="1" fieldCol="2"/>
<x:inputC name="design" label="版式" labelCol="1" fieldCol="2"/>
<x:inputC name="size" label="尺码" labelCol="1" fieldCol="2"/>
<x:inputC name="brand" label="品牌" labelCol="1" fieldCol="2"/>
<x:selectC name="itemAttributes" label="物品属性" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
<x:inputC name="materialUsage" label="用途" labelCol="1" fieldCol="8"/>
</div>
</div>
<x:title title="维护成本信息" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="ekalr" label="数量结构" labelCol="1" fieldCol="2"/>
<x:inputC name="ncost" label="不参与成本核算" labelCol="1" fieldCol="2"/>
<x:inputC name="hkmat" label="物料来源" labelCol="1" fieldCol="2"/>
<x:inputC name="awsls" label="差异码" labelCol="1" fieldCol="2"/>
</div>
</div>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11" disabled="true"/>
</div>
<div class="hg-form-row" id="businessPersonnelList">
<!--x:title title="业务人员" name="group"/-->
<div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div>
</div>
<%--div-- class="hg-form-cols">
<div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div>
</div--%>
</form>
<form class="hg-form" method="post" action="" style="display: none;" id="auditForm">
<div class=" border-left-top" style="margin-top: 10px;">
<div class=" gray-bg">
<div class="col-xs-2 " style="text-align: center;margin-top: 30px">
<span>部门数据审核</span>
</div>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:checkboxListC name="auditDept" label="驳回部门" list="auditDeptMap" labelCol="2"
fieldCol="10"/>
</div>
<div id="rejectReasonBox"></div>
<div style="text-align: center">
<div class="btn-group" style="margin: 15px 0px 15px 0px;">
<button id="reject" title="" type="button" onclick="rejectForm()" class="btn btn-gray"><i
class="fa fa-reply"></i>驳回
</button>
<button id="exPass" title="" type="button" class="btn btn-gray"><i
class="fa fa-mail-forward"></i>检查通过
</button>
<button id="send" title="" type="button" onclick="distributeForm()"
class="btn btn-gray"><i
class="fa fa-send-o"></i>传输
</button>
</div>
</div>
</div>
</div>
</div>
</form>
<div class="blank_div clearfix" ></div>
</div>
</body>
</html>
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDeptList.js deleted 100644 → 0
View file @ 12b03586
var gridManager = null;
$(document).ready(function () {
initializateUI()
loadNonProdApplyListGrid();
})
function initializateUI() {
UICtrl.layout("#layout", {leftWidth: 3});
}
function loadNonProdApplyDeptListGrid() {
var toolbarOptions = UICtrl.getDefaultToolbarOptions({
deleteHandler: deleteHandler
});
gridManager = UICtrl.grid("#nonProdApplyDeptListGrid", {
columns: [
{display: "申请单编号", name: "billCode", width: 60, minWidth: 60, type: "string", align: "left"},
{display: "申请状态", name: "statusTextView", width: 60, minWidth: 60, type: "string", align: "left"},
{display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "申请部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "申请日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},
{display: "维护类型", name: "maintenanceTypeTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "批准人", name: "approver", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "批准日期", name: "approvalDate", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "通用品名", name: "genericName", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "适用标准(国标)", name: "applicableStandard", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "基本计量单位", name: "baseUnitTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "规格", name: "specifications", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "材质", name: "material", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "版式", name: "design", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "尺码", name: "size", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "品牌", name: "brand", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "用途", name: "materialUsage", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "物品属性", name: "itemAttributesTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "业务用途", name: "businessUsageTextView", width: 140, minWidth: 60, type: "string", align: "left"},
{display: "文本说明", name: "textDescription", width: 140, minWidth: 60, type: "string", align: "left"},
],
dataAction: "server",
url: web_app.name + '/sapNonProdApply/slicedNonProdApplyList.ajax',
pageSize: 20,
usePager: true,
toolbar: toolbarOptions,
width: "100%",
height: "100%",
heightDiff: -8,
checkbox: true,
async: false,
fixedCellHeight: true,
selectRowButtonOnly: true,
onDblClickRow: function (data, rowindex, rowobj) {
doView(data.id);
},
onAfterShowData: function (data){
console.log(data)
}
});
UICtrl.setSearchAreaToggle(gridManager);
}
function query(obj) {
var param = $(obj).formToJSON();
UICtrl.gridSearch(gridManager, param);
}
function reloadGrid() {
gridManager.loadData();
}
function resetForm(obj) {
$(obj).formClean();
}
//删除按钮
function deleteHandler() {
DataUtil.del({
action: 'sapNonProdApply/deleteNonProdApply.ajax',
gridManager: gridManager, idFieldName: 'id',
onSuccess: function () {
reloadGrid();
}
});
}
function addHandler() {
UICtrl.addTabItem({
tabid: 'nonProdApply',
text: "非产品/非半成品类物料主数据维护申请",
url: web_app.name + '/sapNonProdApply/forwardNonProdApplyDetail.job'
});
}
function doView(id) {
UICtrl.addTabItem({
tabid: 'showNonProdApply'+id,
text: "非产品/非半成品类物料主数据维护申请详情",
url: web_app.name + '/sapNonProdApply/showNonProdApply.job?bizId='+id+"&isDetailPage=true"
});
}
// function next(){
// UICtrl.addTabItem({
// tabid: 'showNonProdApplyNext',
// text: "非产品/非半成品类物料主数据维护申请详情",
// url: web_app.name + '/sapNonProdApply/forwardNonProdApplyNext.do?isDetailPage=true'
// });
// }
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyDeptList.jsp deleted 100644 → 0
View file @ 12b03586
<%@ 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,combox,commonTree"/>
<x:script src='/biz/topsun/sap/nonProdApply/nonProdApplyList.js'/>
</head>
<body>
<div class="container-fluid">
<%-- <x:button value="next" onclick="next()" icon="fa-save"/>--%>
<div class="ui-hide">
<x:select name="processType" dictionary="processType"/>
<x:select name="yesorno" dictionary="yesorno"/>
</div>
<div id="layout">
<div position="center" title="非半成品类物料部门数据维护查询">
<x:title title="common.button.search" hideTable="queryMainForm" isHide="true"/>
<form class="hg-form ui-hide" method="post" action="" id="queryMainForm">
<x:inputC name="proofingApplyNo" required="false" label="申请单号" labelCol="1"/>
<x:searchButtons/>
</form>
<div class="blank_div clearfix"></div>
<div id="nonProdApplyDeptListGrid" style="margin: 2px;"></div>
</div>
</div>
</div>
</body>
</html>
\ No newline at end of file
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyNext.js
View file @ 45f1a04b
......@@ -18,13 +18,13 @@ function initializate() {
// UICtrl.setDisable("#businessUsageDiv")
UICtrl.setDisable("#totalContentDiv");
coRowNum= $("#busiLens").val();
$("#klart").val("023")
$("#classify").val("Z_YCL")
initKlart($("#mtart").val());
//页面控制
UICtrl.enable($("#businessUsage"));
UICtrl.enable($("#matklName"));
//物品类型 控制存储的序列号参数
$("#mtart").combox({onChange:function(data) {
initKlart(data.value);
storeDisplaySer(data.value);
getBklas(data.value);
}
......@@ -137,6 +137,18 @@ function initializate() {
});
}
function initKlart(mtart) {
if (mtart == "ZBCP" || mtart == "ZZCP"){
//分类类型、分类名称
$("#klart").val("023");
$("#classify").val("Z_PROD");
}else if (mtart == "ZFBL" || mtart == "ZMYP" || mtart == "ZYCL"){
//分类类型、分类名称
$("#klart").val("023");
$("#classify").val("Z_YCL");
}
}
function showBusiness(busiCode) {
if (busiCode=="V") { //销售
$("#saleDiv").show();
......
topsun-xt/src/main/webapp/biz/topsun/sap/nonProdApply/nonProdApplyProduce.jsp deleted 100644 → 0
View file @ 12b03586
<%@ page language="java" contentType="text/html; charset=utf-8" %>
<%@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,combox,commonTree,date"/>
<x:script src='/biz/topsun/sap/nonProdApply/nonProdApplyProduce.js'/>
</head>
<body>
<x:hidden name="isDetailPage" value="false"/> <!--是否是详情页-->
<x:hidden name="deptCode" value="false"/> <!--是否是详情页-->
<div class="container-fluid" style="padding: 10px;">
<x:billTitle title="非产品/非半成品类物料生产信息维护" needStatus="false" needPerson="true"/>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="active"/> <!--状态-->
<x:hidden name="meId"/> <!--状态-->
<x:hidden name="werks"/>
<div style="float: right; margin-right: 10px;display: none;" class="btn-group" id="buttonBox">
<button id="save" title="" type="button" onclick="saveForm(0)" class="btn btn-gray"><i
class="fa fa-save"></i>保存
</button>
<button id="submit" title="" type="button" onclick="saveForm(1)" class="btn btn-gray"><i
class="fa fa-check-circle-o"></i>提交
</button>
<button id="back" title="" type="button" onclick="clearForm()" class="btn btn-gray"><i
class="fa fa-reply"></i>撤销
</button>
</div>
<br/>
<div class=" border-left-top" style="margin-top: 20px;display: none;" id="causeBox">
<div class=" gray-bg">
<div class="col-xs-2 " style="text-align: center;margin-top: 30px">
<h4>驳回历史</h4>
</div>
<div class="hg-form-cols" id="cause-details-box"></div>
</div>
</div>
<x:hidden name="applyDeptId"/>
<x:hidden name="id"/>
<x:hidden name="businessCode"/>
<x:title title="基本信息" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="billCode" label="申请单编号" labelCol="1" readonly="true" 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="fillinDate" label="填写日期" readonly="true" wrapper="date" labelCol="1" fieldCol="2"/>
</div>
<div class="hg-form-row">
<x:radioC name="maintenanceType" label="维护类型" labelCol="1" fieldCol="11" dictionary="maintainType" disabled="true"/>
</div>
</div>
<x:title title="物品总体内容" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="genericName" label="通用品名" labelCol="1" fieldCol="2"/>
<x:inputC name="applicableStandard" label="适用标准" labelCol="1" fieldCol="2"/>
<x:selectC name="baseUnit" label="基本计量单位" labelCol="1" fieldCol="2" dictionary="measuringUnit"/>
<x:inputC name="specifications" label="规格" labelCol="1" fieldCol="2"/>
<x:inputC name="material" label="材质" labelCol="1" fieldCol="2"/>
<x:inputC name="design" label="版式" labelCol="1" fieldCol="2"/>
<x:inputC name="size" label="尺码" labelCol="1" fieldCol="2"/>
<x:inputC name="brand" label="品牌" labelCol="1" fieldCol="2"/>
<x:selectC name="itemAttributes" label="物品属性" labelCol="1" fieldCol="2" dictionary="suppliesType"/>
<x:inputC name="materialUsage" label="用途" labelCol="1" fieldCol="8"/>
</div>
</div>
<x:title title="维护生产信息" name="group"/>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="ausmeName" label="投料计量单位" labelCol="1" fieldCol="2" wrapper="select"/>
<x:hidden name="ausme"/>
<x:inputC name="umrenProd" label="转换分母" labelCol="1" fieldCol="3"/>
<x:inputC name="umrezProd" label="转换分子" labelCol="1" fieldCol="3"/>
<x:selectC name="sfcpf" label="生产计划参数文件" labelCol="2" fieldCol="2" dictionary="sfcpf" required="true"/>
<x:inputC name="fevor" label="生产主管" labelCol="1" fieldCol="2" wrapper="select" required="true"/>
</div>
</div>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:checkboxListC name="businessUsage" label="业务用途" dictionary="serviceusage" labelCol="1"
fieldCol="11" disabled="true"/>
</div>
<div class="hg-form-row" id="businessPersonnelList">
<!--x:title title="业务人员" name="group"/-->
<div id="businessPersonnelListGrid" style="margin: 2px;"></div>
</div>
</div>
<%--div-- class="hg-form-cols">
<div class="hg-form-row">
<x:textareaC rows="3" name="textDescription" label="文本说明" labelCol="1" fieldCol="11"/>
</div>
</div--%>
</form>
<form class="hg-form" method="post" action="" style="display: none;" id="auditForm">
<div class=" border-left-top" style="margin-top: 10px;">
<div class=" gray-bg">
<div class="col-xs-2 " style="text-align: center;margin-top: 30px">
<span>部门数据审核</span>
</div>
<div class="hg-form-cols">
<div class="hg-form-row">
<x:checkboxListC name="auditDept" label="驳回部门" list="auditDeptMap" labelCol="2"
fieldCol="10"/>
</div>
<div id="rejectReasonBox"></div>
<div style="text-align: center">
<div class="btn-group" style="margin: 15px 0px 15px 0px;">
<button id="reject" title="" type="button" onclick="rejectForm()" class="btn btn-gray"><i
class="fa fa-reply"></i>驳回
</button>
<button id="exPass" title="" type="button" class="btn btn-gray"><i
class="fa fa-mail-forward"></i>检查通过
</button>
<button id="send" title="" type="button" onclick="distributeForm()"
class="btn btn-gray"><i
class="fa fa-send-o"></i>传输
</button>
</div>
</div>
</div>
</div>
</div>
</form>
<div class="blank_div clearfix" ></div>
</div>
</body>
</html>
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/application/impl/NonProdApplyApplicationImpl.java
View file @ 45f1a04b
......@@ -605,7 +605,7 @@ public class NonProdApplyApplicationImpl extends FlowBroker implements NonProdA
nonProdApplyBaseInfo.setApprover(operator.getPersonMemberName());
nonProdApplyBaseInfo.setDefaultValues(new OrgUnit(operator.getFullId(), operator.getFullName()));
nonProdApplyBaseInfo.setMaintenanceType("new");
nonProdApplyBaseInfo.setMaintenanceType("extend");
nonProdApplyBaseInfo.setApprovalDate(new Date());
nonProdApplyBaseInfo.setKind("product");
......
topsun/src/main/java/com/huigou/topsun/sap/nonProdApply/domain/vo/NonProdApplyBasicVo.java
View file @ 45f1a04b
......@@ -279,6 +279,7 @@ public class NonProdApplyBasicVo extends NonProdApplyDeptVo {
* 装载组
*/
private String ladgr;
private String ladgrName;
private String dwerkName;
......
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