[feat] 完成付款申请书功能 [fix]修改收款申请bug

src/main/webapp/WEB-INF/classes/acr/acr_invoice_hd_v.lwm

@@ -204,8 +204,8 @@
         <bm:field name="tax_code" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="tax_code"/>
         <bm:field name="tax_msg" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="tax_msg"/>
 
-        <bm:field name="error_code" expression="(select aeih.error_code from acr_ele_invoice_hd aeih where aeih.invoice_hd_id = t1.invoice_hd_id)"/>
-        <bm:field name="error_message" expression="(select aeih.error_message from acr_ele_invoice_hd aeih where aeih.invoice_hd_id = t1.invoice_hd_id)"/>
+        <!--<bm:field name="error_code" expression="(select aeih.error_code from acr_ele_invoice_hd aeih where aeih.invoice_hd_id = t1.invoice_hd_id)"/>
+        <bm:field name="error_message" expression="(select aeih.error_message from acr_ele_invoice_hd aeih where aeih.invoice_hd_id = t1.invoice_hd_id)"/>-->
 
         <bm:field name="ele_invoice_status"
                   expression="nvl((select nvl(aeih.status, 'NEW') from acr_ele_invoice_hd aeih where aeih.invoice_hd_id = t1.invoice_hd_id),'NEW')"/>

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

