Merge branch 'feature/凭证明细查看' into develop

.gitignore

@@ -23,8 +23,8 @@ overlays/
 *~pck
 
 # common config rename
-uncertain.local.xml
-config.properties
+# uncertain.local.xml
+# onfig.properties
 
 atm_upload.svc
 atm_upload_unUseSubFolder.svc

src/main/resources/config.properties

+
+
+redis.sentinel=\
+  10.86.20.183:26379,\
+  10.86.20.184:26379
+
+# if redis.useSentinel is true, then redis.ip and redis.port is useless
+# this value should always be true except local dev test
+redis.useSentinel=false
+
+redis.ip=127.0.0.1
+redis.port=6379
+redis.db=10
+
+#db.jndiName=java:comp/env/jdbc/hap_dev
+
+# db.type property is used for activiti
+#db.type=mysql
+db.type=oracle
+db.driverClassName=oracle.jdbc.driver.OracleDriver
+
+db.url=jdbc:oracle:thin:@10.200.17.100:1521:HLS
+db.username=hl_cm_dev
+db.password=hl_cm_dev
+db.maxLifetime=600000
+db.maxPoolSize=100
+db.minIdle=10
+
+#db.type=mssql
+#db.type=hana
+
+#mybatis.identity=JDBC
+mybatis.identity=SEQUENCE
+
+# environment
+env.code=SIT
+
+
+#Document history
+data.backup = false
+data.backup.filePath=e:\\hand
+
+
+
+# SIT
+
+
+# job
+job.autoStartup=true
+
+# build number
+project.buildDate=${project.buildDate}
+
+# CAS
+cas.service=http://localhost:8080/hap/login/cas
+cas.ssoserver.loginurl=https://login.hand-china.com/sso/login
+cas.ssoserver.url=https://login.hand-china.com/sso
+cas.ssoserver.logouturl=https://login.hand-china.com/sso/logout?service=http://localhost:8080/hap
+
+# LDAP
+ldap.server.url=ldap://localhost:389/
+ldap.conn.userDn=cn=Manager,dc=hand,dc=com
+ldap.conn.password=secret
+ldap.user.search.base=dc=hand,dc=com
+ldap.user.search.filter=(uid={0})
+
+# REDISSON
+#  multiple redis such as
+#  redisson.server.url=\
+#    127.0.0.1:6379,\
+#    10.211.103.142:6379
+
+# redisson.server.url=
+# redissson.server.password=
+
+# Activiti MailServer
+activiti.mailServerHost=smtp.126.com
+activiti.mailServerPort=25
+activiti.mailServerUsername=hap_dev@126.com
+activiti.mailServerPassword=hapdev11
+
+# Message-Redis
+message.provider=redis
+
+# Message-RabbitMQ
+#message.provider=rabbitmq
+#rabbitmq.host=localhost
+#rabbitmq.username=guest
+#rabbitmq.password=guest
+#rabbitmq.port=5672
+
+hlsv3.plugin.enabled=true
+
+# sso login flag
+ssoLoginFlag=true
+
+#Electronic Invoice Interface wsdl url
+acr.webservice.url=
+#Electronic Invoice Interface TaxNumber
+acr.saleTax=
+#pdf download link
+acr.pdfAddress = D:/u01/
+
+#Paper invoice interface wsdl url
+paper.webservice.url =
+
+#onlyoffice
+files.docservice.timeout=120000
+files.docservice.host.url=http://127.0.0.1:8082/hlcm
+files.docservice.enableAccessControl=false
+files.docservice.url=http://127.0.0.1:8765
+
+#Log in to the AES key
+aes.key=1vgH5678GH3a1678
+
+#Industrial and Commercial Bank Interface
+icbc.signUrl=
+icbc.submitUrl=
+
+#Generic log storage address
+hls.interface.log=/u01/logs
+
+#Leaf frame version
+leaf.version=1.0
+
+leaf.logDebuggerModel=true
+
+session.filter.excludePattern=
+
+#layout config
+layout.gridButtonIgnoreReadModel=false
\ No newline at end of file

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

