From 3958e9d289136732354f1628eda6d4b8869e93a5 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Thu, 3 Sep 2020 22:25:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7(=E9=A9=AC?= =?UTF-8?q?=E4=BA=AE=E3=80=81=E5=BC=A0=E7=A3=8A)=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkFlow/PaymentApplyViewFlowOpinions.jsp | 2 +- .../Tenwa/Apzl/FileUpload/ApproveDetail.jsp | 12 +- .../Apzl/FileUpload/ApproveDetail_gd.jsp | 144 +++++++++--------- .../LBnotAllMailHndHandoverTempList.jsp | 2 + .../FundPaymentInvoice/LbInvoiceInfoTemp.jsp | 33 ++-- WebContent/WEB-INF/etc/jbo/jbo_doc.xml | 6 +- WebContent/WEB-INF/etc/jbo/jbo_lease.xml | 8 + .../tenwa/doc/LB_FILE_MAILARCHIVING_INFO.java | 16 ++ .../lease/comm/LB_CAR_LICENSE_PLATE_INFO.java | 16 ++ .../comm/LB_CAR_LICENSE_PLATE_INFO_TEMP.java | 16 ++ .../project/businessapply/DocMailAction.java | 3 + .../flow/project/commcheck/CarTypeCheck.java | 125 ++++++++------- 12 files changed, 228 insertions(+), 155 deletions(-) diff --git a/WebContent/Common/WorkFlow/PaymentApplyViewFlowOpinions.jsp b/WebContent/Common/WorkFlow/PaymentApplyViewFlowOpinions.jsp index d55801bb3..35f6521ec 100644 --- a/WebContent/Common/WorkFlow/PaymentApplyViewFlowOpinions.jsp +++ b/WebContent/Common/WorkFlow/PaymentApplyViewFlowOpinions.jsp @@ -24,7 +24,7 @@ if(contractId==null)contractId=""; BizObjectManager ftManager = JBOFactory.getBizObjectManager("jbo.sys.FLOW_TASK"); BizObjectManager fbo = JBOFactory.getBizObjectManager(FLOW_BUSSINESS_OBJECT.CLASS_NAME); - List opinionList = new ArrayList<>(); + List opinionList = new ArrayList(); BizObject fboRes = fbo.createQuery("flow_name=:flow_name and contract_id=:contract_id").setParameter("contract_id", contractId).setParameter("flow_name", "付款申请(汽车)").getSingleResult(false); if(null != fboRes){ sObjectNo = fboRes.getAttribute("flow_unid").getString(); diff --git a/WebContent/Tenwa/Apzl/FileUpload/ApproveDetail.jsp b/WebContent/Tenwa/Apzl/FileUpload/ApproveDetail.jsp index 76ce3dd51..3362e52a3 100644 --- a/WebContent/Tenwa/Apzl/FileUpload/ApproveDetail.jsp +++ b/WebContent/Tenwa/Apzl/FileUpload/ApproveDetail.jsp @@ -12,7 +12,7 @@ ASObjectModel doTemp = new ASObjectModel(sTempletNo); doTemp.setRequired("EXPNUMBER", true); doTemp.setRequired("EXPCOMPANY", true); - //doTemp.setRequired("EXPSTRATDATE", true); + doTemp.setRequired("EXPSTRATDATE", true); ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform //dwTemp.ReadOnly = "-2";//只读模式 @@ -29,21 +29,21 @@ AsControl.OpenView("<%=sPrevUrl%>", "","_self",""); } function recordsave(){ - if(getItemValue(0,getRow(),"EXPNUMBER")==""||getItemValue(0,getRow(),"EXPCOMPANY")==""){ + if(getItemValue(0,getRow(),"EXPNUMBER")==""||getItemValue(0,getRow(),"EXPCOMPANY")==""||getItemValue(0,getRow(),"EXPSTRATDATE")==""){ alert("快递信息填写不完整！"); return; } var myObject={}; myObject.EXPNUMBER = getItemValue(0,getRow(),"EXPNUMBER"); myObject.EXPCOMPANY = getItemValue(0,getRow(),"EXPCOMPANY"); - //myObject.EXPSTRATDATE = getItemValue(0,getRow(),"EXPSTRATDATE"); + myObject.EXPSTRATDATE = getItemValue(0,getRow(),"EXPSTRATDATE"); AsDialog.ClosePage(myObject); } - //window.onload=function(){ + window.onload=function(){ //alert(); - //hideItem(0,"EXPENDDATE"); - //} + hideItem(0,"EXPENDDATE"); + } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Apzl/FileUpload/ApproveDetail_gd.jsp b/WebContent/Tenwa/Apzl/FileUpload/ApproveDetail_gd.jsp index fee57f5ac..f0848cc55 100644 --- a/WebContent/Tenwa/Apzl/FileUpload/ApproveDetail_gd.jsp +++ b/WebContent/Tenwa/Apzl/FileUpload/ApproveDetail_gd.jsp @@ -1,72 +1,74 @@ -<%@ page contentType="text/html; charset=GBK"%> -<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% - /* - Author: undefined 2018-06-27 - Content: 示例详情页面 - History Log: - */ - String sPrevUrl = CurPage.getParameter("PrevUrl"); - String flowunid = CurPage.getParameter("ObjectNo"); - String PhaseNo = CurPage.getParameter("PhaseNo"); - if(sPrevUrl == null) sPrevUrl = ""; - - String sTempletNo = "ERPEditInfo";//--模板号-- - ASObjectModel doTemp = new ASObjectModel(sTempletNo); - doTemp.setReadOnly("EXPNUMBER", true); - doTemp.setReadOnly("EXPCOMPANY", true); - doTemp.setReadOnly("EXPSTRATDATE", true); - doTemp.setRequired("EXPNUMBER", true); - doTemp.setRequired("EXPCOMPANY", true); - doTemp.setRequired("EXPSTRATDATE", true); - doTemp.setRequired("EXPENDDATE", true); - ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); - dwTemp.Style = "2";//freeform - //dwTemp.ReadOnly = "-2";//只读模式 - dwTemp.genHTMLObjectWindow(CurPage.getParameter("SerialNo")); - - ASResultSet rs = Sqlca.getASResultSet("select O.EXPNUMBER,O.EXPCOMPANY,O.EXPSTRATDATE from LB_FILE_MAILARCHIVING_INFO_TEMP O " + - "where FLOWUNID = '"+flowunid+"' AND O.EXPNUMBER IS NOT NULL LIMIT 1 " ); - rs.next(); - String EXPNUMBER = rs.getString("EXPNUMBER"); - String EXPCOMPANY = rs.getString("EXPCOMPANY"); - String EXPSTRATDATE = rs.getString("EXPSTRATDATE"); - - String sButtons[][] = { - {"true","All","Button","保存","保存所有修改","recordsave()","","","",""}, - {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""} - }; - sButtonPosition = "south"; -%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> - +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><% + /* + Author: undefined 2018-06-27 + Content: 示例详情页面 + History Log: + */ + String sPrevUrl = CurPage.getParameter("PrevUrl"); + String flowunid = CurPage.getParameter("ObjectNo"); + String PhaseNo = CurPage.getParameter("PhaseNo"); + if(sPrevUrl == null) sPrevUrl = ""; + + String sTempletNo = "ERPEditInfo";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + doTemp.setReadOnly("EXPNUMBER", true); + doTemp.setReadOnly("EXPCOMPANY", true); + doTemp.setReadOnly("EXPSTRATDATE", true); + doTemp.setRequired("EXPNUMBER", true); + doTemp.setRequired("EXPCOMPANY", true); + doTemp.setRequired("EXPSTRATDATE", true); + doTemp.setRequired("EXPENDDATE", true); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + //dwTemp.ReadOnly = "-2";//只读模式 + dwTemp.genHTMLObjectWindow(CurPage.getParameter("SerialNo")); + + ASResultSet rs = Sqlca.getASResultSet("select O.EXPNUMBER,O.EXPCOMPANY,O.EXPSTRATDATE,O.EXPENDDATE from LB_FILE_MAILARCHIVING_INFO_TEMP O " + + "where FLOWUNID = '"+flowunid+"' AND O.EXPNUMBER IS NOT NULL LIMIT 1 " ); + rs.next(); + String EXPNUMBER = rs.getString("EXPNUMBER"); + String EXPCOMPANY = rs.getString("EXPCOMPANY"); + String EXPSTRATDATE = rs.getString("EXPSTRATDATE"); + String EXPENDDATE = rs.getString("EXPENDDATE"); + + String sButtons[][] = { + {"true","All","Button","保存","保存所有修改","recordsave()","","","",""}, + {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""} + }; + sButtonPosition = "south"; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp b/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp index 78b39a999..1e0cfd6e2 100644 --- a/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp +++ b/WebContent/Tenwa/Apzl/FileUpload/LBnotAllMailHndHandoverTempList.jsp @@ -13,6 +13,8 @@ doTemp.setVisible("ARCHIVING_CABINET_NO", false); doTemp.setVisible("ARCHIVING_TIME", false); doTemp.setVisible("ARCHIVING_PERSON", false); + doTemp.setVisible("is_delay", false); + doTemp.setVisible("delay_date", false); } doTemp.setLockCount(2); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); diff --git a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp index bcaa4a12f..7822f2198 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp +++ b/WebContent/Tenwa/Core/InvoiceManager/FundPaymentInvoice/LbInvoiceInfoTemp.jsp @@ -21,7 +21,6 @@ dwTemp.Style = "2";//freeform //dwTemp.ReadOnly = "-2";//只读模式 dwTemp.genHTMLObjectWindow(CurPage.getParameter("ContractId")); - String vehiclelevel = Sqlca.getString("select LEC.vehiclelevel from LB_EQUIPMENT_CAR_TEMP LEC where contract_id='"+ContractId+"'"); String sButtons[][] = { {"false","All","Button","保存","保存所有修改","as_save(0)","","","",""}, @@ -89,27 +88,35 @@ function checkInvoiceNull(){ var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.contract.check.ContractInfoCheck","checkCarType","contractid=<%=ContractId%>"); if("EROOR"==sResult){//新车返回为Error - //发票代码是否为空 + //发票代码是否为空 2222 var invoiceCode = getItemValue(0,getRow(0),"Invoice_code"); if (invoiceCode.length == 0){ setErrorTips("Invoice_code","发票代码不能为空"); return true; + }else{ + setErrorTips("Invoice_code",""); } var invoiceNumber = getItemValue(0,getRow(0),"Invoice_number"); if (invoiceNumber.length == 0) { setErrorTips("Invoice_number","发票号码不能为空"); return true; + }else{ + setErrorTips("Invoice_number",""); } - /* var invoiceDate = getItemValue(0,getRow(0),"Invoice_date"); + var invoiceDate = getItemValue(0,getRow(0),"Invoice_date"); if (invoiceDate.length == 0) { setErrorTips("Invoice_date","开票日期不能为空"); return true; + }else{ + setErrorTips("Invoice_date",""); } var invoiceMoney = getItemValue(0,getRow(0),"Invoice_money"); if (invoiceMoney.length == 0) { setErrorTips("Invoice_money","开票金额不能为空"); return true; - } */ + }else{ + setErrorTips("Invoice_money",""); + } } return false; } @@ -121,9 +128,9 @@ || checkInvoiceCodeBak()==false || checkInvoiceNumberBak()==false){ return; } - // if(checkInvoiceNull()){//车辆属性发票非空校验 - // return; - // } + if(checkInvoiceNull()){//车辆属性发票非空校验 + return; + } var infoStatus = this.getInfoIsnull(); if(infoStatus){ as_save(0); @@ -185,17 +192,5 @@ document.getElementById("INVOICE_DATE").readOnly=true; document.getElementById("INVOICE_DATE_BAK").readOnly=true; }) - - window.onload = function(){ - //重卡发票信息 - <%--var vehiclelevel= "<%=vehiclelevel%>";--%> - <%--if ('重卡' != vehiclelevel &&'重型'!=vehiclelevel) {--%> - <%--hideItem(0, "Invoice_code_bak");--%> - <%--hideItem(0, "Invoice_number_bak");--%> - <%--hideItem(0, "Invoice_date_bak");--%> - <%--hideItem(0, "Invoice_money_bak");--%> - <%--hideItem(0, "tax_due_bak");--%> - <%--}--%> - } <%@ include file="/Frame/resources/include/include_end.jspf"%> \ No newline at end of file diff --git a/WebContent/WEB-INF/etc/jbo/jbo_doc.xml b/WebContent/WEB-INF/etc/jbo/jbo_doc.xml index 12dd22653..cacb4318d 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_doc.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_doc.xml @@ -234,7 +234,11 @@ - + + + + + diff --git a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml index e0aa1f0d9..2dd83b7d6 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_lease.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_lease.xml @@ -26,6 +26,10 @@ + + + + @@ -4392,6 +4396,10 @@ + + + + diff --git a/src_jbo/jbo/app/tenwa/doc/LB_FILE_MAILARCHIVING_INFO.java b/src_jbo/jbo/app/tenwa/doc/LB_FILE_MAILARCHIVING_INFO.java index aa027f263..49c1ac54c 100644 --- a/src_jbo/jbo/app/tenwa/doc/LB_FILE_MAILARCHIVING_INFO.java +++ b/src_jbo/jbo/app/tenwa/doc/LB_FILE_MAILARCHIVING_INFO.java @@ -93,4 +93,20 @@ public interface LB_FILE_MAILARCHIVING_INFO{ * 意见解释 STRING(255)
*/ public static final String opinion_comments = "opinion_comments"; + /** + * 档案邮寄时间 STRING(32)
+ */ + public static final String EXPSTRATDATE = "EXPSTRATDATE"; + /** + * 档案收到时间 STRING(32)
+ */ + public static final String EXPENDDATE = "EXPENDDATE"; + /** + * 档案邮寄时间 STRING(32)
+ */ + public static final String is_delay = "is_delay"; + /** + * 档案收到时间 STRING(32)
+ */ + public static final String delay_date = "delay_date"; } \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_CAR_LICENSE_PLATE_INFO.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_CAR_LICENSE_PLATE_INFO.java index 73cccc550..7a46be849 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_CAR_LICENSE_PLATE_INFO.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_CAR_LICENSE_PLATE_INFO.java @@ -101,4 +101,20 @@ public interface LB_CAR_LICENSE_PLATE_INFO{ * 延迟申请日期 STRING(32)
*/ public static final String delay_date = "delay_date"; + /** + * 挂车-是否抵押 STRING(100)
+ */ + public static final String frame_is_pledge = "frame_is_pledge"; + /** + * 挂车-抵押日期 STRING(100)
+ */ + public static final String frame_pledge_date = "frame_pledge_date"; + /** + * 挂车-是否提交延迟申请 STRING(32)
+ */ + public static final String frame_is_delay = "frame_is_delay"; + /** + * 挂车-延迟申请日期 STRING(32)
+ */ + public static final String frame_delay_date = "frame_delay_date"; } \ No newline at end of file diff --git a/src_jbo/jbo/com/tenwa/lease/comm/LB_CAR_LICENSE_PLATE_INFO_TEMP.java b/src_jbo/jbo/com/tenwa/lease/comm/LB_CAR_LICENSE_PLATE_INFO_TEMP.java index 2bbda639c..8a9e875ee 100644 --- a/src_jbo/jbo/com/tenwa/lease/comm/LB_CAR_LICENSE_PLATE_INFO_TEMP.java +++ b/src_jbo/jbo/com/tenwa/lease/comm/LB_CAR_LICENSE_PLATE_INFO_TEMP.java @@ -105,4 +105,20 @@ public interface LB_CAR_LICENSE_PLATE_INFO_TEMP{ * 延迟申请日期 STRING(32)
*/ public static final String delay_date = "delay_date"; + /** + * 挂车-是否抵押 STRING(100)
+ */ + public static final String frame_is_pledge = "frame_is_pledge"; + /** + * 挂车-抵押日期 STRING(100)
+ */ + public static final String frame_pledge_date = "frame_pledge_date"; + /** + * 挂车-是否提交延迟申请 STRING(32)
+ */ + public static final String frame_is_delay = "frame_is_delay"; + /** + * 挂车-延迟申请日期 STRING(32)
+ */ + public static final String frame_delay_date = "frame_delay_date"; } \ No newline at end of file diff --git a/src_tenwa/com/tenwa/lease/flow/project/businessapply/DocMailAction.java b/src_tenwa/com/tenwa/lease/flow/project/businessapply/DocMailAction.java index e1b058e90..b7e18d4fe 100644 --- a/src_tenwa/com/tenwa/lease/flow/project/businessapply/DocMailAction.java +++ b/src_tenwa/com/tenwa/lease/flow/project/businessapply/DocMailAction.java @@ -152,6 +152,9 @@ public class DocMailAction { // for(int i=0;i