【界面标准化】【查询界面查询去掉lable】

frontend/saas-web/app/view/money/report/VendorCheck.js

@@ -33,7 +33,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
     // }, {
         xtype: 'condatefield',
         name: 'pi_date',
-        fieldLabel: '单据日期',
+        fieldLabel: '日期',
         columnWidth: 0.4
     }],
 
@@ -58,7 +58,10 @@ Ext.define('saas.view.money.report.VendorCheck', {
         dataIndex: 'pd_pdno',
         align: 'center',
         exportFormat: 'Integer',
-        width: 65
+        width: 65,
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 0, true);
+        }
     }, {
         text: '物料编号',
         dataIndex: 'pr_code',

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

@@ -328,7 +328,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         columnWidth: 1
     }, {
         xtype: "textfield",
-        name: "pu_currency",
+        name: "pi_currency",
         fieldLabel: "币别",
         readOnly: true,
         defaultValue: 'RMB'

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

@@ -15,6 +15,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%'+value+'%\' or pi_vendname like \'%'+value+'%\') ';
         }
     }, {
+        margin:'0 0 0 20',
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         emptyText:'输入物料编号或名称',

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

@@ -325,7 +325,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         columnWidth: 1
     }, {
         xtype: "textfield",
-        name: "pu_currency",
+        name: "pi_currency",
         fieldLabel: "币别",
         readOnly: true,
         defaultValue: 'RMB'

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

@@ -15,6 +15,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             return ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%' + value + '%\' or pi_vendname like \'%' + value + '%\') ';
         }
     },{
+        margin:'0 0 0 20',
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         emptyText: '输入物料编号或名称',

frontend/saas-web/app/view/purchase/report/PurchasePay.js

@@ -17,7 +17,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         xtype: 'vendorDbfindTrigger',
         name: 'pu_vendname',
         columnWidth: 0.25,
-        emptyText:'请输入供应商名称'
+        emptyText:'请输入供应商编号或名称'
     }, {
         xtype: 'condatefield',
         name: 'createTime',

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

@@ -11,24 +11,20 @@ Ext.define('saas.view.sale.report.SaleProfit', {
     listUrl: '/api/sale/report/saleProfit',
     defaultCondition: null,
     reportTitle: '销售毛利润表',
-//筛选：客户、物料、时间	
     QueryWidth:0.2, 	
     searchItems: [{
-        xtype: 'textfield',
-        name: 'sa_custname',
-        emptyText:'请输入客户编号或名称',
-        columnWidth: 0.2,
-        getCondition: function(value) {
-            return  ' (sa_custname like\'%' + value + '%\' or sa_custcode like \'%'+value+'%\' ) ';
-        }
-    }, {
         xtype: 'textfield',
         name: 'pr_detail',
-        emptyText:'请输入物料编号或品牌',
+        emptyText:'请输入物料编号、品牌、型号或规格',
         columnWidth: 0.2,
         getCondition: function(value) {
-            return  ' (pr_code like\'%' + value + '%\' or pr_brand like \'%'+value+'%\' ) ';
+            return  ' (pr_code like\'%' + value + '%\' or pr_brand like \'%'+value+'%\' or pr_spec like \'%'+value+'%\' or pr_orispeccode like \'%'+value+'%\' ) ';
         }
+    }, {
+        xtype: 'customerDbfindTrigger',
+        name: 'sa_custname',
+        emptyText:'请输入客户编号或名称',
+        columnWidth: 0.2
     }, {
         xtype: 'condatefield',
         name: 'pi_date',

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

@@ -79,6 +79,13 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                     }
                     return me;
                 }
+            }, {
+                xtype: "datefield",
+                name: "sa_delivery",
+                fieldLabel: "交货日期",
+                allowBlank: false,
+                defaultValue: new Date(),
+                columnWidth: 0.25,
             }, {
                 name: "sa_toplace",
                 xtype: "remotecombo",
@@ -323,7 +330,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 xtype: "textfield",
                 name: "sa_nettotal",
                 fieldLabel: "金额(元)",
-                readOnly: true
+                hidden: true
             },{
                 xtype: "textfield",
                 name: "sa_total",

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

@@ -349,7 +349,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         xtype : "textfield", 
         name : "pi_remark", 
         fieldLabel : "备注", 
-        columnWidth : 0.75
+        columnWidth : 1
     },{
         xtype: "textfield",
         name: "pi_currency",

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

@@ -351,7 +351,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         xtype: "textfield",
         name: "pi_remark",
         fieldLabel: "备注",
-        columnWidth: 0.75
+        columnWidth: 1
     },{
         xtype: "textfield",
         name: "pi_currency",

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

@@ -18,24 +18,17 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
                 return  ' (pi_inoutno like\'%' + value + '%\' ) ';
             }
         }
+    }, {
+        xtype: 'productDbfindTrigger',
+        name: 'pr_detail',
+        emptyText:'请输入物料编号或名称',
+        margin:'0 0 0 20'
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '日期',
         allowBlank: true,
         columnWidth: 0.5
-    }, {
-        xtype: 'productDbfindTrigger',
-        name: 'pr_detail',
-        fieldLabel: '物料',
-        emptyText:'请输入物料编号或名称',
-        getCondition: function(value) {
-            if(value == ''|| value ==null) {
-                return '1=1';
-            }else {
-                return  ' (pr_detail like\'%' + value + '%\' or  ) ';
-            }
-        }
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',

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

@@ -12,16 +12,10 @@ Ext.define('saas.view.stock.make.QueryPanel', {
         name: 'ma_code',
         emptyText :'请输入单号',
     }, {
-        xtype: 'condatefield',
-        name: 'createTime',
-        fieldLabel: '日期',
-        columnWidth: 0.5,
-        operation: 'between'
-    },{
         xtype: 'productDbfindTrigger',
         name: 'ma_prodcode',
-        fieldLabel: '产品',
         emptyText :'请输入产品名称或编号',
+        margin:'0 0 0 20',
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';
@@ -29,6 +23,12 @@ Ext.define('saas.view.stock.make.QueryPanel', {
                 return  ' (ma_prodcode like\'%' + value + '%\' or ma_proddetail like \'%'+value+'%\') ';
             }
         }
+    }, {
+        xtype: 'condatefield',
+        name: 'createTime',
+        fieldLabel: '日期',
+        columnWidth: 0.5,
+        operation: 'between'
     }, {
         xtype: 'combobox',
         name: 'ma_type',

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

@@ -18,18 +18,18 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
                 return  ' (pi_inoutno like\'%' + value + '%\') ';
             }
         }
+    }, {
+        xtype: 'productDbfindTrigger',
+        name: 'pr_detail',
+        emptyText:'输入物料编号或名称',
+        margin:'0 0 0 20',
+        showDetail: true
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '日期',
         columnWidth: 0.5,
         operation: 'between'
-    }, {
-        xtype: 'productDbfindTrigger',
-        name: 'pr_detail',
-        fieldLabel: '物料',
-        emptyText:'输入物料编号或名称',
-        showDetail: true
     }, {
         xtype: 'vendorDbfindTrigger',
         name: 'pi_vendcode',

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

@@ -18,18 +18,18 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
                 return  ' (pi_inoutno like\'%' + value + '%\') ';
             }
         }