+
+
+redis.sentinel=\
+  10.86.20.183:26379,\
+  10.86.20.184:26379
+
+# if redis.useSentinel is true, then redis.ip and redis.port is useless
+# this value should always be true except local dev test
+redis.useSentinel=false
+
+redis.ip=localhost
+redis.port=6379
+redis.db=2
+
+#db.jndiName=java:comp/env/jdbc/hap_dev
+
+# db.type property is used for activiti
+#db.type=mysql
+db.type=oracle
+db.driverClassName=oracle.jdbc.driver.OracleDriver
+
+db.url=jdbc:oracle:thin:@10.200.17.100:1521:HLS
+db.username=hl_cm_dev
+db.password=hl_cm_dev
+db.maxLifetime=600000
+db.maxPoolSize=100
+db.minIdle=10
+
+#db.type=mssql
+#db.type=hana
+
+#mybatis.identity=JDBC
+mybatis.identity=SEQUENCE
+
+# environment
+env.code=SIT
+
+
+#Document history
+data.backup = false
+data.backup.filePath=e:\\hand
+
+
+
+# SIT
+
+
+# job
+job.autoStartup=true
+
+# build number
+project.buildDate=${project.buildDate}
+
+# CAS
+cas.service=http://localhost:8080/hap/login/cas
+cas.ssoserver.loginurl=https://login.hand-china.com/sso/login
+cas.ssoserver.url=https://login.hand-china.com/sso
+cas.ssoserver.logouturl=https://login.hand-china.com/sso/logout?service=http://localhost:8080/hap
+
+# LDAP
+ldap.server.url=ldap://localhost:389/
+ldap.conn.userDn=cn=Manager,dc=hand,dc=com
+ldap.conn.password=secret
+ldap.user.search.base=dc=hand,dc=com
+ldap.user.search.filter=(uid={0})
+
+# REDISSON
+#  multiple redis such as
+#  redisson.server.url=\
+#    127.0.0.1:6379,\
+#    10.211.103.142:6379
+
+# redisson.server.url=
+# redissson.server.password=
+
+# Activiti MailServer
+activiti.mailServerHost=smtp.126.com
+activiti.mailServerPort=25
+activiti.mailServerUsername=hap_dev@126.com
+activiti.mailServerPassword=hapdev11
+
+# Message-Redis
+message.provider=redis
+
+# Message-RabbitMQ
+#message.provider=rabbitmq
+#rabbitmq.host=localhost
+#rabbitmq.username=guest
+#rabbitmq.password=guest
+#rabbitmq.port=5672
+
+hlsv3.plugin.enabled=true
+
+# sso login flag
+ssoLoginFlag=true
+
+#Electronic Invoice Interface wsdl url
+acr.webservice.url=
+#Electronic Invoice Interface TaxNumber
+acr.saleTax=
+#pdf download link
+acr.pdfAddress = D:/u01/
+
+#Paper invoice interface wsdl url
+paper.webservice.url =
+
+#onlyoffice
+files.docservice.timeout=120000
+files.docservice.host.url=http://127.0.0.1:8082/hlcm
+files.docservice.enableAccessControl=false
+files.docservice.url=http://127.0.0.1:8765
+
+#Log in to the AES key
+aes.key=1vgH5678GH3a1678
+
+#Industrial and Commercial Bank Interface
+icbc.signUrl=
+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
\ No newline at end of file

src/main/webapp/WEB-INF/classes/cont/CON3300/contract_item_report_query.lwm

@@ -243,7 +243,83 @@
                        to_char(to_date(${@base_date}, 'yyyy-mm-dd'), 'yyyymm')),0) future_principal,
                '0' unexecute_total,
                --未来应收
