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

src/main/webapp/WEB-INF/server-script/layoutconfig/csh_create_entrance_g_csh_req_1_queryfields.js

@@ -25,6 +25,18 @@ var add_datafilters = [
         name : 'approval_status',
         expression : "(t1.approval_status in ('NEW','RETURN','REJECT'))"
 
-    } ];
+    },
+	{
+		name : '',
+		expression : "exists(select 1\n" +
+			"          from csh_payment_req_ln l,con_contract cc,con_contract_cashflow cf\n" +
+			"          where l.payment_req_id = t1.payment_req_id\n" +
+			"          and l.ref_doc_category = 'CONTRACT'\n" +
+			"          and l.ref_doc_id = cc.contract_id\n" +
+			"          and l.ref_doc_line_id = cf.cashflow_id\n" +
+			"          and cf.cf_item in ('0'))"
+
+	}
+];
 add_datafilter();
 override();

src/main/webapp/WEB-INF/server-script/layoutconfig/csh_create_entrance_g_csh_req_2_queryfields.js

@@ -25,6 +25,18 @@ var add_datafilters = [
         name : 'approval_status',
         expression : "(t1.approval_status NOT in ('NEW','RETURN','REJECT','CANCEL'))"
 
-    } ];
+    },
+	{
+		name : '',
+		expression : "exists(select 1\n" +
+			"          from csh_payment_req_ln l,con_contract cc,con_contract_cashflow cf\n" +
+			"          where l.payment_req_id = t1.payment_req_id\n" +
+			"          and l.ref_doc_category = 'CONTRACT'\n" +
+			"          and l.ref_doc_id = cc.contract_id\n" +
+			"          and l.ref_doc_line_id = cf.cashflow_id\n" +
+			"          and cf.cf_item in ('0'))"
+
+	}
+];
 add_datafilter();
 override();

src/main/webapp/modules/csh/CSH501C/csh_payment_asset_req.lview

@@ -43,7 +43,7 @@
         }
         //如果头id 不为空，就使用自在定义的ds进行查询
         Leaf.onReady(function () {
-             if ('${/parameter/@source_type}' == 'WFL'||'${/parameter/@source_type}' == 'WFL_N') {
+         if ('${/parameter/@source_type}' == 'WFL'||'${/parameter/@source_type}' == 'WFL_N'||'${/parameter/@source_type}' == 'WFL_ACCT') {
             if(document.getElementById('${/parameter/@layout_code}_save')){
             document.getElementById('${/parameter/@layout_code}_save').style.display = "none";
             }
@@ -79,6 +79,12 @@
            if ('${/parameter/@source_type}' == 'WFL_N') {
                 record.getField('apply_pay_date').setReadOnly(true);
             }
+           if ('${/parameter/@source_type}' != 'WFL_ACCT') {
+              var gridId= ds.bindname+'_layout_grid_id';
+              $(gridId).hideColumn('sbo_num');
+             $(gridId).hideColumn('journal_date');
+           }
+
          }
         }
 

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain_wfl_new.lview

@@ -228,7 +228,35 @@
                     window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
                     var cal_hd_price_list = record.get('cal_hd_price_list');
                     var price_list = record.get('price_list');
-                    if (cal_hd_price_list == price_list) {
+                   //追加二手机报价重算条件，选择了适用或者调整了利率组合则需要重算报价
+                   var cal_hd_user_col_v06 = record.get('cal_hd_user_col_v06');
+                   var hd_user_col_v06 = record.get('hd_user_col_v06');
+                   var cal_btb_int_rate = record.get('cal_btb_int_rate');
+                   var btb_int_rate = record.get('btb_int_rate');
+                   var cal_int_rate_display = record.get('cal_int_rate_display');
+                   var int_rate_display = record.get('int_rate_display');
+                   if(check_empty(cal_hd_user_col_v06)){
+                       cal_hd_user_col_v06='N';
+                   }
+                   if(check_empty(hd_user_col_v06)){
+                       hd_user_col_v06='N';
+                   }
+                   if(check_empty(btb_int_rate)){
+                       btb_int_rate=0;
+                   }
+                   if(check_empty(int_rate_display)){
+                       int_rate_display=0;
+                   }
+                   if(check_empty(cal_btb_int_rate)){
+                        cal_btb_int_rate =0;
+                   }
+                   if(check_empty(cal_int_rate_display)){
+                       cal_int_rate_display=0;
+                   }
+                   if ((cal_hd_price_list == price_list&&'${/parameter/@asset_fee_flag}'=='N')
+                       ||(cal_hd_price_list == price_list&&'${/parameter/@asset_fee_flag}'=='Y'&&cal_hd_user_col_v06==hd_user_col_v06
+                           &&cal_btb_int_rate==btb_int_rate&&cal_int_rate_display==int_rate_display)) {
+
 
                         //直接进入报价页面
                         var win = new Leaf.Window({
@@ -1169,6 +1197,10 @@
                     if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
                         document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none';
                     }
+                    record.getField('hd_user_col_v06').setRequired(false);
+                    record.getField('hd_user_col_v06_n').setRequired(false);
+                    record.getField('asset_id').setRequired(false);
+                    record.getField('asset_id_n').setRequired(false);
                     if($('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id')){
                     $('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_interest');
                     $('PROJECT_WFL_NP_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
@@ -1179,6 +1211,12 @@
                     }
                 }else{
                     if (check_empty(record.get('hd_user_col_v06'))||record.get('hd_user_col_v06')=='N' ) {
+                        record.set('asset_id', null);
+                        record.set('asset_id_n', null);
+                        record.set('btb_int_rate', '');
+                        //record.set('int_rate_display', '');
+                        record.getField('asset_id').setRequired(false);
+                        record.getField('asset_id_n').setRequired(false);
                         //隐藏组件
                         if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
                             document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none';
@@ -1192,6 +1230,8 @@
                         $('PROJECT_WFL_RE_G_CASHFLOW_NS_prj_quotation_layout_grid_id').hideColumn('btb_fee');
                         }
                     }else{
+                        record.getField('asset_id').setRequired(true);
+                        record.getField('asset_id_n').setRequired(true);
                         //显示组件
                         if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
                             document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'block';
@@ -1364,7 +1404,12 @@
                 if (name == 'hd_user_col_v06') {
                     if('${/parameter/@asset_fee_flag}'=='Y'){
                         if (value== 'N'||Ext.isEmpty(value)||value==''||typeof(value) == 'undefined'||value==null) {
-
+                            record.set('asset_id', null);
+                            record.set('asset_id_n', null);
+                            record.set('btb_int_rate', '');
+                            //record.set('int_rate_display', '');
+                            record.getField('asset_id').setRequired(false);
+                            record.getField('asset_id_n').setRequired(false);
                             //隐藏组件
                             if(document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id')){
                                 document.getElementById('${/parameter/@layout_code}_F_RATE_N_component_id').style.display = 'none';