建机北京心诚合并二手机改造

(cherry picked from commit 91f8e51b)

src/main/webapp/modules/cont/CON930/con_contract_cashflow_monthly.lview

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    $Author: WangYu  
-    $Date: 2014-4-25 上午09:31:11  
-    $Revision: 1.0  
-    $Purpose: 
+    $Author: WangYu
+    $Date: 2014-4-25 上午09:31:11
+    $Revision: 1.0
+    $Purpose:
 -->
 <a:screen xmlns:a="http://www.leaf-framework.org/application" trace="true">
     <a:view>
         <!--<a:link id="con_cashflow_pre_query_id" model="cont.CON930.con_contract_cashflow_monthly" modelaction="update"/>-->
-        <a:link id="con_cashflow_pre_query_id" model="cont.CON930.con_contract_cashflow_monthly_n" modelaction="update"/>
-         <a:link id="con_cashflow_pre_update_id" model="cont.CON930.insert_con_cash_temp_data_job" modelaction="update"/>
-
+		<a:link id="con_cashflow_pre_query_id" model="cont.CON930.con_contract_cashflow_monthly_n" modelaction="update"/>
+        <a:link id="con_cashflow_pre_update_id" model="cont.CON930.insert_con_cash_temp_data_job" modelaction="update"/>
         <script><![CDATA[
         function CON321_con_contract_query() {
             if ($('con_contract_cashflow_monthly_query_ds').validate()){
@@ -48,9 +47,9 @@
                 if(record.data.lease_name91=='Y'){//addby xsh35973 20221011 I-12357新增产品线
                     record.data.division=record.data.division+',91';
                 };
-                if(record.data.lease_name92=='Y'){//add by gzj 2022-12-19 10:17:53
-                    record.data.division=record.data.division+',92';
-                };
+                //if(record.data.lease_name92=='Y'){//add by gzj 2022-12-19 10:17:53
+                    //record.data.division=record.data.division+',92';
+                //};
                 if(record.data.lease_name99=='Y'){//add by gzj 2022-12-19 10:17:53
                     record.data.division=record.data.division+',99';
                 };
@@ -94,34 +93,34 @@
             }
         }
 
-         function CON321_con_contract_update() {
-                    var headers_ds = $('con_contract_cashflow_monthly_query_ds');
-                    var record = headers_ds.getAt(0);
-                    //基准日期校验
+		 function CON321_con_contract_update() {
+            var headers_ds = $('con_contract_cashflow_monthly_query_ds');
+            var record = headers_ds.getAt(0);
+	    //基准日期校验
                     if(record.get('due_date') == null || record.get('due_date') == ''){
                         Leaf.showMessage('提示', '请选择报表的基准日期');
                         return false;
                     }
-                    Leaf.Masker.mask(Ext.getBody(), '正在更新数据，请稍等...');
-                    Leaf.request({
-                        url: $('con_cashflow_pre_update_id').getUrl(),
-                        para: {
-                            due_date : record.get('due_date'),
-                            business_type : record.get('business_type')
-                        },
-                        success: function(res) {
-                            Leaf.Masker.unmask (Ext.getBody());
+            Leaf.Masker.mask(Ext.getBody(), '正在更新数据，请稍等...');
+            Leaf.request({
+                url: $('con_cashflow_pre_update_id').getUrl(),
+                para: {
+                    due_date : record.get('due_date'),
+                    business_type : record.get('business_type')
+                },
+                success: function(res) {
+                    Leaf.Masker.unmask (Ext.getBody());
 
-                        },
-                        failure: function() {
-                            Leaf.Masker.unmask (Ext.getBody());
-                        },
-                        error: function() {
-                            Leaf.Masker.unmask (Ext.getBody());
-                        },
-                        scope: this
-                    });
-                }
+                },
+                failure: function() {
+                    Leaf.Masker.unmask (Ext.getBody());
+                },
+                error: function() {
+                    Leaf.Masker.unmask (Ext.getBody());
+                },
+                scope: this
+            });
+        }
 
         function CON321_con_contract_reset() {
             $('con_contract_cashflow_monthly_query_ds').reset();
@@ -167,7 +166,7 @@
                     <a:field checkedValue="Y" name="lease_name70" uncheckedValue="N" defaultValue="N"/>
                     <a:field checkedValue="Y" name="lease_name80" uncheckedValue="N" defaultValue="N"/>
                     <a:field checkedValue="Y" name="lease_name90" uncheckedValue="N" defaultValue="N"/>
-                    <a:field checkedValue="Y" name="lease_name92" uncheckedValue="N" defaultValue="N"/>
+                    <!--<a:field checkedValue="Y" name="lease_name92" uncheckedValue="N" defaultValue="N"/>-->
                     <a:field checkedValue="Y" name="lease_name99" uncheckedValue="N" defaultValue="N"/>
                     <a:field checkedValue="Y" name="lease_name93" uncheckedValue="N" defaultValue="N"/>
                     <a:field name="division" />
@@ -189,7 +188,7 @@
         <a:screenBody>
             <a:screenTopToolbar>
                 <a:gridButton click="CON321_con_contract_query" text="HLS.QUERY"/>
-                <a:gridButton click="CON321_con_contract_update" text="更新全量数据"/>
+				<a:gridButton click="CON321_con_contract_update" text="更新全量数据"/>
                 <a:gridButton click="CON321_con_contract_reset" text="HLS.RESET"/>
             </a:screenTopToolbar>
             <a:form bindTarget="con_contract_cashflow_balance_query_ds" column="3" title="收付款预定查询" marginWidth="40">
@@ -213,14 +212,12 @@
                     <a:checkBox name="lease_name50" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="星邦高空作业车"/>
 
                     <a:checkBox name="lease_name60" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="新业务"/>
-<!--                    <a:checkBox name="lease_name70" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="铁甲业务"/>-->
                     <a:checkBox name="lease_name70" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="二手机业务"/>
                     <a:checkBox name="lease_name80" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="叉车"/>
-<!--                    <a:checkBox name="lease_name90" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="租赁二手机"/>-->
-                <a:checkBox name="lease_name90" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="租赁二手机（日立）"/>
+                    <a:checkBox name="lease_name90" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="租赁二手机（日立）"/>
                     <a:checkBox name="lease_name40" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="其它"/>
                 <a:checkBox name="lease_name91" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="神钢建机"/>//addby xsh35973 20221011 I-12357新增产品线
-                <a:checkBox name="lease_name92" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="北京心诚"/>
+               <!-- <a:checkBox name="lease_name92" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="北京心诚"/>-->
                 <a:checkBox name="lease_name99" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="工程机械"/>
                 <a:checkBox name="lease_name93" bindTarget="con_contract_cashflow_monthly_query_ds" prompt="新业务-厂商担保"/>
 
@@ -269,7 +266,8 @@
                                 <a:column name="not_due_amount_4" align="center" prompt="未到期4个月" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_5" align="center" prompt="未到期5个月" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_6" align="center" prompt="未到期6个月" renderer="Leaf.formatMoney" width="80"/>
-                                 <a:column name="not_due_amount_7" align="center" prompt="未到期7个月" renderer="Leaf.formatMoney" width="80"/>
+                                <!--<a:column name="not_due_amount_left" align="center" prompt="未到期6个月以上" renderer="Leaf.formatMoney" width="80"/>-->
+                                <a:column name="not_due_amount_7" align="center" prompt="未到期7个月" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_8" align="center" prompt="未到期8个月" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_9" align="center" prompt="未到期9个月" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_10" align="center" prompt="未到期10个月" renderer="Leaf.formatMoney" width="80"/>
@@ -333,7 +331,7 @@
                                 <a:column name="not_due_amount_68" align="center" prompt="未到期68个月" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_69" align="center" prompt="未到期69个月" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_70" align="center" prompt="未到期70个月及以上" renderer="Leaf.formatMoney" width="80"/>
-                                <a:column name="not_due_amount_left" align="center" prompt="未到期6个月以上" renderer="Leaf.formatMoney" width="80"/>
+								<a:column name="not_due_amount_left" align="center" prompt="未到期6个月以上" renderer="Leaf.formatMoney" width="80"/>
                                 <!--<a:column name="not_due_amount_48_left" align="center" prompt="未到期48个月以上" renderer="Leaf.formatMoney" width="80"/>-->
                                 <a:column name="not_due_amount_year_1" align="center" prompt="未到期1年" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_year_2" align="center" prompt="未到期2年" renderer="Leaf.formatMoney" width="80"/>
@@ -341,6 +339,7 @@
                                 <a:column name="not_due_amount_year_4" align="center" prompt="未到期4年" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_year_5" align="center" prompt="未到期5年" renderer="Leaf.formatMoney" width="80"/>
                                 <a:column name="not_due_amount_year_5_left" align="center" prompt="未到期5年以上" renderer="Leaf.formatMoney" width="80"/>
+								<a:column name="full_name" align="center" prompt="设备名称" width="220"/>
                             </a:columns>
                         </a:grid>
                     </a:tab>

src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview

@@ -6,8 +6,9 @@
     <a:init-procedure>
         <a:model-query defaultWhereClause="t1.user_id=${/session/@user_id}" fetchAll="true" model="wx.WX100.sys_pilot_run_user" rootPath="pilot_run_user"/>
         <a:model-query defaultWhereClause="t1.contract_id=${/parameter/@contract_id}" fetchAll="true" model="cont.CON_ET001.con_get_contract_status" rootPath="get_contract_status"/>
-        <a:model-query defaultWhereClause="t1.contract_id=${/parameter/@contract_id}" fetchAll="true" model="cont.CON_ET001.create_change_req" rootPath="get_contract_division"/>
-	   <a:model-query fetchAll="true" model="cont.CON_ET001.con_asset_fee_calc" rootPath="asset_flag_path" ></a:model-query>
+        <a:model-query fetchAll="true" model="cont.CON_ET001.create_change_req" rootPath="get_contract_division"/>
+        <a:model-query fetchAll="true" model="cont.CON_ET001.con_asset_fee_calc" rootPath="asset_flag_path" ></a:model-query>
+
     </a:init-procedure>
     <a:view>
         <a:link id="con_contract_repo_detail_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code" modelaction="update"/>
@@ -58,40 +59,50 @@
             if ('${/model/pilot_run_user/record/@pilot_run_flag}' != 'Y'){
                 $('${/parameter/@layout_code}_user_button4').hide();
             }
-            //铁甲业务合同展示保证金字段  18083  2023/5/11
+			//铁甲业务合同展示保证金字段  18083  2023/6/14
             if('${/model/get_contract_division/record/@division}' !='70' && '${/model/get_contract_division/record/@division}' != ''){
             if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE")){
-            document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE_prompt").style.display = "none";
+			document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE_prompt").style.display = "none";
             document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE").style.display = "none";
-            }
-            if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION")){
-            document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION_prompt").style.display = "none";
+              }
+		    if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION")){
+		    document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION_prompt").style.display = "none";
             document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION").style.display = "none";
-		      }
-			}
-			 //报价中资管费字段为否时，不展示资产管理费字段 18083 2024/1/29
+            }
+            }else if('${/model/get_contract_division/record/@division}' =='70'){
+               if('${/model/get_contract_division/record/@division_detail}' =='03'||'${/model/get_contract_division/record/@division_detail}' =='02' ){
+                if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE")){
+                   document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE_prompt").style.display = "none";
+                   document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_BALANCE").style.display = "none";
+                   }
+                   if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION")){
+                   document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION_prompt").style.display = "none";
+                   document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_DEPOSIT_DEDUCTION").style.display = "none";
+                   }
+              }
+            }
+            //报价中资管费字段为否时，不展示资产管理费字段 18083 2024/1/29
            if('${/model/asset_flag_path/record/@hd_user_col_v06}' !='Y'){
               if(document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ASSET_POSSESSION_COST")){
               document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ASSET_POSSESSION_COST_prompt").style.display = "none";
               document.getElementById("CON_ET_MODIFY_F_QUOTATION_01_CON_CONTRACT_CHANGE_REQ_ASSET_POSSESSION_COST").style.display = "none";
-            }
-            }
+                  }
+              }
         });
         var calc_flag='N';
         //新增和加载时调用form
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records, bp_seq) {
-             var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_01', 'con_contract_change_req');
-             if (ds_id == ds.id && ds_id) {
+            var ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'],'F_BASE_01', 'con_contract_change_req');
+            if (ds_id == ds.id && ds_id) {
                 if(record.get('bp_class') == 'NP'){
                     record.getField('signer_n').setReadOnly(true);
                     record.getField('signer_n').setRequired(false);
                     record.set('signer_n','');
                 }
-                if(record.get('division') == '70'){
+                if(record.get('division') == '70' && record.get('division_detail') == '01'){
                 record.getField('deposit_deduction').setRequired(true);
                 }
             }
-
         };
 
 		var clc_flag = 'N';
@@ -102,13 +113,11 @@
                     calc_flag='N';
                     record.set('calc_flag','N');
                 }
-                //调整后提前结清手续费
                 if (name == 'et_fee') {
                     var et_total_amount=record.get('et_total_amount')||0;
                     var old_et_fee=old_value||0;
                     record.set('et_total_amount', plus(minus(et_total_amount,old_et_fee),value||0));
                 }
-                //调整后逾期罚息
                 if (name == 'ccr_penalty') {
                     var et_total_amount=record.get('et_total_amount')||0;
                     var due_amount = record.get('penalty') || 0;
@@ -126,10 +135,11 @@
                         }, 5);
                         return;
                     }