-               '0' this_due_amount
+               '0' this_due_amount,
+               -- add by liyuan.chen
+               (select hb.bp_code from hls_bp_master hb where hb.bp_id = t.bp_id_agent_level1) as bp_agent_code,
+               (select hb.bp_name from hls_bp_master hb where hb.bp_id = t.bp_id_agent_level1) as bp_agent_name,
+               --当期利息
+               nvl((SELECT SUM(nvl(ccc.net_interest, 0))
+                     FROM con_contract_cashflow ccc
+                    WHERE ccc.contract_id =
+                          contract_item_query_pkg.get_contract_history_id(p_contract_id => t.contract_id,
+                                                                          p_calc_date   => to_date(${@base_date},
+                                                                                                   'yyyy-mm-dd'))
+                      AND cf_item IN(1,200,250)
+                      AND ccc.cf_status = 'RELEASE'
+                      AND to_char(ccc.due_date, 'yyyymm') =
+                          to_char(to_date(${@base_date}, 'yyyy-mm-dd'),
+                                  'yyyymm')),
+                   0)+
+                   NVL((SELECT nvl(ccc.net_due_amount, 0)
+                   FROM con_contract_cashflow ccc
+                  WHERE ccc.contract_id =
+                        contract_item_query_pkg.get_contract_history_id(p_contract_id => t.contract_id,
+                                                                        p_calc_date   => to_date(${@base_date},
+                                                                                                 'yyyy-mm-dd'))
+                    AND ccc.cf_item = 8
+                    AND ccc.cf_status = 'RELEASE'
+                    AND to_char(ccc.due_date, 'yyyymm') =
+                          to_char(to_date(${@base_date}, 'yyyy-mm-dd'),
+                                  'yyyymm')),0) net_this_interest,
+               --当次累计利息
+               nvl((SELECT SUM(nvl(ccc.net_interest, 0))
+                     FROM con_contract_cashflow ccc
+                    WHERE ccc.contract_id =
+                          contract_item_query_pkg.get_contract_history_id(p_contract_id => t.contract_id,
+                                                                          p_calc_date   => to_date(${@base_date},
+                                                                                                   'yyyy-mm-dd'))
+                      AND cf_item IN( 1,200,250)
+                      AND ccc.cf_status = 'RELEASE'
+                      AND to_char(ccc.due_date, 'yyyymm') <=
+                          to_char(to_date(${@base_date}, 'yyyy-mm-dd'),
+                                  'yyyymm')),
+                   0)+NVL((SELECT nvl(ccc.net_due_amount, 0)
+                   FROM con_contract_cashflow ccc
+                  WHERE ccc.contract_id =
+                        contract_item_query_pkg.get_contract_history_id(p_contract_id => t.contract_id,
+                                                                        p_calc_date   => to_date(${@base_date},
+                                                                                                 'yyyy-mm-dd'))
+                    AND ccc.cf_item = 8
+                    AND ccc.cf_status = 'RELEASE'
+                    AND to_char(ccc.due_date, 'yyyymm') <=
+                          to_char(to_date(${@base_date}, 'yyyy-mm-dd'),
+                                  'yyyymm')),0) net_this_add_interest,
+                                   --未执行利息
+               '0' net_unexecute_interest,
+               --未来应收利息
+                nvl((SELECT SUM(nvl(ccc.net_interest, 0))
+                     FROM con_contract_cashflow ccc
+                    WHERE ccc.contract_id =
+                          contract_item_query_pkg.get_contract_history_id(p_contract_id => t.contract_id,
+                                                                          p_calc_date   => to_date(${@base_date},
+                                                                                                   'yyyy-mm-dd'))
+                      AND cf_item IN ( 1,200,250)
+                      AND ccc.cf_status = 'RELEASE'
+                      AND to_char(ccc.due_date, 'yyyymm') >
+                          to_char(to_date(${@base_date}, 'yyyy-mm-dd'),
+                                  'yyyymm')),
+                   0)+NVL((SELECT nvl(ccc.net_due_amount, 0)
+                   FROM con_contract_cashflow ccc
+                  WHERE ccc.contract_id =
+                        contract_item_query_pkg.get_contract_history_id(p_contract_id => t.contract_id,
+                                                                        p_calc_date   => to_date(${@base_date},
+                                                                                                 'yyyy-mm-dd'))
+                    AND ccc.cf_item = 8
+                    AND ccc.cf_status = 'RELEASE'
+                    AND to_char(ccc.due_date, 'yyyymm') >
+                          to_char(to_date(${@base_date}, 'yyyy-mm-dd'),
+                                  'yyyymm')),0) net_future_interest
+               
           FROM con_contract t
          WHERE t.data_class = 'NORMAL'
            AND t.contract_status NOT IN('CANCEL', 'NEW', 'INCEPTING', 'INCEPT_RETURN')

