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

src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query.lwm

@@ -86,7 +86,8 @@
         v.entrusted_amount,
         v.amount_tenant,
         v.write_off_date,
-        v.write_off_amount
+        v.write_off_amount,
+        v.division
   FROM (SELECT t.contract_id,
                 (SELECT hbbc.bank_account_id
                        FROM hls_bp_master_bank_account hbbc
@@ -216,7 +217,8 @@
                where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=t.contract_id) write_off_date,
         nvl((select  sum(cwo.write_off_due_amount) write_off_amount
                 from csh_write_off cwo
-                 where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=t.contract_id),0) write_off_amount
+                 where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=t.contract_id),0) write_off_amount,
+               t.division
           FROM con_contract_cashflow f
           join con_contract t
             on t.contract_id = f.contract_id

src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query_after_save.lwm

@@ -130,8 +130,8 @@
                where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=c.contract_id) write_off_date,
         nvl((select  sum(cwo.write_off_due_amount) write_off_amount
                 from csh_write_off cwo
-                 where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=c.contract_id),0) write_off_amount
-
+                 where cwo.write_off_type='DEPOSIT_ENTRY' and cwo.contract_id=c.contract_id),0) write_off_amount,
+        c.division
           from csh_payment_req_ln cpr,
                con_contract c,
                hls_bp_master hbm,

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_transaction_query.lwm

@@ -94,7 +94,7 @@
     <!--</bm:data-filters>-->
     <bm:query-fields>
         <bm:query-field name="contract_number" queryExpression="v.contract_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
-        <bm:query-field name="bp_name_n" queryExpression="v.bp_name = ${@bp_name_n}"/>
+        <bm:query-field name="bp_name_n" queryExpression="v.bp_name like &apos;%&apos;||${@bp_name_n}||&apos;%&apos;"/>
         <bm:query-field name="bp_id_telnet_n" queryExpression="v.bp_id_telnet_n =${@bp_id_telnet_n}"/>
         <bm:query-field name="deposit_trans_type" queryExpression="v.deposit_trans_type =${@deposit_trans_type}"/>
         <bm:query-field name="trans_review_status" queryExpression="v.trans_review_status =${@trans_review_status}"/>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT102/csh_transaction_review_execute.lwm

@@ -76,7 +76,7 @@
     </bm:operations>
     <bm:query-fields>
         <bm:query-field name="contract_number" queryExpression="t1.contract_number like &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
-        <bm:query-field name="bp_name_n" queryExpression="t1.bp_name = ${@bp_name_n}"/>
+        <bm:query-field name="bp_name_n" queryExpression="t1.bp_name like &apos;%&apos;||${@bp_name_n}||&apos;%&apos;"/>
         <bm:query-field name="bp_id_telnet_n" queryExpression="t1.bp_id_telnet_n =${@bp_id_telnet_n}"/>
         <bm:query-field name="deposit_trans_type" queryExpression="t1.source_trans_type = ${@deposit_trans_type}"/>
         <bm:query-field name="trans_review_status" queryExpression="t1.trans_review_status =${@trans_review_status}"/>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT104/csh_transaction_maintain_query.lwm

@@ -163,7 +163,7 @@
         <!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
         <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
         <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
-        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
+        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like  &apos;%&apos;||${@bp_name_n}||&apos;%&apos; "/>
         <bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106/csh_transaction_maintain_query.lwm

@@ -180,7 +180,7 @@
         <!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
         <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
         <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
-        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
+        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like  &apos;%&apos;||${@bp_name_n}||&apos;%&apos; "/>
         <bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT106N/csh_transaction_maintain_query.lwm

@@ -181,7 +181,7 @@
         <!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
         <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
         <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
-        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
+        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like &apos;%&apos;||${@bp_name_n}||&apos;%&apos; "/>
         <bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/cus_deposit/CUS_DEPOSIT110/csh_transaction_maintain_query.lwm

@@ -158,7 +158,7 @@
         <!--<bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||upper(${@contract_number})||&apos;%&apos;"/>-->
         <bm:query-field name="bp_id_telnet_n" queryExpression="(select hb.bp_name from hls_bp_master hb,con_contract ct where ct.contract_id=t1.ref_contract_id and hb.bp_id=ct.bp_id_tenant) like ${@bp_id_telnet_n}"/>
         <bm:query-field name="contract_number" queryExpression="(SELECT cc.contract_number FROM con_contract cc WHERE cc.contract_id = t1.ref_contract_id) like  &apos;%&apos;||${@contract_number}||&apos;%&apos;"/>
