Merge remote-tracking branch 'origin/develop' into dev_local

src/main/webapp/WEB-INF/classes/basic/sys_code_value_v_lease.lwm

@@ -37,14 +37,14 @@
                 FROM exp_emp_assign_e_v t
                 WHERE t.user_id = ${/session/@user_id}
                 and PARENT_UNIT_ID <> 1544
-                AND v.code_value IN ('10', '20', '30', '40','50'))
+                AND v.code_value IN ('10', '20', '30', '40','50','70'))
                 UNION ALL
                 SELECT v.code_value AS value_code, v.code_value_name AS value_name
                 FROM sys_code_values_v v
                 WHERE v.code_enabled_flag = 'Y'
                 AND v.code_value_enabled_flag = 'Y'
                 AND v.code = 'DIVISION'
-                AND v.code_value IN ('10', '20', '30', '40','50')
+                AND v.code_value IN ('10', '20', '30', '40','50','70')
                 AND NOT EXISTS (SELECT 1
                 FROM exp_emp_assign_e_v t
                 WHERE t.user_id = ${/session/@user_id}

src/main/webapp/WEB-INF/classes/cont/CON3400/contract_sales_report_query.lwm

@@ -28,7 +28,7 @@
     <bm:query-fields>
         <bm:query-field name="journal_date_from" queryExpression="to_char(t.journal_date,&apos;yyyy-mm-dd&apos;) &gt;= ${@journal_date_from}"/>
         <bm:query-field name="journal_date_to" queryExpression="to_char(t.journal_date,&apos;yyyy-mm-dd&apos;) &lt;= ${@journal_date_to}"/>
-        <bm:query-field name="bp_id_agent_level1" queryExpression="t.bp_id_agent_level1=${@bp_id_agent_level1}"/>
+        <bm:query-field name="bp_id" queryExpression="t.bp_id_agent_level1 in (${:@bp_id})"/>
         <bm:query-field name="business_type" queryExpression="t.business_type=${@business_type}"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/cont/CON3400/contract_sales_report_query_lns.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+
+         select *
+          from CONTRACT_BENEFITS_SALE_V t
+         #WHERE_CLAUSE#
+
+
+                ]]>
+            </bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:query-fields>
+        <bm:query-field name="journal_date_from" queryExpression="to_char(t.journal_date,&apos;yyyy-mm-dd&apos;) &gt;= ${@journal_date_from}"/>
+        <bm:query-field name="journal_date_to" queryExpression="to_char(t.journal_date,&apos;yyyy-mm-dd&apos;) &lt;= ${@journal_date_to}"/>
+        <bm:query-field name="division" queryExpression="t.division in (${:@division})"/>
+        <bm:query-field name="bp_id" queryExpression="t.bp_id_agent_level1 in (${:@bp_id})"/>
+        <bm:query-field name="business_type" queryExpression="t.business_type=${@business_type}"/>
+    </bm:query-fields>
+</bm:model>

src/main/webapp/WEB-INF/classes/cont/CON3400/hls_bp_master_for_lov.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:fields>
+        <bm:field name="bp_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="BP_ID" prompt="HLS_BP_MASTER_V.BP_ID"/>
+        <bm:field name="bp_code" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="80" forDisplay="true" forQuery="true" physicalName="BP_CODE" prompt="HLS.BP_TITLE"/>
+        <bm:field name="bp_name" databaseType="VARCHAR2" datatype="java.lang.String" displayWidth="160" forDisplay="true" forQuery="true" physicalName="BP_NAME" prompt="HLS.BP_NAME_SHORT"/>
+        <bm:field name="extra_nam" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="EXTRA_NAM" prompt="HLS_BP_MASTER_LV.EXTRA_NAM"/>
+
+        <!--<bm:field name="id_card_no" displayWidth="200" forDisplay="true" prompt="身份证"/>-->
+    </bm:fields>
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+
+      select t1.bp_id,
+       t1.bp_code,
+       t1.extra_nam,
+       t1.extra_nam as bp_name
+
+        from hls_bp_master         t1
+         #WHERE_CLAUSE#
+
+
+                ]]>
+            </bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+    <bm:query-fields>
+        <bm:query-field field="bp_id" queryOperator="="/>
+        <bm:query-field field="bp_code" queryOperator="like"/>
+        <bm:query-field field="bp_name" queryExpression="t1.extra_nam like &apos;%&apos;||${@bp_name}||&apos;%&apos;"/>
+        <bm:query-field name="bp_category" queryExpression="(t1.bp_category = ${@bp_category})"/>
+    </bm:query-fields>
+    <bm:data-filters>
+        <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
+        <bm:data-filter name="query" expression="(t1.enabled_flag=&apos;Y&apos;)"/>
+    </bm:data-filters>
+</bm:model>

