Skip to content

T
topsun-bpm
Commit 3591efaf authored by 刘学辉's avatar 刘学辉
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 2383274c 332d8114
Hide whitespace changes
Inline Side-by-side
Showing with 141 additions and 132 deletions
.gitignore 0 → 100644
View file @ 3591efaf
/.idea
*.iml
/.settings
/target
.classpath
.project
/bin
/lib
/src/main/resources/application.properties
/topsun-bpm.iml
huigou-xt/src/main/webapp/system/opm/organization/Org.js
View file @ 3591efaf
......@@ -505,20 +505,50 @@ function initPersonDialog() {
sapMesShow();
}else {
$("#sapMes").hide();
$("#sapMes2").hide();
sapMesHide();
}
}
});
$('#companyCode').searchbox({
type: "system", name: "dictionary",
getParam: function (item) {
return {fieldName: "BUKRS"}
},
onChange: function (value, data) {
$('#companyCode').val(data.BUKRS);
//$('#butxt').val(data.BUTXT);
}
});
$('#regionName').searchbox({
type: "system", name: "getArea",
getParam: function (item) {
if (Public.isBlank($('#country').val())){
Public.tip("请先选择国家")
return false;
}
return {
LAND1: $('#country').val(),
}
},
onChange: function (value, data) {
$('#region').val(data.BLAND);
$('#regionName').val(data.BEZEI);
}
});
}
function sapMesShow(){
$("#sapMes").show();
$("#sapMes2").show();
UICtrl.setElRequiredFlag("#country",true);
UICtrl.setElRequiredFlag("#bankCountry",true);
UICtrl.setElRequiredFlag("#bankCode",true);
UICtrl.setElRequiredFlag("#consultItem",true);
UICtrl.setElRequiredFlag("#companyCode",true);
UICtrl.setElRequiredFlag("#bankAccountNumber",true);
UICtrl.setElRequiredFlag("#langu",true);
UICtrl.setElRequiredFlag("#region",true);
}
function sapMesHide(){
......@@ -528,12 +558,16 @@ function sapMesHide(){
UICtrl.setElRequiredFlag("#consultItem",false);
UICtrl.setElRequiredFlag("#companyCode",false);
UICtrl.setElRequiredFlag("#bankAccountNumber",false);
UICtrl.setElRequiredFlag("#langu",false);
UICtrl.setElRequiredFlag("#region",false);
$("#country").val("");
$("#bankCountry").val("");
$("#bankCode").val("");
$("#bankCode").val("");
$("#consultItem").val("");
$("#companyCode").val("");
$("#bankAccountNumber").val("");
$("#langu").val("");
$("#region").val("");
}
function doSavePerson() {
......
huigou-xt/src/main/webapp/system/opm/organization/PersonDetail.jsp
View file @ 3591efaf
......@@ -28,6 +28,10 @@
<x:inputC name="sequence" required="true" label="排序号" spinner="true" mask="nnn" dataOptions="min:1" labelCol="2" fieldCol="4" />
<x:selectC name="isSapPerson" required="true" label="是否SAP员工" dictionary="yesorno" labelCol="2" fieldCol="4" />
</div>
<div class="hg-form-row" id="sapMes2">
<x:inputC name="langu" label="语言" labelCol="2" fieldCol="4" />
<x:selectC dictionary="country" name="country" label="国家" labelCol="2" fieldCol="4" />
</div>
</div>
<div class="col-md-4">
<div style="text-align: center;margin-top:10px;">
......@@ -41,8 +45,9 @@
<div id="sapMes" hidden="hidden">
<div class="hg-form-row">
<div class="col-md-8">
<x:inputC name="country" label="国家" labelCol="2" fieldCol="4" maxlength="16"/>
<x:inputC name="bankCountry" label="银行所属国家" labelCol="2" fieldCol="4" />
<x:inputC name="regionName" label="地区" labelCol="2" fieldCol="4" maxlength="16" wrapper="select"/>
<x:hidden name="region"/>
<x:selectC dictionary="country" name="bankCountry" label="银行所属国家" labelCol="2" fieldCol="4" />
</div>
<div class="col-md-4">
<x:inputC name="bankCode" label="银行代码" labelCol="4" fieldCol="8" />
......@@ -51,7 +56,7 @@
<div class="hg-form-row">
<div class="col-md-8">
<x:inputC name="consultItem" label="参考明细" labelCol="2" fieldCol="4" />
<x:inputC name="companyCode" label="公司代码" labelCol="2" fieldCol="4" />
<x:inputC name="companyCode" label="公司代码" labelCol="2" fieldCol="4" wrapper="select"/>
</div>
<div class="col-md-4">
<x:inputC name="bankAccountNumber" required="false" label="银行账号" labelCol="4" fieldCol="8" />
......@@ -60,7 +65,7 @@
</div>
<div class="hg-form-row">
<div class="col-md-8">
<x:selectC name="sex" dictionary="sex" label="性别" labelCol="2" fieldCol="4" />
<x:selectC name="sex" dictionary="sexFlag" label="性别" labelCol="2" fieldCol="4" />
<x:selectC name="marriage" dictionary="maritalStatus" label="婚姻状况" labelCol="2" fieldCol="4" />
</div>
<div class="col-md-4">
......
topsun-xt/src/main/webapp/biz/topsun/sap/fixedAssets/sapFixedAssetsDetail.jsp
View file @ 3591efaf
......@@ -32,16 +32,16 @@
<x:hidden name="personMemberName"/>
<x:hidden name="statusId"/>
<div class="hg-form-row">
<x:inputC name="anln1" required="false" readonly="true" label="主资产号" labelCol="2" maxLength="64" fieldCol="4"/>
<x:inputC name="anlkl" required="true" label="资产分类" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
<x:inputC name="bukrs" required="true" label="公司代码" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
<x:inputC name="anlkl" required="true" label="资产分类" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
<x:inputC name="anln1" required="false" readonly="true" label="主资产号" labelCol="2" maxLength="64" fieldCol="4"/>
<x:inputC name="txt50" required="true" label="文本" labelCol="2" maxLength="64" fieldCol="4"/>
<x:inputC name="txa50" required="true" label="规格型号" labelCol="2" maxLength="64" fieldCol="4"/>
<x:inputC name="invnr" required="false" label="存货号" labelCol="2" maxLength="64" fieldCol="4" />
<x:inputC name="menge" required="true" label="数量" labelCol="2" maxLength="64" fieldCol="4" />
<x:inputC name="meins" required="true" label="基本计量单位" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
<x:inputC name="kostl" required="true" label="成本中心" labelCol="2" wrapper="select" fieldCol="4"/>
<x:inputC name="kostlv" required="true" label="责任成本中心" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
<x:inputC name="kostlv" required="false" label="责任成本中心" labelCol="2" maxLength="64" fieldCol="4" wrapper="select"/>
</div>
<div class="blank_div clearfix"></div>
</form>
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapPurchaseDetail.js
View file @ 3591efaf
......@@ -139,6 +139,34 @@ function getGridColumns() {
display: "工厂名称", name: "name1", width: "200", align: "left", type: "string",
editor: {required: false, type: "text"}
});
columns.push({
display: "物料编号", name: "matnr", width: "300", align: "left", type: "string",
editor: {
required: false, type: "select",
data: {
type: 'system',
name: "sapMaterialSelect",
getParam: function (item) {
return {
filterValue: item.werks
}
},
back: {
MATNR: "matnr",
MAKTX: "txz01",
MATKL: "matkl",
WGBEZ: "matklName",
EKGRP: "ekgrp",
EKNAM: "ekgrpName",
PEINH: "peinh",
MEINS: "meins",
MSEHL: "meinsName",
LGFSB: "lgort",
LGOBE: "lgobe"
}
},
}
});
columns.push({
display: "库存地点", name: "lgort", width: "100", align: "left", type: "string",
editor: {
......@@ -377,15 +405,24 @@ function getExtendedData(processAction) {
return false;
}
var checked6 = false;
var checked1 = false;
datas.forEach(data => {
if ("F" == data.knttp && Public.isBlank(data.aufnr)){
checked6 = true;
}
//当“科目分配类型”选择F后“物料编号”字段调整为必须输入项
if ("F" == data.knttp && Public.isBlank(data.matnr)){
checked1 = true;
}
})
if (checked6) {
Public.tip("订单号不能为空")
return false;
}
if (checked1) {
Public.tip("物料编号不能为空")
return false;
}
extendedData.sapPurchaseItems = Public.encodeJSONURI(datas);
}
return extendedData;
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchase/sapZNE1PurchaseDetail.js
View file @ 3591efaf
......@@ -282,12 +282,12 @@ function getGridColumns() {
columns.push({
display: "多重科目分配", name: "vrtkz", width: "100", align: "left", type: "string",
//editor: {type: 'text'},
render: function (item) {
//资产消耗性申购，若申请数量大于1，此处不能为空，必须选择1
if (item.knttp == "A" && item.menge > 1) {
return item.vrtkz = 1;
}
}
// render: function (item) {
// //资产消耗性申购，若申请数量大于1，此处不能为空，必须选择1
// if (item.knttp == "A" && item.menge > 1) {
// return item.vrtkz = 1;
// }
// }
},);
columns.push({
display: "部分发票", name: "twrkz", width: "100", align: "left", type: "string",
......@@ -326,6 +326,18 @@ function getGridColumns() {
},
}
},);
columns.push({
display: "审批处理状态", name: "banpr", width: "100", align: "left", type: "string",
//editor: {type: 'text'}
},);
columns.push({
display: "申请日期", name: "badat", width: "100", align: "left", type: "string",
editor: {required: false, type: "date"}
},);
columns.push({
display: "创建日期", name: "erdat", width: "100", align: "left", type: "string",
//editor: {required: false, type: "date"}
},);
return columns;
}
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseApproval/sapPurchaseApprovalDetail.js
View file @ 3591efaf
......@@ -32,7 +32,7 @@ function initItemGrid() {
dataAction: 'server',
url: web_app.name + '/sapPurchaseApprovalItem/querySapPurchaseApprovalItems.ajax',
parms:{sapPurchaseApprovalId:getId()},
height: '99.6%',
height: '95%',
heightDiff: -4,
sortName: 'id',
sortOrder: 'asc',
......@@ -111,13 +111,13 @@ function getGridColumns() {
{display: "评估价格", name: "preis", width: "100", align: "left", type: "string",
editor: {type: 'text', mask: '9999999.99',required: false}
},
{display: "价格单位", name: "peinh", width: 150, minWidth: 60, type: "string", align: "center",
{display: "价格单位", name: "meins", width: 150, minWidth: 60, type: "string", align: "center",
editor: {required: false, type: "text"}
},
{display: "币种", name: "waers", width: "100", align: "left", type: "string",
editor: {type: 'text'}
},
{display: "价格基数", name: "rlwrt", width: "100", align: "left", type: "string",
{display: "价格基数", name: "peinh", width: "100", align: "left", type: "string",
editor: {type: 'text', mask: '9999999',required: false}
},
{display: "需求(请求)日期", name: "badat", width: "100", align: "left", type: "string",
......@@ -126,7 +126,7 @@ function getGridColumns() {
{display: "创建人", name: "ernam", width: "100", align: "left", type: "string",
editor: {type: 'text'}
},
{display: "创建人名称", name: "nameText", width: "100", align: "left", type: "string",
{display: "申请人", name: "nameText", width: "100", align: "left", type: "string",
editor: {type: 'text'}
},
]
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.js
View file @ 3591efaf
......@@ -15,7 +15,7 @@ function initItemGrid() {
dataAction: 'server',
url: web_app.name + '/sapPurchaseOrder/querySapPurchaseOrderItems.ajax',
parms: {sapPurchaseOrderId: getId()},
height: '400px',
height: '95%',
heightDiff: -4,
// sortName: 'id',
// sortOrder: 'asc',
......@@ -33,8 +33,8 @@ function getGridColumns() {
{display: "项目类别", name: "pstyp", width: "100", align: "left", type: "string"},
{display: "项目类别描述", name: "knttp", width: "100", align: "left", type: "string"},
{display: "科目分配类别描述", name: "knttx", width: "100", align: "left", type: "string"},
{display: "物料号", name: "matnr", width: "100", align: "left", type: "string"},
{display: "物料描述", name: "txz01", width: "100", align: "left", type: "string"},
{display: "物料号", name: "matnr", width: "200", align: "left", type: "string"},
{display: "物料描述", name: "txz01", width: "300", align: "left", type: "string"},
{display: "物料组", name: "matkl", width: "100", align: "left", type: "string"},
{display: "物料组描述", name: "wgbez", width: "100", align: "left", type: "string"},
{display: "采购订单数量", name: "menge", width: "100", align: "left", type: "string"},
......@@ -42,17 +42,17 @@ function getGridColumns() {
{display: "单位描述", name: "msehl", width: "100", align: "left", type: "string"},
{display: "要求交货日期", name: "eindt", width: "100", align: "left", type: "string"},
{display: "工厂", name: "werks", width: "100", align: "left", type: "string"},
{display: "名称", name: "name1", width: "100", align: "left", type: "string"},
{display: "名称", name: "name1", width: "200", align: "left", type: "string"},
{display: "库存地点", name: "lgort", width: "100", align: "left", type: "string"},
{display: "库存地点的描述", name: "lgobe", width: "100", align: "left", type: "string"},
{display: "价格", name: "netpr", width: "100", align: "left", type: "string"},
{display: "库存地点的描述", name: "lgobe", width: "200", align: "left", type: "string"},
{display: "含税单价", name: "netpr", width: "100", align: "left", type: "string"},
{display: "价格单位", name: "peinh", width: "100", align: "left", type: "string"},
{display: "税码", name: "mwskz", width: "100", align: "left", type: "string"},
{display: "总价", name: "netwr", width: "100", align: "left", type: "string"},
{display: "含税总价", name: "netwr", width: "100", align: "left", type: "string"},
{display: "退货项目", name: "retpo", width: "100", align: "left", type: "string"},
{display: "总账科目", name: "sakto", width: "100", align: "left", type: "string"},
{display: "成本中心", name: "kostl", width: "100", align: "left", type: "string"},
{display: "主资产号", name: "anln1", width: "100", align: "left", type: "string"},
{display: "成本中心", name: "kostl", width: "200", align: "left", type: "string"},
{display: "主资产号", name: "anln1", width: "200", align: "left", type: "string"},
{display: "资产次级编号", name: "anln2", width: "100", align: "left", type: "string"}
]
......
topsun-xt/src/main/webapp/biz/topsun/sap/purchaseOrder/sapPurchaseOrderDetail.jsp
View file @ 3591efaf
......@@ -42,20 +42,21 @@
<div class="hg-form-cols">
<div class="hg-form-row">
<x:inputC name="msgType" label="消息类型" readonly="true" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="msgId" label="消息id" readonly="true" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="number" label="消息编号" readonly="true" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="message" label="消息内容" readonly="true" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="logNo" label="日志编号" readonly="true" labelCol="1" fieldCol="2" required="false"/>
<x:inputC name="logMsgNo" label="日志消息编号" readonly="true" labelCol="1" fieldCol="2"
required="false"/>
<x:inputC name="messageV1" label="消息参数 1" readonly="true" wrapper="date" labelCol="1" fieldCol="2"
required="false"/>
<x:inputC name="messageV2" label="消息参数 2" readonly="true" wrapper="date" labelCol="1" fieldCol="2"
required="false"/>
<x:inputC name="messageV3" label="消息参数 3" readonly="true" wrapper="date" labelCol="1" fieldCol="2"
required="false"/>
<x:inputC name="messageV4" label="消息参数 4" readonly="true" wrapper="date" labelCol="1" fieldCol="2"
required="false"/>
<%-- <x:inputC name="msgId" label="消息id" readonly="true" labelCol="1" fieldCol="2" required="false"/>--%>
<%-- <x:inputC name="number" label="消息编号" readonly="true" labelCol="1" fieldCol="2" required="false"/>--%>
<%-- <x:inputC name="logNo" label="日志编号" readonly="true" labelCol="1" fieldCol="2" required="false"/>--%>
<%-- <x:inputC name="logMsgNo" label="日志消息编号" readonly="true" labelCol="1" fieldCol="2"--%>
<%-- required="false"/>--%>
<%-- <x:inputC name="messageV1" label="消息参数 1" readonly="true" wrapper="date" labelCol="1" fieldCol="2"--%>
<%-- required="false"/>--%>
<%-- <x:inputC name="messageV2" label="消息参数 2" readonly="true" wrapper="date" labelCol="1" fieldCol="2"--%>
<%-- required="false"/>--%>
<%-- <x:inputC name="messageV3" label="消息参数 3" readonly="true" wrapper="date" labelCol="1" fieldCol="2"--%>
<%-- required="false"/>--%>
<%-- <x:inputC name="messageV4" label="消息参数 4" readonly="true" wrapper="date" labelCol="1" fieldCol="2"--%>
<%-- required="false"/>--%>
</div>
</div>
<div id="maingrid"></div>
......
topsun-xt/src/main/webapp/system/opm/organization/PersonDetail.jsp deleted 100644 → 0
View file @ 2383274c
<%@ 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"%>
<form class="hg-form" method="post" action="" id="submitForm">
<x:hidden name="id" />
<x:hidden name="mainOrgId" />
<x:hidden name="version" />
<x:hidden name="status" />
<x:hidden name="picturePath" />
<div class="hg-form-row">
<div class="col-md-8">
<div class="hg-form-row">
<x:inputC name="parentFullName" label="上级" readonly="true" fieldCol="10" />
</div>
<div class="hg-form-row">
<x:inputC name="code" id="code" required="true" label="员工编号" maxlength="16" labelCol="2" fieldCol="4" />
<x:inputC name="name" id="name" required="true" label="姓名" maxlength="30" labelCol="2" fieldCol="4" />
</div>
<div class="hg-form-row">
<x:inputC name="loginName" id="loginName" label="登录名" required="true" labelCol="2" fieldCol="4" maxlength="16"/>
<x:inputC name="email" id="email" label="电子邮件" required="true" labelCol="2" fieldCol="4" maxlength="64" match="email"/>
</div>
<div class="hg-form-row">
<x:selectC name="certificateKindId" label="证件类型" required="false" dictionary="certificateKind" labelCol="2" fieldCol="4" />
<x:inputC name="certificateNo" id="certificateNo" label="证件号码" required="false" labelCol="2" fieldCol="4" maxlength="30"/>
</div>
<div class="hg-form-row">
<x:inputC name="englishName" id="englishName" label="英文名称" labelCol="2" fieldCol="4" maxlength="60"/>
<x:selectC name="sex" dictionary="sex" label="性别" labelCol="2" fieldCol="4" />
</div>
</div>
<div class="col-md-4">
<div style="text-align: center;margin-top:10px;">
<img src='<c:url value="/images/photo.jpg"/>' height='144' width='102' border=0 id="showPersonPicture" onerror="src='<c:url value="/images/photo.jpg"/>';"/>
</div>
<div style="text-align: center;margin-top:20px;">
<x:button value="上传照片" id="addPicture" icon="fa-hand-o-up"/>
</div>
</div>
</div>
<div class="hg-form-row">
<div class="col-md-8">
<x:inputC name="joinDate" id="joinDate" label="工作日期" wrapper="date" labelCol="2" fieldCol="4"/>
<x:inputC name="title" id="title" label="职称" labelCol="2" fieldCol="4" maxlength="30"/>
</div>
<div class="col-md-4">
<x:inputC name="degree" id="title" label="学历" labelCol="4" fieldCol="8" maxlength="30"/>
</div>
</div>
<div class="hg-form-row">
<div class="col-md-8">
<x:inputC name="graduateSchool" id="graduateSchool" label="毕业院校" labelCol="2" fieldCol="4" maxlength="60"/>
<x:inputC name="speciality" id="speciality" label="专业" labelCol="2" fieldCol="4" maxlength="60"/>
</div>
<div class="col-md-4">
<!--<x:inputC name="schoolLength" id="schoolLength" label="学年制" labelCol="4" fieldCol="8" maxlength="16"/>-->
<x:selectC name="personKind" dictionary="rolePersonKind" label="人员类别" labelCol="4" fieldCol="8" />
</div>
</div>
<div class="hg-form-row">
<div class="col-md-8">
<x:inputC name="birthday" id="birthday" label="出生日期" wrapper="date" labelCol="2" fieldCol="4" />
<x:inputC name="qq" id="qq" label="QQ" labelCol="2" fieldCol="4" match="qq" maxlength="20"/>
</div>
<div class="col-md-4">
<x:inputC name="weixin" label="微信" labelCol="4" fieldCol="8" match="letter" maxlength="32"/>
</div>
</div>
<div class="hg-form-row">
<div class="col-md-8">
<x:inputC name="officePhone" id="officePhone" label="办公电话" labelCol="2" fieldCol="4" maxlength="30" match="englishCode"/>
<x:inputC name="mobilePhone" id="mobilePhone" label="移动电话" labelCol="2" fieldCol="4" maxlength="11" match="phone"/>
</div>
<div class="col-md-4">
<x:inputC name="familyPhone" id="familyPhone" label="家庭电话" labelCol="4" fieldCol="8" maxlength="30" match="englishCode"/>
</div>
</div>
<div class="hg-form-row">
<div class="col-md-4">
<x:inputC name="zip" id="zip" label="邮编" labelCol="4" fieldCol="8" maxlength="16" match="englishCode"/>
</div>
<div class="col-md-8">
<x:inputC name="familyAddress" id="familyAddress" label="家庭地址" labelCol="2" fieldCol="10" maxlength="120" />
</div>
</div>
<div class="hg-form-row">
<div class="col-md-8">
<x:textareaC name="description" label="描述" maxlength="100" rows="2" labelCol="2" fieldCol="10" />
</div>
</div>
</form>
topsun/src/main/java/com/huigou/topsun/sap/purchaseApproval/application/impl/SapPurchaseApprovalApplicationImpl.java
View file @ 3591efaf
......@@ -181,6 +181,8 @@ public class SapPurchaseApprovalApplicationImpl extends FlowBroker implements Sa
sapPurchaseApproval.setStatusId(BizBillStatus.APPLYING.getId());
sapPurchaseApprovalRepository.save(sapPurchaseApproval);
sendSapDate(sapPurchaseApproval,"N");
//终止
//workflowApplication.abortProcessInstance(delegateTask.getProcessInstanceId());
}
}
......
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