预收款跨月核销反冲改造

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

@@ -30,10 +30,9 @@
         <!-- <a:link id="csh510_csh_transaction_import_link" url="${/request/@context_path}/modules/csh/CSH510/csh_transaction_import.lview"/>-->
 
         <a:link id="csh510_csh_transaction_import_link" url="${/request/@context_path}/modules/csh/CSH510N/csh_transaction_import.lview"/>
-        <a:link id="csh_margin_check_id" url="${/request/@context_path}/modules/csh/CSH531F/csh_bank_recoi_margin_check.lview"/>
+		<a:link id="csh_margin_check_id" url="${/request/@context_path}/modules/csh/CSH531F/csh_bank_recoi_margin_check.lview"/>
         <a:link id="hls_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
-        <a:link id="agricultural_bank_link" url="${/request/@context_path}/modules/csh/CSH1400/csh_agricultural_bank_check.lview"/>
-
+		<a:link id="agricultural_bank_link" url="${/request/@context_path}/modules/csh/CSH1400/csh_agricultural_bank_check.lview"/>
         <script type="text/javascript"><![CDATA[
         Leaf.onReady(function(){
             //console.log($('csh_transaction_receipt_maintain_result_ds'));
@@ -257,7 +256,7 @@
                     return value;
                 }*/
                 if(record.get('confirmed_flag')=='NEW' || record.get('confirmed_flag') == 'CT_REJECTED' || record.get('confirmed_flag')=='ACCAUDITED_RECOI'){
-                    url = $('csh_transaction_receipt_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=true'+'&import_source='+ record.get('import_source');
+                    url = $('csh_transaction_receipt_maintain_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=true'+'&import_source='+ record.get('import_source')+'&extend_receipt_pre_flag='+ record.get('extend_receipt_pre_flag');
                 }else{
                     url = $('csh_transaction_receipt_maintain_readonly_link').getUrl() + '?transaction_id=' + record.get('transaction_id')+'&update_flag=false';
                 }
@@ -492,21 +491,22 @@
             $('csh_transaction_receipt_maintain_grid_ds')._export(null,'收款维护');
         }
 
-        function csh531_margin_check() {
+		  function csh531_margin_check() {
             var param={};
             param['function_code']= 'CSH531F3';
             param['function_usage'] = 'MODIFY';
-            param['url_title']='控制茂甲保证金校验';
+            //param['url_title']='控制茂甲保证金校验';
+			param['url_title']='控制二手机业务保证金校验';
             hls_doc_get_layout_code('hls_get_layout_code_link_id',param,'csh_margin_check_id');
         }
-        function agricultural_bank() {
+
+         function agricultural_bank() {
             new Leaf.Window({
                 id: 'agricultural_bank_wind',
                 params: {
                     winid:'agricultural_bank_wind',
                     sessionId: '${/session/@session_id}',
                     role_id: '${/session/@role_id}',
-
                 },
                 url:$('agricultural_bank_link').getUrl(),
                 title: '农行回单',
@@ -516,7 +516,7 @@
         }
 
         ]]></script>
-        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
+		<a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
         <a:dataSets>
             <a:dataSet id="confirmed_flag_ds">
                 <a:datas>
@@ -553,7 +553,16 @@
             <a:dataSet id="reversed_flag_ds">
                 <a:datas dataSource="/model/reversed_flag_rp"/>
             </a:dataSet>
-            <a:dataSet id="ds_collection_classes_ds" lookupCode="DS_COLLECTION_CLASSES"/>
+            <!--<a:dataSet id="ds_collection_classes_ds" lookupCode="DS_COLLECTION_CLASSES"/>-->
+			<a:dataSet id="ds_collection_classes_ds">
+                <a:datas>
+                    <a:record code_value="DEPOSIT" code_value_name="保证金类"/>
+                    <a:record code_value="NON_DEPOSIT" code_value_name="非保证金类"/>
+                    <a:record code_value="COMBINED" code_value_name="混合类"/>
+                    <a:record code_value="REFUND" code_value_name="日立为优质客户付租金"/>
+                   <a:record code_value="OPERAT_DEPOSIT" code_value_name="经营性租赁保证金类"/>
+            </a:datas>
+            </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"/>
@@ -741,7 +750,8 @@
                 <a:gridButton click="csh510_csh_trx_bank_apply_new" text="提交复核" id="csh510_csh_trx_bank_apply_new"/>
                 <!--                <a:gridButton click="csh510_csh_trx_bank_drop" text="CSH510.CSH_TRANSACTION.DROP_BTN" id="csh510_csh_trx_bank_drop"/>-->
                 <a:gridButton click="csh510_receipt_reset" text="HLS.RESET"/>
-                <a:gridButton id="csh531_margin_check_id" click="csh531_margin_check" text="茂甲保证金校验"/>
+                <!--<a:gridButton id="csh531_margin_check_id" click="csh531_margin_check" text="茂甲保证金校验"/>-->
+				<a:gridButton id="csh531_margin_check_id" click="csh531_margin_check" text="二手机业务保证金校验"/>
                 <a:gridButton id="Ocr_Bank_id" click="agricultural_bank" text="农行回单"/>
                 <!--  <a:gridButton click="csh510_csh_transaction_batch_update" text="批量过账"/>-->
                 <!-- <a:gridButton click="csh510_receipt" text="财务认领"/> -->