Merge branch 'feature/金税功能去除空格' into develop

# Conflicts:
#	src/main/resources/profiles/dev/config.properties
#	src/main/webapp/WEB-INF/uncertain.local.xml

.gitignore

@@ -25,6 +25,8 @@ overlays/
 # common config rename
 uncertain.local.xml
 config.properties
+pom.xml
 
 atm_upload.svc
 atm_upload_unUseSubFolder.svc
+!/src/main/webapp/WEB-INF/uncertain.local.xml

src/main/resources/config.properties

@@ -122,6 +122,8 @@ hls.interface.log=/u01/logs
 #Leaf frame version
 leaf.version=1.0
 
+
+
 leaf.logDebuggerModel=true
 
 session.filter.excludePattern=

src/main/resources/profiles/dev/config.properties

@@ -10,7 +10,7 @@ redis.useSentinel=false
 
 redis.ip=localhost
 redis.port=6379
-redis.db=2
+redis.db=10
 
 #db.jndiName=java:comp/env/jdbc/hap_dev
 
@@ -119,14 +119,17 @@ icbc.submitUrl=
 #Generic log storage address
 hls.interface.log=/u01/logs
 
-
 #Leaf frame version
 leaf.version=1.0
 
 
-# session.filter.excludePattern=
-
-layout.gridButtonIgnoreReadModel=true
+leaf.logDebuggerModel=true
 
+session.filter.excludePattern=
 
-leaf.logDebuggerModel=true
\ No newline at end of file
+#layout config
+layout.gridButtonIgnoreReadModel=false
+#emay dev
+emay.appId=EUCP-EMY-SMS0-JBZOQ
+emay.secretKey=3E6BA3366DCF8959
+emay.host=bjmtn.b2m.cn:80

src/main/webapp/WEB-INF/classes/acr/ACR515/acr_invoice_interface_ln.lwm

@@ -2,7 +2,52 @@
 <bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
     <bm:operations>
         <bm:operation name="query">
-            <bm:query-sql><![CDATA[select *
+            <bm:query-sql><![CDATA[select
+   l.invoice_hd_id,
+   l.bp_code,
+   l.description,
+   l.vat_red_notice_num,
+   l.ref_vat_invoice_code,
+   l.ref_invoice_number,
+   l.created_by_name，
+   l.confirmed_by_name,
+   l.received_by_name,
+   l.invoice_kind_n,
+   l.invoice_title,
+   l.invoice_bp_address_phone_num,
+   l.document_number,
+   l.invoice_date,
+   l.invoice_number,
+   l.bp_name,
+   l.bp_tax_registry_num,
+   l.bp_address_phone_num,
+   replace(l.bp_bank_account,' ','')bp_bank_account,
+   l.product_name,
+   l.product_code,
+   l.specification,
+   l.uom,
+   l.quantity,
+   l.price,
+   l.tax_type_rate,
+   l.tax_amount,
+   l.total_amount,
+   l.discount_amount,
+   l.dicount_tax_amount,
+   l.discount_rate,
+   l.rec_man,
+   l.rec_man_tax_num,
+   l.del_man,
+   l.del_man_tax_num,
+   l.place_of_sending,
+   l.car_type_num,
+   l.car_ship_tonnage,
+   l.product_info,
+   l.code_version,
+   l.tax_type_code,
+   l.preferential_policy_flag,
+   l.preferential_policy_content,
+   l.zero_tax_rate_flag,
+   l.reduce_amount
   from acr_invoice_interface_lv l
  where l.invoice_hd_id in
        (select t.invoice_hd_id

src/main/webapp/WEB-INF/classes/cont/CON3500/contract_ifrs9_sum_report.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 ( select cfr.bp_code,max(cfr.max_overdue_days)max_overdue_days from con_contract_ifrs9 cfr where cfr.period_day=${@period_name} and cfr.max_overdue_days>0 group by cfr.bp_code)v
+                #WHERE_CLAUSE#
+                ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>
\ No newline at end of file

src/main/webapp/WEB-INF/classes/cont/CON_ET003/con_early_termination_modify_query.lwm

@@ -156,7 +156,8 @@
                             )req_status_n,
                             r.created_by,
                             (SELECT su.description FROM sys_user su WHERE su.user_id=r.created_by)req_employee_n,
-                              to_char(r.termination_date,'yyyy-mm-dd')termination_date
+                              to_char(r.termination_date,'yyyy-mm-dd')termination_date,
+                              r.simulation_flag
                             FROM
                             con_contract t,
                             hls_bp_master b,
@@ -167,6 +168,7 @@
                             r.et_flag='Y' AND
                             t.bp_id_tenant      = b.bp_id(+) AND
                             dt.document_type(+) = t.document_type
+                            and nvl(r.simulation_flag,'N')='N'
                             order by r.change_req_number
 
                         ) t1 #WHERE_CLAUSE# #ORDER_BY_CLAUSE#

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/csh_transaction_deposit_sum_report_query.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 ( select v1.contract_id,
+            (select cc.contract_number from con_contract cc where cc.contract_id=v1.contract_id)contract_number,
+       v1.unwrite_off_amount
+
+  from (select tt.ref_contract_id contract_id,
+               sum((nvl(tt.transaction_amount, 0) -
+                   nvl(tt.write_off_amount, 0) - nvl(tt.returned_amount, 0))) unwrite_off_amount
+          from csh_transaction tt
+         where tt.transaction_type = 'DEPOSIT'
+           and tt.ref_contract_id is not null
+           and tt.transaction_amount > 0
+           and tt.source_type is not null
+           and tt.transaction_date <= to_date(${@calc_date},'yyyy-mm-dd')
+           and tt.deposit_trans_type ='rent_deposit'
+           and tt.source_type is not null
+           and tt.company_id=${/session/@company_id}
+           and (exists (
+                (select 1
+                from exp_emp_assign_e_v ee
+               where ee.user_id = ${/session/@user_id}
+                  and ee.unit_id not in (1565,1552,1564,1551,1559,1547,1560,1545,1546,1568,1566,1570,1550,1569,1555,1571,1558)
+                  and ee.unit_id=(SELECT h.unit_id FROM hls_bp_master h WHERE h.bp_id=tt.bp_id)
+                  and ${/session/@role_id} in (select v.role_id from sys_role_vl v where v.role_code in ('0018','0019')) ) )
+                  or (${/session/@role_id} not in (select v.role_id from sys_role_vl v where v.role_code in ('0018','0019')) ))
+            and ((decode(${/session/@user_id}, 10600, 1, 2) = 1
+                                                   and exists (select 1 from hls_bp_master hb where hb.bp_id = tt.bp_id
+                                                   and hb.bp_code in  ('D00000028','D00000035','D00000016','D00000021','D00000039','D00000025','D00000034','D00000017','D00000018','D00000024','D00000032','D00000009','D00000012','D00000014','D00000015','D00000023')) )
+                                                   or (decode(${/session/@user_id}, 10600, 1, 2) = 2))
+          and ((nvl(tt.transaction_amount, 0) - nvl(tt.write_off_amount, 0) -
+       nvl(tt.returned_amount, 0)) > 0)
+         group by tt.ref_contract_id) v1
+         )v
+                #WHERE_CLAUSE#
+                ]]></bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+<!--    <bm:data-filters>-->
+<!--        <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>-->
+<!--        &lt;!&ndash;<bm:data-filter name="query" expression="((nvl(t1.transaction_amount,0)-nvl(t1.write_off_amount,0)-nvl(t1.returned_amount,0)) >0)"/>&ndash;&gt;-->
+<!--        <bm:data-filter name="query" expression="(t1.ref_contract_id is not null)"/>-->
+<!--        <bm:data-filter name="query" expression="(t1.transaction_type ='DEPOSIT')"/>-->
+<!--        <bm:data-filter name="query" expression="(t1.source_type is not null)"/>-->
+<!--        <bm:data-filter name="query" expression="(exists (-->
+<!--                (select 1-->
+<!--                from exp_emp_assign_e_v ee-->
+<!--               where ee.user_id = ${/session/@user_id}-->
+<!--                  and ee.unit_id not in (1565,1552,1564,1551,1559,1547,1560,1545,1546,1568,1566,1570,1550,1569,1555,1571,1558)-->
+<!--                  and ee.unit_id=(SELECT h.unit_id FROM hls_bp_master h WHERE h.bp_id=t1.bp_id)-->
+<!--                  and ${/session/@role_id} in (select v.role_id from sys_role_vl v where v.role_code in ('0018','0019')) ) )-->
+<!--                  or (${/session/@role_id} not in (select v.role_id from sys_role_vl v where v.role_code in ('0018','0019')) ))"/>-->
+<!--        <bm:data-filter name="query" expression="( (decode(${/session/@user_id}, 10600, 1, 2) = 1-->
+<!--                                                   and exists (select 1 from hls_bp_master hb where hb.bp_id = t1.bp_id-->
+<!--                                                   and hb.bp_code in  ('D00000028','D00000035','D00000016','D00000021','D00000039','D00000025','D00000034','D00000017','D00000018','D00000024','D00000032','D00000009','D00000012','D00000014','D00000015','D00000023')) )-->
+<!--                                                   or (decode(${/session/@user_id}, 10600, 1, 2) = 2) )"/>-->
+<!--    </bm:data-filters>-->
+</bm:model>
\ No newline at end of file

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT122/gld_periods.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: DJ  
+    $Date: 2014-2-13 下午2:42:08  
+    $Revision: 1.0  
+    $Purpose: 
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" xmlns:f="leaf.database.features" alias="t1" baseTable="GLD_PERIODS" defaultOrderBy="t1.internal_period_num" needAccessControl="false">
+    <bm:fields>
+        <bm:field name="period_set_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PERIOD_SET_CODE" prompt="GLD_PERIODS.PERIOD_SET_CODE"/>
+        <bm:field name="period_year" databaseType="NUMBER" datatype="java.lang.Long" physicalName="PERIOD_YEAR" prompt="GLD_PERIODS.PERIOD_YEAR"/>
+        <bm:field name="period_num"  databaseType="NUMBER" datatype="java.lang.Long" physicalName="PERIOD_NUM" prompt="GLD_PERIODS.PERIOD_NUM"/>
+        <bm:field name="period_name" displayWidth="120" forDisplay="true" forQuery="true" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="PERIOD_NAME" prompt="GLD_PERIODS.PERIOD_NAME"/>
+        <bm:field name="adjustment_flag" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="ADJUSTMENT_FLAG" prompt="GLD_PERIODS.ADJUSTMENT_FLAG"/>
+        <bm:field name="internal_period_num"  displayWidth="120" forDisplay="true" forQuery="true"  physicalName="INTERNAL_PERIOD_NUM" prompt="期间号"/>
+        <bm:field name="start_date" databaseType="DATE" datatype="java.util.Date" physicalName="START_DATE" prompt="GLD_PERIODS.START_DATE"/>
+        <bm:field name="end_date"  displayWidth="130" forDisplay="true" databaseType="DATE" datatype="java.util.Date" physicalName="END_DATE" prompt="截止日期"/>
+        <bm:field name="quarter_num" databaseType="NUMBER" datatype="java.lang.Long" physicalName="QUARTER_NUM" prompt="GLD_PERIODS.QUARTER_NUM"/>
+    </bm:fields>
+    <bm:features>
+        <f:standard-who/>
+    </bm:features>
+    <bm:primary-key>
+        <bm:pk-field name="internal_period_num"/>
+        <bm:pk-field name="period_set_code"/>
+    </bm:primary-key>
+    <bm:query-fields>
+        <bm:query-field name="internal_period_num" queryExpression="t1.internal_period_num=${@internal_period_num}"/>
+        <bm:query-field name="period_name" queryExpression="t1.period_name=${@period_name}"/>
+    </bm:query-fields>
+</bm:model>