src/main/webapp/WEB-INF/classes/cont/CON930/con_contract_cashflow_monthly.lwm

@@ -119,7 +119,7 @@
                t.agent_bp_id,
                ((select v.bp_name from hls_bp_master v where v.bp_id = t.vender_id)||'/'||(SELECT v.code_value_name
              FROM sys_code_values_v v
-            WHERE v.code = 'DIVISION' AND v.code_value = t.division))division_n
+            WHERE v.code = 'DIVISION' AND v.code_value = t.division))division_n,t.division
           from con_cashflow_monthly_temp t, hls_bp_master m, gld_accounts g
          where m.bp_id = t.agent_bp_id
            and g.account_id(+) = t.account_id
@@ -233,7 +233,7 @@
                tt.agent_bp_id,
                ((select v.bp_name from hls_bp_master v where v.bp_id = tt.vender_id)||'/'||(SELECT v.code_value_name
              FROM sys_code_values_v v
-            WHERE v.code = 'DIVISION' AND v.code_value = tt.division))division_n
+            WHERE v.code = 'DIVISION' AND v.code_value = tt.division))division_n,tt.division
           from (select sum(nvl(t.unreceived_sum_amount, 0)) unreceived_sum_amount,
                        sum(nvl(t.overdue_sum_amount, 0)) overdue_sum_amount,
                        sum(nvl(t.not_due_sum_amount, 0)) not_due_sum_amount,
@@ -328,7 +328,7 @@
                  where t.session_id = ${/session/@session_id}
                  group by t.contract_id, t.bp_id, t.agent_bp_id,t.vender_id,t.division) tt,
                hls_bp_master m
-         where m.bp_id = tt.agent_bp_id) ttt
+         where m.bp_id = tt.agent_bp_id) ttt #WHERE_CLAUSE#
  order by ttt.contract_id, ttt.account_id_n
 
 
@@ -342,7 +342,6 @@
 		           p_session_id   =>${/session/@session_id},
                                  p_due_date     =>to_date(${@due_date},'yyyy-mm-dd'),
                                  p_user_id      =>${/session/@user_id},
-                                 p_bp_id        =>${@bp_id},
                                  p_business_type =>${@business_type},
                                  p_overday1     =>${@overday1},
                                  p_overday2     =>${@overday2},
@@ -359,6 +358,7 @@
     </bm:operations>
     <bm:fields>
         <bm:field name="division_n"/>
+        <bm:field name="division"/>
         <bm:field name="business_type_n"/>
         <bm:field name="contract_id"/>
         <bm:field name="bp_code"/>
@@ -461,4 +461,18 @@
     <!--        <bm:query-field field="account_name" queryExpression="t1.account_name = ${@account_name}"/>-->
     <!--        <bm:query-field field="account_id_n" queryExpression="t1.account_id_n = ${@account_id_n}"/>-->
     <!--    </bm:query-fields>-->
+    <bm:query-fields>
+        <bm:query-field field="division" queryExpression="ttt.division in (${:@division})"/>
+        <bm:query-field name="bp_id" queryExpression="ttt.agent_bp_id in (${:@bp_id})"/>
+
+        <bm:query-field name="bp_id_agent_level1_id" queryExpression="to_char(ttt.agent_bp_id) in (select regexp_substr(${@bp_id},
+                              '[^;]+',
+                              1,
+                              level)
+           from dual
+         connect by regexp_substr(${@bp_id},
+                                  '[^;]+',
+                                  1,
+                                  level) is not null)"/>
+    </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/cont/CON930/con_contract_cashflow_monthly_agent.lwm

@@ -322,7 +322,7 @@
                  where t.session_id = ${/session/@session_id}
                  group by t.agent_bp_id, t.division) tt,
                hls_bp_master m
-         where m.bp_id = tt.agent_bp_id) ttt
+         where m.bp_id = tt.agent_bp_id) ttt #WHERE_CLAUSE#
  order by ttt.agent_bp_id,ttt.division, ttt.account_id_n
 
 