src/main/webapp/WEB-INF/classes/cont/CON560/con_contract_received_amount.lwm

@@ -15,6 +15,9 @@
        (SELECT tp.description
           FROM hls_cashflow_type tp
          WHERE tp.cf_type = t.cf_type) cf_type_dis,
+       t.CF_ITEM,
+       (SELECT tc.description FROM HLS_CASHFLOW_ITEM tc WHERE tc.CF_ITEM = t.CF_ITEM
+       ) cf_item_dis,
        nvl(t.due_amount,0) due_amount,
        nvl(t.received_amount,0) received_amount,
        to_char(t.due_date,'yyyy-mm-dd') due_date,

src/main/webapp/WEB-INF/classes/cont/CON560/con_contract_unreceived_amount.lwm

@@ -14,6 +14,9 @@
                     t.cf_type,
                     (SELECT tp.description FROM hls_cashflow_type tp WHERE tp.cf_type = t.cf_type
                     ) cf_type_dis,
+                    t.CF_ITEM,
+                    (SELECT tc.description FROM HLS_CASHFLOW_ITEM tc WHERE tc.CF_ITEM = t.CF_ITEM
+                    ) cf_item_dis,
                     nvl(t.due_amount,0) due_amount,
                     nvl(t.received_amount,0) received_amount,
                      to_char(t.due_date,'yyyy-mm-dd') due_date,

src/main/webapp/WEB-INF/classes/hls/HLS801/con_unearned_finance_income.lwm

@@ -59,7 +59,7 @@
         <bm:query-field  field="finance_income_recognized" queryExpression="t1.finance_income_recognized=${@finance_income_recognized}"/>
     </bm:query-fields>
     <bm:data-filters>
-        <bm:data-filter enforceOperations="query" expression="t1.internal_period_num = ${@internal_period_num} and exists (Select 1 From con_contract c Where t1.contract_id = c.contract_id And c.data_class = &apos;NORMAL&apos; And (c.contract_status = &apos;INCEPT&apos; Or c.contract_status = &apos;TERMINATE&apos; Or (c.contract_status = &apos;PENDING&apos; And Exists (Select 1 From con_contract_et_hd e Where e.contract_id = c.contract_id And e.document_type = &apos;ET&apos; And e.available_flag = &apos;Y&apos; And e.status = &apos;NEW&apos;)) Or c.contract_status = &apos;ETING&apos; Or (c.contract_status = &apos;PENDING&apos; And Exists (Select 1 From con_contract_change_req cc Where cc.contract_id = c.contract_id And cc.document_type = &apos;PAYCARD&apos;  And cc.req_status In (&apos;NEW&apos;))))) and exists (select 1 from con_contract_cashflow c where c.cashflow_id = t1.cashflow_id and c.interest is not null)"/>
+        <bm:data-filter enforceOperations="query" expression="t1.internal_period_num = ${@internal_period_num} and exists (Select 1 From con_contract cc Where t1.contract_id = cc.contract_id And cc.data_class = &apos;NORMAL&apos; And t1.cf_item In (1, 8) And ((t1.cf_item = 1 And cc.contract_status In (&apos;TERMINATE&apos;, &apos;INCEPT&apos;, &apos;ETING&apos;, &apos;REPURING&apos;)) Or (t1.cf_item = 8 And cc.contract_status In (&apos;TERMINATE&apos;, &apos;INCEPT&apos;))) ) and exists (select 1 from con_contract_cashflow c where c.cashflow_id = t1.cashflow_id and c.interest is not null)"/>
         <bm:data-filter enforceOperations="query" expression="to_char(t1.calc_end_date,&apos;yyyy-mm-dd&apos;) = ${@calc_end_date} "/>
         <bm:data-filter enforceOperations="query" expression="t1.cashflow_id in (select cw.cashflow_id from con_contract_cashflow cw where cw.cf_direction not in ('NONCASH'))"/>
 <!--        <bm:data-filter enforceOperations="query" expression="t1.contract_id in (select contract_id from con_contract t where nvl(t.fraud_flag,'N') !='Y')"/>-->

