Merge branch 'refs/heads/feature/fix_bug' into develop

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

@@ -9,12 +9,13 @@
     <bm:operations>
         <bm:operation name="query">
             <bm:query-sql><![CDATA[
-          select *
+
+select *
   from (       select count(*) total_number,
-               sum(nvl(c.lease_item_amount, 0)) sum_amount,
-               sum(nvl(v.amount_agent, 0)) sum_amount_agent,
-               sum(nvl(v.amount_vender, 0)) sum_amount_vender,
-               sum(nvl(v.other_payment2, 0)) sum_other_payment,
+               TRIM(to_char(sum(nvl(c.lease_item_amount, 0)),'999,999,999,999.99')) sum_amount,
+               TRIM(to_char(sum(nvl(v.amount_agent, 0)),'999,999,999,999.99')) sum_amount_agent,
+               TRIM(to_char(sum(nvl(v.amount_vender, 0)),'999,999,999,999.99')) sum_amount_vender,
+                TRIM(to_char(sum(nvl(v.other_payment2, 0)),'999,999,999,999.99')) sum_other_payment,
                to_char(sysdate, 'yyyy') || '年' || to_char(sysdate, 'mm') || '月' purchase_date
           from csh_payment_req_ln v,con_contract c
           WHERE v.ref_doc_id=c.contract_id

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

@@ -415,10 +415,7 @@
                // 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);
-
-
-
+                window.location.href =url;
 
         }