资产管理费提前结清调整

src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview

@@ -5,7 +5,8 @@
         <a:model-query defaultWhereClause="t1.change_req_id = ${/parameter/@change_req_id}"
                        model="cus_deposit.CUS_DEPOSIT106.get_contract_wfl_status" rootPath="default_value_path"/>
          <a:model-query defaultWhereClause="t1.contract_id=${/parameter/@contract_id}" fetchAll="true" model="cont.CON_ET001.create_change_req" rootPath="get_contract_division"/>
-    </a:init-procedure>
+         <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="con731_calc_ccr_fee_link" model="cont.CON731.calc_ccr_fee" modelaction="execute"/>-->
         <a:link id="calc_leasse_amount_link" model="cont.CON731.calc_leasse_date" modelaction="execute"/>
@@ -50,11 +51,13 @@
                 $(ds_con_id).setQueryParameter('contract_id', '${/parameter/@contract_id}');
                 $(ds_con_id).query();
             }
-            //让历史信息查询
+             //让历史信息查询
             var history_con_id=get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master');
+            if(history_con_id){
             var url = '${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?bp_id=${/parameter/@bp_id}';
             $(history_con_id).setQueryUrl(url);
             $(history_con_id).query();
+            }
 
             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")){
@@ -66,6 +69,13 @@
             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";
+                }
+              }
         });
 
         function open_contract_win(ds_id, record_id) {
@@ -290,8 +300,7 @@
                 }
                 // 回款賬戶變更
                 if ('${/parameter/@layout_code}' == 'CON_ACCOUNT_CHANGE_MODIFY') {
-                    debugger;
-                    if (name == 'pay_method') {
+                     if (name == 'pay_method') {
                         if ( value== 'WIRE_TRANSFER') {
                             record.set('bank_account_id', null);
                             record.set('bank_account_id_n', null);
@@ -590,8 +599,7 @@
                         change_req_id: '${/parameter/@change_req_id}',
                     },
                     success: function (res) {
-                        debugger;
-                        same_flag = res.result.same_flag;
+                         same_flag = res.result.same_flag;
                     },
                     failure: function () {
 
@@ -608,8 +616,7 @@
             }else{
                 var showMessage ='担保人未发生变更,是否确认提交审批？';
             }
-            // debugger;
-            Leaf.showConfirm('${l:HLS.PROMPT}', showMessage, function () {
+             Leaf.showConfirm('${l:HLS.PROMPT}', showMessage, function () {
                 var req_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
                 var req_record = $(req_ds_id).getAt(0);
                 window['${/parameter/@bp_seq}${/parameter/@layout_code}_lock_layout_dynamic_window']();
@@ -901,8 +908,8 @@
             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';
-                var division =$(project_ds_id).getAt(0).get('division');
-                if(division=='70' || division=='92'){
+                //var division =$(project_ds_id).getAt(0).get('division');
+                if(record.data.division=='70' || record.data.division=='92'){
                     $(gridId).hideColumn('full_name');
                     $(gridId).hideColumn('machine_number');
                 }else {
@@ -921,7 +928,6 @@
         };*/
 		 //add by lihh 20210330审批记录打印
             window['${/parameter/@layout_code}_user_button4_layout_dynamic_click'] = function() {
-                debugger;
                     var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
                     var records = $(ds_id).getCurrentRecord();
                     var document_id = records.get('contract_id');

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

@@ -7,6 +7,7 @@
         <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:init-procedure>
     <a:view>
@@ -69,6 +70,14 @@
             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
@@ -186,6 +195,7 @@
                             record.set('fund_possession_rate', res.result.fund_possession_rate);
                             record.set('last_rent_due_date',res.result.last_rent_due_date);
                             record.set('sum_unreceived_principal',res.result.sum_unreceived_principal);
+                             record.set('asset_possession_cost', res.result.asset_possession_cost);
 							clc_flag = 'N';
                         },
                         failure: function () {
@@ -200,6 +210,7 @@
                             //record.set('fund_possession_rate','');
                             record.set('last_rent_due_date','');
                             record.set('sum_unreceived_principal','');
+                            record.set('asset_possession_cost','');
                         },
                         error: function () {
                             record.set('termination_date','');
@@ -213,6 +224,7 @@
                             //record.set('fund_possession_rate','');
                             record.set('last_rent_due_date','');
                             record.set('sum_unreceived_principal','');
+                            record.set('asset_possession_cost','');
                         },
                         scope: this
                     });