@@ -408,4 +408,9 @@
 <!--        <bm:query-field field="account_name" queryExpression="t1.account_name = ${@account_name}"/>-->
 <!--        <bm:query-field field="account_id_n" queryExpression="t1.account_id_n = ${@account_id_n}"/>-->
 <!--    </bm:query-fields>-->
+
+    <bm:query-fields>
+        <bm:query-field field="division" queryExpression="ttt.division in (${:@division})"/>
+        <bm:query-field name="bp_id" queryExpression="ttt.agent_bp_id in (${:@bp_id})"/>
+    </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/cont/CON930/con_contract_cashflow_monthly_lease_item.lwm

@@ -9,7 +9,7 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-         select *
+         select ttt.*,(select hm.bp_name from hls_bp_master hm where hm.bp_id=ttt.agent_bp_id) bp_id_agent_level1_n
   from (select tt.unreceived_sum_amount,
                tt.overdue_sum_amount,
                tt.not_due_sum_amount,
@@ -91,7 +91,8 @@
                (SELECT v.code_value_name
                   FROM sys_code_values_v v
                  WHERE v.code = 'DIVISION'
-                   AND v.code_value = tt.division) division_n
+                   AND v.code_value = tt.division) division_n,
+                   tt.agent_bp_id
           from (select sum(nvl(t.unreceived_sum_amount, 0)) unreceived_sum_amount,
                        sum(nvl(t.overdue_sum_amount, 0)) overdue_sum_amount,
                        sum(nvl(t.not_due_sum_amount, 0)) not_due_sum_amount,
@@ -157,10 +158,11 @@
                        sum(nvl(t.not_due_amount_year_5_left, 0)) not_due_amount_year_5_left,
                        t.division,
                        t.account_id,
-                       t.account_code
-                  from con_cashflow_monthly_temp t
-                 where t.session_id = ${/session/@session_id}
-                 group by t.division, t.account_id, t.account_code) tt,
+                       t.account_code,
+                       t.agent_bp_id
+                  from con_cashflow_monthly_temp t,hls_bp_master hm
+                 where t.session_id = ${/session/@session_id} and hm.bp_id=t.agent_bp_id
+                 group by t.division, t.account_id, t.account_code,t.agent_bp_id) tt,
                gld_accounts g
          where g.account_id(+) = tt.account_id
         union
@@ -242,7 +244,8 @@
                (SELECT v.code_value_name
                   FROM sys_code_values_v v
                  WHERE v.code = 'DIVISION'
-                   AND v.code_value = tt.division) division_n
+                   AND v.code_value = tt.division) division_n,
+                   tt.agent_bp_id
           from (select sum(nvl(t.unreceived_sum_amount, 0)) unreceived_sum_amount,
                        sum(nvl(t.overdue_sum_amount, 0)) overdue_sum_amount,
                        sum(nvl(t.not_due_sum_amount, 0)) not_due_sum_amount,
@@ -306,10 +309,11 @@
                        sum(nvl(t.not_due_amount_year_4, 0)) not_due_amount_year_4,
                        sum(nvl(t.not_due_amount_year_5, 0)) not_due_amount_year_5,
                        sum(nvl(t.not_due_amount_year_5_left, 0)) not_due_amount_year_5_left,
-                       t.division
-                  from con_cashflow_monthly_temp t
-                 where t.session_id = ${/session/@session_id}
-                 group by t.division) tt) ttt
+                       t.division,
+                       t.agent_bp_id
+                  from con_cashflow_monthly_temp t,hls_bp_master hm
+                 where t.session_id = ${/session/@session_id} and hm.bp_id=t.agent_bp_id
+                 group by t.division,t.agent_bp_id) tt) ttt #WHERE_CLAUSE#
  order by ttt.division, ttt.account_id_n
 
             ]]></bm:query-sql>
@@ -321,7 +325,6 @@
 		           p_session_id   =>${/session/@session_id},
                                  p_due_date     =>to_date(${@due_date},'yyyy-mm-dd'),
                                  p_user_id      =>${/session/@user_id},
-                                 p_bp_id        =>${@bp_id},
                                  p_overday1     =>${@overday1},
                                  p_overday2     =>${@overday2},
                                  p_overday3     =>${@overday3},
