From fc134740241e25ec7df5e41874a8caeee9e2432a Mon Sep 17 00:00:00 2001 From: tangfutang Date: Wed, 30 Dec 2020 16:58:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=A0=E7=BB=9F=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E5=BD=92=E5=B1=9E=E4=BA=BA=E5=92=8C=E5=87=BA=E7=A7=9F?= =?UTF-8?q?=E4=BA=BA=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Customer/Lessee/Company/CustomerCompanyList.jsp | 2 +- .../Tenwa/Lease/Flow/Comm/LBRent/LBLessorInfo.jsp | 11 ++++++++++- src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql | 13 ++++++++++++- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyList.jsp b/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyList.jsp index c88e6ebf6..ac0d085ac 100644 --- a/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyList.jsp +++ b/WebContent/Tenwa/Customer/Lessee/Company/CustomerCompanyList.jsp @@ -13,7 +13,7 @@ ASObjectModel doTemp = new ASObjectModel(customerListTemplet); //String otherWhere=DataRightManager.getRightCondition(CurUser,"O","cust"); //登录超级管理员显示所有的法人客户 - doTemp.appendJboWhere(" and (O.inputuserid='"+userId+"' or '"+userId+"'='administrator')"); + doTemp.appendJboWhere(" and (ca.userid='"+userId+"' or '"+userId+"'='administrator')"); //doTemp.appendJboWhere(otherWhere); //doTemp.setJboWhereWhenNoFilter("ct.custstatus = 'status02' "); ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBRent/LBLessorInfo.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBRent/LBLessorInfo.jsp index da64a95ae..b1a35a1d6 100644 --- a/WebContent/Tenwa/Lease/Flow/Comm/LBRent/LBLessorInfo.jsp +++ b/WebContent/Tenwa/Lease/Flow/Comm/LBRent/LBLessorInfo.jsp @@ -32,6 +32,9 @@ if(sTempletNo == null) sTempletNo = "LBLessorInfoTemp"; String RightType = CurPage.getParameter("RightType");//页面是否 是只读 String nodeNo=CurPage.getParameter("NodeNo"); + //查询租赁类型 + String businesstype = Sqlca.getString(" select BUSINESSTYPE from lb_contract_info_temp where flowunid='"+sFlowUnid+"'"); + %> <%/*~END~*/%> @@ -128,7 +131,13 @@ } //选择出租人 function SelectOwnInfo(){ - AsDialog.OpenSelector("SelectOwnInfo","","dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ + var businesstype = "<%=businesstype%>"; + if(businesstype=="2"){//传统 + businesstype="0030"; + }else if (businesstype=="3"){//汽车类传统 + businesstype="0020"; + } + AsDialog.OpenSelector("SelectOwnInfo","acc_type,"+businesstype,"dialogWidth=" + parseInt(window.screen.width * 0.4) + "px dialogHeight=" + parseInt(window.screen.height * 0.6) + "px",function(sReturn){ if(!sReturn || sReturn == "_CANCEL_"){ return; } diff --git a/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql b/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql index a1ddbbad2..b1ef9935f 100644 --- a/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql +++ b/src_sql/鎶曚骇SQL/v20201022/tft_20201022.sql @@ -282,8 +282,19 @@ Insert Into awe_do_library (dono,colindex,sortno,isinuse,coltablename,colactualn -- 扣款卡变更表中添加扣款渠道字段 alter table customer_account_middle add column collect_type varchar(20) null comment '渠道类型' after flowunid; +-- 签约历史表添加签约类型 +alter table LB_CARD_SIGN_STATUS_HIS add column sign_type varchar(10) null comment '签约方式' after agrmno; + +-- 修改合同审批出租人选择对话框 +delete from SELECT_CATALOG where selname='SelectOwnInfo'; +Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('SelectOwnInfo','Sql','查询本方信息','','','Grid','','OWN_NUMBER','select OWN_NUMBER,OWN_NAME,LEASE_CONSIGNER,LEASE_REGISTER_ADDR,LEASE_ADDR,LEASE_PERSON,LEASE_POSTCODE,LEASE_LINKMAN,LEASE_TEL,LEASE_FAX,LEASE_EMAIL from own_info oi left join OWN_ACCOUNT oa on oi.own_number=oa.own_id where oa.acc_type=''#acc_type'' and state_=''0010''','客户编号,出租人,委托代理人,注册地址,通讯地址,法定代表人,邮编,联系人,电话,传真,电子邮件','','OWN_NUMBER@OWN_NAME@LEASE_CONSIGNER@LEASE_REGISTER_ADDR@LEASE_ADDR@LEASE_PERSON@LEASE_POSTCODE@LEASE_LINKMAN@LEASE_TEL@LEASE_FAX@LEASE_EMAIL','OWN_NAME','1','Single','','','','','','SYS_Designer','','2017/05/11 18:41:49','SYS_Designer','2020/12/30 14:06:44',''); - +-- 修改法人客户的list页面条件 +delete from AWE_DO_CATALOG where dono='CustomerCompanyList'; +Insert Into AWE_DO_CATALOG (dono,doname,dodescribe,dotype,doclass,isinuse,colcount,modeid,jboclass,jbofrom,jbowhere,jbogroup,jboorder,businessprocess,exportflag,inputuser,inputtime,updateuser,updatetime,remark,isvalidate,parent) Values ('CustomerCompanyList','法人客户列表',null,'30010',null,'1','1','default','jbo.app.tenwa.customer.CUSTOMER_INFO','O left join jbo.app.tenwa.customer.CUSTOMER_TYPE ct on O.customerid=ct.customerid left join jbo.app.tenwa.customer.CUSTOMER_ATTRIBUTION ca on ca.customerid=O.customerid','O.customertype =:sCustomerType and ct.custtype=''cust_type.cust'' and ct.status=''valid'' and ca.status=''yes''','','inputtime desc','',null,'SYS_Designer','2017/03/15 11:52:03','SYS_Designer','2020/12/30 15:09:56','','1',''); +-- 修改项目立项选客户根据归属设置显示 +delete from SELECT_CATALOG where selname='SelectCustomerForProjectApprove'; +Insert Into SELECT_CATALOG (selname,seltype,seldescribe,seltablename,selprimarykey,selbrowsemode,selargs,selhidefield,selcode,selfieldname,selfielddisp,selreturnvalue,selfilterfield,isinuse,mutilorsingle,attribute1,attribute2,attribute3,attribute4,attribute5,inputuser,inputorg,inputtime,updateuser,updatetime,remark) Values ('SelectCustomerForProjectApprove','Sql','查询客户项目立项','customer_info','customerid','Grid','String userid','','SELECT O.customerid,O.customername,getItemName(''CertType'',O.certtype) AS certtype,O.certid,O.CUSTKIND,getItemName(''CustomerType'',O.customertype) AS customertype,getUserName(O.inputuserid) AS inputusername,getOrgName(O.inputorgid) AS inputorgid ,O.inputtime FROM CUSTOMER_INFO O LEFT JOIN CUSTOMER_TYPE ct ON O.customerid=ct.customerid LEFT JOIN CUSTOMER_COMPANY cc ON cc.customerid=O.customerid LEFT JOIN CUSTOMER_ATTRIBUTION ca ON ca.customerid=O.customerid WHERE O.customertype=''01'' AND ct.custtype=''cust_type.cust'' AND ct.custstatus=''status02'' AND ct.status=''valid'' AND cc.status=''status02'' AND ca.status=''yes'' AND ca.userid=''#userid'' AND NOT EXISTS (SELECT 1 FROM CUSTOMER_BLANK_LIST cbl WHERE cbl.customer_id=O.customerid AND (cbl.blank_level =''stop'' AND cbl.blank_status=''no'')) {O,cust}','客户编号,客户名称,证件类型,证件编号,内部行业,客户类别,登记人,登记机构,登记时间','','customerid@customername','customername,custkind,certid','1','Single','','','','','customername@ @ @EqualsString,Contains@certid@ @ @EqualsString,Contains@custkind@sql@SELECT itemno,itemname FROM code_library WHERE codeno=''cust_kind'' ORDER BY sortno@EqualsString','SYS_Designer','','2017/07/06 15:38:06','SYS_Designer','2020/12/30 15:17:05','');