-                    record.set('et_total_amount',minus(plus(plus(plus(plus(record.get('et_due_amount')||0,record.get('et_fee')||0),record.get('residual_value')||0),record.get('overdue_amount')||0),value),record.get('deposit_deduction')||0));
-                 }
-                //铁甲业务计算保证金抵扣金额  18083 2023/5/12
-                if('${/model/get_contract_division/record/@division}' =='70' && '${/model/get_contract_division/record/@division}' != ''){
+                 record.set('et_total_amount',minus(plus(plus(plus(plus(record.get('et_due_amount')||0,record.get('et_fee')||0),record.get('residual_value')||0),record.get('overdue_amount')||0),value),record.get('deposit_deduction')||0));
+                }
+
+					//铁甲业务计算保证金抵扣金额  18083 2023/6/14
+                if('${/model/get_contract_division/record/@division}' =='70' && '${/model/get_contract_division/record/@division}' != '' && '${/model/get_contract_division/record/@division_detail}' == '01'){
                 if (name == 'deposit_deduction') {
                 var et_total_amount=record.get('et_total_amount')||0;
                 var deposit_balance = record.get('deposit_balance') || 0;
@@ -141,7 +151,6 @@
                     }, 5);
                     return;
                 }
-
                 if (value < 0 || value == NaN || value == undefined) {
                     Leaf.showMessage('${l:HLS.PROMPT}', '调整后的保证金抵扣金额应大于等于0！');
                     setTimeout(function () {
@@ -149,7 +158,8 @@
                     }, 5);
                     return;
                 }