-        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like ${@bp_name_n} "/>
+        <bm:query-field name="bp_name_n" queryExpression="(select d.bp_name from hls_bp_master_v d where d.bp_id=t1.bp_id) like &apos;%&apos;||${@bp_name_n}||&apos;%&apos; "/>
         <bm:query-field name="deposit_trans_type" queryExpression="t1.deposit_trans_type=${@deposit_trans_type}"/>
     </bm:query-fields>
 </bm:model>

src/main/webapp/WEB-INF/classes/zjwfl/WFL2110/zj_wfl_workflow_deliver_query.lwm

@@ -48,6 +48,7 @@
         <bm:ref-field name="employee_name" prompt="WFL_WORKFLOW_DELIVER.DELIVER_TO" relationname="e" sourcefield="name"/>
     </bm:ref-fields>
     <bm:data-filters>
-        <bm:data-filter name="query" expression="(exists (select 1 from sys_user su where su.user_id= ${/session/@user_id} and (su.user_name  in('HAND','HL_ADMIN') or   (su.user_name not in('HAND','HL_ADMIN') and su.user_id=t.recipient_id) )))"/>
+<!--        <bm:data-filter name="query" expression="(exists (select 1 from sys_user su where su.user_id= ${/session/@user_id} and (su.user_name  in('HAND','HL_ADMIN') or   (su.user_name not in('HAND','HL_ADMIN') and su.user_id=t.recipient_id) )))"/>-->
+        <bm:data-filter name="query" expression="(exists (select 1 from sys_role sr where sr.role_id= ${/session/@role_id} and (sr.role_code  in('0017','HAND') or   (sr.role_code not  in('0017','HAND') and ${/session/@user_id}=t.recipient_id) )))"/>
     </bm:data-filters>
 </bm:model>

src/main/webapp/WEB-INF/classes/zjwfl/zj_wfl_users_v_lov.lwm

@@ -13,6 +13,7 @@
         <ns1:field name="employee_name" databaseType="VARCHAR2" datatype="java.lang.String" forDisplay="true" forQuery="true" prompt="用户姓名"/>
         <ns1:field name="email" forDisplay="true" prompt="邮箱"/>
         <ns1:field name="mobil" forDisplay="true" prompt="号码"/>
+        <ns1:field name="role_admin_amount" expression="(select count(1) from SYS_USER_ROLE_GROUPS_VL t where t.enabled_flag = &apos;Y&apos; and t.role_code in (&apos;0017&apos;,&apos;HAND&apos;) and t.user_id = t1.user_id and t.role_id = ${/session/@role_id})"/>
     </ns1:fields>
     <ns1:query-fields>
         <ns1:query-field field="user_name" queryOperator="like"/>

src/main/webapp/modules/cont/CON733/hls_con_contract_et_create_entrance.lview

@@ -108,7 +108,8 @@
                     Leaf.showErrorMessage('${l:PROMPT}', '售后回租无法操作此项变更!');
                     return;
                 }
-                if(record.get('division') == '70' &&(ccr_document_type == 'LEASE_CHAG' ||ccr_document_type == 'CUT_CHAG')){
+                if(record.get('division') == '70' && ccr_document_type == 'LEASE_CHAG'){
+                //if(record.get('division') == '70' &&(ccr_document_type == 'LEASE_CHAG' ||ccr_document_type == 'CUT_CHAG')){
                     Leaf.showErrorMessage('${l:PROMPT}', '铁甲业务无法操作此项变更!');
                     return;
                 }

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

@@ -83,6 +83,7 @@
             }
         };
 
+        var clc_flag = 'N';
         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');
@@ -150,6 +151,7 @@
                             residual_value: record.get('ccr_residual_value')  //update by xsh35973 20220613
                         },
                         success: function (res) {
+                            clc_flag = 'Y';
                             //record.set('et_fee', res.result.et_fee);
                             var deposit_deduct =record.get('deposit_deduct')||0;
                             record.set('et_total_amount', minus(res.result.et_total_amount,deposit_deduct));
@@ -163,6 +165,7 @@
                             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);
+                            clc_flag = 'N';
                         },
                         failure: function () {
                             record.set('termination_date', '');
@@ -194,7 +197,7 @@
                     });
                 }
                 //add by xsh35973 添加修改调整后资源占用费提前结清租金跟随变动