src/main/webapp/WEB-INF/web.xml

@@ -236,8 +236,6 @@
     </servlet-mapping>
 
 
-
-
     <!--<servlet>-->
     <!--<servlet-name>ureportServlet</servlet-name>-->
     <!--<servlet-class>com.bstek.ureport.console.UReportServlet</servlet-class>-->

src/main/webapp/leafresource/leaf.ui.std/hap/grid/Grid-min.js

@@ -2928,7 +2928,8 @@
                 exportOptions = sf.exportOptions || (sf.exportOptions = {}),
                 type = exportOptions && exportOptions.type;
             EACH(sf.columns, function(c, i) {
-                if (!sf.isFunctionCol(c.type)) {
+                // modify by niminmin 隐藏列不需要显示
+                if (!sf.isFunctionCol(c.type)&&c.forexport) {
                     if (exportall) {
                         exportall = c.forexport !== FALSE
                     }

src/main/webapp/modules/cont/CON3500/contract_ifrs9_report_query.lview

@@ -21,6 +21,8 @@
                 modelaction="execute"/>
         <a:link id="${/parameter/@layout_code}con_contract_query_link"
                 url="${/request/@context_path}/modules/cont/CON505/con_contract_modify.lview"/>
+        <a:link id="contract_ifrs9_sum_report_link"
+                url="${/request/@context_path}/modules/cont/CON3500/contract_ifrs9_sum_report.lview"/>
         <style>
             body{
                 font-size: 12px;
@@ -102,7 +104,7 @@
             // $(ds_id).query();
 
 
-        }
+        };
 
         //保存数据
         window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
@@ -131,7 +133,7 @@
                 },
                 scope: this
             });
-        }
+        };
         //获取查询结果
         window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_ifrs9');
@@ -165,7 +167,26 @@
                 scope: this
             });
 
-        }
+        };
+     //承租人最大逾期天数
+        window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() {
+          var  url = $('contract_ifrs9_sum_report_link').getUrl();
+            new Leaf.Window({
+                id: 'contract_ifrs9_sum_report_link_winid',
+                params: {
+                    winId: 'contract_ifrs9_sum_report_link_winid',
+                    period_name:'${/parameter/@period_name}'
+                },
+                url: url,
+                title: '承租人最大逾期天数',
+                width: 600,
+                height: 400
+            }).on('close', function () {
+              null;
+            });
+
+
+        };
 
 
         ]]></script>

src/main/webapp/modules/cont/CON3500/contract_ifrs9_sum_report.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
+    <a:view>
+        <script type="text/javascript"><![CDATA[
+        // 退出按钮
+        function contract_ifrs9_sum_back() {
+            $('${/parameter/@winId}').close();
+        }
+
+        ]]></script>
+        <a:dataSets>
+            <a:dataSet id="contract_ifrs9_sum_report_ds" fetchAll="true" autoQuery="true"
+                       model="cont.CON3500.contract_ifrs9_sum_report"
+                       queryUrl="${/request/@context_path}/autocrud/cont.CON3500.contract_ifrs9_sum_report/query?period_name=${/parameter/@period_name}"
+            />
+        </a:dataSets>
+        <a:screenBody>
+            <a:screenTopToolbar>
+                <a:screenTitle/>
+                <a:gridButton click=" contract_ifrs9_sum_back
+            " text="HLS.BACK"/>
+            </a:screenTopToolbar>
+            <a:grid id="contract_ifrs9_sum_report_ds_id" bindTarget="contract_ifrs9_sum_report_ds"
+                    marginHeight="200" marginWidth="800" navBar="true" >
+                <a:columns>
+                    <a:column name="bp_code" prompt="商业伙伴编号" width="250" align="center"/>
+                    <a:column name="max_overdue_days" prompt="承租人最大逾期期数" width="150"
+                              align="center"/>
+
+                </a:columns>
+            </a:grid>
+        </a:screenBody>
+    </a:view>
+</a:screen>
\ No newline at end of file

src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview

@@ -2,20 +2,25 @@
 <!--
     2019-9-6  Spencer 3893  合同提前结清申请创建明细
  -->
-<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true" trace="true">
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true"
+          trace="true">
     <a:init-procedure/>
     <a:view>
-        <a:link id="con_contract_repo_detail_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
+        <a:link id="con_contract_repo_detail_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
+                modelaction="update"/>
         <a:link id="con_et002_submit_link" model="cont.CON_ET001.submit_change_req" modelaction="execute"/>
         <a:link id="con_et002_cancel_link" model="cont.CON731.cancel_change_req" modelaction="execute"/>
         <a:link id="con_et001_calc_cashflow_link" model="cont.CON_ET001.calc_cashflow" modelaction="execute"/>
         <a:link id="con_et001_calc_cashflow_link1" model="cont.CON_ET001.insert_calc_cashflow" modelaction="execute"/>
-        <a:link id="con_et001_calc_et_date_amount_link" model="cont.CON_ET001.calc_et_date_amount" modelaction="execute"/>
+        <a:link id="con_et001_calc_et_date_amount_link" model="cont.CON_ET001.calc_et_date_amount"
+                modelaction="execute"/>
         <a:link id="con731_cancel_link" model="cont.CON731.cancel_change_req" modelaction="execute"/>
         <a:link id="${/parameter/@layout_code}_prj500_cdd_uploadFile_id"
                 url="${/request/@context_path}/uploadFile.lview"/>
         <a:link id="${/parameter/@layout_code}_prj500_cdd_downloadFile_id"
                 url="${/request/@context_path}/downloadFile.lview"/>
+        <a:link id="con_lease_org_print_link"
+                url="${/request/@context_path}/modules/cont/CON_ET001/create_content_for_con_et.lsc"/>
         <script src="${/request/@context_path}/javascripts/lightbox.js" type="text/javascript"/>
         <link href="${/request/@context_path}/css/lightbox.css" rel="stylesheet" type="text/css"/>
         <script type="text/javascript"><![CDATA[
@@ -26,28 +31,44 @@
                 $(ds_con_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
                 $(ds_con_id).query();
             }
+            if ('${/parameter/@simulation_flag}' == 'Y') {
+                if (document.getElementById('${/parameter/@layout_code}_submit_approval')) {
+                    document.getElementById('${/parameter/@layout_code}_submit_approval').style.display = 'none';
+                }
+                if (document.getElementById('${/parameter/@layout_code}_user_button3')) {
+                    document.getElementById('${/parameter/@layout_code}_user_button3').style.display = 'none';
+                }
+                if (document.getElementById('${/parameter/@layout_code}_user_button4')) {
+                    document.getElementById('${/parameter/@layout_code}_user_button4').style.display = 'none';
+                }
+            }
+            else{
+                if (document.getElementById('${/parameter/@layout_code}_user_button5')) {
+                    document.getElementById('${/parameter/@layout_code}_user_button5').style.display = 'none';
+                }
+            }
         });
-        var calc_flag='N';
+        var calc_flag = 'N';
         //新增和加载时调用form
-        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
+        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
 
         };
 
