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

src/main/webapp/WEB-INF/classes/cont/CON505/contract_approval.lwm

@@ -18,6 +18,7 @@
             ]]></bm:update-sql>
         </bm:operation>
         <bm:operation name="execute">
+
             <bm:update-sql><![CDATA[
                 begin
                     con_contract_workflow_pkg.contract_incept_submit(

src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_database_query.lwm

@@ -897,16 +897,70 @@ select          '合计' tax_month,
        sum(amount_tax) amount_tax,
        null times,
        null due_date,
-                sum(due_amount) due_amount,
-                 sum(principal) principal,
+       sum(decode((select cc.business_type
+                from con_contract_cashflow ca, con_contract cc
+               where ca.cashflow_id = t.cashflow_id
+                 and ca.contract_id = cc.contract_id),
+              'LEASEBACK',
+              due_amount -nvl(t.principal,0),
+              t.due_amount)) due_amount,
+       sum(decode((select cc.business_type
+                    from con_contract_cashflow ca, con_contract cc
+                   where ca.cashflow_id = t.cashflow_id
+                     and ca.contract_id = cc.contract_id),
+                  'LEASEBACK',
+                  0,
+                  t.principal)) principal,
        sum(interest) interest,
        sum(vat_due_amount) vat_due_amount,
        null vat_rate,
        null je_transaction_code,
        null cashflow_id,
-                null fixed_data_flag from temp
+       null fixed_data_flag
+  from temp t
 union
-select * from temp) data order by data.order_seq
+select tax_month,
+       sale_amount,
+       order_seq,
+       period_year,
+       period_num,
+       internal_period_num,
+       journal_date,
+       journal_num,
+       reference2,
+       line_description,
+       journal_number,
+       contract_number,
+       bp_code,
+       bp_name,
+       journal_header_id,
+       invoice_date,
+       amount_tax,
+       times,
+       due_date,
+       decode((select cc.business_type
+                from con_contract_cashflow ca, con_contract cc
+               where ca.cashflow_id = t.cashflow_id
+                 and ca.contract_id = cc.contract_id),
+              'LEASEBACK',
+              due_amount -nvl(t.principal,0),
+              t.due_amount) due_amount,
+       decode((select cc.business_type
+                from con_contract_cashflow ca, con_contract cc
+               where ca.cashflow_id = t.cashflow_id
+                 and ca.contract_id = cc.contract_id),
+              'LEASEBACK',
+              0,
+              t.principal) principal,
+       interest,
+       vat_due_amount,
+       vat_rate,
+       je_transaction_code,
+       cashflow_id,
+       fixed_data_flag
+  from temp t
+
+) data order by data.order_seq
    ]]></bm:query-sql>
         </bm:operation>
     </bm:operations>

src/main/webapp/modules/cont/CON3200/con_re_incept_modify.lview

@@ -61,9 +61,11 @@
                 url="${/request/@context_path}/modules/batch_download/lease_atm_batch_dl.lsc"/>
         <a:link id="check_contract_status" model="cont.CON3200.con_checklist_contract" modelaction="query"/>
         <link href="${/request/@context_path}/modules/viewerjs/viewer.css" rel="stylesheet"/>
+        <a:link id="prj2000_pur_order_deteail_link_id" url="${/request/@context_path}/modules/prj/PRJ2000/purchase_order_deteail.lview"></a:link>
         <script src="${/request/@context_path}/modules/viewerjs/viewer.js"/>
         <script src="${/request/@context_path}/modules/viewerjs/viewer_tool.js"/>
         <script type="text/javascript"><![CDATA[
+
         function lock_current_window() {
             Leaf.Masker.mask(Ext.getBody(), '${l:HLS.EXECUTING}');
         }
@@ -86,6 +88,8 @@
         };
 
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
+            debugger;
+            if('${/parameter/@cond_para2}'=='N' || '${/parameter/@cond_para2}'==''){
                 var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
                 if (ds_id == ds.id && ds_id) {
                     // if (record.get('business_type') == 'LEASEBACK'&&'${/parameter/@function_usage}'=='MODIFY') {
@@ -171,6 +175,7 @@
                         }
                     }
                 }
+            }
 
         };
 
@@ -273,6 +278,9 @@
             } else if (name == 'attach_file_name_new') {
                 link_function = '${/parameter/@layout_code}_prj500_cdd_attachtment_new_upload';
                 return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.ds.id + '\',\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' + config_record.get('prompt') + '</a>';
+            }else if(name=='lease_detail' && record.get('project_lease_item_id')!=null) {
+                link_function = 'cont3200_lease_renderer';
+                return '<a href="javascript:window[\'' + link_function + '\'](\'' + record.id + '\',\'' + name + '\',\'' + config_record.get('query_only') + '\');">' +'明细' + '</a>';
             }
         };
 
@@ -287,6 +295,21 @@
             hls_doc_get_layout_code('${/parameter/@layout_code}_con_contract_get_layout_code_link_id', param, 'wfl_readonly_pageLink_projectQueryScreen_update_project', record.ds.id, '${/parameter/@layout_code}');
         }
 
+        function cont3200_lease_renderer(record_id, ds_id) {
+            debugger;
+            var ds_id = 'CONTRACT_OP_QUERY_INC_G_LEASE_HEAD_CAR_con_contract_lease_item_ds';
+            var record = $(ds_id).getCurrentRecord();
+            var project_id=record.get('source_project_id');
+            var param = {};
+            var param = record.data;
+            param['function_code'] = 'PRJ2000D_WFL';
+            param['function_usage'] = 'QUERY';
+            param['maintain_type'] = 'READONLY'
+            param['url_title'] = '采购申请单维护';
+            param['project_id'] = project_id;
+            hls_doc_get_layout_code('${/parameter/@layout_code}_con_contract_get_layout_code_link_id', param, 'prj2000_pur_order_deteail_link_id', null, '${/parameter/@layout_code}');
+        }
+
 
         window['${/parameter/@layout_code}_ast_con_cdd4_attachtment_upload'] = function (ds_id, id, name, query_only) {
             var record = $(ds_id).findById(id);
@@ -596,6 +619,7 @@
         };
 
         window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function () {
+            debugger;
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
             var lease_item_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_lease_item');
             var record = $(ds_id).getCurrentRecord();
@@ -696,6 +720,11 @@
             }
         }
         Leaf.onReady(function () {
+            debugger;
+            var a='${/parameter/@layout_code}';
+            var b='${/parameter/@function_usage}';
+            var b1='${/parameter/@function_code}';
+            var c='${/parameter/@layout_code}';
             var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_INVOICE_INFO', 'con_contract_bp');
             $(ds_id).setQueryUrl('${/request/@context_path}/autocrud/prj.PRJ501N.con_contract_bp/query');
             $(ds_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
@@ -748,6 +777,7 @@
                         $(gridId).hideColumn('item_type_n');
                         $(gridId).hideColumn('equipment_type_n');
                         $(gridId).hideColumn('machine_number');
+                        $(gridId).hideColumn('BP_ID_TENANT_N');
                         record.getField('machine_number').setRequired(false);
                     }else {
                         $(gridId).hideColumn('machine_number_70');
@@ -761,7 +791,6 @@
                         $(gridId).hideColumn('ownership_flag_n');
                         $(gridId).hideColumn('created_by_n');
                     }
-
                 }
                 var cashflow_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_CASHFLOW_1', 'con_contract_cashflow');
                 if(ds.id == cashflow_ds_id&&cashflow_ds_id){