@@ -9,11 +9,24 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-       select *
+            select rownum, v.*
   from (select c.contract_number,
                c.contract_name,
+               c.contract_id,
+               (select hli.pattern
+                  from con_contract_lease_item ccli, hls_lease_item hli
+                 where ccli.lease_item_id = hli.lease_item_id
+                   and ccli.contract_id = c.contract_id) pattern,
+               (select hli.machine_number
+                  from con_contract_lease_item ccli, hls_lease_item hli
+                 where ccli.lease_item_id = hli.lease_item_id
+                   and ccli.contract_id = c.contract_id) machine_number,
+               --add 添加预付款的时间
+               (select hbm.bp_name
+                  from hls_bp_master hbm
+                 where hbm.bp_id = c.bp_id_tenant) bp_id_tenant_n,
                hbm.bp_name,
-               cpr.apply_pay_date,
+               to_char(cpr.apply_pay_date,'yyyy-mm-dd') apply_pay_date,
                cpr.bp_bank_account_id,
                (select cph.payment_req_number
                   from csh_payment_req_hd cph
@@ -40,7 +53,6 @@
                   and c.source_doc_id = cpr.payment_req_id
                   and c.transaction_type = 'PAYMENT') bank_slip_num,*/
 
-
                (select bp_name
                   from hls_bp_master hbm
                  where hbm.bp_id = cpr.bp_id) BP_ID_AGENT_N,
@@ -48,6 +60,9 @@
                (select hbm.bank_account_num
                   from hls_bp_master_bank_account hbm
                  where hbm.bank_account_id = cpr.bp_bank_account_id) BP_BANK_ACCOUNT_NUM,
+               (select hbm.bank_account_num
+                  from hls_bp_master_bank_account hbm
+                 where hbm.bank_account_id = cpr.bp_bank_account_id) BP_BANK_ACCOUNT_NUM_N,
 
                (select hbm.bank_account_name
                   from hls_bp_master_bank_account hbm
@@ -63,17 +78,18 @@
                (select bp_name
                   from hls_bp_master hbm
                  where hbm.bp_id =
-                       (select ccli.vender_id
-                          from con_contract_lease_item ccli,
-                               hls_lease_item          hli
-                         where ccli.lease_item_id = hli.lease_item_id
-                           and ccli.contract_id = c.contract_id)) vender_name,
+                       (select bp_id
+                          from hls_bp_master_bank_account t
+                         where t.bank_account_id = cpr.vender_bank_account_id)) vender_name,
                (select hbm.bank_account_name
                   from hls_bp_master_bank_account hbm
                  where hbm.bank_account_id = cpr.vender_bank_account_id) VENDER_BANK_ACCOUNT_ID,
                (select hbm.bank_account_num
                   from hls_bp_master_bank_account hbm
                  where hbm.bank_account_id = cpr.vender_bank_account_id) VENDER_BANK_ACCOUNT_number,
+               (select hbm.bank_account_num
+                  from hls_bp_master_bank_account hbm
+                 where hbm.bank_account_id = cpr.vender_bank_account_id) vender_bank_account_number_n,
                cpr.amount,
                --首付款抵充金额
                (select nvl(hd.other_payment2, 0)

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

@@ -32,8 +32,8 @@ var override_queryfields = [
         name: 'lease_execution_date_to',
         queryexpression: "trunc(t1.lease_execution_date)<=to_date(${@lease_execution_date_to},'yyyy-mm-dd')"
     },
-    {custtelephone
-        name: 'total_amount_from',
+    {//custtelephone',
+        name : 'total_amount_from',
         queryexpression: "t1.total_amount>=${@total_amount_from}"
     },
     {

src/main/webapp/modules/acp/ACP517/acp_invoice_entrance.lview

@@ -103,6 +103,7 @@
                     flag = flag + 1;
                 }
             }
+            //一次只能对同一个合同进行确认
             if (flag > 0) {
                 Leaf.showErrorMessage('${l:PROMPT}', '请选择同一条合同');
                 return;

src/main/webapp/modules/acr/ACR515/acr_invoice_vat.lview

@@ -696,8 +696,8 @@
                 <a:screenTitle/>
                 <a:gridButton click="acr515_invoice_query" text="HLS.QUERY"/>
                 <a:gridButton click="acr515_invoice_reset" text="HLS.RESET"/>
-                <!--<a:gridButton click="acr515_invoice_post" text="开票"/>-->
-                <!--<a:gridButton click="acr515_invoice_import" text="导入开票结果"/>-->
+                <a:gridButton click="acr515_invoice_post" text="开票"/>
+                <a:gridButton click="acr515_invoice_import" text="导入开票结果"/>
                 <a:gridButton click="acr515_invoice_post_interface" text="传入电子金税接口"/>
                 <a:gridButton click="acr515_invoice_download_interface" text="下载电子发票"/>
                 <!-- <a:gridButton click="acr515_vat_pause" text="暂挂"/>

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

@@ -30,7 +30,7 @@
             var records = $(ds_id).getSelected();
             var param = {};
             var datas = [];
-            var win = Leaf.showConfirm('${l:HLS.PROMPT}', '${l:HLS.DELETE_CONFIRM}', function okFun() {
+            var win = Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认取消该笔申请？', function okFun() {
                 if (!records.length) {
                     Leaf.showMessage('提示', '请至少选择一条数据!');
                 } else {
@@ -79,7 +79,7 @@
             var records = $(ds_id).getSelected();
             var param = {};
             var datas = [];
-            var win = Leaf.showConfirm('${l:HLS.PROMPT}', '${l:HLS.DELETE_CONFIRM}', function okFun() {
+            var win = Leaf.showConfirm('${l:HLS.PROMPT}', '是否确认取消该笔申请？', function okFun() {
                 if (!records.length) {
                     Leaf.showMessage('提示', '请至少选择一条数据!');
                 } else {
@@ -126,7 +126,6 @@
                // //删除
                // window['${/parameter/@layout_code}_user_button2_layout_dynamic_click'] = function () {
                //     var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
-        //
                //     var records = $(ds_id).getSelected();
                //     var param = {};
                //     var datas = [];

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

@@ -25,6 +25,8 @@
         <a:model-query fetchAll="true" model="csh.CSH501.get_loan_flag" rootPath="loan_flag_path"/>
     </a:init-procedure>
     <a:view>
+        <a:link id="cont811_con_sale_contract_info_print_link"
+                url="${/request/@context_path}/modules/csh/CSH501/payment_req_apply_print.lview"/>
         <a:link id="csh_req_ddct_link"
                 url="${/request/@context_path}/modules/csh/CSH504/csh_payment_req_ln_ddct.lview"/>
         <a:link id="csh_payment_prepayment_dk"
@@ -70,9 +72,10 @@
         <a:link id="csh501_confirm_invoice_link_id"
                 url="${/request/@context_path}/modules/acp/ACP517/acp_invoice_entrance.lview"/>
         <a:link id="get_xml" model="cont.CON501.con_change_case_submit" modelaction="execute"/>
-        <a:link id="attachment_uploadFile_link" url="${/request/@context_path}/uploadFile.lview"/>
 
-        <a:link id="${/parameter/@layout_code}csh511_csh_payment_req_hd_query" model="csh.CSH511.csh_payment_req_hd" modelaction="query" />
+       <!-- 生成Excel文件-->
+        <a:link id="tre_loan_con_print_excel_link_id" url="${/request/@context_path}/modules/csh/CSH501/csh_payment_contract_export.lsc"/>
+
         <script type="text/javascript"><![CDATA[
         jQuery.noConflict();
         //如果头id 不为空，就使用自在定义的ds进行查询
@@ -254,7 +257,9 @@
                     var record = records[i];
 
                     if (!record.get('apply_pay_date')) {
-                        record.set('apply_pay_date', Leaf.formatDate(new Date()));
+                        //添加时间为预定的每月20号
+                       var pre_date= [new Date().getFullYear(),new Date().getMonth()+1,20].join('-');
+                        record.set('apply_pay_date',pre_date);
                     }
                     $(lnds_id).create(Ext.apply({}, record.data));
                 }
@@ -394,19 +399,28 @@
         //打印
 
         function csh501_print() {
+
             var hdds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_hd');
             var lnds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'csh_payment_req_ln');
             var records_l = $(lnds_id).getAll();
-
+            console.log(records_l);
             var hd_record = $(hdds_id).getCurrentRecord();
-            if (records_l.length > 0) {
-                // var birt_print_path = '${/parameter/@birt_print_path}';
-                var birt_print_path = '${/request/@context_path}/reports';
-                // var url_1 = 'http://199.10.10.65:8180/reportapp/frameset?__report=reports/req/new/' + 'con_payment_req.rptdesign' + '&&__format=PDF';
-                var url_1 = birt_print_path + '?__report=reports/req/new/' + 'con_payment_req.rptdesign' + '&&__format=PDF';
-                var url_1_param = '&&batch_id=' + ${/session/@session_id} +'&&payment_req_id=' + hd_record.get('payment_req_id');
-                window.open(url_1 + url_1_param);
-            }
+            //add by st
+            var url;
+           /* url = $('tre_loan_con_print_excel_link_id').getUrl() + '?payment_req_id=' +hd_record.get('payment_req_id');
+            window.open(href = url);*/
+           debugger
+                /*var sale_id = record[0].get('sale_id');
+                var sale_code = record[0].get('sale_code');*/
+                var template_name = 'payment_apply_content.xml';
+               // var template_name = '1.xml';
+                var file_name = '付款申请书.doc';
+                var url = $('cont811_con_sale_contract_info_print_link').getUrl() + '?template_name=' + template_name + '&payment_req_id=' + hd_record.get('payment_req_id') + '&file_name=' + encodeURI(file_name);
+                window.location.href = encodeURI(url);
+
+
+
+
         }
 
 
@@ -434,7 +448,10 @@
                 ln_records = ln_ds.getAll();
             if (ln_records.length > 0 && !ln_records[0].get('payment_req_ln_id')) {
                 Leaf.showMessage('${HLS.PROMPT}', '请先保存！');
-            } else {
+            }else{
+                csh501_print();
+            }
+            /*else {
 
                 Leaf.request({
                     url: '${/request/@context_path}/autocrud/csh.CSH504.csh_payment_print/execute',
@@ -457,7 +474,7 @@
                 }, Leaf.Masker.unmask(Ext.getBody()));
 
 
-            }
+            }*/
         };
 
         // //车辆信息
@@ -659,6 +676,7 @@
 
             bp_bank_account_code = line_record.get('bp_bank_account_code');
             bp_bank_account_num = line_record.get('bp_bank_account_num');
+            var vender_bank_account_num=line_record.get('vender_bank_account_number');
             bp_bank_account_name = line_record.get('bp_bank_account_name');
             bp_bank_account_code_n = line_record.get('bp_bank_account_code_n');
             bp_bank_account_id = line_record.get('bp_bank_account_id');
@@ -666,10 +684,8 @@
             line_record.set('loan_date',hd_record.get('loan_date'));
             line_record.set('hdds_id',hdds_id);
             line_record.set('lnds_id',lnds_id);
+            line_record.set('vender_bank_account_num',vender_bank_account_num);
             line_record.set('winid','csh_payment_req_pay_win');
-
-            var data=[];
-            data.push(line_record);
             var win = new Leaf.Window({
                 id: 'csh_payment_req_pay_win',
                 url: $('csh_payment_req_pay_win_link').getUrl(),
@@ -1250,6 +1266,7 @@
 
         };
         ]]></script>
+        <a:link id="${/parameter/@layout_code}csh511_csh_payment_req_hd_query" model="csh.CSH511.csh_payment_req_hd" modelaction="query" />
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
         <a:dataSets>
             <a:dataSet id="csh_payment_req_temp_ln_ds" autoQuery="true" fetchAll="true"

src/main/webapp/modules/csh/CSH502/csh_payment_req_query.lview

@@ -346,7 +346,7 @@
                <!-- <a:gridButton click="csh502_payment_doc_print_d" text="汇签单"/>-->
               <!--  <div style="margin-left:30px;margin-top:13px"><![CDATA[注：汇签单打印之后请重新点击查询按钮以获取最新数据后进行其它操作]]></div>-->
             </a:screenTopToolbar>
-            <a:form column="3" labelWidth="130" marginWidth="35" title="CSH502.CSH_PAYMENT_REQ_PAY">
+            <a:form column="4" labelWidth="130" marginWidth="35" title="CSH502.CSH_PAYMENT_REQ_PAY">
                 <a:textField name="payment_req_number" bindTarget="csh_payment_req_query_ds" prompt="申请单号"/>
                <!-- <a:textField name="bp_id_tenant_n" bindTarget="csh_payment_req_query_ds" prompt="商业伙伴名称"/>-->
 <!--                <a:datePicker name="approval_date_from" bindTarget="csh_payment_req_query_ds" prompt="CSH502.CSH_APR_DATE_FROM" width="150"/>-->
@@ -354,9 +354,11 @@
                 <a:textField name="contract_number" bindTarget="csh_payment_req_query_ds" prompt="合同编号"/>
                 <a:datePicker name="req_date_from" bindTarget="csh_payment_req_query_ds" prompt="CSH502.CSH_REQ_DATE_FROM" width="150"/>
                 <a:datePicker name="req_date_to" bindTarget="csh_payment_req_query_ds" prompt="CSH502.CSH_REQ_DATE_TO" width="150"/>
+                <a:textField name="amount_from" bindTarget="csh_payment_req_query_ds" prompt="应付金额从"/>
+                <a:textField name="amount_to" bindTarget="csh_payment_req_query_ds" prompt="应付金额到"/>
                 <!-- <a:lov name="user_name" bindTarget="csh_payment_req_query_ds" prompt="提交人帐号" width="150"/> -->
                 <!-- <a:textField name="employee_name" bindTarget="csh_payment_req_query_ds" prompt="提交人姓名" readOnly="true" width="150"/> -->
-                <a:textField name="user_name" bindTarget="csh_payment_req_query_ds" prompt="申请人" width="150"/>
+<!--                <a:textField name="user_name" bindTarget="csh_payment_req_query_ds" prompt="申请人" width="150"/>-->
 <!--                <a:comboBox name="print_flag_des" bindTarget="csh_payment_req_query_ds" prompt="汇签单" width="150"/>-->
                 <!-- <a:comboBox name="approval_status_desc" bindTarget="csh_payment_req_query_ds" prompt="CSH502.CSH_APR_STATE" width="150"/> -->
                 <!-- <a:textField name="submitted_flag" bindTarget="csh_payment_req_query_ds" prompt="CSH502.CSH_SUBMIT_STATE" width="150"/> -->

src/main/webapp/modules/csh/CSH503/csh_payment_reverse.lview

@@ -219,7 +219,7 @@
                 <a:gridButton click="csh503_payment_reset" text="HLS.RESET"/>
                 <a:gridButton click="csh503_payment_reverse" text="HLS.REVERSE"/>
             </a:screenTopToolbar>
-            <a:form column="4" labelWidth="100" title="CSH502.CSH_PAYMENT_REVERSE_QUERY">
+            <a:form column="4" labelWidth="100" title="CSH502.CSH_PAYMENT_REVERSE_QUERY" width="1310">
                 <!-- <a:textField name="payment_req_number_from" bindTarget="csh_payment_reverse_query_ds" prompt="申请单号从" width="150"/>
                 <a:textField name="payment_req_number_to" bindTarget="csh_payment_reverse_query_ds" prompt="申请单号到" width="150"/> -->
                 <a:textField name="transaction_num_from" bindTarget="csh_payment_reverse_query_ds" prompt="CSH502.CSH_TRANSACTION.TRANSACTION_NUM_FROM" width="150"/>

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

@@ -86,7 +86,7 @@
             })
 
         }
-        //新增申请按钮’
+        //新增申请按钮
         function csh510_csh_trx_bank_apply_new() {
             $('csh510_csh_trx_bank_apply_new').disable();
             var datas = $('csh_transaction_receipt_maintain_result_ds').selected;
@@ -103,11 +103,13 @@
                 var bp_name=datas[i].get('bp_name');
                 if(bp_name==''||bp_name==undefined){
                     $L.showInfoMessage("提示", '商业伙伴为空，不能提交', null, null);
+                    $('csh510_csh_trx_bank_apply_new').enable();
                     return;
                 }
                 //不是新增就报错
                 if (confirmed_flag != 'NEW' && confirmed_flag != undefined) {
                     $L.showInfoMessage("提示", '请选择单据为未提交的数据', null, null);
+                    $('csh510_csh_trx_bank_apply_new').enable();
                     return;
                 }
 
@@ -144,6 +146,8 @@
                            },
                            scope: this
                        });
+                   },function(){
+                       $('csh510_csh_trx_bank_apply_new').enable();
                    });
                }