-        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function(ds, record, name, value, old_value, bp_seq) {
+        window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_update'] = function (ds, record, name, value, old_value, bp_seq) {
             debugger;
-            var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_01', 'con_contract_change_req');
+            var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract_change_req');
             if (ds == $(ds_id)) {
-                if(value!=old_value){
-                    calc_flag='N';
-                    record.set('calc_flag','N');
+                if (value != old_value) {
+                    calc_flag = 'N';
+                    record.set('calc_flag', 'N');
                 }
                 if (name == 'et_fee') {
-                    var et_total_amount=record.get('et_total_amount')||0;
-                    var old_et_fee=old_value||0;
-                    record.set('et_total_amount', plus(minus(et_total_amount,old_et_fee),value||0));
+                    var et_total_amount = record.get('et_total_amount') || 0;
+                    var old_et_fee = old_value || 0;
+                    record.set('et_total_amount', plus(minus(et_total_amount, old_et_fee), value || 0));
                 }
                 if (name == 'ccr_penalty') {
-                    var et_total_amount=record.get('et_total_amount')||0;
+                    var et_total_amount = record.get('et_total_amount') || 0;
                     var due_amount = record.get('penalty') || 0;
                     if (due_amount < value) {
                         Leaf.showMessage('${l:HLS.PROMPT}', '调整后的罚息必须小于等于逾期罚息！');
@@ -63,60 +84,60 @@
                         }, 5);
                         return;
                     }
-                    record.set('et_total_amount', plus(plus(plus(plus(record.get('et_due_amount')||0,record.get('et_fee')||0),record.get('residual_value')||0),record.get('overdue_amount')||0),value));
+                    record.set('et_total_amount', plus(plus(plus(plus(record.get('et_due_amount') || 0, record.get('et_fee') || 0), record.get('residual_value') || 0), record.get('overdue_amount') || 0), value));
 
                 }
 
-                if (name == 'termination_date'&&value) {
+                if (name == 'termination_date' && value) {
                     // 根据结清日计算结清相关金额字段
                     Leaf.request({
                         url: $('con_et001_calc_et_date_amount_link').getUrl(),
                         para: {
-                            change_req_id:record.get('change_req_id'),
+                            change_req_id: record.get('change_req_id'),
                             contract_id: record.get('contract_id'),
                             termination_date: value,
-                            et_fee:record.get('et_fee')||0,
-                            et_interest_rate:record.get('et_interest_rate'),
-                            residual_value:record.get('residual_value')
+                            et_fee: record.get('et_fee') || 0,
+                            et_interest_rate: record.get('et_interest_rate'),
+                            residual_value: record.get('residual_value')
                         },
                         success: function (res) {
                             //record.set('et_fee', res.result.et_fee);
                             record.set('et_total_amount', res.result.et_total_amount);
                             record.set('et_due_amount', res.result.et_due_amount);
-                            record.set('overdue_amount', res.result.overdue_amount||0);
-                            record.set('penalty', res.result.penalty||0);
-                            record.set('ccr_penalty', res.result.penalty||0);
+                            record.set('overdue_amount', res.result.overdue_amount || 0);
+                            record.set('penalty', res.result.penalty || 0);
+                            record.set('ccr_penalty', res.result.penalty || 0);
                             record.set('fund_possession_time', res.result.fund_possession_time);
                             record.set('fund_possession_cost', res.result.fund_possession_cost);
                             record.set('fund_possession_rate', res.result.fund_possession_rate);
-                            record.set('last_rent_due_date',res.result.last_rent_due_date);
-                            record.set('sum_unreceived_principal',res.result.sum_unreceived_principal);
+                            record.set('last_rent_due_date', res.result.last_rent_due_date);
+                            record.set('sum_unreceived_principal', res.result.sum_unreceived_principal);
                         },
                         failure: function () {
-                            record.set('termination_date','');
-                            record.set('et_total_amount','');
-                            record.set('et_due_amount','');
+                            record.set('termination_date', '');
+                            record.set('et_total_amount', '');
+                            record.set('et_due_amount', '');
                             record.set('overdue_amount', '');
                             record.set('penalty', '');
                             record.set('ccr_penalty', '');
-                            record.set('fund_possession_time','');
-                            record.set('fund_possession_cost','');
+                            record.set('fund_possession_time', '');
+                            record.set('fund_possession_cost', '');
                             //record.set('fund_possession_rate','');
-                            record.set('last_rent_due_date','');
-                            record.set('sum_unreceived_principal','');
+                            record.set('last_rent_due_date', '');
+                            record.set('sum_unreceived_principal', '');
                         },
                         error: function () {
-                            record.set('termination_date','');
-                            record.set('et_total_amount','');
-                            record.set('et_due_amount','');
+                            record.set('termination_date', '');
+                            record.set('et_total_amount', '');
+                            record.set('et_due_amount', '');
                             record.set('overdue_amount', '');
                             record.set('penalty', '');
                             record.set('ccr_penalty', '');
-                            record.set('fund_possession_time','');
-                            record.set('fund_possession_cost','');
+                            record.set('fund_possession_time', '');
+                            record.set('fund_possession_cost', '');
                             //record.set('fund_possession_rate','');
-                            record.set('last_rent_due_date','');
-                            record.set('sum_unreceived_principal','');
+                            record.set('last_rent_due_date', '');
+                            record.set('sum_unreceived_principal', '');
                         },
                         scope: this
                     });
@@ -125,14 +146,14 @@
             }
         };
 
-        window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
+        window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function () {
             $('${/parameter/@layout_code}_submit_approval').disable();
             var req_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract_change_req');
             var req_record = $(req_ds_id).getAt(0);
             var case_type = '';
             var document_type = '${/parameter/@document_type}';
             var calc_session_id = req_record.get('calc_session_id');
-            calc_flag=req_record.get('calc_flag');
+            calc_flag = req_record.get('calc_flag');
             // window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
             if ($(req_ds_id).validate($('${/parameter/@layout_code}_submit_approval').enable())) {
                 if (req_record.dirty) {
@@ -140,7 +161,7 @@
                     //   window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     return;
                 }
-                    if (calc_flag=='N') {
+                if (calc_flag == 'N') {
                     Leaf.showMessage('${l:HLS.PROMPT}', '请先计算！');
                     //     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     return;
@@ -156,6 +177,7 @@
                 window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
             }
         };
+
         function con_repo001_submit() {
             Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认提交审批？', function () {
                 $('${/parameter/@layout_code}_submit_approval').disable();
@@ -171,7 +193,7 @@
                         change_req_id: ${/parameter/@change_req_id},
                         layout_code: '${/parameter/@layout_code}'
                     },
-                success: function(res) {
+                    success: function (res) {
                         window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                         $('${/parameter/@layout_code}_submit_approval').enable();
                         $('${/parameter/@layout_code}_save').enable();
@@ -180,7 +202,7 @@
                         $('${/parameter/@winid}').close();
 
                     },
-                failure: function() {
+                    failure: function () {
                         window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                         $('${/parameter/@layout_code}_submit_approval').enable();
                         $('${/parameter/@layout_code}_save').enable();
@@ -188,7 +210,7 @@
                         $('${/parameter/@layout_code}_user_button3').enable();
 
                     },
-                error: function() {
+                    error: function () {
                         window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                         $('${/parameter/@layout_code}_submit_approval').enable();
                         $('${/parameter/@layout_code}_save').enable();
@@ -202,22 +224,22 @@
         }
 
         //保存submitsuccess调用
-        window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function(ds, record, res, bp_seq) {
-            var ca_ds_id_s = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_QUOTATION_03', 'con_contract_cashflow');
+        window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function (ds, record, res, bp_seq) {
+            var ca_ds_id_s = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_QUOTATION_03', 'con_contract_cashflow');
             if (ca_ds_id_s) {
                 $(ca_ds_id_s).query();
             }
-            var ca_ds_id_c = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_QUOTATION_04', 'con_contract_cashflow');
+            var ca_ds_id_c = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_QUOTATION_04', 'con_contract_cashflow');
             if (ca_ds_id_c) {
                 $(ca_ds_id_c).query();
             }
             window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
         };
         //报价计算
-        window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
+        window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
             $('${/parameter/@layout_code}_user_button1').disable(); //按钮不可用
             window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
-            var con_contract_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_01', 'con_contract_change_req');
+            var con_contract_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract_change_req');
             var con_record = $(con_contract_ds_id).getAt(0);
             if ($(con_contract_ds_id).validate()) {
                 if (con_record.dirty) {
@@ -233,31 +255,31 @@
             }
         };
 
-        function clac(){
+        function clac() {
             Leaf.request({
                 url: $('con_et001_calc_cashflow_link1').getUrl(),
                 para: {
                     change_req_id: '${/parameter/@change_req_id}',
                 },
-                success: function(res) {
+                success: function (res) {
                     Leaf.SideBar.enable = true;
-                    Leaf.SideBar.show({msg: '计算成功！',duration: 2000});
-                    calc_flag='Y';
+                    Leaf.SideBar.show({msg: '计算成功！', duration: 2000});
+                    calc_flag = 'Y';
                     //con_record.getField('ccr_start_times').setReadOnly(true);
-                    var ca_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'G_QUOTATION_02', 'con_contract_cashflow');
-                    var con_contract_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_01', 'con_contract_change_req');
-                    if (ca_ds_id&&con_contract_ds_id) {
+                    var ca_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_QUOTATION_02', 'con_contract_cashflow');
+                    var con_contract_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract_change_req');
+                    if (ca_ds_id && con_contract_ds_id) {
                         $(ca_ds_id).query();
                         $(con_contract_ds_id).query();
                     }
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     $('${/parameter/@layout_code}_user_button1').enable(); //按钮启用
                 },
-                failure: function() {
+                failure: function () {
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     $('${/parameter/@layout_code}_user_button1').enable(); //按钮启用
                 },
-                error: function() {
+                error: function () {
                     window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     $('${/parameter/@layout_code}_user_button1').enable(); //按钮启用
                 },
@@ -266,9 +288,9 @@
         }
 
         //取消变更
-        window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function() {
+        window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function () {
 
-            Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认取消变更？', function() {
+            Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认取消变更？', function () {
                 $('${/parameter/@layout_code}_user_button3').disable(); //按钮不可用
                 window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
                 Leaf.request({
@@ -276,16 +298,16 @@
                     para: {
                         change_req_id: ${/parameter/@change_req_id}
                     },
-                    success: function(res) {
+                    success: function (res) {
                         $('${/parameter/@layout_code}_user_button3').enable(); //按钮启用
                         window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                         $('${/parameter/@winid}').close();
                     },
-                    failure: function() {
+                    failure: function () {
                         $('${/parameter/@layout_code}_user_button3').enable(); //按钮启用
                         window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     },
-                    error: function() {
+                    error: function () {
                         $('${/parameter/@layout_code}_user_button3').enable(); //按钮启用
                         window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     },
@@ -298,7 +320,7 @@
         };
 
         //图片渲染
-        window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_pic_renderer'] = function(record, name, bp_seq) {
+        window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_pic_renderer'] = function (record, name, bp_seq) {
             var result = name.match(/(.*)_pic$/);
             if (result) {
                 var pic_value = record.get(result[1]);
@@ -313,6 +335,7 @@
                 }
             }
         };
+
         //附件上传
 
         function con_et_upload_file(id, name, query_only) {
@@ -369,6 +392,20 @@
                 }
             }
         };
+        window['${/parameter/@layout_code}_user_button5_layout_dynamic_click'] = function () {
+            debugger;
+            var req_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_01', 'con_contract_change_req');
+            var req_record = $(req_ds_id).getAt(0);
+             calc_flag = req_record.get('calc_flag')||'N';
+                if (calc_flag == 'N') {
+                    Leaf.showMessage('${l:HLS.PROMPT}', '请先保存并计算！');
+                    return;
+                }
+            var contract_id =req_record.get('change_req_id');
+            var templet_code = 'ET_CALCULATION_TABLE_SIMU';
+            var  url=$('con_lease_org_print_link').getUrl() + '?contract_id=' + contract_id + '&templet_code=' + templet_code;
+            window.open(url, '_self');
+        };
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>

src/main/webapp/modules/cont/CON_ET001/con_early_termination_query.lview

@@ -10,8 +10,10 @@
         <a:model-query fetchAll="true" model="basic.hls_division_for_lov" rootPath="hls_division_path"/>
     </a:init-procedure>
     <a:view>
-        <a:link id="con_et_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
-        <a:link id="con_et_change_link" url="${/request/@context_path}/modules/cont/CON_ET001/con_early_termination_et_detail.lview"/>
+        <a:link id="con_et_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
+                modelaction="update"/>
+        <a:link id="con_et_change_link"
+                url="${/request/@context_path}/modules/cont/CON_ET001/con_early_termination_et_detail.lview"/>
         <a:link id="con_et_create_change_link" model="cont.CON_ET001.create_change_req" modelaction="execute"/>
         <script type="text/javascript"><![CDATA[
         function contractQueryScreen_query() {
@@ -50,6 +52,7 @@
                         param['maintain_type'] = 'UPDATE';
                         param['document_type'] = ccr_document_type;
                         param['winid'] = 'con_et002_detail_winid';
+                        param['simulation_flag'] = 'N';
                         hls_doc_get_layout_code('con_et_get_layout_code_link_id', param, 'con_et_change_link', 'contractQueryScreen_mainDs');
                     },
                     failure: function () {
@@ -66,8 +69,56 @@
                 // $('et_create').enable(); //按钮启用
             }, 300, 150);
         }
+
+        function et_simulation_click() {
+            //$('et_create').disable(); //按钮不可用
+            var records = $('contractQueryScreen_mainDs').getSelected();
+            var record = records[0],
+                contract_id = record.get('contract_id');
+            Leaf.showConfirm('提示', '<span style="color: #ff0000;font-size: 15px; ">该操作不会对合同还款计划产生变更，仅试算用途；若需提交提前结清申请，请点击主界面【创建】按钮！</span>', function () {
+                var ccr_document_type = 'ET_CHAG';
+                Leaf.Masker.mask(Ext.getBody(), '正在创建试算，，，');
+                Leaf.request({
+                    url: $('con_et_create_change_link').getUrl(),
+                    para: {
+                        simulation_flag: 'Y',
+                        contract_id: contract_id,
+                        req_type: ccr_document_type
+                    },
+                    success: function (res) {
+                        //   $('et_create').enable(); //按钮启用
+                        var param = record.data;
+                        param['change_req_id'] = res.result.change_req_id;
+                        param['contract_id'] = res.result.change_req_id;
+                        param['source_contract_id'] = contract_id;
+                        //param['layout_debugger_flag'] = 'Y';
+                        param['function_code'] = 'CON_ET002';
+                        param['url_title'] = '提前结清创建';
+                        param['function_usage'] = 'MODIFY';
+                        param['maintain_type'] = 'UPDATE';
+                        param['document_type'] = ccr_document_type;
+                        param['winid'] = 'con_et002_detail_winid';
+                        param['simulation_flag'] = 'Y';
+                        hls_doc_get_layout_code('con_et_get_layout_code_link_id', param, 'con_et_change_link', 'contractQueryScreen_mainDs');
+                    },
+                    failure: function () {
+                        Leaf.Masker.unmask(Ext.getBody());
+                        //   $('et_create').enable(); //按钮启用
+                    },
+                    error: function () {
+                        Leaf.Masker.unmask(Ext.getBody());
+                        //  $('et_create').enable(); //按钮启用
+                    },
+                    scope: this
+                });
+            }, function () {
+                // $('et_create').enable(); //按钮启用
+            }, 300, 200);
+        }
+
         ]]></script>
-        <a:screen-include screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CON_ET001"/>
+        <a:screen-include
+                screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CON_ET001"/>
         <a:dataSets>
             <a:dataSet id="yes_or_no_ds" lookupCode="YES_NO"/>
             <a:dataSet id="contract_status_ds" lookupCode="CON500_CONTRACT_STATUS"/>
@@ -81,7 +132,9 @@
                     <a:field name="date_from"/>
                     <a:field name="date_to"/>
                     <a:field name="bp_id_tenant"/>
-                    <a:field name="bp_name" lovGridHeight="330" lovHeight="470" lovLabelWidth="120" lovService="cont.CON701.hls_bp_master_v_all_lov?bp_category=TENANT" lovWidth="700" title="承租人">
+                    <a:field name="bp_name" lovGridHeight="330" lovHeight="470" lovLabelWidth="120"
+                             lovService="cont.CON701.hls_bp_master_v_all_lov?bp_category=TENANT" lovWidth="700"
+                             title="承租人">
                         <a:mapping>
                             <a:map from="bp_id" to="bp_id_tenant"/>
                             <a:map from="bp_name" to="bp_name"/>
@@ -89,23 +142,32 @@
                     </a:field>
                     <!--代理商-->
                     <a:field name="bp_id_agent_level1"/>
-                    <a:field name="bp_agent" lovGridHeight="330" lovHeight="470" lovLabelWidth="120" lovService="cont.CON701.hls_bp_master_v_all_lov?bp_category=AGENT" lovWidth="700" title="代理商">
+                    <a:field name="bp_agent" lovGridHeight="330" lovHeight="470" lovLabelWidth="120"
+                             lovService="cont.CON701.hls_bp_master_v_all_lov?bp_category=AGENT" lovWidth="700"
+                             title="代理商">
                         <a:mapping>
                             <a:map from="bp_id" to="bp_id_agent_level1"/>
                             <a:map from="bp_name" to="bp_agent"/>
                         </a:mapping>
                     </a:field>
                     <!--产品线-->
-                    <a:field name="division_n" displayField="description" options="hls_division_ds" returnField="division" valueField="division"/>
+                    <a:field name="division_n" displayField="description" options="hls_division_ds"
+                             returnField="division" valueField="division"/>
                     <a:field name="overdue_status"/>
-                    <a:field name="overdue_status_desc" displayField="code_value_name" options="yes_or_no_ds" returnField="overdue_status" valueField="code_value"/>
+                    <a:field name="overdue_status_desc" displayField="code_value_name" options="yes_or_no_ds"
+                             returnField="overdue_status" valueField="code_value"/>
                     <a:field name="contract_status"/>
-                    <a:field name="contract_status_desc" displayField="code_value_name" options="contract_status_ds" returnField="contract_status" valueField="code_value"/>
+                    <a:field name="contract_status_desc" displayField="code_value_name" options="contract_status_ds"
+                             returnField="contract_status" valueField="code_value"/>
                 </a:fields>
             </a:dataSet>
-            <a:dataSet id="contractQueryScreen_mainDs" autoQuery="true" fetchAll="false" model="cont.CON_ET001.con_early_termination_query" pageSize="14" queryDataSet="contractQueryScreen_paraDs" selectable="true" selectionModel="single">
+            <a:dataSet id="contractQueryScreen_mainDs" autoQuery="true" fetchAll="false"
+                       model="cont.CON_ET001.con_early_termination_query" pageSize="14"
+                       queryDataSet="contractQueryScreen_paraDs" selectable="true" selectionModel="single">
                 <a:fields>
-                    <a:field name="et_type_dis" autoComplete="true" lovGridHeight="300" lovHeight="450" lovService="cont.CON701.hls_document_type_for_et_lov" lovWidth="500" prompt="提前结清类型" readOnly="true" required="true">
+                    <a:field name="et_type_dis" autoComplete="true" lovGridHeight="300" lovHeight="450"
+                             lovService="cont.CON701.hls_document_type_for_et_lov" lovWidth="500" prompt="提前结清类型"
+                             readOnly="true" required="true">
                         <a:mapping>
                             <a:map from="document_type" to="et_type"/>
                             <a:map from="document_type_desc" to="et_type_dis"/>
@@ -127,27 +189,29 @@
                 <a:gridButton click="contractQueryScreen_query" text="HLS.QUERY"/>
                 <a:gridButton click="contractQueryScreen_reset" text="HLS.RESET"/>
                 <a:gridButton id="et_create" click="contractQueryScreen_add" text="HLS.CREATE"/>
+                <a:gridButton id="et_simulation" click="et_simulation_click" text="试算"/>
             </a:screenTopToolbar>
             <a:form column="4" labelWidth="100" marginWidth="40" title="HLS.QUERY_TITLE">
                 <a:textField name="contract_number" bindTarget="contractQueryScreen_paraDs" prompt="合同编号"/>
                 <a:textField name="contract_name" bindTarget="contractQueryScreen_paraDs" prompt="合同名称"/>
                 <a:lov name="bp_name" bindTarget="contractQueryScreen_paraDs" prompt="承租人名称"/>
-<!--                <a:lov name="bp_agent" bindTarget="contractQueryScreen_paraDs" prompt="代理店"/>-->
+                <!--                <a:lov name="bp_agent" bindTarget="contractQueryScreen_paraDs" prompt="代理店"/>-->
                 <a:comboBox name="division_n" bindTarget="contractQueryScreen_paraDs" prompt="租赁物"/>
-<!--                <a:textField name="received_times" bindTarget="contractQueryScreen_paraDs" prompt="已还款期数"/>-->
-<!--                <a:comboBox name="contract_status_desc" bindTarget="contractQueryScreen_paraDs" prompt="合同状态"/>-->
-<!--                <a:comboBox name="overdue_status_desc" bindTarget="contractQueryScreen_paraDs" prompt="是否逾期"/>-->
+                <!--                <a:textField name="received_times" bindTarget="contractQueryScreen_paraDs" prompt="已还款期数"/>-->
+                <!--                <a:comboBox name="contract_status_desc" bindTarget="contractQueryScreen_paraDs" prompt="合同状态"/>-->
+                <!--                <a:comboBox name="overdue_status_desc" bindTarget="contractQueryScreen_paraDs" prompt="是否逾期"/>-->
             </a:form>
-            <a:grid id="contractQueryScreen_mainDs_grid" bindTarget="contractQueryScreen_mainDs" marginHeight="230" marginWidth="40" navBar="true">
+            <a:grid id="contractQueryScreen_mainDs_grid" bindTarget="contractQueryScreen_mainDs" marginHeight="150"
+                    marginWidth="40" navBar="true">
                 <a:columns>
                     <a:column name="contract_number" prompt="合同编号" width="120" align="left"/>
                     <a:column name="contract_name" prompt="合同名称" width="120" align="left"/>
                     <a:column name="bp_name" prompt="承租人名称" width="200" align="left"/>
                     <a:column name="bp_agent" prompt="代理店" width="200" align="left"/>
                     <a:column name="division_n" prompt="租赁物" width="120" align="left"/>
-<!--                    <a:column name="received_times" prompt="已还款期数" width="80" align="right"/>-->
+                    <!--                    <a:column name="received_times" prompt="已还款期数" width="80" align="right"/>-->
                     <a:column name="status_desc" prompt="合同状态" width="120" align="center"/>
-<!--                    <a:column name="overdue_status" prompt="是否逾期" width="100" align="center"/>-->
+                    <!--                    <a:column name="overdue_status" prompt="是否逾期" width="100" align="center"/>-->
                 </a:columns>
             </a:grid>
         </a:screenBody>

src/main/webapp/modules/cont/CON_ET001/create_content_for_con_et.lsc

+<?xml version="1.0" encoding="UTF-8"?>
+<a:service xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" trace="true">
+    <a:init-procedure>
+        <s:server-script import="contract_print_path.js"><![CDATA[
+            importPackage(java.io);
+            importPackage(Packages.hls.plugin.docx4j);
+            importPackage(Packages.leaf.plugin.word2pdf);
+            importPackage(Packages.org.apache.commons.io);
+
+
+            function RandomString(length) {   
+            var str = '';   
+            for (;str.length < length;str += Math.random().toString(36).substr(2));   
+            return str.substr(0, length); 
+            }
+
+            //删除文件
+
+            function deleteFile(filePath) {
+            var file = new File(filePath);
+            if (file.exists()) {
+            file.delete();
+            }
+            }
+
+            //生成pdf
+               function wordToPdf(word_file_path,pdf_file_path) {
+                // word转pdf
+                var pdf_file_path_new = pdf_file_path + '.pdf';
+                var wordToPdf = new WordToPdf($instance('uncertain.ocm.IObjectRegistry'), "jacob-1.19-x64.dll");
+                wordToPdf.word2pdf(word_file_path, pdf_file_path_new);
+                //删除word文件
+               // deleteFile(word_file_path);
+
+                return pdf_file_path_new;
+            }
+
+            function copyFile(fOld, fNew) {
+            var fis = new java.io.FileInputStream(fOld);
+            var fos = new java.io.FileOutputStream(fNew);
+            var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 4);
+            var len = -1;
+            while ((len = fis.read(b)) != -1) {
+            fos.write(b, 0, len);
+            }
+            fis.close();
+            fos.close();
+            }
+
+            //按日期创建目录
+
+
+            function getDatePath() {
+            set_parameter_file_path();
+            var file_path = $ctx.parameter.file_path; //file_path = c:/hls_test_files/content_files/
+            var now = new Date()
+            y = now.getFullYear()
+            m = now.getMonth() + 1
+            m = m < 10 ? "0" + m : m
+            var datePath = file_path + y + "/" + m + "/";
+            return datePath; //datePath = d:/hls_test_files/fileupload/2018/04/
+            }
+
+            function write_os_to_file(file, os) {
+            var fis = new FileInputStream(file);
+            var b = new java.lang.reflect.Array.newInstance(java.lang.Byte.TYPE, 1024 * 64);
+            var len = -1;
+            while ((len = fis.read(b)) != -1) {
+            os.write(b, 0, len);
+            }
+            fis.close();
+            }
+
+            function download_file(file_path, file_name) {
+            $ctx["__request_type__"] = 'file';
+            var resp = $ctx['_instance.javax.servlet.http.HttpServletResponse'];
+            resp.setHeader("Pragma", "No-cache");
+            resp.setHeader("Cache-Control", "no-cache, must-revalidate");
+            resp.setHeader("Content-disposition", "attachment; filename=" + encodeURI(file_name, 'utf-8'));
+            resp.setDateHeader("Expires", 0);
+            resp.setContentType("application/x-msdownload");
+            try {
+            var os = resp.getOutputStream();
+            write_os_to_file(file_path, os);
+
+            os.flush();
+            } catch (e) {
+            $logger("server-script").severe(e.message);
+            }
+            }
+
+            function collection_create_content() {
+            try {
+            //第一步生成合同文本
+            $bm('cont.CON620.create_content_for_collection').update({
+            contract_id: $ctx.parameter.contract_id,
+            templet_code: $ctx.parameter.templet_code
+            });
+            //获取日期目录
+            var datePath = getDatePath();
+            $ctx.parameter.batch_flag='Y';
+            FileUtils.forceMkdir(new File(datePath)); //根据日期创建目录
+            var from_file_data_map = $bm('cont.CON500.con_doc_file_templet_get_atm_new').queryAsMap({
+            contract_id: $ctx.parameter.contract_id,
+            batch_flag:$ctx.parameter.batch_flag,
+            templet_code: $ctx.parameter.templet_code
+            });
+            var from_file_data = from_file_data_map.getChildren();
+            for (var i = 0;i < from_file_data.length;i++) {
+            var to_file_path = $ctx.parameter.file_path;
+            var record_data = from_file_data[i];
+            if (record_data.file_exists_flag != 'Y') {
+            var to_file_name = record_data.to_file_name + '.' + record_data.file_type_code || 'doc';
+            var from_file_path = record_data.file_path;
+            var guid_file_name_path = $bm('cont.CON500.con_contract_get_guid_file_name').queryAsMap();
+            var guid_file_name_tables = guid_file_name_path.getChildren();
+            to_file_path = datePath + guid_file_name_tables[0].guid_file_name + 'con' + record_data.content_id;
+
+            copyFile(from_file_path, to_file_path);
+            try {
+            var brwt = new BookmarksReplaceWithText($instance('leaf.database.service.IDatabaseServiceFactory'), $instance('uncertain.ocm.IObjectRegistry'), $ctx.getData());
+            brwt.replaceBookmarkFromContent(to_file_path.toString(), record_data.content_id);
+            } catch (e) {
+            raise_app_error(e);
+            }
+            // word转pdf
+            var pdf_file_path=datePath+guid_file_name_tables[0].guid_file_name + 'con_' + record_data.content_id;
+            var outputfilepath = wordToPdf(to_file_path,pdf_file_path);
+            var outputfilename= record_data.to_file_name +'.pdf';
+            var pdf_file = new File(outputfilepath);
+            var file_size = 0;
+            if (pdf_file.exists()) {
+            file_size = pdf_file.length();
+            }
+              //保存文本名及路径
+            $bm('cont.CON500.con_file_content_copy_update').execute({
+            table_name: 'CON_CONTRACT_CONTENT',
+            content_id: record_data.content_id,
+            file_name: outputfilename.toString(),
+            file_path: outputfilepath.toString(),
+            file_size: file_size,
+            file_type_code: 'pdf',
+            mime_type: 'application/pdf',
+            user_id: $ctx.parameter.user_id
+            });
+
+            download_file(outputfilepath.toString(),outputfilename.toString());
+            }
+            }
+
+
+            $ctx.parameter.return_status = 'S';
+            $ctx.parameter.return_message = '执行成功';
+            } catch (e) {
+            $ctx.success = "true";
+            $ctx.parameter.return_status = 'E';
+            $ctx.parameter.return_message = $ctx.get('/error/@message') || String(e);
+            raise_app_error(e);
+            }
+            var result = {
+            result: $ctx.parameter.return_status,
+            message: $ctx.parameter.return_message
+            };
+            $ctx.parameter.json = JSON.stringify(result);
+            }
+
+            if ($ctx.parameter.return_status != 'E' && $ctx.parameter.return_status != 'TIMEOUT') {
+            collection_create_content();
+            }
+            ]]></s:server-script>
+    </a:init-procedure>
+    <a:service-output/>
+</a:service>

src/main/webapp/modules/cont/CON_ET003/con_early_termination_modify_query.lview

@@ -28,10 +28,11 @@
                 var req_status = record.get('req_status');
                 var change_req_id = record.get('change_req_id');
                 var contract_id=record.get('contract_id');
+                var simulation_flag=record.get('simulation_flag');
                 if('NEW' == req_status){
-                    return '<a href="javascript:open_change_req_detail(' + change_req_id + ',' + contract_id + ')">'+value+'</a>';
+                    return '<a href="javascript:open_change_req_detail(' + change_req_id + ',' + contract_id + ',' + record.id + ')">'+value+'</a>';
                 }else{
-                    return '<a href="javascript:open_change_req_readonly_detail(' + change_req_id + ',' + contract_id + ')">'+value+'</a>';
+                    return '<a href="javascript:open_change_req_readonly_detail(' + change_req_id + ',' + contract_id + ',' + record.id + ')">'+value+'</a>';
                 }
             }
             return value;
@@ -72,7 +73,8 @@
             window.open(url, '_self');*/
         }
 
-        function open_change_req_detail(change_req_id,contract_id) {
+        function open_change_req_detail(change_req_id,contract_id,id) {
+            var current_record = $('contractQueryScreen_mainDs').findById(id);
             var param = {};
             param['change_req_id'] = change_req_id;
             param['contract_id'] = change_req_id;
@@ -84,9 +86,12 @@
             param['maintain_type'] = 'UPDATE';
             param['document_type'] = 'ET_CHAG';
             param['winid'] = 'con_et003_detail_winid';
+            param['simulation_flag'] =current_record.get('simulation_flag');
             hls_doc_get_layout_code('con_et_get_layout_code_link_id', param, 'con_et_change_link', 'contractQueryScreen_mainDs');
         }
-        function open_change_req_readonly_detail(change_req_id,contract_id) {
+        function open_change_req_readonly_detail(change_req_id,contract_id,id) {
+                debugger;
+            var current_record = $('contractQueryScreen_mainDs').findById(id);
             var param = {};
             param['change_req_id'] = change_req_id;
             param['contract_id'] = change_req_id;
@@ -98,6 +103,7 @@
             param['maintain_type'] = 'QUERY';
             param['document_type'] = 'ET_CHAG';
             param['winid'] = 'con_et003_detail_winid';
+            param['simulation_flag'] =current_record.get('simulation_flag');
             hls_doc_get_layout_code('con_et_get_layout_code_link_id', param, 'con_et_change_link', 'contractQueryScreen_mainDs');
         }
 
@@ -173,7 +179,7 @@
                 <a:gridButton click="contractQueryScreen_reset" text="HLS.RESET"/>
                 <a:gridButton click="con_gur_np_pint" text="合同文本打印" id="con_gur_np_pint_id"/>
             </a:screenTopToolbar>
-            <a:form column="3" labelWidth="100" marginWidth="40" title="HLS.QUERY_TITLE">
+            <a:form column="4" labelWidth="100" marginWidth="40" title="HLS.QUERY_TITLE">
                 <a:textField name="change_req_number" bindTarget="contractQueryScreen_paraDs" prompt="变更申请编号"/>
                 <a:textField name="contract_number" bindTarget="contractQueryScreen_paraDs" prompt="合同编号"/>
                 <a:textField name="contract_name" bindTarget="contractQueryScreen_paraDs" prompt="合同名称"/>
@@ -185,7 +191,7 @@
                 <a:datePicker name="termination_date_to" bindTarget="contractQueryScreen_paraDs" prompt="提前结清日到"/>
                 <a:comboBox name="req_status_n" bindTarget="contractQueryScreen_paraDs" prompt="变更审批状态"/>
             </a:form>
-            <a:grid id="contractQueryScreen_mainDs_grid" bindTarget="contractQueryScreen_mainDs" marginHeight="230" marginWidth="40" navBar="true">
+            <a:grid id="contractQueryScreen_mainDs_grid" bindTarget="contractQueryScreen_mainDs" marginHeight="200" marginWidth="40" navBar="true">
                 <a:columns>
                     <a:column name="change_req_number" prompt="变更申请编号" width="120" align="left" renderer="open_change_req"/>
                     <a:column name="contract_number" prompt="合同编号" width="120" align="left"/>

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT122/cus_deposit_record_maintain.lview

@@ -7,23 +7,35 @@
 -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
     <a:init-procedure>
-        <a:model-query defaultWhereClause="t1.enabled_flag=&apos;Y&apos;" fetchAll="true" model="basic.csh_payment_method_for_lov" rootPath="payment_method_path"/>
+        <a:model-query defaultWhereClause="t1.enabled_flag=&apos;Y&apos;" fetchAll="true"
+                       model="basic.csh_payment_method_for_lov" rootPath="payment_method_path"/>
         <a:model-query fetchAll="true" model="gld.gld_currency_vl" rootPath="currency"/>
-        <a:model-query defaultWhereClause="t.code = &apos;CSH511_TRANSACTION_TYPE&apos; and t.code_value in (&apos;RECEIPT&apos;,&apos;ADVANCE_RECEIPT&apos;)" fetchAll="true" model="sys.sys_code_values_v" rootPath="transaction_type"/>
-        <a:model-query defaultWhereClause="t.code = &apos;CSH510_RETURN_SELECT&apos; and t.code_value not in (&apos;RETURN&apos;)" fetchAll="true" model="sys.sys_code_values_v" rootPath="returned_flag_rp"/>
-        <a:model-query defaultWhereClause="t.code = &apos;CSH510_REVERSE_SELECT&apos; and t.code_value not in (&apos;R&apos;)" fetchAll="true" model="sys.sys_code_values_v" rootPath="reversed_flag_rp"/>
+        <a:model-query
+                defaultWhereClause="t.code = &apos;CSH511_TRANSACTION_TYPE&apos; and t.code_value in (&apos;RECEIPT&apos;,&apos;ADVANCE_RECEIPT&apos;)"
+                fetchAll="true" model="sys.sys_code_values_v" rootPath="transaction_type"/>
+        <a:model-query
+                defaultWhereClause="t.code = &apos;CSH510_RETURN_SELECT&apos; and t.code_value not in (&apos;RETURN&apos;)"
+                fetchAll="true" model="sys.sys_code_values_v" rootPath="returned_flag_rp"/>
+        <a:model-query
+                defaultWhereClause="t.code = &apos;CSH510_REVERSE_SELECT&apos; and t.code_value not in (&apos;R&apos;)"
+                fetchAll="true" model="sys.sys_code_values_v" rootPath="reversed_flag_rp"/>
     </a:init-procedure>
     <a:view>
-       <a:link id="csh_transaction_receipt_maintain_link" url="${/request/@context_path}/modules/cus_deposit/CUS_DEPOSIT122/cus_deposit_detail.lview"/>
+        <a:link id="csh_transaction_receipt_maintain_link"
+                url="${/request/@context_path}/modules/cus_deposit/CUS_DEPOSIT122/cus_deposit_detail.lview"/>
+        <a:link id="csh_transaction_receipt_sum_report_link"
+                url="${/request/@context_path}/modules/cus_deposit/CUS_DEPOSIT122/cus_deposit_sum_report.lview"/>
         <script type="text/javascript"><![CDATA[
         //锁表
         function lock_current_window() {
             Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
         }
+
         //解锁
         function unlock_current_window() {
             Leaf.Masker.unmask(Ext.getBody());
         }
+
         function dateValidator(record, name, value) { //日期校验方法
             if (name == 'transaction_date_from' || name == 'transaction_date_to') {
                 var start_date = Leaf.formatDate(record.get('transaction_date_from'));
@@ -69,16 +81,15 @@
             $('csh_transaction_receipt_maintain_query_ds').reset();
         }
 
-        function cus100_receipt_query(){
+        function cus100_receipt_query() {
             $('csh_transaction_receipt_maintain_result_ds').query();
         }
 
 
-
         function seedetail_transaction_num(value, record, name) {
             if (record.get('transaction_id')) {
                 var url;
-                    url = $('csh_transaction_receipt_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id') + '&source_csh_trx_id='+record.get('source_csh_trx_id')+ '&source_doc_id='+record.get('source_doc_id');
+                url = $('csh_transaction_receipt_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id') + '&source_csh_trx_id=' + record.get('source_csh_trx_id') + '&source_doc_id=' + record.get('source_doc_id');
                 return '<a href="javascript:openWindow(\'' + url + '\');">' + value + '</a>';
             }
         }
@@ -92,7 +103,7 @@
                 url: url,
                 title: '保证金台账详情',
                 fullScreen: true
-            }).on('close',function(){
+            }).on('close', function () {
                 cus100_receipt_query();
             });
         }
@@ -122,6 +133,20 @@
             }
         }
 
+        function cus100_receipt_sum() {
+            var url = $('csh_transaction_receipt_sum_report_link').getUrl();
+            new Leaf.Window({
+                id: 'csh_transaction_deposit_sum_report_link_winid',
+                params: {
+                    winId: 'csh_transaction_deposit_sum_report_link_winid'
+                },
+                url: url,
+                title: '租金保证金合同纬度汇总',
+                fullScreen: true
+            }).on('close', function () {
+                cus100_receipt_query();
+            });
+        }
 
 
         ]]></script>
@@ -153,7 +178,8 @@
             </a:dataSet>
             <a:dataSet id="csh510_collection_classes_batch_update_ds">
                 <a:fields>
-                    <a:field name="collection_classes_desc" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
+                    <a:field name="collection_classes_desc" options="ds_collection_classes_ds"
+                             displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
 
                 </a:fields>
             </a:dataSet>
@@ -165,11 +191,14 @@
                     <a:field name="bp_id_telnet_n"/>
                     <a:field name="query_amount_flag" defaultValue="3"/>
                     <a:field name="query_amount_flag_n" options="QUERY_AMOUNT_FLAG_DS"
-                             returnField="query_amount_flag" displayField="code_value_name" valueField="code_value" defaultValue="全部"/>
+                             returnField="query_amount_flag" displayField="code_value_name" valueField="code_value"
+                             defaultValue="全部"/>
                     <a:field name="deposit_trans_type_desc" options="DEPOSIT_TRANS_TYPE_DS"
                              returnField="deposit_trans_type" displayField="code_value_name" valueField="code_value"/>
 
-                    <a:field name="bank_account_name" autoComplete="true" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850"  title="CSH511.BANK_ACCOUNT_CODE">
+                    <a:field name="bank_account_name" autoComplete="true" lovGridHeight="350" lovHeight="550"
+                             lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850"
+                             title="CSH511.BANK_ACCOUNT_CODE">
                         <a:mapping>
                             <a:map from="precision" to="precision"/>
                             <a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/>
@@ -184,7 +213,9 @@
                             <a:map from="bank_branch_name" to="bank_branch_name"/>
                         </a:mapping>
                     </a:field>
-                    <a:field name="bank_branch_name" autoComplete="true" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850"  title="CSH511.BANK_ACCOUNT_CODE">
+                    <a:field name="bank_branch_name" autoComplete="true" lovGridHeight="350" lovHeight="550"
+                             lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850"
+                             title="CSH511.BANK_ACCOUNT_CODE">
                         <a:mapping>
                             <a:map from="precision" to="precision"/>
                             <a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/>
@@ -199,7 +230,9 @@
                             <a:map from="bank_branch_name" to="bank_branch_name"/>
                         </a:mapping>
                     </a:field>
-                    <a:field name="bank_account_num" autoComplete="true" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850"  title="CSH511.BANK_ACCOUNT_CODE">
+                    <a:field name="bank_account_num" autoComplete="true" lovGridHeight="350" lovHeight="550"
+                             lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="850"
+                             title="CSH511.BANK_ACCOUNT_CODE">
                         <a:mapping>
                             <a:map from="precision" to="precision"/>
                             <a:map from="zero_amounts_allowed" to="zero_amounts_allowed"/>
@@ -214,16 +247,20 @@
                             <a:map from="bank_branch_name" to="bank_branch_name"/>
                         </a:mapping>
                     </a:field>
-                    <a:field name="confirmed_flag_desc"  options="confirmed_flag_ds" valueField="code_value" displayField="code_value_name" returnField="confirmed_flag"/>
-                    <a:field name="payment_method_display" displayField="description" options="payment_method_ds" returnField="payment_method_id" valueField="payment_method_id"/>
-                    <a:field name="bp_name_from" lovGridHeight="350" lovHeight="500" lovService="basic.hls_bp_master_v_for_lov" lovWidth="500" title="HLS.BP_TITLE">
+                    <a:field name="confirmed_flag_desc" options="confirmed_flag_ds" valueField="code_value"
+                             displayField="code_value_name" returnField="confirmed_flag"/>
+                    <a:field name="payment_method_display" displayField="description" options="payment_method_ds"
+                             returnField="payment_method_id" valueField="payment_method_id"/>
+                    <a:field name="bp_name_from" lovGridHeight="350" lovHeight="500"
+                             lovService="basic.hls_bp_master_v_for_lov" lovWidth="500" title="HLS.BP_TITLE">
                         <a:mapping>
                             <a:map from="bp_id" to="bp_id_from"/>
                             <a:map from="bp_name" to="bp_name_from"/>
                         </a:mapping>
                     </a:field>
                     <a:field name="bp_id_from"/>
-                    <a:field name="bp_name_to" lovGridHeight="350" lovHeight="500" lovService="basic.hls_bp_master_v_for_lov" lovWidth="500" title="HLS.BP_TITLE">
+                    <a:field name="bp_name_to" lovGridHeight="350" lovHeight="500"
+                             lovService="basic.hls_bp_master_v_for_lov" lovWidth="500" title="HLS.BP_TITLE">
                         <a:mapping>
                             <a:map from="bp_id" to="bp_id_to"/>
                             <a:map from="bp_name" to="bp_name_to"/>
@@ -236,57 +273,75 @@
                     <a:field name="bank_slip_num_to"/>
                     <a:field name="transaction_date_from" validator="dateValidator"/>
                     <a:field name="transaction_date_to" validator="dateValidator"/>
-                    <a:field name="bank_account_code" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE">
+                    <a:field name="bank_account_code" autoCompleteField="bank_account_num" lovGridHeight="350"
+                             lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov"
+                             lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE">
                         <a:mapping>
                             <a:map from="bank_account_code" to="bank_account_code"/>
                         </a:mapping>
                     </a:field>
-                    <a:field name="bank_account_code_from" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE">
+                    <a:field name="bank_account_code_from" autoCompleteField="bank_account_num" lovGridHeight="350"
+                             lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov"
+                             lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE">
                         <a:mapping>
                             <a:map from="bank_account_code" to="bank_account_code_from"/>
                         </a:mapping>
                     </a:field>
                     <a:field name="bank_account_from_id"/>
-                    <a:field name="bank_account_code_to" autoComplete="true" autoCompleteField="bank_account_num" lovGridHeight="350" lovHeight="550" lovLabelWidth="90" lovService="csh.CSH101.csh_bank_account_lov" lovWidth="580" title="CSH511.BANK_ACCOUNT_CODE">
+                    <a:field name="bank_account_code_to" autoComplete="true" autoCompleteField="bank_account_num"
+                             lovGridHeight="350" lovHeight="550" lovLabelWidth="90"
+                             lovService="csh.CSH101.csh_bank_account_lov" lovWidth="580"
+                             title="CSH511.BANK_ACCOUNT_CODE">
                         <a:mapping>
                             <a:map from="bank_account_code" to="bank_account_code_to"/>
                         </a:mapping>
                     </a:field>
                     <a:field name="transaction_amount_from"/>
                     <a:field name="transaction_amount_to"/>
-                    <a:field name="posted_flag_display" displayField="code_value_name" options="posted_flag_ds" returnField="posted_flag" valueField="code_value"/>
-                    <a:field name="posted_flag" />
-                    <a:field name="period_name" lovGridHeight="300" lovHeight="500" lovService="gld.gld_period_lov" lovWidth="500" title="GLD_PERIODS.PERIOD_NAME">
+                    <a:field name="posted_flag_display" displayField="code_value_name" options="posted_flag_ds"
+                             returnField="posted_flag" valueField="code_value"/>
+                    <a:field name="posted_flag"/>
+                    <a:field name="period_name" lovGridHeight="300" lovHeight="500" lovService="gld.gld_period_lov"
+                             lovWidth="500" title="GLD_PERIODS.PERIOD_NAME">
                         <a:mapping>
                             <a:map from="period_name" to="period_name"/>
                         </a:mapping>
                     </a:field>
-                    <a:field name="user_desc" autoComplete="true" lovGridHeight="300" lovHeight="450" lovService="basic.sys_user_for_lov" lovWidth="500" prompt="AUT_TRX_USER_AUTHORIZE.USER_ID" title="员工选择">
+                    <a:field name="user_desc" autoComplete="true" lovGridHeight="300" lovHeight="450"
+                             lovService="basic.sys_user_for_lov" lovWidth="500" prompt="AUT_TRX_USER_AUTHORIZE.USER_ID"
+                             title="员工选择">
                         <a:mapping>
                             <a:map from="description" to="user_desc"/>
                             <a:map from="user_id" to="user_id"/>
                         </a:mapping>
                     </a:field>
-                    <a:field name="transaction_type_display" displayField="code_value_name" options="transaction_type_ds" returnField="transaction_type" valueField="code_value"/>
-                    <a:field name="currency_name_from_display" displayField="currency_name" options="currency_ds" returnField="currency_code_from" valueField="currency_code"/>
+                    <a:field name="transaction_type_display" displayField="code_value_name"
+                             options="transaction_type_ds" returnField="transaction_type" valueField="code_value"/>
+                    <a:field name="currency_name_from_display" displayField="currency_name" options="currency_ds"
+                             returnField="currency_code_from" valueField="currency_code"/>
                     <a:field name="currency_code_from"/>
-                    <a:field name="currency_name_to_display" displayField="currency_name" options="currency_ds" returnField="currency_code_to" valueField="currency_code"/>
+                    <a:field name="currency_name_to_display" displayField="currency_name" options="currency_ds"
+                             returnField="currency_code_to" valueField="currency_code"/>
                     <a:field name="currency_code_to"/>
-                    <a:field name="transaction_type" />
+                    <a:field name="transaction_type"/>
                     <a:field name="transaction_category"/>
-                    <a:field name="write_off_flag_desc" displayField="code_value_name" options="write_off_flag_ds" returnField="write_off_flag" valueField="code_value"/>
+                    <a:field name="write_off_flag_desc" displayField="code_value_name" options="write_off_flag_ds"
+                             returnField="write_off_flag" valueField="code_value"/>
                     <a:field name="not_reversed_flag_r"/>
                     <a:field name="receipt_type"/>
-                    <a:field name="receipt_type_des" displayField="code_value_name" options="receipt_type_ds" returnField="receipt_type" valueField="code_value"/>
+                    <a:field name="receipt_type_des" displayField="code_value_name" options="receipt_type_ds"
+                             returnField="receipt_type" valueField="code_value"/>
                     <a:field name="description"/>
-                    <a:field name="bp_name" lovGridHeight="350" lovHeight="500" lovService="basic.hls_bp_master_v_for_lov" lovWidth="500" title="HLS.BP_TITLE">
+                    <a:field name="bp_name" lovGridHeight="350" lovHeight="500"
+                             lovService="basic.hls_bp_master_v_for_lov" lovWidth="500" title="HLS.BP_TITLE">
                         <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="collection_classes_n" options="ds_collection_classes_ds" displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
+                    <a:field name="collection_classes_n" options="ds_collection_classes_ds"
+                             displayField="code_value_name" returnField="collection_classes" valueField="code_value"/>
                     <!--&lt;!&ndash;对方账户的&ndash;&gt;-->
                     <!--<a:field name="bp_bank_account_name" lovGridHeight="350" lovHeight="550" lovService="csh.CSH510.csh_transaction_for_lov" lovLabelWidth="90" lovWidth="580" title="对方账户信息">-->
                     <!--<a:mapping>-->
@@ -315,7 +370,10 @@
                     <a:event name="update" handler="csh510_receipt_maintain_update"/>
                 </a:events>
             </a:dataSet>
-            <a:dataSet id="csh_transaction_receipt_maintain_result_ds" autoPageSize="true" autoQuery="true" model="cus_deposit.CUS_DEPOSIT122.csh_transaction_record_query" queryDataSet="csh_transaction_receipt_maintain_query_ds" selectable="true" selectionModel="single">
+            <a:dataSet id="csh_transaction_receipt_maintain_result_ds" autoPageSize="true" autoQuery="true"
+                       model="cus_deposit.CUS_DEPOSIT122.csh_transaction_record_query"
+                       queryDataSet="csh_transaction_receipt_maintain_query_ds" selectable="true"
+                       selectionModel="single">
 
             </a:dataSet>
         </a:dataSets>
@@ -324,57 +382,88 @@
                 <a:screenTitle/>
                 <a:gridButton click="cus100_receipt_query" text="HLS.QUERY" id="cus100_receipt_query"/>
                 <a:gridButton click="cus100_receipt_reset" text="HLS.RESET"/>
+                <a:gridButton click="cus100_receipt_sum" text="租金保证金合同纬度汇总" id="cus100_receipt_sum_id"/>
             </a:screenTopToolbar>
             <a:form labelWidth="120" marginWidth="80"
                     title="查询条件" style="margin-left:20px">
                 <a:hBox>
                     <a:fieldSet column="4" labelWidth="150" title="HLS.QUERY_TITLE">
-                        <a:datePicker name="transaction_date_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_DATE_FROM"/>
-                        <a:datePicker name="transaction_date_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_DATE_TO"/>
-                        <a:numberField name="transaction_amount_from" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_FROM" align="right"/>
-                        <a:numberField name="transaction_amount_to" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_TO" align="right"/>
+                        <a:datePicker name="transaction_date_from"
+                                      bindTarget="csh_transaction_receipt_maintain_query_ds"
+                                      prompt="CSH510.CSH_TRANSACTION.TRANSACTION_DATE_FROM"/>
+                        <a:datePicker name="transaction_date_to" bindTarget="csh_transaction_receipt_maintain_query_ds"
+                                      prompt="CSH510.CSH_TRANSACTION.TRANSACTION_DATE_TO"/>
+                        <a:numberField name="transaction_amount_from"
+                                       bindTarget="csh_transaction_receipt_maintain_query_ds"
+                                       prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_FROM" align="right"/>
+                        <a:numberField name="transaction_amount_to"
+                                       bindTarget="csh_transaction_receipt_maintain_query_ds"
+                                       prompt="CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_TO" align="right"/>
                         <!--我方账户户名-->
-                        <a:lov name="bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_NAME"/>
-                        <a:lov name="bank_branch_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_BANK_NAME"/>
-                        <a:lov name="bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_USERNAME"/>
+                        <a:lov name="bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds"
+                               prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_NAME"/>
+                        <a:lov name="bank_branch_name" bindTarget="csh_transaction_receipt_maintain_query_ds"
+                               prompt="CSH510.CSH_TRANSACTION.MY_BANK_NAME"/>
+                        <a:lov name="bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds"
+                               prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT_USERNAME"/>
                         <!--银行流水号-->
-                        <a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
+                        <a:textField name="bank_slip_num" bindTarget="csh_transaction_receipt_maintain_query_ds"
+                                     prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE"/>
                         <!--对方账户户名-->
-                        <a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
+                        <a:textField name="bp_bank_account_name" bindTarget="csh_transaction_receipt_maintain_query_ds"
+                                     prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_NAME"/>
                         <!--对方银行名称-->
-                        <a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
+                        <a:textField name="opposite_band_na" bindTarget="csh_transaction_receipt_maintain_query_ds"
+                                     prompt="CSH510.CSH_TRANSACTION.YOUR_BANK_NAME"/>
                         <!--对方账户账号-->
-                        <a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
-                        <a:textField name="contract_number" prompt="合同编号" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
-                        <a:textField name="bp_name_n"  prompt="代理店" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
-                        <a:textField name="bp_id_telnet_n" prompt="承租人" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
-                        <a:comboBox name="deposit_trans_type_desc" prompt="保证金类型" bindTarget="csh_transaction_receipt_maintain_query_ds"/>
-                        <a:comboBox name="query_amount_flag_n" bindTarget="csh_transaction_receipt_maintain_query_ds" prompt="剩余可用金额"/>
+                        <a:textField name="bp_bank_account_num" bindTarget="csh_transaction_receipt_maintain_query_ds"
+                                     prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT_USERNAME"/>
+                        <a:textField name="contract_number" prompt="合同编号"
+                                     bindTarget="csh_transaction_receipt_maintain_query_ds"/>
+                        <a:textField name="bp_name_n" prompt="代理店"
+                                     bindTarget="csh_transaction_receipt_maintain_query_ds"/>
+                        <a:textField name="bp_id_telnet_n" prompt="承租人"
+                                     bindTarget="csh_transaction_receipt_maintain_query_ds"/>
+                        <a:comboBox name="deposit_trans_type_desc" prompt="保证金类型"
+                                    bindTarget="csh_transaction_receipt_maintain_query_ds"/>
+                        <a:comboBox name="query_amount_flag_n" bindTarget="csh_transaction_receipt_maintain_query_ds"
+                                    prompt="剩余可用金额"/>
                     </a:fieldSet>
                 </a:hBox>
             </a:form>
             <a:fieldSet labelWidth="150" style="margin-left:20px">
-            <a:grid id="csh_transaction_receipt_maintain_grid_ds" bindTarget="csh_transaction_receipt_maintain_result_ds" marginHeight="200" marginWidth="80" navBar="true" >
+                <a:grid id="csh_transaction_receipt_maintain_grid_ds"
+                        bindTarget="csh_transaction_receipt_maintain_result_ds" marginHeight="200" marginWidth="80"
+                        navBar="true">
                     <a:columns>
-                        <a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM" renderer="seedetail_transaction_num" width="110" align="center"/>
+                        <a:column name="transaction_num" prompt="CSH510.CSH_TRANSACTION.CSH_TRANSACTION_NUM"
+                                  renderer="seedetail_transaction_num" width="110" align="center"/>
                         <a:column name="bp_name" prompt="代理店/厂商" align="center"/>
                         <a:column name="bp_id_telnet_n" prompt="承租人" align="center"/>
                         <a:column name="contract_number" prompt="合同编号" align="center"/>
-                        <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT" width="100" renderer="Leaf.formatMoney"/>
+                        <a:column name="transaction_amount" align="right" prompt="CSH510.CSH_TRANSACTION.RECEIPT_AMOUNT"
+                                  width="100" renderer="Leaf.formatMoney"/>
                         <a:column name="transaction_date" renderer="Leaf.formatDate" align="center"/>
                         <a:column name="unwrite_off_amount" prompt="剩余可用金额" align="right" renderer="Leaf.formatMoney"/>
                         <a:column name="deposit_trans_type_desc" prompt="保证金类型" align="center"/>
                         <a:column name="approve_status" prompt="状态" width="120" align="center"/>
-                        <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center" forExport="false"/>
+                        <a:column name="bank_slip_num" prompt="CSH510.CSH_TRANSACTION.BANK_CASH_CODE" align="center"
+                                  />
                         <a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
-                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name" align="center" forExport="false"/>
-                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name" align="center" forExport="false"/>
-                        <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center" forExport="false"/>
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bank_account_name"
+                                      align="center" />
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="bank_branch_name"
+                                      align="center" />
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bank_account_num" align="center"
+                                      />
                         </a:column>
                         <a:column prompt="CSH510.CSH_TRANSACTION.YOUR_ACCOUNT">
-                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name" align="center" forExport="false"/>
-                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na" align="center" forExport="false"/>
-                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num" align="center" forExport="false"/>
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NAME" name="bp_bank_account_name"
+                                      align="center" />
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_BANK" name="opposite_band_na"
+                                      align="center" />
+                            <a:column prompt="CSH510.CSH_TRANSACTION.ACCOUNT_NUM" name="bp_bank_account_num"
+                                      align="center" />
                         </a:column>
                     </a:columns>
                 </a:grid>

src/main/webapp/modules/cus_deposit/CUS_DEPOSIT122/cus_deposit_sum_report.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" trace="true">
+    <a:view>
+        <script type="text/javascript"><![CDATA[
+        // 退出按钮
+        function cus_deposit122_sum_back() {
+            $('${/parameter/@winId}').close();
+        }
+        function cus_deposit122_sum_query() {
+            $('csh_transaction_deposit_sum_report_ds').query();
+        }
+
+        ]]></script>
+        <a:dataSets>
+            <a:dataSet id="csh_transaction_receipt_sum_query_ds" autoCreate="true">
+                <a:fields>
+                    <a:field name="calc_date" lovGridHeight="300" lovHeight="500"
+                             lovService="cus_deposit.CUS_DEPOSIT122.gld_periods"
+                             lovWidth="500" required="true" title="GLD_PERIODS.PERIOD_NAME" validator="">
+                        <a:mapping>
+                            <a:map from="end_date" to="calc_date"/>
+                        </a:mapping>
+                    </a:field>
+                    <a:field name="deposit_trans_type_desc" defaultValue="租金保证金" readOnly="true"/>
+                    <a:field name="query_amount_flag_n" defaultValue="剩余金额大于0" readOnly="true"/>
+                </a:fields>
+            </a:dataSet>
+            <a:dataSet id="csh_transaction_deposit_sum_report_ds" autoPageSize="true"
+                       model="cus_deposit.CUS_DEPOSIT122.csh_transaction_deposit_sum_report_query"
+                       queryDataSet="csh_transaction_receipt_sum_query_ds"
+            />
+        </a:dataSets>
+        <a:screenBody>
+            <a:screenTopToolbar>
+                <a:screenTitle/>
+                <a:gridButton click="cus_deposit122_sum_back" text="HLS.BACK"/>
+                <a:gridButton click="cus_deposit122_sum_query" text="HLS.QUERY"/>
+            </a:screenTopToolbar>
+            <a:form bindTarget="csh_transaction_receipt_sum_query_ds" column="3" labelWidth="130" marginWidth="80">
+                <a:lov name="calc_date" prompt="截至日期"
+                       bindTarget="csh_transaction_receipt_sum_query_ds" renderer="Leaf.formatDate"/>
+                <a:textField name="deposit_trans_type_desc" prompt="保证金类型"
+                             bindTarget="csh_transaction_receipt_sum_query_ds"/>
+                <a:textField name="query_amount_flag_n" bindTarget="csh_transaction_receipt_sum_query_ds"
+                             prompt="剩余可用金额"/>
+            </a:form>
+            <a:grid id="csh_transaction_deposit_sum_report_id" bindTarget="csh_transaction_deposit_sum_report_ds"
+                    marginHeight="150" marginWidth="238" navBar="true">
+                <a:columns>
+                    <a:column name="contract_number" prompt="合同编号" width="250" align="center"/>
+                    <a:column name="unwrite_off_amount" prompt="租金保证金汇总" renderer="Leaf.formatMoney" width="150" align="right"/>
+
+                </a:columns>
+            </a:grid>
+        </a:screenBody>
+    </a:view>
+</a:screen>
\ No newline at end of file

src/main/webapp/modules/zjwfl/WFL2110/zj_wfl_workflow_deliver_create.lview

@@ -131,12 +131,12 @@
                     <a:field name="workflow_code"/>
                 </a:fields>
             </a:dataSet>
-            <a:dataSet id="batch_workflow_ds" autoQuery="true" pageSize="5" fetchAll="false" model="zjwfl.zj_wfl_workflow" queryDataSet="batch_workflow_query_ds" queryUrl="${/request/@context_path}/autocrud/zjwfl.zj_wfl_workflow/query?enabled_flag=Y" selectable="true" submitUrl="${/request/@context_path}/autocrud/zjwfl.WFL2110.wfl_workflow_deliver_batch/batch_update">
+            <a:dataSet id="batch_workflow_ds" autoQuery="true" fetchAll="true" model="zjwfl.zj_wfl_workflow" queryDataSet="batch_workflow_query_ds" queryUrl="${/request/@context_path}/autocrud/zjwfl.zj_wfl_workflow/query?enabled_flag=Y" selectable="true" submitUrl="${/request/@context_path}/autocrud/zjwfl.WFL2110.wfl_workflow_deliver_batch/batch_update">
                 <a:events>
                     <a:event name="submitsuccess" handler="onSuccess"/>
                 </a:events>
             </a:dataSet>
-            <a:dataSet id="workflow_ds" autoQuery="true" fetchAll="true" model="zjwfl.zj_wfl_workflow_dilever" queryUrl="${/request/@context_path}/autocrud/zjwfl.zj_wfl_workflow/query?ORDER_FIELD=w.workflow_code,t.date_from" selectable="true"/>
+            <a:dataSet id="workflow_ds" autoQuery="true" fetchAll="true" model="zjwfl.zj_wfl_workflow_dilever" queryUrl="${/request/@context_path}/autocrud/zjwfl.zj_wfl_workflow/query?enabled_flag=Y&amp;ORDER_FIELD=w.workflow_code,t.date_from" selectable="true"/>
             <a:dataSet id="wfl_workflow_deliver_create_query_ds" autoCreate="true" model="zjwfl.WFL2110.zj_wfl_workflow_deliver_query"/>
             <a:dataSet id="wfl_workflow_deliver_create_ds" autoQuery="true" pageSize="5" fetchAll="false" model="zjwfl.WFL2110.zj_wfl_workflow_deliver_query" queryDataSet="wfl_workflow_deliver_create_query_ds" queryUrl="${/request/@context_path}/autocrud/zjwfl.WFL2110.zj_wfl_workflow_deliver_query/query?ORDER_FIELD=z.workflow_desc,t.date_from" selectable="true" submitUrl="${/request/@context_path}/autocrud/zjwfl.WFL2110.wfl_workflow_deliver_modify/batch_update">
                 <a:fields>