src/main/webapp/WEB-INF/server-script/layoutconfig/con_due_detail_ac_doc_info_2_queryfields.js

+
+
+var add_datafilters = [ {
+    name : 'attach_type',
+    expression : "(t1.attach_type = 'ACCOUNT')"
+} ];
+add_datafilter();

src/main/webapp/WEB-INF/server-script/layoutconfig/con_due_detail_ac_g_cashflow_queryfields.js

+
+
+var add_datafilters = [ {
+    name : 'bp_category',
+    expression : "(trunc(t1.due_date) <= trunc(Sysdate) and (t1.account_unreceived_9 > 0 or t1.account_unreceived_amount > 0))"
+} ];
+add_datafilter();

src/main/webapp/WEB-INF/server-script/layoutconfig/con_due_detail_ac_g_phone_collection_queryfields.js

+
+
+var add_datafilters = [ {
+    name : 'user_col_v01',
+    expression : "(t1.user_col_v01 = 'ACCOUNT')"
+} ];
+add_datafilter();

src/main/webapp/WEB-INF/server-script/layoutconfig/con_due_detail_doc_info_2_queryfields.js

+
+
+var add_datafilters = [ {
+    name : 'attach_type',
+    expression : "(t1.attach_type = 'BUSINESS')"
+} ];
+add_datafilter();

src/main/webapp/WEB-INF/server-script/layoutconfig/con_due_detail_g_cashflow_queryfields.js

+
+
+var add_datafilters = [ {
+    name : 'cashflow',
+    expression : "(Exists (Select 1 From con_contract_cashflow c1 Where c1.contract_id = t1.contract_id  And c1.times = t1.times  And ((nvl(t1.overdue_status, 'N') = 'Y' And t1.cf_item <> 9) Or (t1.cf_item = 9)) And nvl(c1.write_off_flag, 'NOT') <> 'FULL'))"
+} ];
+add_datafilter();

src/main/webapp/WEB-INF/server-script/layoutconfig/con_due_detail_g_phone_collection_queryfields.js

+
+
+var add_datafilters = [ {
+    name : 'user_col_v01',
+    expression : "(t1.user_col_v01 = 'BUSINESS')"
+
+} ];
+add_datafilter();

src/main/webapp/WEB-INF/server-script/layoutconfig/je_detail_query_g_result_queryfields.js

@@ -14,6 +14,10 @@ var override_queryfields = [
 {
 	name : 'journal_date_to',
 	queryexpression : "t1.journal_date <= to_date(${@journal_date_to},'YYYY-MM-DD')"
+},
+{
+	name : 'contract_number',
+	queryexpression : "t1.reference3 = ${@contract_number}"
 }
 
 ];

src/main/webapp/WEB-INF/uncertain.local.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<uncertain-engine defaultLogLevel="INFO">
+    <path-config logPath="D:\install_soft\jenkins_logs" uiPackageBasePath="D:\install_soft\apache-tomcat-jenkins\webapps\hlcm\lib\LeafUI\src"/>
+</uncertain-engine>
\ No newline at end of file

src/main/webapp/modules/cont/CON500/con_contract_get_layout_code.lview

@@ -123,6 +123,62 @@
             }
             return '';
         }