-                //调整后的保证金余额应小于支付总额
+
+				//调整后的保证金余额应小于支付总额
                 if (value > et_total_amount) {
                     Leaf.showMessage('${l:HLS.PROMPT}', '调整后的保证金抵扣金额应小于支付总额！');
                     setTimeout(function () {
@@ -157,13 +167,12 @@
                     }, 5);
                     return;
                 }
-                 record.set('et_total_amount', minus(plus(plus(plus(plus(record.get('et_due_amount')||0,record.get('et_fee')||0),record.get('residual_value')||0),record.get('overdue_amount')||0),record.get('ccr_penalty')||0),value));
-
+         record.set('et_total_amount', minus(plus(plus(plus(plus(record.get('et_due_amount')||0,record.get('et_fee')||0),record.get('residual_value')||0),record.get('overdue_amount')||0),record.get('ccr_penalty')||0),value));
                         }
                  }
 
                 if (name == 'termination_date'&&value) {
-                     // 根据结清日计算结清相关金额字段
+                    // 根据结清日计算结清相关金额字段
                     Leaf.request({
                         url: $('con_et001_calc_et_date_amount_link').getUrl(),
                         para: {
@@ -176,12 +185,12 @@
                             et_interest_rate: record.get('et_interest_rate'),
                             /**留购价**/
                             residual_value: record.get('residual_value'),  //update by xsh35973 20220613
-                            /**保证金抵扣金额**/
-                            deposit_deduction: record.get('deposit_deduction')||0  //update by 18083 2023/5/12
+											 /**保证金抵扣金额**/
+                            deposit_deduction: record.get('deposit_deduction')||0  //update by 18083 2023/6/14
                         },
                         success: function (res) {
-						     clc_flag = 'Y';
-						     //record.set('et_fee', res.result.et_fee);
+						    clc_flag = 'Y';
+                           //record.set('et_fee', res.result.et_fee);
                             record.set('et_total_amount', res.result.et_total_amount);
                             record.set('et_due_amount', res.result.et_due_amount);
                             record.set('overdue_amount', res.result.overdue_amount||0);
@@ -228,7 +237,6 @@
                     });
                 }
                 //add by xsh35973 添加修改调整后资源占用费提前结清租金跟随变动
-                //调整后资金占用费
                 if(name == 'fund_possession_cost'&& clc_flag =='N'){
                     if (value < 0 || value == NaN || value == undefined) {
                         Leaf.showMessage('${l:HLS.PROMPT}', '调整后的资金占用费金额应大于等于0！');
@@ -260,10 +268,9 @@
                         }, 5);
                         return;
                     }
