[fix]去除合同界面的状态条件，修改付款打印功能

src/main/webapp/WEB-INF/classes/csh/CSH501/csh_payment_req_ln_query_after_save.lwm

@@ -16,6 +16,7 @@
                c.bp_id_agent_level1,
                ccli.pattern pattern,
                ccli.machine_number machine_number,
+               ccli.modelcd,
                --add 添加预付款的时间
                (select b.bp_name
                   from con_contract_bp b

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

@@ -4,10 +4,10 @@ var add_datafilters = [
         name: 'document_type',
         expression: "t1.document_type = 'CARCON'"
     },
-    {
-        name:'contract_status',
-        expression:"t1.contract_status ='NEW'"
-    },
+    // {
+    //     name:'contract_status',
+    //     expression:"t1.contract_status ='NEW'"
+    // },
     {
         name: 'sign_contract_status',
         expression: "t1.sign_contract_status in ('NEW','SIGNING','SIGN','SIGN_RETURN')"

src/main/webapp/modules/csh/CSH501/csh_payment_req.lview

@@ -79,6 +79,7 @@
         <a:link id="tre_loan_con_print_excel_link_id" url="${/request/@context_path}/modules/csh/CSH501/csh_payment_contract_export.lsc"/>
 
         <script type="text/javascript"><![CDATA[
+
         jQuery.noConflict();
 
         //如果头id 不为空，就使用自在定义的ds进行查询
@@ -95,6 +96,7 @@
 
             }
         })
+
         Ext.ux.Lightbox.register('a[ref=img]', true);
 
         if ('${/parameter/@payment_req_id}') {
@@ -183,6 +185,15 @@
                     hdrecord.set('currency_code', currency_code);
                     hdrecord.set('currency_name', currency_name);
                     record.set('act_amount', minus(record.get('amount'), record.get('sum_ddct_amount') || 0));
+                } else if(name=='amount_vender'&& value){
+                        var due_amount=record.get('due_amount');
+                        var other_payment2=record.get('other_payment2');
+                        var amount_agent=minus(minus(due_amount,other_payment2),value);
+                        if(amount_agent<0){
+                            $L.showErrorMessage("提示",'委托付款金额和首付款抵充金额不能大于应付金额！');
+                            return;
+                        }
+                        record.set('amount_agent',amount_agent);
                 } else if (name == 'act_amount') {
                     hdrecord.set('sum_act_amount', plus(minus(hdrecord.get('sum_act_amount') || 0, old_value || 0), value || 0));
                 }
@@ -1218,6 +1229,15 @@
             qpara['payment_bp_id'] = '${/parameter/@payment_bp_id}';
 
         }
+        // function on_csh_payment_req_temp_ln_ds_update( dataSet,  record,  name, value,oldvalue) {
+        //     if(name=='amount_vender'&&value){
+        //         var due_amount=record.get('due_amount');
+        //         var other_payment2=record.get('other_payment2');
+        //         var amount_agent=minus(minus(due_amount,other_payment2),value);
+        //         record.set('amount_agent',amount_agent);
+        //     }
+        //
+        // }
 
 
         function sumFunction(datas, name) {