+    }, {
+        xtype: 'productDbfindTrigger',
+        name: 'pr_detail',
+        emptyText:'输入物料编号或名称',
+        showDetail: true,
+        margin:'0 0 0 20'
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '日期',
         columnWidth: 0.5,
         operation: 'between'
-    }, {
-        xtype: 'productDbfindTrigger',
-        name: 'pr_detail',
-        fieldLabel: '物料',
-        emptyText:'输入物料编号或名称',
-        showDetail: true
     }, {
         xtype: 'customerDbfindTrigger',
         name: 'pi_custname',

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

@@ -14,12 +14,18 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
     searchItems: [{		
         xtype: 'textfield',
         name: 'wh_description',
+        fieldLabel: '仓库',
+        emptyText:'输入仓库编号或名称',
         columnWidth: 0.2,
-        emptyText:'输入仓库名称或物料名称',
-        columnWidth: 0.2,
-        getCondition:function(v){
-            return "(upper(pr_detail) like '%" + v.toUpperCase() + "%' or upper(wh_description) like '%" + v.toUpperCase() + "%')";
+        getCondition: function(value) {
+           return  ' (wh_description like\'%' + value + '%\' or wh_code like \'%'+value+'%\') ';
         }
+    }, {		
+        xtype: 'productDbfindTrigger',
+        name: 'pr_code',
+        emptyText:'输入物料编号或名称',
+        columnWidth: 0.2,
+        margin:'0 0 0 20',
     }, {
         xtype: 'monthdatefield',
         name: 'pwm_yearmonth',