+        // 获取组件ID 参数prompt若传入则传'prompt'
+        function get_id_by_basetable(layoutDataSetList, base_table, name, prompt) {
+            var base_table_temp = '_' + base_table.toLowerCase() + '_ds';
+            for (var i = 0; i < layoutDataSetList.length; i++) {
+                var dsId = layoutDataSetList[i];
+                if (dsId.substring(dsId.length - base_table_temp.length, dsId.length).toLowerCase() == base_table_temp) {
+                    if(name){
+                        if(name.toUpperCase() != 'F' && name.toUpperCase() != 'G'){
+                            // 针对form下字段
+                            if(prompt){
+                                return dsId.substring(0, dsId.length - base_table_temp.length) + '_' + (base_table||'NULL').toUpperCase() + '_' +  name.toUpperCase() + '_' + prompt;
+                            }else{
+                                return dsId.substring(0, dsId.length - base_table_temp.length) + '_' + (base_table||'NULL').toUpperCase() + '_' +  name.toUpperCase();
+                            }
+                        }else if(name.toUpperCase() == 'F'){
+                            // 针对form
+                            return dsId.substring(0, dsId.length - base_table_temp.length) + '_component_id';
+                        }else if(name.toUpperCase() == 'G'){
+                            // 针对grid
+                            // return dsId.substring(0, dsId.length - base_table_temp.length) + '_' + (base_table||'').toLowerCase() + '_layout_grid_id';
+                            return dsId.replace('ds', 'layout_grid_id');
+                        }
+                    }
+                }
+            }
+            return '';
+        }
+
+        // 获取组件ID 参数prompt若传入则传'prompt'
+        function get_id_by_tabcode_basetable(layoutDataSetList, tab_code, base_table, name, prompt) {
+            if (tab_code) {
+                var base_table_temp = tab_code + '_' + base_table.toLowerCase() + '_ds';
+                for (var i = 0; i < layoutDataSetList.length; i++) {
+                    var dsId = layoutDataSetList[i];
+                    if (dsId.substring(dsId.length - base_table_temp.length, dsId.length).toLowerCase() == base_table_temp.toLowerCase()) {
+                        if(name){
+                            if(name.toUpperCase() != 'F' && name.toUpperCase() != 'G'){
+                                // 针对form下字段
+                                if(prompt){
+                                    return dsId.substring(0, dsId.length - base_table_temp.length) + tab_code.toUpperCase() + '_' + (base_table||'NULL').toUpperCase() + '_' + name.toUpperCase() + '_' + prompt;
+                                }else{
+                                    return dsId.substring(0, dsId.length - base_table_temp.length) + tab_code.toUpperCase() + '_' + (base_table||'NULL').toUpperCase() + '_' + name.toUpperCase();                                }
+                            }else if(name.toUpperCase() == 'F'){
+                                // 针对form
+                                return dsId.substring(0, dsId.length - base_table_temp.length) + tab_code.toUpperCase() + '_component_id';
+                            }else if(name.toUpperCase() == 'G'){
+                                // 针对grid
+                                // return dsId.substring(0, dsId.length - base_table_temp.length) + tab_code.toUpperCase()  + '_' + (base_table||'').toLowerCase() + '_layout_grid_id';
+                                return dsId.replace('ds', 'layout_grid_id');
+                            }
+                        }
+                    }
+                }
+            }
+            return '';
+        }
         ]]></script>
     </a:view>
 </a:screen>

src/main/webapp/modules/cont/CON500/con_doc_batch_create.lsc

@@ -113,7 +113,7 @@
             } catch (e) {
             raise_app_error(e);
             }
