付款单放大镜条件

frontend/saas-web/app/view/money/payBalance/FormPanel.js

@@ -297,9 +297,9 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                         store: null,
                         valueField: "value",
                         xtype: "oriOrderMutiDbfindTrigger",
-                        listeners: {
-                            beforetriggerclick: 'vendnamechange'
-                        }
+                        // listeners: {
+                        //     beforetriggerclick: 'vendnamechange'
+                        // }
                     },
 
                 }, {

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -80,7 +80,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         return false;
                     }
                     Ext.apply(f, {
-                        defaultCondition: "sl_vendid = "+pb_vendid+" and sl_currency ='"+pb_currency+"' AND sl_custid <> 0 AND (  sl_kind IN ( '出货单', '销售退货单' ) OR ( sl_kind = '期初余额' AND sl_ym = (select min(pd_detno) from periodsdetail  where pd_status=0 and periodsdetail.companyid=subledger.companyid) ) "+
+                        defaultCondition: "sl_vendid = "+pb_vendid+" and sl_currency ='"+pb_currency+"' AND sl_custid <> 0 AND (  sl_kind IN ( '采购验收单','采购验退单' ) OR ( sl_kind = '期初余额' AND sl_ym = (select min(pd_detno) from periodsdetail  where pd_status=0 and periodsdetail.companyid=subledger.companyid) ) "+
                         ") and sl_namount<>0 "
                     });
                 },
@@ -99,7 +99,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         return false;
                     }
                     Ext.apply(f, {
-                        defaultCondition: "sl_vendid = "+pb_vendid+" and sl_currency ='"+pb_currency+"' AND sl_custid <> 0 AND (  sl_kind IN ( '出货单', '销售退货单' ) OR ( sl_kind = '期初余额' AND sl_ym = (select min(pd_detno) from periodsdetail  where pd_status=0 and periodsdetail.companyid=subledger.companyid) ) "+
+                        defaultCondition: "sl_vendid = "+pb_vendid+" and sl_currency ='"+pb_currency+"' AND sl_custid <> 0 AND (  sl_kind IN ( '采购验收单','采购验退单' ) OR ( sl_kind = '期初余额' AND sl_ym = (select min(pd_detno) from periodsdetail  where pd_status=0 and periodsdetail.companyid=subledger.companyid) ) "+
                         ") and sl_namount<>0 "
                     });
                 }
@@ -240,23 +240,22 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
             me.save();
         }
     },
-    vendnamechange:function(dbfindtrigger){
-        var me = this,
-            viewModel = me.getViewModel(),
-            c = viewModel.get('pb_vendname_change'),
-            pb_currency = viewModel.get('pb_currency');
-            console.log('vendnamechange');
-        if(c!=null&&c!=''){
-            c = ' and sl_vendid='+c;
-        }else{
-            c ='';
-        }
-        if(pb_currency!=null&&pb_currency!='') {
-            c = ' and sl_currency='+pb_currency+"'";
-        }
-        dbfindtrigger.defaultCondition="((sl_kind in ('采购验收单','采购验退单')) or (sl_kind='期初余额' and sl_ym="+
-        "(select min(pd_detno) from periodsdetail  where pd_status=0 and periodsdetail.companyid=subledger.companyid))) and sl_namount<>0" + c
-    },
+    // vendnamechange:function(dbfindtrigger){
+    //     var me = this,
+    //         viewModel = me.getViewModel(),
+    //         c = viewModel.get('pb_vendname_change'),
+    //         pb_currency = viewModel.get('pb_currency');
+    //     if(c!=null&&c!=''){
+    //         c = ' and sl_vendid='+c;
+    //     }else{
+    //         c ='';
+    //     }
+    //     if(pb_currency!=null&&pb_currency!='') {
+    //         c = ' and sl_currency='+pb_currency+"'";
+    //     }
+    //     dbfindtrigger.defaultCondition="((sl_kind in ('采购验收单','采购验退单')) or (sl_kind='期初余额' and sl_ym="+
+    //     "(select min(pd_detno) from periodsdetail  where pd_status=0 and periodsdetail.companyid=subledger.companyid))) and sl_namount<>0" + c
+    // },
     myInitCopyData: function(formData) {
         var main = formData.main;
         main.pb_auditman = '';

frontend/saas-web/app/view/sale/business/QuoteWin.js

@@ -160,7 +160,7 @@ Ext.define('saas.view.sale.business.QuoteWin', {
         var params = {
             sourceId: values.sourceId,
             inquiry: {
-                id: values.inquiryId,
+                id: values.sourceId,
                 enUU: values.enUU,
                 recorderUU: values.recorderUU,
                 code: values.inquiryCode,