@@ -336,6 +339,8 @@
         </bm:operation>
     </bm:operations>
     <bm:fields>
+        <bm:field name="bp_id_agent_level1_n"/>
+        <bm:field name="division"/>
         <bm:field name="division_n"/>
         <bm:field name="account_id_n"/>
         <bm:field name="account_name"/>
@@ -411,4 +416,10 @@
 <!--        <bm:query-field field="account_name" queryExpression="t1.account_name = ${@account_name}"/>-->
 <!--        <bm:query-field field="account_id_n" queryExpression="t1.account_id_n = ${@account_id_n}"/>-->
 <!--    </bm:query-fields>-->
+
+    <bm:query-fields>
+        <bm:query-field field="division" queryExpression="ttt.division in (${:@division})"/>
+        <bm:query-field name="bp_id" queryExpression="ttt.agent_bp_id in (${:@bp_id})"/>
+    </bm:query-fields>
+
 </bm:model>

src/main/webapp/leafresource/leaf.ui.std/hap/base/Leaf-all-min.js

@@ -11341,7 +11341,7 @@ $L.MultiLov = Ext.extend($L.MultiTextField, {
             } else {
                 var mapps = sf.getMapping();
                 var showCode = mapps[1].from;
-                url = ctx + 'sys_multiLov.lview?url=' + encodeURIComponent(Ext.urlAppend(ctx + 'autocrud/' + svc + '/query', Ext.urlEncode(sf.getLovPara()))) + '&service=' + svc + '&fieldRecord=' + JSON.stringify(fieldRecord) + '&showCode=' + showCode;
+                url = ctx + 'sys_multiLov.lview?url=' + encodeURIComponent(Ext.urlAppend(ctx + 'autocrud/' + svc + '/query', Ext.urlEncode(sf.getLovPara()))) + '&service=' + svc +  '&showCode=' + showCode;
             }
 
         }
