建机罚息变更调整

src/main/webapp/WEB-INF/classes/csh/CSH531N/con_contract.lwm

@@ -20,6 +20,7 @@
                             AND sc.code_value = t1.contract_status) contract_status_desc,
                 t1.payment_deduction,
 				t1.division,
+				nvl(t1.is_include_pealty,'Y') is_include_pealty,
                 t1.business_type,
                 (Select bt.description
                 From hls_business_type bt
@@ -56,6 +57,7 @@ select t.parent_company_id company_id
         <bm:field name="dd_bank_account_name"/>
         <bm:field name="payment_deduction"/>
         <bm:field name="division"/>
+        <bm:field name="is_include_pealty"/>
         <bm:field name="business_type_n"/>
         <bm:field name="search_term_1"/>
         <bm:field name="agent_name"/>

src/main/webapp/modules/cont/CON_AR001/contract_accounts_receivable_maintain.lview

@@ -74,7 +74,7 @@
             var detail_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_account_detail');
             var batch_record = $(batch_ds_id).getAt(0);
             var detail_record = $(detail_ds_id).getAll();
-            var account_batch_id = batch_record.data.account_batch_id
+            var account_batch_id = batch_record.data.account_batch_id;
             if (!account_batch_id) {
                 Leaf.showMessage('${l:HLS.PROMPT}', '请先保存再提交数据！');
                 window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
@@ -125,12 +125,18 @@
         window['${/parameter/@layout_code}_user_button3_layout_dynamic_click'] = function () {
             window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
             var batch_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract_accounts_batch');
-            var batch_record = $(batch_ds_id).getCurrentRecord();
+            var batch_record = $(batch_ds_id).getAt(0);
+            var account_batch_id = batch_record.data.account_batch_id;
+               if (!account_batch_id) {
+             		Leaf.showMessage('${l:HLS.PROMPT}', '请先保存再取消数据！');
+             		window['${/parameter/@bp_seq}${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+             		return;
+             	}
              $L.showConfirm('提示','确认取消该批次的修改信息?',function () {
                 Leaf.request({
                     url: $('con_contract_account_cancle_link').getUrl(),
                     para: {
-                           account_batch_id: batch_record.data.account_batch_id
+                           account_batch_id: account_batch_id
                            },
                     success: function (res) {
                         Leaf.SideBar.show({

src/main/webapp/modules/csh/CSH531N/csh_write_off_ref_contract.lview

@@ -20,6 +20,7 @@
             rec.set('contract_id', con_rec.get('contract_id'));
             rec.set('contract_number', con_rec.get('contract_number'));
 			rec.set('division', con_rec.get('division'));
+			rec.set('is_include_pealty', con_rec.get('is_include_pealty'));
             rec.set('bp_tenant_name', con_rec.get('bp_name'));
             rec.set('write_off_bp_name', con_rec.get('bp_name'));
             rec.set('write_off_bp_id', con_rec.get('bp_id_tenant'));
@@ -66,6 +67,7 @@
                             rec.set('contract_id', con_rec.get('contract_id'));
                             rec.set('contract_number', con_rec.get('contract_number'));
                             rec.set('division', con_rec.get('division'));
+                            rec.set('is_include_pealty', con_rec.get('is_include_pealty'));
                             rec.set('bp_tenant_name', con_rec.get('bp_name'));
                             rec.set('write_off_bp_name', con_rec.get('bp_name'));
                             rec.set('write_off_bp_id', con_rec.get('bp_id_tenant'));
@@ -124,6 +126,7 @@
                         rec.set('contract_id', con_rec.get('contract_id'));
                         rec.set('contract_number', con_rec.get('contract_number'));
                         rec.set('division', con_rec.get('division'));
+                        rec.set('is_include_pealty', con_rec.get('is_include_pealty'));
                         rec.set('bp_tenant_name', con_rec.get('bp_name'));
                         rec.set('write_off_bp_name', con_rec.get('bp_name'));
                         rec.set('write_off_bp_id', con_rec.get('bp_id_tenant'));