[feat] 开发收款退款功能

src/main/database/Init/INITIALIZE_SYS_FUNCTION_DYNAMIC.sql

@@ -18,4 +18,28 @@ VALUES
    LAST_UPDATE_DATE,
    LAST_UPDATED_BY)
 VALUES
-  ('CON_ET002', '提前结清申请明细', 1, SYSDATE, -1, SYSDATE, -1);
\ No newline at end of file
+  ('CON_ET002', '提前结清申请明细', 1, SYSDATE, -1, SYSDATE, -1);
+
+
+INSERT INTO sys_function_dynamic
+  (function_code,
+   function_name,
+   sequence,
+   creation_date,
+   created_by,
+   last_update_date,
+   last_updated_by)
+VALUES
+  ('HLS36103', '授信详细', 1, SYSDATE, -1, SYSDATE, -1);
+
+INSERT INTO sys_function_dynamic
+  (function_code,
+   function_name,
+   sequence,
+   creation_date,
+   created_by,
+   last_update_date,
+   last_updated_by)
+VALUES
+  ('HLS36101', '授信详细', 1, SYSDATE, -1, SYSDATE, -1);
+end;
\ No newline at end of file

src/main/database/Init/Sys_prompt/CSH_TRANSACTION_PROMPT.sql

@@ -6,7 +6,10 @@ spool CSH_TRANSACTION_PROMPT.log
 set feedback off
 set define off
 begin
-
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.RETURNED_AMOUNT',
+                                  p_language => 'ZHS',
+                                  p_description => '已退款金额',
+                                  p_created_by => 1);
 sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.TRANSACTION_AMOUNT_FROM',
                                   p_language => 'ZHS',
                                   p_description => '收款金额从',
@@ -135,6 +138,43 @@ sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH510.CSH_TRANSACTION.ACCT_CO
                                   p_language => 'ZHS',
                                   p_description => '会计确认人',
                                   p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH509.CSH_RECEIPT_CONFIRM.NEW_APPLY_BTN',
+                                  p_language => 'ZHS',
+                                  p_description => '新增确认',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH509.CSH_RECEIPT_CONFIRM.REFUSE_BTN',
+                                  p_language => 'ZHS',
+                                  p_description => '新增驳回',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH509.CSH_RECEIPT_CONFIRM.DROP_BTN',
+                                  p_language => 'ZHS',
+                                  p_description => '作废',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH509.CSH_RECEIPT_CONFIRM.QUERY_BTN',
+                                  p_language => 'ZHS',
+                                  p_description => '查询',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.MANUAL_ADD',
+                                  p_language => 'ZHS',
+                                  p_description => '收款手动新增',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.CLASS_DESC',
+                                  p_language => 'ZHS',
+                                  p_description => '款项分类',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.STATEMENT',
+                                  p_language => 'ZHS',
+                                  p_description => '备注',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.BANK_INFO',
+                                  p_language => 'ZHS',
+                                  p_description => '账户信息',
+                                  p_created_by => 1);
+sys_prompt_pkg.sys_prompts_load(p_prompt_code => 'CSH511.CSH_TRANSACTION.ATTACHMENT',
+                                  p_language => 'ZHS',
+                                  p_description => '附件',
+                                  p_created_by => 1);
+
 end;
 /
 commit;

src/main/database/Register_function/REGISTER_HLS361N_credit_entrance_detail.sql

@@ -10,18 +10,7 @@ begin
 --页面注册
 sys_function_assign_pkg.service_load('modules/hls/HLS361N/hls_bp_master_credit.lview','授信管理',1,1,0);
 
---创建动态页面的虚拟功能号
-INSERT INTO sys_function_dynamic
-  (function_code,
-   function_name,
-   sequence,
-   creation_date,
-   created_by,
-   last_update_date,
-   last_updated_by)
-VALUES
-  ('HLS36101', '授信详细', 1, SYSDATE, -1, SYSDATE, -1);
-end;
+
 
 /
 commit;

src/main/database/Register_function/REGISTER_HLS362N_credit_entrance_confirm_detail.sql

@@ -17,18 +17,6 @@ end;
 
 
 
---创建动态页面的虚拟功能号
-INSERT INTO sys_function_dynamic
-  (function_code,
-   function_name,
-   sequence,
-   creation_date,
-   created_by,
-   last_update_date,
-   last_updated_by)
-VALUES
-  ('HLS36103', '授信详细', 1, SYSDATE, -1, SYSDATE, -1);
-
 /
 commit;
 

src/main/webapp/WEB-INF/classes/csh/CSH510/csh_transaction_for_lov.lwm

@@ -41,6 +41,6 @@
     </bm:query-fields>
     <bm:data-filters>
         <bm:data-filter name="query" expression="(t1.company_id=${/session/@company_id})"/>
-        <bm:data-filter name="query" expression="(t1.posted_flag in (&apos;N&apos;))"/>
+     <!--   <bm:data-filter name="query" expression="(t1.posted_flag in (&apos;N&apos;))"/>-->
     </bm:data-filters>
 </bm:model>

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