@@ -11366,7 +11366,10 @@ $L.MultiLov = Ext.extend($L.MultiTextField, {
         }
         sf.saveRecord = {};
         sf.clearAllItems();
-        sf.record.ds.reset();
+        //sf.record.ds.reset();
+        Ext.each(mapping || sf.getMapping(), function (map) {
+            sf.record.set(map.to, '');
+        });
         for (var i = 0; i < r.length; i++) {
             if (record && r[i]) {
                 sf.saveRecord[i] = r[i].data;
@@ -11376,7 +11379,7 @@ $L.MultiLov = Ext.extend($L.MultiTextField, {
                     if (!Ext.isEmpty(from)) {
                         obj[map.to] = from;
                         if (!Ext.isEmpty(v)) {
-                            var SYMBOL = ";";
+                            var SYMBOL = ",";
                             from = v + SYMBOL + from;
                         }
                     } else {

src/main/webapp/modules/cont/CON930/con_contract_cashflow_monthly.lview

@@ -11,15 +11,39 @@
         <script><![CDATA[
         function CON321_con_contract_query() {
             if ($('con_contract_cashflow_monthly_query_ds').validate()){
+                debugger;
                 var headers_ds = $('con_contract_cashflow_monthly_query_ds');
                 var record = headers_ds.getAt(0);
-
+                record.data.division='';
+                if(record.data.lease_name10=='Y'){
+                    record.data.division=',10';
+                }
+                if(record.data.lease_name20=='Y'){
+                    record.data.division=record.data.division+',20';
+                }
+                if(record.data.lease_name30=='Y'){
+                    record.data.division=record.data.division+',30';
+                }
+                if(record.data.lease_name40=='Y'){
+                    record.data.division=record.data.division+',40';
+                }
+                if(record.data.lease_name50=='Y'){
+                    record.data.division=record.data.division+',50';
+                }
+                if(record.data.lease_name60=='Y'){
+                    record.data.division=record.data.division+',60';
+                }
+                if(record.data.lease_name70=='Y'){
+                    record.data.division=record.data.division+',70';
+                };
+                record.data.division=record.data.division.substr(1,record.data.division.length);
                 Leaf.Masker.mask(Ext.getBody(), '正在统计并查询，请稍等...');
                 Leaf.request({
                     url: $('con_cashflow_pre_query_id').getUrl(),
                     para: {
                         due_date : record.get('due_date'),
-                        bp_id : record.get('bp_id_agent_level1'),
+                        division:record.data.division,
+                        bp_id : record.get('bp_id'),
                         business_type : record.get('business_type'),
                         overday1:record.get('overdue_day1'),
                         overday2:record.get('overdue_day2'),
@@ -68,6 +92,8 @@
                              returnField="business_type" valueField="code_value" prompt="业务类型"/>
                     <a:field name="due_date" required="true"  prompt="基准日期"/>
                     <a:field name="bp_id_agent_level1" />
+                    <a:field name="bp_id_agent_level1_id" />
+                    <a:field name="bp_id_agent_level1_desc" />
                     <a:field name="account_name" displayField="account_name" options="gld_accounts_ds" returnField="account_id" valueField="account_id"/>
                     <a:field name="bp_id_agent_level1_n" prompt="代理店" lovGridHeight="350" lovHeight="500" lovService="basic.hls_bp_master_v_for_lov?bp_category=AGENT" lovWidth="500" title="HLS.BP_TITLE" >
                         <a:mapping>
@@ -75,6 +101,21 @@
                             <a:map from="bp_name" to="bp_id_agent_level1_n" />
                         </a:mapping>
                     </a:field>
+                    <a:field name="bp_name" lovGridHeight="350" lovHeight="500" lovService="basic.hls_bp_master_v_for_lov?bp_category=AGENT" lovWidth="800" displayField="bp_name" valueField="bp_id">
+                      <a:mapping>
+                        <a:map from="bp_id" to="bp_id"/>
+                        <a:map from="bp_name" to="bp_name"/>
+                      </a:mapping>
+                    </a:field>
+                    <a:field name="bp_id"/>
+                    <a:field checkedValue="Y" name="lease_name10" uncheckedValue="N" defaultValue="N"/>
+                    <a:field checkedValue="Y" name="lease_name20" uncheckedValue="N" defaultValue="N"/>
+                    <a:field checkedValue="Y" name="lease_name30" uncheckedValue="N" defaultValue="N"/>
+                    <a:field checkedValue="Y" name="lease_name40" uncheckedValue="N" defaultValue="N"/>
+                    <a:field checkedValue="Y" name="lease_name50" uncheckedValue="N" defaultValue="N"/>
+                    <a:field checkedValue="Y" name="lease_name60" uncheckedValue="N" defaultValue="N"/>
+                    <a:field checkedValue="Y" name="lease_name70" uncheckedValue="N" defaultValue="N"/>
+                    <a:field name="division" />
                     <a:field name="overdue_day1" required="true" prompt="已到期1个月界定天数" defaultValue="30"/>
                     <a:field name="overdue_day2" required="true" prompt="已到期2个月界定天数" defaultValue="60"/>
                     <a:field name="overdue_day3" required="true" prompt="已到期3个月界定天数" defaultValue="90"/>
@@ -95,9 +136,35 @@
                 <a:gridButton click="CON321_con_contract_query" text="HLS.QUERY"/>
                 <a:gridButton click="CON321_con_contract_reset" text="HLS.RESET"/>
             </a:screenTopToolbar>
-            <a:form bindTarget="con_contract_cashflow_balance_query_ds" column="4" title="收付款预定查询" marginWidth="40">
+            <a:form bindTarget="con_contract_cashflow_balance_query_ds" column="3" title="收付款预定查询" marginWidth="40">
+
                 <a:datePicker name="due_date" bindTarget="con_contract_cashflow_monthly_query_ds"/>
                 <a:comboBox name="business_type_desc" bindTarget="con_contract_cashflow_monthly_query_ds"/>
+               <!-- <a:lov name="bp_id_agent_level1_n" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="代理店">
+                    <a:events>
+                        <a:event name="commit" handler="bp_id_query_value_change"/>
+                    </a:events>
+                </a:lov>-->
+                <a:multiLov displayField="bp_name" valueField="bp_id"
+                            bindTarget="con_contract_cashflow_monthly_query_ds" name="bp_name" prompt="代理店"
+                            lovWidth="300" lovHeight="300" lovGridHeight="300" title="代理店lov"  width="400"/>
+
+
+                    <a:checkBox name="lease_name10" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="国产挖机"/>
+                    <a:checkBox name="lease_name20" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="进口挖机"/>
+
+                    <a:checkBox name="lease_name30" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="高空作业车"/>
+                    <a:checkBox name="lease_name50" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="星邦高空作业车"/>
+
+                    <a:checkBox name="lease_name60" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="新业务"/>
+                    <a:checkBox name="lease_name70" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="铁甲业务"/>
+                    <a:checkBox name="lease_name40" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="其它"/>
+
+
+
+
+
+
                 <!--                <a:lov name="bp_id_agent_level1_n" bindTarget="con_contract_cashflow_monthly_query_ds"/>-->
                 <!--                <a:numberField name="overdue_day1" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>-->
                 <!--                <a:numberField name="overdue_day2" bindTarget="con_contract_cashflow_monthly_query_ds" allowDecimals="false"/>-->
@@ -298,6 +365,7 @@
                             </a:toolBar>
                             <a:columns>
                                 <a:column name="division_n" align="center" prompt="租赁物" width="220"/>
+                                <a:column name="bp_id_agent_level1_n" align="center" prompt="代理店" width="220"/>
                                 <a:column name="account_id_n" align="center" prompt="科目代码" width="120"/>
                                 <a:column name="account_name" align="center" prompt="科目名称" width="180"/>
                                 <a:column name="unreceived_sum_amount" align="center" prompt="总额" renderer="Leaf.formatMoney" width="80"/>

src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview

@@ -695,6 +695,10 @@
                 //获取员工类型
                 var description = '${/model/description/record/@employee_type_code}';
                 var bp_code='${/model/user_agent_description/record/@bp_code}';
+                if(division=='80'){
+                    record.set('credit_line','TENANT');
+                    record.set('credit_line_n','承租人');
+                }
                 if(!Ext.isEmpty(description) && description == 'AGENT'){
                     if(!Ext.isEmpty(bp_code)){
                         if(bp_code !== 'C00010180' && bp_code !== 'C00010175' && bp_code !== 'C00010176' && bp_code !== 'C00010187'){

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview

@@ -1015,6 +1015,10 @@
                 var description = '${/model/description/record/@employee_type_code}';
                 var bp_code='${/model/user_agent_description/record/@bp_code}';
                 var credit_record = $(ds_id).getCurrentRecord();
+                if(division=='80'){
+                    credit_record.set('credit_line','TENANT');
+                    credit_record.set('credit_line_n','承租人');
+                }
                 if(!Ext.isEmpty(description) && description == 'AGENT'){
                     if(!Ext.isEmpty(bp_code)){
                         if(bp_code !== 'C00010180' && bp_code !== 'C00010175' && bp_code !== 'C00010176' && bp_code !== 'C00010187'){

src/main/webapp/sys_multiLov.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
+    <a:parameter>
+        <a:param DataType="java.lang.String" Name="ORDER_FIELD"/>
+        <a:param DataType="java.lang.String" Name="ORDER_TYPE"/>
+    </a:parameter>
+    <a:init-procedure/>
+    <a:view package="leaf.ui.std" template="default">
+        <div/>
+        <script language="JavaScript"><![CDATA[
+        	function _getRecordByFieldName(r,displayField,valueField){
+        		var records=$('SYS_LOV_RESULT_DS').getAll();
+        		for(var i=0;i<records.length;i++){
+        			if(r.get(displayField)==records[i].get(displayField)&&r.get(valueField)==records[i].get(valueField))
+        				return records[i];
+        		}
+        		return null;
+        	}
+            function _onLovRowSelect(grid,record,row){
+            	if(_disableAdded(record)){
+	            	$('SYS_LOV_RETURN_DS').add(record);
+	            	record.isNew = false;
+	            	$('_superlov_autogrid').setSelectStatus(record);
+            	}
+            }
+            function _onLovRowUnSelect(grid,record,row){
+                record.isNew = true;
+            	$('SYS_LOV_RETURN_DS').remove(record);
+            	record.isNew = false;
+            	record=_getRecordByFieldName(record,$('${/parameter/@lovid}').displayfield,$('${/parameter/@lovid}').valuefield)
+            	if(record)
+            		$('_superlov_autogrid').setSelectStatus(record);
+            }
+            function _onLovRecordsCommit(){
+                $('${/parameter/@lovid}').commit($('SYS_LOV_RETURN_DS').getAll());
+            }
+            function _lovquery(){
+                $('SYS_LOV_RESULT_DS').query()
+            }
+            function _addRecords(){
+                var ds = $('SYS_LOV_RESULT_DS');
+            	var selected=ds.getSelected();
+            	var grid=$('_superlov_autogrid');
+            	while(selected[0]){
+            	    var record = selected[0];
+            	    ds.unSelect(record);
+            		_onLovRowSelect(grid,record);
+            	}
+            	var cb = grid.wrap.child('div[atype=grid.headcheck]');
+            	grid.setCheckBoxStatus(cb,false);
+            }
+            function _removeRecords(){
+           		var selected=$('SYS_LOV_RETURN_DS').getSelected();
+           		var grid=$('_superlov_autogrid2');
+            	while(selected[0]){
+            		_onLovRowUnSelect(null,selected[0]);
+            	}
+            	var cb = grid.wrap.child('div[atype=grid.headcheck]');
+            	grid.setCheckBoxStatus(cb,false);
+            }
+            function _disableAdded(record){
+            	var all=$('SYS_LOV_RETURN_DS').getAll();
+            	for(var i=0;all[i];i++){
+	            	if(_isEqualRecordByFieldName(all[i],record,$('${/parameter/@lovid}').displayfield,$('${/parameter/@lovid}').valuefield)){
+	            		return false;
+	            	}
+            	}
+            	return true;
+            }
+            function _isEqualRecordByFieldName(r1,r2,displayField,valueField){
+            	if(r1===r2)return true;
+            	if(r1.get(displayField)==r2.get(displayField)&&r1.get(valueField)==r2.get(valueField))
+            			return true;
+	            return false;
+            }
+            function onLoad(){
+            	var ds=$('${/parameter/@lovid}').optionDataSet;
+            	if(ds&&$('SYS_LOV_RETURN_DS').getAll().length==0){
+            		var records=ds.getAll();
+            		for(var i=0;i < records.length;i++){
+            			$('SYS_LOV_RETURN_DS').add(records[i]);
+            		}
+            	}
+            }
+        ]]></script>
+        <a:dataSets>
+            <a:dataSet id="SYS_LOV_QUERY_DS" model="${/parameter/@service}"/>
+            <a:dataSet id="SYS_LOV_RESULT_DS" autoQuery="${/parameter/@lovautoquery}" model="${/parameter/@service}" queryDataSet="SYS_LOV_QUERY_DS" queryUrl="${/parameter/@url}" selectFunction="_disableAdded">
+                <a:events>
+                    <a:event name="load" handler="onLoad"/>
+                </a:events>
+            </a:dataSet>
+            <a:dataSet id="SYS_LOV_RETURN_DS" selectable="true"/>
+        </a:dataSets>
+        <a:autoForm bindTarget="SYS_LOV_QUERY_DS" column="2" labelWidth="${/parameter/@lovlabelwidth}" model="${/parameter/@service}" style="margin:7px;" title="查询条件" width="${/parameter/@innerwidth}"/>
+        <a:button click="_lovquery" style="margin-left:7px;" text="查询"/>
+        <a:hBox>
+            <a:autoGrid id="_superlov_autogrid" bindTarget="SYS_LOV_RESULT_DS" enablepagesize="false" height="${/parameter/@gridheight}" model="${/parameter/@service}" navBar="true" style="margin:7px;" width="${/parameter/@innergridwidth}">
+                <a:events>
+                    <a:event name="dblclick" handler="_onLovRowSelect"/>
+                </a:events>
+            </a:autoGrid>
+            <div valign="middle">
+                <a:vBox>
+                    <a:button click="_addRecords" text="&gt;" width="30"/>
+                    <br/>
+                    <a:button click="_removeRecords" text="&lt;" width="30"/>
+                </a:vBox>
+            </div>
+            <a:autoGrid id="_superlov_autogrid2" bindTarget="SYS_LOV_RETURN_DS" enablepagesize="false" height="${/parameter/@gridheight}" model="${/parameter/@service}" style="margin:7px;" width="${/parameter/@innergridwidth}">
+                <a:events>
+                    <a:event name="dblclick" handler="_onLovRowUnSelect"/>
+                </a:events>
+            </a:autoGrid>
+        </a:hBox>
+        <div class="win-toolbar" style="width:100%;height:35px;position:absolute; bottom:0px;">
+            <a:hBox style="float:right;margin-right:10px;margin-top:5px;">
+                <a:button click="_onLovRecordsCommit" style="margin-left:7px;" text="提交"/>
+            </a:hBox>
+        </div>
+    </a:view>
+</a:screen>