-                    var et_total_amount_result=minus(plus(plus(plus(plus(record.get('et_due_amount') || 0, record.get('et_fee') || 0), record.get('residual_value') || 0), record.get('overdue_amount') || 0), record.get('ccr_penalty')),record.get('deposit_deduction') || 0);
+					var et_total_amount_result=minus(plus(plus(plus(plus(record.get('et_due_amount') || 0, record.get('et_fee') || 0), record.get('residual_value') || 0), record.get('overdue_amount') || 0), record.get('ccr_penalty')),record.get('deposit_deduction') || 0);
                     record.set('et_total_amount',et_total_amount_result);
                 }
-                //提前结清租金
                 if(name == 'et_due_amount'&& clc_flag =='N'){
                     if (value < 0 || value == NaN || value == undefined) {
                         Leaf.showMessage('${l:HLS.PROMPT}', '调整后的提前结清租金金额应大于等于0！');
@@ -272,11 +279,10 @@
                         }, 5);
                         return;
                     }
-                     var et_total_amount_result=minus(plus(plus(plus(plus(record.get('et_due_amount') || 0, record.get('et_fee') || 0), record.get('residual_value') || 0), record.get('overdue_amount') || 0), record.get('ccr_penalty')),record.get('deposit_deduction') || 0);
+					var et_total_amount_result=minus(plus(plus(plus(plus(record.get('et_due_amount') || 0, record.get('et_fee') || 0), record.get('residual_value') || 0), record.get('overdue_amount') || 0), record.get('ccr_penalty')),record.get('deposit_deduction') || 0);
                     record.set('et_total_amount',et_total_amount_result);
                 }
-             }
-
+            }
         };
 
         window['${/parameter/@layout_code}_submit_approval_layout_dynamic_click'] = function() {
@@ -705,7 +711,7 @@
             var lease_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASE_10', 'con_contract_lease_item');
             if(ds.id == lease_ds_id&&lease_ds_id){
                 var gridId= ds.bindname+'_layout_grid_id';
-                if(record.data.division=='70' || record.data.division=='92'){
+                if(record.data.division=='70'){
                     $(gridId).hideColumn('full_name');
                     $(gridId).hideColumn('machine_number');
                 }else {
@@ -800,7 +806,7 @@
             var  url=$('con_lease_org_print_link').getUrl() + '?contract_id=' + contract_id + '&templet_code=' + templet_code;
             window.open(url, '_self');
         };
-		
+
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>