-                if(name == 'fund_possession_cost'){
+                if(name == 'fund_possession_cost' && clc_flag =='N'){
                     if (value < 0 || value == NaN || value == undefined) {
                         Leaf.showMessage('${l:HLS.PROMPT}', '调整后的资金占用费金额应大于等于0！');
                         setTimeout(function () {
@@ -208,7 +211,7 @@
                         record.set('et_due_amount', et_due_amount_result);
                     }
                 }
-                if(name == 'residual_value'){
+                if(name == 'residual_value' && clc_flag =='N'){
                     if (value < 0 || value == NaN || value == undefined) {
                         Leaf.showMessage('${l:HLS.PROMPT}', '调整后的留购金金额应大于等于0！');
                         setTimeout(function () {
@@ -219,7 +222,7 @@
                     var et_total_amount_result=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), record.get('ccr_penalty'));
                     record.set('et_total_amount',et_total_amount_result);
                 }
-                if(name == 'et_due_amount'){
+                if(name == 'et_due_amount' && clc_flag =='N'){
                     if (value < 0 || value == NaN || value == undefined) {
                         Leaf.showMessage('${l:HLS.PROMPT}', '调整后的提前结清租金金额应大于等于0！');
                         setTimeout(function () {

src/main/webapp/modules/csh/CSH501/csh_payment_req.lview

@@ -66,7 +66,6 @@
         }
         //如果头id 不为空，就使用自在定义的ds进行查询
         Leaf.onReady(function () {
-            debugger;
             if ('${/parameter/@source_type}' == 'WFL') {
                 document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
             }
@@ -150,7 +149,6 @@
         };
 
         window['${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
-            debugger;
             var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
             var hd_ds, lineRecords, currency_code;
@@ -174,13 +172,21 @@
                     }
                 }
             }
+            var lnds_records = $(ds_id).getAll();
+            if (ds.id == ds_id) {
+                for (var i = 0; i < lnds_records.length; i++) {
+                    if (lnds_records[i].get('division') == '70') {
+                        lnds_records[i].getField('tenant_bank_account_number').setRequired(false);
+                        lnds_records[i].getField('tenant_bank_account_number_n').setRequired(false);
+                    }
+                }
+            }
             window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
         };
 
         var first_load_flag = 'N';
 
         function on_csh_payment_req_temp_ln_ds_load(ds) {
-            debugger;
             var lnds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
             var records = ds.getAll();
             if (!'${/parameter/@payment_req_id}' && lnds_id && '${/parameter/@business_type}' == 'PAYMENT') {
@@ -199,6 +205,12 @@
                         ln_record.getField('tenant_bank_account_number_n').setRequired(false);
                         ln_record.getField('tenant_bank_account_name').setRequired(false);
                     }
+                    var ln_record = $(lnds_id).getCurrentRecord();
+                    if (ln_record.get('division') == '70'){
+                        ln_record.getField('tenant_bank_account_number').setRequired(false);
+                        ln_record.getField('tenant_bank_account_number_n').setRequired(false);
+                    }
+
                 }
             }
             window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
@@ -276,7 +288,6 @@
         //保存前调用
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_before_submit'] = function (ds, record) {
             window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
-            debugger;
             var check_flag = false;
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
             var ds_line_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
@@ -448,7 +459,6 @@
         };
         //保存submitsuccess调用
         window['${/parameter/@layout_code}_on_layout_dynamic_submitsuccess'] = function (ds, record, res, bp_seq) {
-            debugger;
             window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
             dirty_flag = 'N';
             var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');

src/main/webapp/modules/csh/CSH510/csh_transaction_hand_receipt_update.lview

@@ -128,7 +128,7 @@
 
         function onUpdate_csh511_receipt(ds, record, name, value, oldvalue) {
             if (name == 'bp_id') {
-                if (value != oldvalue) {
+                if (value != oldvalue && '${/parameter/@import_source}' != 'HSBC_ADD'&&'${/parameter/@import_source}' != 'EXCEL_ADD') {
                     record.set('bp_bank_account_id', '');
                     record.set('bp_bank_account_code', '');
                     record.set('bp_bank_account_name', '');
@@ -839,5 +839,20 @@
 
 
         </a:screenBody>
+        <script type="text/javascript"><![CDATA[
+        Leaf.onReady(init);
+
+        function init() {
+            if('${/parameter/@import_source}' == 'HSBC_ADD'||'${/parameter/@import_source}' == 'EXCEL_ADD' ){
+                var record = $('csh_transaction_receipt_head_ds').getAt(0);
+                record.getField('transaction_date').setReadOnly(true);
+                record.getField('transaction_amount').setReadOnly(true);
+                record.getField('bank_slip_num').setReadOnly(true);
+                record.getField('ref_v05').setReadOnly(true);
+                record.getField('bank_account_name').setReadOnly(true);
+                record.getField('bp_bank_account_name').setReadOnly(true);
+            }
+        }
+        ]]></script>
     </a:view>
 </a:screen>

src/main/webapp/modules/csh/CSH510/csh_transaction_receipt_maintain.lview

@@ -253,7 +253,7 @@
                     return value;
                 }*/
                 if(record.get('confirmed_flag')=='NEW' || record.get('confirmed_flag') == 'CT_REJECTED'){
-                    url = $('csh_transaction_receipt_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=true';
+                    url = $('csh_transaction_receipt_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=true'+'&import_source='+ record.get('import_source');
                 }else{
                     url = $('csh_transaction_receipt_maintain_readonly_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=false';
                 }

src/main/webapp/modules/hsbc/HSBC100/hsbc_paying_batch_create.lview

@@ -10,7 +10,45 @@
     <a:view>
         <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
         <a:link id="pageLink_choose_acount" url="${/request/@context_path}/modules/hsbc/HSBC100/csh_bank_account_choose.lview"/>
+        <a:link id="${/parameter/@layout_code}con_contract_query_link" url="${/request/@context_path}/modules/cont/CON3200/con_re_incept_modify.lview"/>
+        <a:link id="transaction_return_downloadFile_link_id" url="${/request/@context_path}/downloadFile.lview"/>
+        <script src="${/request/@context_path}/javascripts/calculate.js"/>
         <script type="text/javascript"><![CDATA[
+
+        function open_contract_win(ds_id, record_id) {
+            var record = $(ds_id).findById(record_id);
+            var param = record.data;
+            param['function_usage'] = 'QUERY';
+            param['function_code'] = 'CON3200Q';
+            param['maintain_type'] = 'QUERY';
+            param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
+
+            hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, '${/parameter/@layout_code}con_contract_query_link', ds_id);
+        }
+
+        function open_return_win(ds_id, record_id) {
+            var record = $(ds_id).findById(record_id);
+            var header_id = record.data.return_id;
+            var url = $('transaction_return_downloadFile_link_id').getUrl() + '?table_name=CSH_TRANSACTION_RETURN&_csrf=${/session/@_csrf.token}&header_id=' + header_id;
+            var win = new Leaf.Window({
+                url: url,
+                title: '${l:HLS.SUPPORTING_DOCUMENT}',
+                id: 'transaction_return_uploadFile_id',
+                width: 850,
+                height: 400
+            });
+        }
+
+        window['${/parameter/@layout_code}_dynamic_link_renderer'] = function(value, record, name, config_record) {
+            if (name == 'contract_number' && value) {
+                return '<a href="javascript:open_contract_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
+            }
+            if (name == 'attachment_r') {
+                return '<a href="javascript:open_return_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + '附件' + '</a>';
+            }
+            return value;
+        };
+
         //创建代付单
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
             var req_ln_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
@@ -118,7 +156,61 @@
             });
         };
 
-]]></script>
+        window['${/parameter/@layout_code}_on_layout_dynamic_grid_select'] = function(ds, record, bp_seq) {
+            var form_ds_id = '${/parameter/@layout_code}_F_QUERY__ds';
+            var formr_r_ds_id = '${/parameter/@layout_code}_R_F_QUERY__ds';
+            var req_ln_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
+            var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
+            var form_record = $(form_ds_id).getAt(0);
+            var form_r_record = $(formr_r_ds_id).getAt(0);
+            var req_records = $(req_ln_ds_id).getSelected();
+            var con_records = $(con_ds_id).getSelected();
+
+            if (req_ln_ds_id == ds.id) {
+                var sum = 0;
+                for (var i = 0;i < req_records.length;i++) {
+                    sum = plus(sum, req_records[i].get('unpaid_amount'));
+                }
+                form_record.set('total_unpaid_amount', sum);
+            }
+
+            if (con_ds_id == ds.id) {
+                var sum = 0;
+                for (var i = 0;i < con_records.length;i++) {
+                    sum = plus(sum, con_records[i].get('this_return_amount'));
+                }
+                form_r_record.set('total_unpaid_amount', sum);
+            }
+        };
+
+        window['${/parameter/@layout_code}_on_layout_dynamic_grid_unselect'] = function(ds, record, bp_seq) {
+            var form_ds_id = '${/parameter/@layout_code}_F_QUERY__ds';
+            var formr_r_ds_id = '${/parameter/@layout_code}_R_F_QUERY__ds';
+            var req_ln_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
+            var con_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
+            var form_record = $(form_ds_id).getAt(0);
+            var form_r_record = $(formr_r_ds_id).getAt(0);
+            var req_records = $(req_ln_ds_id).getSelected();
+            var con_records = $(con_ds_id).getSelected();
+
+            if (req_ln_ds_id == ds.id) {
+                var sum = 0;
+                for (var i = 0;i < req_records.length;i++) {
+                    sum = plus(sum, req_records[i].get('unpaid_amount'));
+                }
+                form_record.set('total_unpaid_amount', sum);
+            }
+
+            if (con_ds_id == ds.id) {
+                var sum = 0;
+                for (var i = 0;i < con_records.length;i++) {
+                    sum = plus(sum, con_records[i].get('this_return_amount'));
+                }
+                form_r_record.set('total_unpaid_amount', sum);
+            }
+        };
+
+        ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>
 </a:screen>
\ No newline at end of file

src/main/webapp/modules/hsbc/HSBC110/hsbc_paying_batch_detail.lview

@@ -9,10 +9,12 @@
     <a:init-procedure/>
     <a:view>
         <a:link id="prj_project_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
-        <a:link id="prj_project_query_link" url="${/request/@context_path}/modules/prj/PRJ501DF/prj_project_maintain.screen"/>
-        <a:link id="${/parameter/@layout_code}_df_csh_payment_apply_link" url="${/request/@context_path}/modules/csh/CSH770/df_csh_payment_apply_wfl.screen"/>
+        <!--<a:link id="prj_project_query_link" url="${/request/@context_path}/modules/prj/PRJ501DF/prj_project_maintain.screen"/>
+        <a:link id="${/parameter/@layout_code}_df_csh_payment_apply_link" url="${/request/@context_path}/modules/csh/CSH770/df_csh_payment_apply_wfl.screen"/>-->
+        <a:link id="${/parameter/@layout_code}con_contract_query_link" url="${/request/@context_path}/modules/cont/CON3200/con_re_incept_modify.lview"/>
+        <a:link id="transaction_return_downloadFile_link_id" url="${/request/@context_path}/downloadFile.lview"/>
         <script><![CDATA[
-        function open_project_win(ds_id, record_id) {
+        /*function open_project_win(ds_id, record_id) {
             var record = $(ds_id).findById(record_id);
             var param = {};
             param['project_id'] = record.get('contract_id');
@@ -35,16 +37,50 @@
             param['url_title'] = '付款明细';
             param['winid'] = 'payment_req_number_link';
             hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, '${/parameter/@layout_code}_df_csh_payment_apply_link', ds_id,'${/parameter/@layout_code}');
-        };
+        };*/
+
+        function open_contract_win(ds_id, record_id) {
+            var record = $(ds_id).findById(record_id);
+            var param = record.data;
+            param['function_usage'] = 'QUERY';
+            param['function_code'] = 'CON3200Q';
+            param['maintain_type'] = 'QUERY';
+            param['url_title'] = '${l:CON301.CONTRACT_DETAIL}';
+
+            hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, '${/parameter/@layout_code}con_contract_query_link', ds_id,'${/parameter/@layout_code}');
+        }
+
+        function open_return_win(ds_id, record_id) {
+            var record = $(ds_id).findById(record_id);
+            var header_id = record.data.source_id;
+            var url = $('transaction_return_downloadFile_link_id').getUrl() + '?table_name=CSH_TRANSACTION_RETURN&_csrf=${/session/@_csrf.token}&header_id=' + header_id;
+            var win = new Leaf.Window({
+                url: url,
+                title: '${l:HLS.SUPPORTING_DOCUMENT}',
+                id: 'transaction_return_uploadFile_id',
+                width: 850,
+                height: 400
+            });
+        }
 
         window['${/parameter/@layout_code}_dynamic_link_renderer'] = function(value, record, name, config_record) {
-            if (name == 'contract_number' && value && '${/parameter/@lease_channel}' == '01') {
-                return '<a href="javascript:open_project_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
+            if (name == 'contract_number' && value) {
+                return '<a href="javascript:open_contract_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + value + '</a>';
             }
-            if (name == 'payment_req_number' && value && '${/parameter/@lease_channel}' == '01') {
+            if (name == 'attachment_r' && record.get('source_table') == 'CSH_TRANSACTION_RETURN') {
+                return '<a href="javascript:open_return_win(\'' + record.ds.id + '\',\'' + record.id + '\')">' + '附件' + '</a>';
+            }
+            /*if (name == 'payment_req_number' && value && '${/parameter/@lease_channel}' == '01') {
                 link_function = '${/parameter/@layout_code}_payment_req_number_win';
                 return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.get('payment_req_id') + '\',\'' + record.ds.id + '\',\'' + '\');">' + value + '</a>';
             }
+            if (name == 'payment_req_number' && value && '${/parameter/@lease_channel}' == '01') {
+                return value;
+            }*/
+            if (name == 'payment_req_number' && value && '${/parameter/@lease_channel}' == '01') {
+                link_function = '${/parameter/@layout_code}_payment_req_number_win';
+                return value
+            }
             if (name == 'payment_req_number' && value && '${/parameter/@lease_channel}' == '01') {
                 return value;
             }

src/main/webapp/modules/hsbc/HSBC110/hsbc_paying_batch_modify.lview

@@ -233,6 +233,60 @@
             }
         });
 
+        window['${/parameter/@layout_code}_on_layout_dynamic_grid_select'] = function(ds, record, bp_seq) {
+            var form_ds_id = '${/parameter/@layout_code}_F_QUERY__ds';
+            var formr_r_ds_id = '${/parameter/@layout_code}_R_F_QUERY__ds';
+            var g_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_RESULT', 'hl_hsbc_paying_batch');
+            var r_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'R_RESULT', 'hl_hsbc_paying_batch');
+            var form_record = $(form_ds_id).getAt(0);
+            var form_r_record = $(formr_r_ds_id).getAt(0);
+            var g_records = $(g_ds_id).getSelected();
+            var r_records = $(r_ds_id).getSelected();
+
+            if (g_ds_id == ds.id) {
+                var sum = 0;
+                for (var i = 0;i < g_records.length;i++) {
+                    sum = plus(sum, g_records[i].get('totalamt'));
+                }
+                form_record.set('total_unpaid_amount', sum);
+            }
+
+            if (r_ds_id == ds.id) {
+                var sum = 0;
+                for (var i = 0;i < r_records.length;i++) {
+                    sum = plus(sum, r_records[i].get('totalamt'));
+                }
+                form_r_record.set('total_unpaid_amount', sum);
+            }
+        };
+
+        window['${/parameter/@layout_code}_on_layout_dynamic_grid_unselect'] = function(ds, record, bp_seq) {
+            var form_ds_id = '${/parameter/@layout_code}_F_QUERY__ds';
+            var formr_r_ds_id = '${/parameter/@layout_code}_R_F_QUERY__ds';
+            var g_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_RESULT', 'hl_hsbc_paying_batch');
+            var r_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'R_RESULT', 'hl_hsbc_paying_batch');
+            var form_record = $(form_ds_id).getAt(0);
+            var form_r_record = $(formr_r_ds_id).getAt(0);
+            var g_records = $(g_ds_id).getSelected();
+            var r_records = $(r_ds_id).getSelected();
+
+            if (g_ds_id == ds.id) {
+                var sum = 0;
+                for (var i = 0;i < g_records.length;i++) {
+                    sum = plus(sum, g_records[i].get('totalamt'));
+                }
+                form_record.set('total_unpaid_amount', sum);
+            }
+
+            if (r_ds_id == ds.id) {
+                var sum = 0;
+                for (var i = 0;i < r_records.length;i++) {
+                    sum = plus(sum, r_records[i].get('totalamt'));
+                }
+                form_r_record.set('total_unpaid_amount', sum);
+            }
+        };
+
 
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>

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

@@ -14,7 +14,8 @@
         <script type="text/javascript"><![CDATA[
         Leaf.onReady(function () {
             var record = $('wfl_workflow_deliver_batch_create_ds').getAt(0);
-            if ('${/model/sys_user_employee_rp/record/@user_name}' != 'HAND' && '${/model/sys_user_employee_rp/record/@user_name}' != 'HL_ADMIN') {
+            //if ('${/model/sys_user_employee_rp/record/@user_name}' != 'HAND' && '${/model/sys_user_employee_rp/record/@user_name}' != 'HL_ADMIN') {
+            if ('${/model/sys_user_employee_rp/record/@role_admin_amount}' == '0' ) {
                 record.set('recipient_name', '${/model/sys_user_employee_rp/record/@employee_name}');
                 record.set('recipient_id', '${/model/sys_user_employee_rp/record/@user_id}');
                 record.getField('recipient_name').setReadOnly(true);