From 065db45276c0868f8d1728bc7034b92ecd0f0778 Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 2 Sep 2020 18:14:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=B7=BB=E5=8A=A0=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E7=A7=9F=E8=B5=81=E7=89=A9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Comm/LBEquipment_Car/LBEquipmentInfo.jsp | 10 ++--- .../Comm/LBEquipment_Car/LBEquipmentList.jsp | 37 ++++++++++++++----- src_sql/鎶曚骇SQL/v20200915/tft_20200915.sql | 12 ++++++ 3 files changed, 44 insertions(+), 15 deletions(-) diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp index 7aa645d78..43d2a81b0 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp @@ -126,7 +126,7 @@ if("flow_contract_sum_car".equals(showtype)){ dwTemp.genHTMLObjectWindow(contractid); }else{ - dwTemp.genHTMLObjectWindow(FlowUnid); + dwTemp.genHTMLObjectWindow(ID); } String vehiclelevel = Sqlca.getString("select vehiclelevel from LB_EQUIPMENT_CAR_TEMP where FLOWUNID ='"+FlowUnid+"'"); // CurPage.getCurComp().setAttribute("RightType", RightType); @@ -140,8 +140,8 @@ <% String sButtons[][] = { //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 - {falg,"All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"}, - //{"true","","Button","返回","返回列表页面","goBack()","","","","btn_icon_return"} + {"true","All","Button","保存","保存所有修改","saveRecord()","","","","btn_icon_save"}, + {"true","","Button","返回","返回列表页面","goBack()","","","","btn_icon_return"} }; sButtonPosition = "north"; %> @@ -285,14 +285,14 @@ }else{ var sResult = RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.BusinessApproveManager","saveAreaCode","flowunid="+sFlowUnid+",plate_number="+plate_number); if(sResult=="SUCCESS"){ - as_save("myiframe0",""); + as_save("myiframe0","goBack()"); //as_save(0,"goBack()"); }else{ alert("请填写正确的车牌号码！"); } } }else{ - as_save("myiframe0",""); + as_save("myiframe0","goBack()"); //as_save(0,"goBack()"); } diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp index c80737cce..3de1769ad 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp @@ -30,6 +30,14 @@ <%/*~BEGIN~可编辑区~[Editable=true;CodeAreaID=List02;Describe=定义变量，获取参数;]~*/%> <% + String ProjectNo = CurPage.getParameter("ProjectNo"); + String projectId = CurPage.getParameter("ProjectId"); + String ApplyType = CurPage.getParameter("ApplyType"); + String flowName = CurPage.getParameter("FlowName");//流程名称 + String contractid = CurPage.getParameter("ContractId"); + String showtype = CurPage.getParameter("ShowType"); + String operationType = CurPage.getParameter("operationType"); + String sFlowUnid = CurPage.getParameter("FlowUnid");//流程编号 if(sFlowUnid == null)sFlowUnid = ""; String certid = Sqlca.getString("select cpt.certid from lb_union_lessee_temp lul inner join CUSTOMER_PERSON_TEMP cpt on cpt.customerid = lul.customer_id where lul.flowunid = '"+sFlowUnid+"' group by cpt.certid"); @@ -92,9 +100,9 @@ if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory. }else{ sButtons=new String[][]{ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格 - //{"true","","Button","新增","新增租赁物信息","newRecord()","","","","btn_icon_add",""}, + {"true","","Button","新增","新增租赁物信息","newRecord()","","","","btn_icon_add",""}, {"true","","Button","修改","修改租赁物信息","viewAndEdit()","","","","btn_icon_edit"}, - //{"true","","Button","删除","删除租赁物信息","deleteRecord()","","","","btn_icon_delete",""}, + {"true","","Button","删除","删除租赁物信息","deleteRecord()","","","","btn_icon_delete",""}, //{"true","","Button","导入Excel","导入租赁物信息Excel","inExcel()","","","","",""}, //{"true","","Button","导出Excel","导出租赁物信息Excel","exportPage('"+sWebRootPath+"',0,'excel','"+dwTemp.getArgsValue()+"')","","","","",""}, //{"true","","Button","下载模板","下载租赁物信息模板","downLoad()","","","","",""} @@ -130,7 +138,7 @@ if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory. // }); $(function(){ //newRecord(); - viewAndEdit(); + //viewAndEdit(); $("#myiframe0_float_div table").css("width","100%"); $("#myiframe0_cells table").css("width","100%"); }) @@ -167,14 +175,20 @@ if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory. /*~[Describe=新增记录;InputParam=无;OutPutParam=无;]~*/ function newRecord(){ - //判断是否承租人租赁车辆数量 - var res0=RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerAction","checkGuaranteeCarByCertid",'certid=<%=certid%>'+',flowunid=<%=sFlowUnid%>'); - if(res0 != "0"){ - alert(res0); + var countNumber = getRowCount(0); + if(countNumber<2){ + //判断是否承租人租赁车辆数量 + var res0=RunJavaMethodTrans("com.tenwa.lease.flow.project.businessapply.CustomerAction","checkGuaranteeCarByCertid",'certid=<%=certid%>'+',flowunid=<%=sFlowUnid%>'); + if(res0 != "0"){ + alert(res0); + } + var sUrl = "/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp"; + var sParam = "FlowUnid="+"<%=sFlowUnid%>"+"&ListTempletNo="+"<%=sTempletNo%>&TaskNo=<%=taskno%>&InfoTempletNo=<%=sInfoTempletNo%>&EquipType=<%=sEquipType%>"; + AsControl.OpenView(sUrl,sParam,"_self",""); + }else{ + alert("租赁物信息最多只能有两个!"); } - var sUrl = "/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentInfo.jsp"; - var sParam = "FlowUnid="+"<%=sFlowUnid%>"+"&ListTempletNo="+"<%=sTempletNo%>&TaskNo=<%=taskno%>&InfoTempletNo=<%=sInfoTempletNo%>&EquipType=<%=sEquipType%>"; - AsControl.OpenView(sUrl,sParam,"_self",""); + } @@ -187,6 +201,9 @@ if((null!=RightType&&RightType.equals("ReadOnly"))||(null!=ishistory&&ishistory. var righttype="<%=RightType%>"; if(righttype=="ReadOnly"){sParam=sParam+"&RightType=<%=RightType%>";} sParam=sParam+"&IsHistory=<%=ishistory%>&NodeNo=<%=nodeNo%>&InfoTempletNo=<%=sInfoTempletNo%>&EquipType=<%=sEquipType%>"; + //添加参数 + sParam=sParam+"&ProjectNo=<%=ProjectNo%>&ProjectId=<%=projectId%>&ApplyType=<%=ApplyType%>&FlowName=<%=flowName%>&ContractId=<%=contractid%>&ShowType=<%=showtype%>&operationType=<%=operationType%>&carAttributes=<%=carAttributes%>"; + AsControl.OpenView(sUrl,sParam,"_self",""); //reloadSelf(); } diff --git a/src_sql/鎶曚骇SQL/v20200915/tft_20200915.sql b/src_sql/鎶曚骇SQL/v20200915/tft_20200915.sql index d2535571f..38bdc7c3d 100644 --- a/src_sql/鎶曚骇SQL/v20200915/tft_20200915.sql +++ b/src_sql/鎶曚骇SQL/v20200915/tft_20200915.sql @@ -118,3 +118,15 @@ INSERT INTO CODE_LIBRARY (CODENO, ITEMNO, ITEMNAME, BANKNO, SORTNO, ISINUSE, ITE INSERT INTO CODE_LIBRARY (CODENO, ITEMNO, ITEMNAME, BANKNO, SORTNO, ISINUSE, ITEMDESCRIBE, ITEMATTRIBUTE, RELATIVECODE,ATTRIBUTE1, ATTRIBUTE2, ATTRIBUTE3, ATTRIBUTE4, ATTRIBUTE5, ATTRIBUTE6, ATTRIBUTE7,ATTRIBUTE8, INPUTUSER, INPUTORG, INPUTTIME, UPDATEUSER, UPDATETIME, REMARK, HELPTEXT)VALUES ('sign_status', 'sign_status4', '签约失效', NULL, '0040', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,NULL, NULL, 'SYS_Designer', NULL, '2019/01/07 19:14:10', 'SYS_Designer', '2019/01/07 19:14:10', NULL, NULL); INSERT INTO CODE_LIBRARY (CODENO, ITEMNO, ITEMNAME, BANKNO, SORTNO, ISINUSE, ITEMDESCRIBE, ITEMATTRIBUTE, RELATIVECODE, ATTRIBUTE1, ATTRIBUTE2, ATTRIBUTE3, ATTRIBUTE4, ATTRIBUTE5, ATTRIBUTE6, ATTRIBUTE7, ATTRIBUTE8, INPUTUSER, INPUTORG, INPUTTIME, UPDATEUSER, UPDATETIME, REMARK, HELPTEXT) VALUES ('sign_status', 'sign_status5','正在签约', NULL, '0050', '1', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'SYS_Designer', NULL, '2019/01/07 19:14:10', 'SYS_Designer', '2019/01/07 19:14:10', NULL, NULL); +-- ==============================v2====================================== +delete from PRD_NODEINFO where nodeid='11291' and nodename='租赁车辆基本信息'; +insert into `PRD_NODEINFO` (`nodeid`, `nodename`, `sortno`, `isinuse`, `itemdescribe`, `inputuserid`, `inputorgid`, `inputtime`, `updateuserid`, `updatetime`, `initscript`, `exportscript`, `phasescript`, `deletescript`, `remark`, `formalClass`, `querycondition`) values('11291','租赁车辆基本信息','11291','1','/Tenwa/Lease/Flow/Comm/LBEquipment_Car/LBEquipmentList.jsp','admin','80009000200010001','2018/01/31','administrator','2020/08/31',NULL,NULL,NULL,NULL,NULL,NULL,NULL); + + + + + + + + +