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

frontend/saas-web/app/model/stock/ProdIODetail.js

@@ -13,8 +13,8 @@ Ext.define('saas.model.stock.ProdIODetail', {
         { name: 'pd_prodid', type: 'int' },
         { name: 'pd_prodcode', type: 'string' },
         { name: 'pd_unit', type: 'string' },
-        { name: 'pd_inqty', type: 'int' },
-        { name: 'pd_outqty', type: 'int' },
+        { name: 'pd_inqty', type: 'float' },
+        { name: 'pd_outqty', type: 'float' },
         { name: 'pd_orderprice', type: 'float' },
         { name: 'pd_sendprice', type: 'float' },
         { name: 'pd_price', type: 'float' },
@@ -32,7 +32,7 @@ Ext.define('saas.model.stock.ProdIODetail', {
         { name: 'pd_sdid', type: 'int' },
         { name: 'pd_status', type: 'string' },
         { name: 'pd_ym', type: 'int' },
-        { name: 'pd_yqty', type: 'int' },
+        { name: 'pd_yqty', type: 'float' },
         { name: 'pd_remark', type: 'string' },
         { name: 'pd_ioid', type: 'int' },
     ]

frontend/saas-web/app/view/document/customer/BasePanelController.js

@@ -11,7 +11,7 @@ Ext.define('saas.view.document.customer.BasePanelController', {
                     Ext.apply(f,{
                         //赋值 
                         dbfinds:[{
-                            from:'id',to:'id',ignore:true
+                            from:'id',to:'cu_id',ignore:true
                         },{
                             from:'cu_code',to:'cu_code'
                         },{

frontend/saas-web/app/view/document/customer/FormController.js

@@ -4,7 +4,21 @@ Ext.define('saas.view.document.customer.FormController', {
     
     init: function (form) {
         var me = this;
-        this.control({});
+        this.control({
+            'employeeDbfindTrigger[name=cu_sellername]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'id',to:'cu_sellerid',ignore:true
+                        },{
+                            from:'em_code',to:'cu_sellercode'
+                        },{
+                            from:'em_name',to:'cu_sellername'
+                        }],
+                    }) ;   
+                }
+            }
+        });
     },
 
     auditBtnClick: function() {

frontend/saas-web/app/view/document/customer/FormPanel.js

@@ -126,7 +126,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         xtype : "numberfield", 
         hideTrigger:true,
         name : "cu_promisedays", 
-        fieldLabel : "承付天数", 
+        fieldLabel : "结算天数", 
         allowBlank : true, 
         columnWidth : 0.25,
         decimalPrecision:0,
@@ -146,31 +146,34 @@ Ext.define('saas.view.document.customer.FormPanel', {
             var format = '0.' + xr.join();
             return Ext.util.Format.number(v, format);
         },
-    },{
-        xtype : "textfield", 
+    }, {
+        xtype : "hidden", 
+        name : "cu_sellerid", 
+        fieldLabel : "业务员id"
+    }, {
+        xtype : "hidden", 
+        name : "cu_sellercode", 
+        fieldLabel : "业务员code",
+    }, {
+        xtype : "employeeDbfindTrigger", 
         name : "cu_sellername", 
         fieldLabel : "业务员", 
-        ignore:true,
         editable:false,
-        readOnly:true,
         allowBlank : true, 
         columnWidth : 0.25
     },{
-        ignore:true,
         xtype : "hidden", 
         name : "cu_nsrzh", 
         fieldLabel : "纳税人识别号", 
         allowBlank : true, 
         columnWidth : 0.25
     },{
-        ignore:true,
         xtype : "hidden", 
         name : "cu_bankaccount", 
         fieldLabel : "开户银行", 
         allowBlank : true, 
         columnWidth : 0.25
     },{
-        ignore:true,
         xtype : "hidden",  
         name : "cu_bankcode", 
         fieldLabel : "银行账户", 
@@ -190,7 +193,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
         fieldLabel : "应收款余额", 
         allowBlank : true, 
         readOnly:true,
-        ignore:true,
         columnWidth : 0.25,
         decimalPrecision: 8,
         renderer : function(v) {

frontend/saas-web/app/view/document/product/BasePanelController.js

@@ -23,7 +23,7 @@ Ext.define('saas.view.document.product.BasePanelController', {
                         }, {
                             from:'pr_orispeccode',to:'pr_orispeccode'
                         }, {
-                            from:'id',to:'id',ignore:true
+                            from:'id',to:'pr_id',ignore:true
                         }],
                     }) ;   
 

frontend/saas-web/app/view/document/vendor/BasePanelController.js

@@ -11,7 +11,7 @@ Ext.define('saas.view.document.vendor.BasePanelController', {
                     Ext.apply(f,{
                         //赋值 
                         dbfinds:[{
-                            from:'id',to:'id',ignore:true
+                            from:'id',to:'ve_id',ignore:true
                         },{
                             from:'ve_code',to:'ve_code'
                         },{

frontend/saas-web/app/view/document/vendor/FormPanel.js

@@ -133,7 +133,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         xtype : "numberfield", 
         hideTrigger:true,
         name : "ve_promisedays", 
-        fieldLabel : "承付天数", 
+        fieldLabel : "结算天数", 
         allowBlank : true, 
         columnWidth : 0.25,
         minValue:0,

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -10,7 +10,8 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
     queryFormItems: [{
         xtype: 'textfield',
         name:'ft_code',
-        emptyText:'请输入单号'
+        emptyText:'请输入单号',
+        style:{paddingLeft: '95px'},
     },{
         xtype : "condatefield",
         name : "ft_date",

frontend/saas-web/app/view/money/othreceipts/QueryPanel.js

@@ -11,7 +11,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         xtype: 'textfield',
         name: 'or_code',
         emptyText:'请输入单号或客户或账号',
-        labelWidth: 100,
+        style:{paddingLeft: '95px'},
         getCondition: function(value) {
            return  ' (or_code like\'%' + value + '%\'' 
                 +' or or_custcode like \'%'+value+'%\''

frontend/saas-web/app/view/money/othspendings/QueryPanel.js

@@ -20,6 +20,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         xtype: 'textfield',
         name: 'os_code',
         emptyText:'请输入单号或客户或账号',
+        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

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

@@ -19,6 +19,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         xtype: 'textfield',
         name: 'pb_code',
         emptyText :'请输入单号或供应商',
+        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

frontend/saas-web/app/view/money/recBalance/QueryPanel.js

@@ -11,6 +11,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
         xtype: 'textfield',
         name: 'rb_code',
         emptyText :'请输入单号或客户',
+        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

frontend/saas-web/app/view/money/verification/QueryPanel.js

@@ -10,14 +10,16 @@ Ext.define('saas.view.money.verification.QueryPanel', {
     queryFormItems: [{
         xtype: 'textfield',
         name: 'vc_code',
-        fieldLabel: '单号/供应商名/客户名',
         emptyText :'请输入单号或者供应商名或者客户名',
+        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';
             }else {
                 return  ' (vc_code like\'%' + value + '%\' '
                     +' or vc_vendcode like \'%'+value+'%\' '
+                    +' or vc_vendname like \'%'+value+'%\' '
+                    +' or vc_custname like \'%'+value+'%\' '
                     +' or vc_custcode like \'%'+value+'%\') ';
             }
         }

frontend/saas-web/app/view/money/verification/QueryPanelController.js

@@ -61,7 +61,7 @@ Ext.define('saas.view.money.verification.QueryPanelController', {
                             "dataIndex": "ve_taxrate",
                             "width": 100
                         }, {
-                            "text": "承付天数",
+                            "text": "结算天数",
                             "flex": 1,
                             "dataIndex": "ve_promisedays",
                             "width": 100

frontend/saas-web/app/view/purchase/purchase/QueryPanel.js

@@ -18,7 +18,10 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
     }, {
         xtype: 'textfield',
         name: 'pu_code',
+        fieldLabel: ' ',
+        labelSeparator:' ',
         emptyText:'请输入单号或供应商',
+        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             return  ' (pu_code like\'%' + value + '%\' or pu_vendcode like \'%'+value+'%\' or pu_vendname like \'%'+value+'%\') ';
         }

frontend/saas-web/app/view/purchase/purchaseIn/QueryPanel.js

@@ -16,6 +16,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或供应商',
+        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%'+value+'%\' or pi_vendname like \'%'+value+'%\') ';
         }

frontend/saas-web/app/view/purchase/purchaseOut/QueryPanel.js

@@ -19,6 +19,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或供应商',
+        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%'+value+'%\' or pi_vendname like \'%'+value+'%\') ';
         }

frontend/saas-web/app/view/sale/report/SaleController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.sale.report.SaleController', {
                     Ext.apply(f,{
                         dbfinds:[
                             {
-                                from:'id',to:'id',ignore:true
+                                from:'id',to:'cu_id',ignore:true
                             },{
                                 from:'cu_code',to:'cu_code'
                             },{

frontend/saas-web/app/view/sale/report/SaleProfitController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                     Ext.apply(f,{
                         dbfinds:[
                             {
-                                from:'id',to:'id',ignore:true
+                                from:'id',to:'sa_custid',ignore:true
                             },{
                                 from:'cu_code',to:'sa_custcode'
                             },{

frontend/saas-web/app/view/sale/report/SaleRecController.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.sale.report.SaleRecController', {
                     Ext.apply(f,{
                         dbfinds:[
                             {
-                                from:'id',to:'id',ignore:true
+                                from:'id',to:'cu_id',ignore:true
                             },{
                                 from:'cu_code',to:'cu_code'
                             },{

frontend/saas-web/app/view/sale/sale/FormPanelController.js

@@ -26,7 +26,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'id',to:'id',ignore:true
+                            from:'id',to:'sa_sellerid',ignore:true
                         },{
                             from:'em_code',to:'sa_sellercode'
                         },{

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

@@ -19,6 +19,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         xtype: 'textfield',
         name: 'sa_code',
         emptyText:'请输入单号或客户',
+        style:{paddingLeft: '95px'},
         getCondition: function(value) {
            return  ' (sa_code like\'%' + value + '%\' or sa_custcode like \'%'+value+'%\' or sa_custname like \'%'+value+'%\') ';
         }

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

@@ -125,8 +125,8 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 text : "数量", 
                 xtype: 'numbercolumn',
                 dataIndex : "pd_inqty", 
+                width : 110.0, 
                 allowBlank:false,
-                width : 110.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 3,

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

@@ -15,7 +15,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或客户或关联单号',
-        labelWidth:100,
+        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\' or pi_sacode like \'%'+value+'%\') ';
         }

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

@@ -16,7 +16,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或客户或关联单号',
-        labelWidth:100,
+        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\' or pi_iocode like \'%'+value+'%\') ';
         }

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanel.js

@@ -18,6 +18,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         name: 'pi_inoutno',
         emptyText:'请输入单号或物料',
         showDetail: true,
+        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

frontend/saas-web/app/view/stock/make/QueryPanel.js

@@ -18,10 +18,12 @@ Ext.define('saas.view.stock.make.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'ma_code',
-        fieldLabel: '单据编号'
+        emptyText :'请输入单据编号',
+        style:{paddingLeft: '95px'}
     },{
         xtype: 'textfield',
         name: 'ma_prodcode',
+        fieldLabel: '产品',
         emptyText :'请输入产品名称或编号',
         getCondition: function(value) {
             if(value == 'ALL') {

frontend/saas-web/app/view/stock/otherIn/QueryPanel.js

@@ -17,6 +17,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或供应商',
+        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

frontend/saas-web/app/view/stock/otherOut/QueryPanel.js

@@ -17,6 +17,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         xtype: 'textfield',
         name: 'pi_inoutno',
         emptyText:'请输入单号或客户',
+        style:{paddingLeft: '95px'},
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

frontend/saas-web/app/view/stock/report/ProdinoutCountController.js

@@ -23,7 +23,7 @@ Ext.define('saas.view.stock.report.ProdinoutCountController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'id',to:'id',ignore:true 
+                            from:'id',to:'wh_id',ignore:true 
                         }, { 
                             from:'wh_code',to:'wh_code'
                         }, {