From 8dd8f5dc9f8f6bf945dd9e380f5231c84e82b5f2 Mon Sep 17 00:00:00 2001 From: liuzhao Date: Tue, 30 Oct 2018 09:34:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfirmInvoice/InvoiceResultListZ.jsp | 2 +- .../AssetsDisposalEndApplyList.jsp | 19 ++++++++++++++++++- .../AssetsDisposalFeeApplyList.jsp | 2 +- .../FileManager/FileReturn/FileReturnList.jsp | 2 +- .../MortgageFile/LbFileArchiving_CTInfo.jsp | 5 +++-- .../apzl/comm/FileArchivingInfoTemp.java | 3 +++ 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceResultListZ.jsp b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceResultListZ.jsp index f6feed9a5..fd0e99d03 100644 --- a/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceResultListZ.jsp +++ b/WebContent/Tenwa/Core/InvoiceManager/ConfirmInvoice/InvoiceResultListZ.jsp @@ -18,7 +18,7 @@ String sButtons[][] = { //{"true","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""}, {"true","","Button","发票作废申请","发票作废申请","InvoiceInvalid()","","","","",""}, - {"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, + //{"true","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""}, {"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""}, }; %><%@include file="/Frame/resources/include/ui/include_list.jspf"%> diff --git a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalEnd/AssetsDisposalEndApplyList.jsp b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalEnd/AssetsDisposalEndApplyList.jsp index fe8e45df4..29511a8a2 100644 --- a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalEnd/AssetsDisposalEndApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalEnd/AssetsDisposalEndApplyList.jsp @@ -5,7 +5,24 @@ /*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/ function newApply() { - AsDialog.OpenSelector("SelectAssetsDisposalForFee","","dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + var flowno="<%=CurPage.getParameter("ApplyType")%>"; + var selname=""; + var orgId="<%=CurUser.getOrgID()%>".substring(0,7); + var businessType=""; + if("AssetsDisposalEndApply"==flowno){ + businessType="1"; + }else{ + if(orgId=="8009013"){ + businessType="3"; + }else if(orgId=="8009010"){ + businessType="2"; + }else{ + alert("当前用户不能发起申请！"); + return; + } + } + + AsDialog.OpenSelector("SelectAssetsDisposalForFee","businessType,"+businessType,"dialogWidth=" + parseInt(window.screen.width * 0.8) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn||sReturn=="_CANCEL_"||sReturn=="_NONE_"){ //alert(getHtmlMessage('1'));//请选择一条信息！ return; diff --git a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalFeeApply/AssetsDisposalFeeApplyList.jsp b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalFeeApply/AssetsDisposalFeeApplyList.jsp index 9f33abcb1..f884e6189 100644 --- a/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalFeeApply/AssetsDisposalFeeApplyList.jsp +++ b/WebContent/Tenwa/Lease/Flow/AssetsDisposal/AssetsDisposalFeeApply/AssetsDisposalFeeApplyList.jsp @@ -9,7 +9,7 @@ var selname=""; var orgId="<%=CurUser.getOrgID()%>".substring(0,7); var businessType=""; - if("TAssetsDisposalFeeApply"==flowno){ + if("AssetsDisposalFeeApply"==flowno){ businessType="1"; }else{ if(orgId=="8009013"){ diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/FileReturn/FileReturnList.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/FileReturn/FileReturnList.jsp index e574a7e98..4b683ef18 100644 --- a/WebContent/Tenwa/Lease/Flow/FileManager/FileReturn/FileReturnList.jsp +++ b/WebContent/Tenwa/Lease/Flow/FileManager/FileReturn/FileReturnList.jsp @@ -19,7 +19,7 @@ ASObjectModel doTemp = new ASObjectModel(sTempletNo); BizObject lfbit = JBOFactory.getBizObjectManager(LB_FILE_BORROWING_INFO_TEMP.CLASS_NAME).createQuery("FLOWUNID=:flowunid ").setParameter("flowunid",sFlowUnid).getSingleResult(false); String fileIds = lfbit.getAttribute("DOCIDS").getString(); - doTemp.setJboWhere("ID IN "+fileIds); + //doTemp.setJboWhere("ID IN "+fileIds); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); dwTemp.Style="1"; dwTemp.ReadOnly = "1"; diff --git a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchiving_CTInfo.jsp b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchiving_CTInfo.jsp index cf5a798a7..27263d15c 100644 --- a/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchiving_CTInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/FileManager/MortgageFile/LbFileArchiving_CTInfo.jsp @@ -6,6 +6,7 @@ History Log: */ String sPrevUrl = CurPage.getParameter("PrevUrl"); + String FLOWUNID = CurPage.getParameter("ObjectNo"); if(sPrevUrl == null) sPrevUrl = ""; String inputuserid = CurUser.getUserID(); String inputusername = CurUser.getUserName(); @@ -18,11 +19,11 @@ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); dwTemp.Style = "2";//freeform //dwTemp.ReadOnly = "-2";//只读模式 - dwTemp.genHTMLObjectWindow(CurPage.getParameter("SerialNo")); + dwTemp.genHTMLObjectWindow(FLOWUNID); String sButtons[][] = { {"true","All","Button","保存","保存所有修改","as_save(0)","","","",""}, - {"true","All","Button","返回","返回列表","returnList()","","","",""} + //{"true","All","Button","返回","返回列表","returnList()","","","",""} }; sButtonPosition = "south"; %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> diff --git a/src_tenwa/com/tenwa/apzl/comm/FileArchivingInfoTemp.java b/src_tenwa/com/tenwa/apzl/comm/FileArchivingInfoTemp.java index 617cad3ab..a6226b43d 100644 --- a/src_tenwa/com/tenwa/apzl/comm/FileArchivingInfoTemp.java +++ b/src_tenwa/com/tenwa/apzl/comm/FileArchivingInfoTemp.java @@ -32,6 +32,9 @@ public class FileArchivingInfoTemp extends BaseBussiness{ bo.setAttributeValue("contract_number", contract_number); bo.setAttributeValue("flowunid", flowunid); fileArchivingManager.saveObject(bo); + }else{ + fileArchivingManager.createQuery("update O set flowunid=:flowunid where contract_id=:contract_id") + .setParameter("flowunid", flowunid).setParameter("contract_id", contract_id).executeUpdate(); } return "true"; }