anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://git2.tenwa.com.cn/ApzlDev/apzl_leasing.git into zhanglei

Browse Source
This commit is contained in:
zhanglei 2018-07-20 14:29:31 +08:00
commit b484243fd2
3 changed files with 57 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
WebContent/Tenwa/Lease/DistributorManage/DistributorApproval/LDistributorInfo.jsp
View File

@ -44,6 +44,7 @@
sButtonPosition = "north";
%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
<script type="text/javascript">
//组织机构验证码的的校验
function Checkfield(){
var businessLicenseNo = getItemValue(0,getRow(0),"BUSINESS_LICENSE_NO");
// if(businessLicenseNo==""){
@ -53,14 +54,11 @@
if(checkORGRight1(businessLicenseNo)){
return true;
}else{
setErrorTips("BUSINESS_LICENSE_NO","组织机构代码格式不正确!");
//setErrorTips("BUSINESS_LICENSE_NO","组织机构代码格式不正确!");
alert("组织机构代码格式不正确!");
return false;
}
}
//校验经销商编号是否唯一
function Uniquenesscheck(){
var DISTRIBUTOR_CODING = getItemValue(0,0,'DISTRIBUTOR_CODING');
@ -72,15 +70,14 @@
return true;
}
}
<%-- $(function(){
if("<%=PhaseNo%>"=="0020"){
setItemRequired(0, "RETAIL_OPEN_DATE", true);
$("#RETAIL_OPEN_DATE")
}
}) --%>
<%-- function Uniquenesscheck(){
var flowunid = "<%=sFlowUnid%>"
var DISTRIBUTOR_CODING = getItemValue(0,0,'DISTRIBUTOR_CODING');
var sReturnInfo = RunJavaMethodTrans("com.tenwa.customer.controller.group.CustomerGroupCompanyController","distributor_basicS","flowunid="+flowunid);
if("distributor_coding".equals(sReturnInfo)){
return true;
}
} --%>
function save() {
var result = false;
var distributor_coding = getItemValue(0,0,'DISTRIBUTOR_CODING');
@ -89,7 +86,6 @@
}else{
result = Uniquenesscheck();
}
// result = Uniquenesscheck();
var result1 = Checkfield();
//if(result==true){
if(result==true && result1==true){
@ -97,9 +93,6 @@
}
}
function saveproj_name(){
var sReturnInfo = RunJavaMethodTrans("com.tenwa.lease.flow.project.businesspply.CustomerInfoManage","saveDistributorInfo","flowunid=<%=sFlowUnid%>");
@ -146,29 +139,6 @@
setItemValue(0,getRow(),"SUBSIDIARY_COMPANY",sReturn[0]);//向页面的框中添加数据
},"请选择经销商");
}
//省市
/* function selectRegionCode(){
var area_code = getItemValue(0,getRow(),"DISTRIBUTOR_ADDRESS");
AsDialog.PopView("/Common/ToolsA/AreaVFrame.jsp","AreaCode="+area_code,"dialogWidth=850px;dialogHeight=450px;center:yes;status:no;statusbar:no",function(sAreaCodeInfo){
//增加清空功能的判断
if( sAreaCodeInfo == '_CANCEL_'){
return;
}
if(sAreaCodeInfo == "NO" || sAreaCodeInfo == '_CLEAR_'){
setItemValue(0,getRow(),"DISTRIBUTOR_ADDRESS","");
setItemValue(0,getRow(),"DISTRIBUTOR_ADDRESSNAME","");
}else{
if(typeof(sAreaCodeInfo) != "undefined" && sAreaCodeInfo != ""){
sAreaCodeInfo = sAreaCodeInfo.split('@');
sAreaCodeValue = sAreaCodeInfo[0];//-- 行政区划代码
sAreaCodeName = sAreaCodeInfo[1];//--行政区划名称
setItemValue(0,getRow(),"DISTRIBUTOR_ADDRESS",sAreaCodeValue);
setItemValue(0,getRow(),"DISTRIBUTOR_ADDRESSNAME",sAreaCodeName);
}
}
},'请选择省市');
} */
var province="";//定义一个全局变量
// 选择省份
function selectProvinceCode(){

17
src_tenwa/com/tenwa/customer/controller/group/CustomerGroupCompanyController.java
View File

@ -18,6 +18,15 @@ public class CustomerGroupCompanyController {
private String group_name = "";
private String group_no = "";
private String DISTRIBUTOR_CODING = "";
private String flowunid;
public String getFlowunid() {
return flowunid;
}
public void setFlowunid(String flowunid) {
this.flowunid = flowunid;
}
public String getDISTRIBUTOR_CODING() {
return DISTRIBUTOR_CODING;
@ -156,7 +165,13 @@ public class CustomerGroupCompanyController {
return "false";
}
}
//判断经销商编码是否是当前页面
/*public String distributor_basicS(JBOTransaction tx) throws Exception{
BizObjectManager dgcm = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME);
BizObject dgc = dgcm.createQuery("flowunid=:flowunid").setParameter("flowunid", this.flowunid).getSingleResult(true);
String distributor_coding = dgc.getAttribute("DISTRIBUTOR_CODING").toString();
return distributor_coding;
}*/
public String getNewId(JBOTransaction tx) throws Exception{
String id="";
BizObjectManager dgcm = JBOFactory.getBizObjectManager(DISTRIBUTOR_GROUP_COMPANY.CLASS_NAME);

31
src_tenwa/com/tenwa/lease/flow/project/businessapply/AccountInfoManage.java
View File

@ -7,6 +7,7 @@ import java.util.Set;
import jbo.app.tenwa.customer.CUSTOMER_FAMILY_TEMP;
import jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT_TEMP;
import jbo.app.tenwa.customer.DISTRIBUTOR_INFO_TEMP;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
@ -17,7 +18,25 @@ import com.amarsoft.are.jbo.JBOTransaction;
public class AccountInfoManage {
private String flowunid;
private String id;
private String DISTRIBUTOR_NO;
public String getDISTRIBUTOR_NO() {
return DISTRIBUTOR_NO;
}
public void setDISTRIBUTOR_NO(String dISTRIBUTOR_NO) {
DISTRIBUTOR_NO = dISTRIBUTOR_NO;
}
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String CheckPartnerInfo(JBOTransaction tx) throws JBOException{
BizObjectManager bm = JBOFactory.getBizObjectManager(DISTRIBUTOR_ACCOUNT_TEMP.CLASS_NAME,tx);
List<BizObject> bos = bm.createQuery("flowunid=:flowunid").setParameter("flowunid",this.flowunid).getResultList(false);
@ -48,5 +67,17 @@ public class AccountInfoManage {
public void setFlowunid(String flowunid) {
this.flowunid = flowunid;
}
//´øÖµ
public String Checkbasicinfo(JBOTransaction tx) throws JBOException{
BizObjectManager bs = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME,tx);
BizObject dgc = bs.createQuery("flowunid=:flowunid").setParameter("flowunid", this.getFlowunid()).getSingleResult(false);
String distributorName = dgc.getAttribute("DISTRIBUTOR_NAME").toString();
/*BizObjectManager bms = JBOFactory.getBizObjectManager(DISTRIBUTOR_ACCOUNT_TEMP.CLASS_NAME,tx);
BizObject account = bms.newObject();
account.setAttributeValue("ACCOUNT", distributorName);
bms.saveObject(account);*/
return distributorName;
}
}