Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -52,12 +52,12 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
     }, {
         xtype: 'multicombo',
         name: 'pi_prstatuscode',
-        fieldLabel: '付款状态',
+        fieldLabel: '收款状态',
         emptyText :'全部',
         datas: [
-            ["PAYNONE", "未付款"],
-            ["PAYPART", "部分付款"],
-            ["PAYALL", "已付款"]
+            ["RECNONE", "未收款"],
+            ["RECPART", "部分收款"],
+            ["RECALL", "已收款"]
         ]
     }, {
         xtype: 'warehouseDbfindTrigger',

frontend/saas-web/app/view/sale/saleOut/QueryPanel.js

@@ -52,7 +52,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
     }, {
         xtype: 'multicombo',
         name: 'pi_prstatuscode',
-        fieldLabel: '付款状态',
+        fieldLabel: '收款状态',
         emptyText :'全部',
         datas: [
             ["RECNONE", "未收款"],