@@ -26,6 +26,7 @@
 
         //附件上传
         function upload_attachment_win() {
+            var record=$('csh_transaction_receipt_head_ds').getAt(0);
            /* var record = $(ds_id).findById(record_id);
             var mortgage_id = record.get('mortgage_id');*/
             var win = new Leaf.Window({
@@ -33,11 +34,11 @@
                 url: $('hn2050_upload_win_link').getUrl(),
                 params: {
                     winid: 'hn2050_upload_win',
-                    table_name: 'hn_virtual_con_mortgage',
-                    header_id: 1000
+                    table_name: 'csh_transaction',
+                    header_id: record.get('transaction_id')
                 },
                 width: 900,
-                hight: 400
+                height: 400
             }).on('close', function() {
                 //record.ds.query();
             });

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

@@ -26,6 +26,8 @@
 
         //附件上传
         function upload_attachment_win() {
+            var record=$('csh_transaction_receipt_head_ds').getAt(0);
+
            /* var record = $(ds_id).findById(record_id);
             var mortgage_id = record.get('mortgage_id');*/
             var win = new Leaf.Window({
@@ -33,11 +35,11 @@
                 url: $('hn2050_upload_win_link').getUrl(),
                 params: {
                     winid: 'hn2050_upload_win',
-                    table_name: 'hn_virtual_con_mortgage',
-                    header_id: 1000
+                    table_name: 'csh_transaction',
+                    header_id: record.get('transaction_id')
                 },
                 width: 900,
-                hight: 400
+                height: 400
             }).on('close', function() {
                 //record.ds.query();
             });

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

@@ -728,7 +728,7 @@
                         <a:column name="description"   prompt="CSH510.CSH_TRANSACTION.DESCRIPTION" align="center"/>
                         <a:column name="confirmed_flag_desc"   prompt="CSH510.CSH_TRANSACTION.BILL_STATUS" align="center"/>
                         <a:column name="written_off_flag_desc"   prompt="CSH510.CSH_TRANSACTION.WRITTEN_OFF_STATUS" align="center"/>
-                        <a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT" >
+                        <a:column prompt="CSH510.CSH_TRANSACTION.MY_ACCOUNT">
                         <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"/>

src/main/webapp/modules/csh/CSH515/csh_amount_return.lview

@@ -15,20 +15,26 @@
         <a:link id="${/parameter/@layout_code}_csh560_cdd_uploadFile_id" url="${/request/@context_path}/uploadFile.lview"/>
         <a:link id="transaction_return_uploadFile_link_id" url="${/request/@context_path}/uploadFile.lview"/>
         <script type="text/javascript"><![CDATA[
+        Leaf.onReady(function(){
+           // console.log('${/parameter}');
+        })
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
 
-            var transaction_amount = ${/parameter/@transaction_amount}||0;
+         /*   var transaction_amount = ${/parameter/@transaction_amount}||0;
             var return_amount = ${/parameter/@returned_amount}||0;
             var write_off_amount = ${/parameter/@write_off_amount}||0;
             var remain_total_amount = ${/parameter/@remain_total_amount}||0;
-            var bank_slip_num = '${/parameter/@bank_slip_num}';
+            var bank_slip_num = '${/parameter/@bank_slip_num}';*/
 
             record.set('remain_total_amount',remain_total_amount);
             record.set('bank_slip_num',bank_slip_num);
         };
+        //提交按钮
     window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
         var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_transaction_return');
+        console.log($(ds_id).getAt(0));
         var return_id = $(ds_id).getAt(0).get('return_id');
+
         var transaction_amount = $(ds_id).getAt(0).get('transaction_amount');
         var this_return_amount = $(ds_id).getAt(0).get('this_return_amount');
         var return_amount = $(ds_id).getAt(0).get('return_amount');
@@ -43,7 +49,7 @@
             Leaf.showMessage('提示', '退款金额不能大于可退款金额！');
             return;
         }
-        var fin_amount = '${/model/fin_amount_check/record/@fin_amount}';
+      /*  var fin_amount = '${/model/fin_amount_check/record/@fin_amount}';*/
 		// if(check_amount < 0.1 * fin_amount){
 		    // Leaf.showMessage('提示','退还后保证金不足融资余额10%！');
 		    // return;

src/main/webapp/modules/csh/CSH515/csh_transaction_returned_list.lview

@@ -75,7 +75,7 @@
                 <a:columns>
                     <a:column name="transaction_num" prompt="退款编号" renderer="returned_list_transaction" width="120"/>
                     <a:column name="transaction_date" prompt="退款日期" renderer="Leaf.formatDate"/>
-                    <a:column name="currency_name" prompt="HLS.CURRENCY"/>
+              <!--      <a:column name="currency_name" prompt="HLS.CURRENCY"/>-->
                     <a:column name="transaction_amount" prompt="退款金额" renderer="Leaf.formatMoney"/>
                     <!-- <a:column name="posted_flag" prompt="HLS.POST"/> -->
                     <a:column name="bank_account_code" prompt="退款账户"/>

src/main/webapp/modules/hls/HLS361N/hls_bp_master_credit.lview

@@ -66,7 +66,7 @@ $Purpose: 商业伙伴授信维护
             //设置为可以修改
             //datas[0].getField('credit_total_amount').setReadOnly(false);
         }
-        //1.	营业内勤/营业担当勾选授信状态为“启用”或“审批冻结
+        //1.	营业内勤/营业担当勾选授信状态为“启用”或“停用
         window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function() {
            //授信额度变更
             var credit_ds=get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master_credit_hd');
@@ -77,8 +77,8 @@ $Purpose: 商业伙伴授信维护
             }
             //启用和审批冻结判断
             var credit_status=datas[0].data.credit_status;
-            if(credit_status!='ENABLE'&&credit_status!='FREZZING'){
-                $L.showInfoMessage("提示",'请选择状态为启用和审批冻结的数据！',null,null)
+            if(credit_status!='ENABLE'&&credit_status!='DISABLE'){
+                $L.showInfoMessage("提示",'请选择状态为启用和停用的数据！',null,null)
                 return;
             }
             //角色判断 00215 营业内勤