-            if (record_data.templet_code == 'FINANCE_LEASE_CONTRACT'||record_data.templet_code == 'FINANCE_LEASE_CONTRACT_A4'||record_data.templet_code == 'BUSINESS_CONTRACT'||record_data.templet_code == 'BUSINESS_CONTRACT_XJ'||record_data.templet_code=='LEASE_EXCHANGE'||record_data.templet_code=='LEASE_EXCHANGE_GN'||record_data.templet_code=='FINANCE_LEASE_CONTRACT_EX'||record_data.templet_code=='BUSINESS_CONTRACT_GK') {
+            if (record_data.templet_code == 'FINANCE_LEASE_CONTRACT'||record_data.templet_code == 'FINANCE_LEASE_CONTRACT_A4'||record_data.templet_code == 'BUSINESS_CONTRACT'||record_data.templet_code == 'BUSINESS_CONTRACT_XJ'||record_data.templet_code=='LEASE_EXCHANGE'||record_data.templet_code=='LEASE_EXCHANGE_GN'||record_data.templet_code=='FINANCE_LEASE_CONTRACT_EX'||record_data.templet_code=='BUSINESS_CONTRACT_GK'||record_data.templet_code == 'REPURCHASE_DEBT_OFFSET') {
 
             // word转pdf
             var pdf_file_path=datePath+guid_file_name_tables[0].guid_file_name + 'con_' + record_data.content_id;

src/main/webapp/modules/cont/CON560/con_contract_finish_maintain.lview

@@ -72,10 +72,15 @@
         function con560_con_contract_detail() {
             var records = $('con560_contract_result_ds').getSelected();
             var seal_record = $('seal_info_ds').getCurrentRecord();
+
             if (!records.length) {
                 Leaf.showMessage('${l:PROMPT}', '请至少选择一条记录');
                 return;
             }
+            if(!records[0].get('et_date')){
+                $L.showInfoMessage("提示",'请输入合同结束日！');
+                return;
+            }
             //判断数据有没有修改
             var arrys=$('con560_contract_result_ds').data;
             for(var i=0;i<arrys.length;i++){
@@ -251,7 +256,7 @@
                        queryUrl="${/request/@context_path}/autocrud/cont.CON560.con_contract_finish_for_query/query"
                        selectable="true" selectionModel="single">
                 <!--<a:fields>
-                    <a:field name="contract_status_n" displayField="code_value_name" options="con560_contract_status_grid_ds" returnField="contract_status" valueField="code_value"/>
+                    <a:field name="et_date" required="true" readOnly="false"/>
                 </a:fields>-->
                 <a:events>
                     <a:event name="indexChange" handler="onIndexChange"/>
@@ -328,7 +333,7 @@
                         <a:grid bindTarget="unreceivedAmountDs" height="250" marginWidth="55" navBar="true">
                             <a:columns>
                                 <a:column name="times" prompt="期数"/>
-                                <a:column name="cf_type_dis" prompt="类型"/>
+                                <a:column name="cf_item_dis" prompt="类型"/>
                                 <a:column name="due_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney"/>
                                 <a:column name="received_amount" align="right" prompt="已收金额"
                                           renderer="Leaf.formatMoney"/>
@@ -345,7 +350,7 @@
                         <a:grid bindTarget="receivedAmountDs" height="250" marginWidth="55" navBar="true">
                             <a:columns>
                                 <a:column name="times" prompt="期数"/>
-                                <a:column name="cf_type_dis" prompt="类型"/>
+                                <a:column name="cf_item_dis" prompt="类型"/>
                                 <a:column name="due_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney"/>
                                 <a:column name="received_amount" align="right" prompt="已收金额"
                                           renderer="Leaf.formatMoney"/>

src/main/webapp/modules/cont/CON560/con_contract_finish_maintain_wfl.lview

@@ -249,7 +249,7 @@
                         <a:grid bindTarget="unreceivedAmountDs" marginHeight="325" marginWidth="55" navBar="true">
                             <a:columns>
                                 <a:column name="times" prompt="期数"/>
-                                <a:column name="cf_type_dis" prompt="类型"/>
+                                <a:column name="cf_item_dis" prompt="类型"/>
                                 <a:column name="due_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney"/>
                                 <a:column name="received_amount" align="right" prompt="已收金额"
                                           renderer="Leaf.formatMoney"/>
@@ -266,7 +266,7 @@
                         <a:grid bindTarget="receivedAmountDs" marginHeight="325" marginWidth="55" navBar="true">
                             <a:columns>
                                 <a:column name="times" prompt="期数"/>
-                                <a:column name="cf_type_dis" prompt="类型"/>
+                                <a:column name="cf_item_dis" prompt="类型"/>
                                 <a:column name="due_amount" align="right" prompt="应收金额" renderer="Leaf.formatMoney"/>
                                 <a:column name="received_amount" align="right" prompt="已收金额"
                                           renderer="Leaf.formatMoney"/>

src/main/webapp/modules/cont/CON620/con_contract_account_detail.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: lpc 9874
+    $Date:
+    $Revision: 1.0
+    $Purpose: 租赁物查看
+-->
+<a:screen xmlns:a="http://www.leaf-framework.org/application" xmlns:s="leaf.plugin.script" customizationEnabled="true"
+          dynamiccreateenabled="true" trace="true">
+
+    <a:view>
+
+        <script type="text/javascript"><![CDATA[
+
+
+        ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
+    </a:view>
+</a:screen>

src/main/webapp/modules/cont/CON620/con_contract_rent_detail.lview

@@ -36,16 +36,19 @@
                 url="${/request/@context_path}/modules/cont/CON620/create_content_con_lease.lsc"/>
         <a:link id="lease_return_print_link"
                 url="${/request/@context_path}/modules/cont/CON620/create_content_lease_return.lsc"/>
+        <a:link id="${/parameter/@layout_code}_con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
+
         <script type="text/javascript"><![CDATA[
         Ext.ux.Lightbox.register('a[ref=img]', true);
 
         //保存submitsuccess调用
         window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function (ds, record, res, bp_seq) {
             window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-            var con_accounting_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_accounting_manage');
+            /*var con_accounting_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_accounting_manage');
             var accounting_record = $(con_accounting_ds_id).getCurrentRecord();
             $('CONTRACT_LEGAL_MODIFY_G_CASHFLOW_con_contract_cashflow_ds').setQueryParameter('con_accounting_id', accounting_record.get('con_accounting_id'));
-            $('CONTRACT_LEGAL_MODIFY_G_CASHFLOW_con_contract_cashflow_ds').query();
+            $('CONTRACT_LEGAL_MODIFY_G_CASHFLOW_con_contract_cashflow_ds').query();*/
+            $(ds.id).query();
         };
 
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
@@ -97,6 +100,7 @@
         function upload_file(id, name, query_only) {
 
             var record = window['${/parameter/@layout_code}_hls_link_render_record'][id + '---' + name];
+            var ds = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_accounting_manage_attch');
             if (record.get('con_accounting_attch_id')) {
                 var url;
                 if (query_only == 'Y') {
@@ -113,9 +117,10 @@
                 });
 
                 win.on('close', function () {
-                    $('CONTRACT_LEGAL_MODIFY_ACY_con_accounting_manage_attch_ds').setQueryParameter('con_accounting_id', record.get('con_accounting_id'));
-                    // $('CONTRACT_LEGAL_MODIFY_ACY_con_accounting_manage_attch_ds').setQueryParameter('con_accounting_attch_id', record.get('con_accounting_attch_id'));
-                    $('CONTRACT_LEGAL_MODIFY_ACY_con_accounting_manage_attch_ds').query();
+                    /*$('CONTRACT_LEGAL_MODIFY_ACY_con_accounting_manage_attch_ds').setQueryParameter('con_accounting_id', record.get('con_accounting_id'));
+                    $('CONTRACT_LEGAL_MODIFY_ACY_con_accounting_manage_attch_ds').setQueryParameter('con_accounting_attch_id', record.get('con_accounting_attch_id'));
+                    $('CONTRACT_LEGAL_MODIFY_ACY_con_accounting_manage_attch_ds').query();*/
+                    $(ds).query();;
                 });
             } else {
                 Leaf.showMessage('${l:HLS.PROMPT}', '请先保存!');
@@ -158,6 +163,7 @@
             }
         };
         Leaf.onReady(function() {
+            if('${/parameter/@function_code}' == 'CON620D'){
                 if("${/model/role_info/record/@role_code}"!="0018"&&"${/model/role_info/record/@role_code}"!="0019") {
                     document.getElementById("CON_DUE_DETAIL_user_button4").style.display = "";
                     document.getElementById("CON_DUE_DETAIL_user_button3").style.display = "";
@@ -165,8 +171,10 @@
                     document.getElementById("CON_DUE_DETAIL_user_button4").style.display = "none";
                     document.getElementById("CON_DUE_DETAIL_user_button3").style.display = "none";
                 }
+            }
 
         });
         ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>
 </a:screen>

src/main/webapp/modules/hls/hls_comment_report.lview

@@ -8,13 +8,24 @@
 <a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true">
 <a:init-procedure/>
 <a:view>
+    <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
+            modelaction="update"/>
 <script type="text/javascript">
     window['${/parameter/@layout_code}_on_layout_dynamic_grid_query'] = function (ds, qpara, bp_seq) {
+        var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
+
+        if (ds == $(ds_id)) {
+            aut_authority_list_validate_query(ds, qpara);
+
+        }
             //异步打印
-            ds.setQueryParameter('__async__', 'Y');
+            //ds.setQueryParameter('__async__', 'Y');
         };
 <![CDATA[
 
 ]]></script>
+    <a:screen-include
+            screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=GENERAL&amp;function_code=HLS302"/>
+    <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
 </a:view>
 </a:screen>