Browse Source

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

chenw 7 years ago
parent
commit
6b4dfae71e

+ 1 - 0
frontend/saas-web/app/view/home/HomeController.js

@@ -73,6 +73,7 @@ Ext.define('saas.view.home.HomeController', {
                                 .then(function(localJson) {
                                     if(localJson.success){
                                         saas.util.BaseUtil.showSuccessToast('本位币设置成功');
+                                        Ext.getCmp('mainView').getViewModel().set('defaultCurrency', v);
                                         Ext.getCmp('x-defaultcurrency').close();
                                     }
                                 })

+ 1 - 1
frontend/saas-web/app/view/money/report/TotalRecDetail.js

@@ -19,7 +19,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
 
     searchItems: [{
         xtype: 'customerDbfindTrigger',
-        name: 'cm_custcode',
+        name: 'cm_custname',
         emptyText: '请输入客户名称',
         columnWidth: 0.25
     }, {

+ 30 - 0
frontend/saas-web/app/view/purchase/deviceQuery/DataList.js

@@ -62,31 +62,61 @@ Ext.define('saas.view.purchase.deviceQuery.DataList', {
         width : 150.0, 
         dataIndex : 'pr_brand', 
         xtype : '', 
+        renderer:function(val,metaData,record,x,y,store, view){
+            metaData.tdAttr = 'qclass="x-tip" data-qtip="'
+                                + val + '"';
+            return val;
+        }
     },{
         text : '名称', 
         width : 200.0, 
         dataIndex : 'pr_detail', 
         xtype : '', 
+        renderer:function(val,metaData,record,x,y,store, view){
+            metaData.tdAttr = 'qclass="x-tip" data-qtip="'
+                                + val + '"';
+            return val;
+        }
     },{
         text : '型号', 
         width : 200.0, 
         dataIndex : 'pr_orispeccode', 
         xtype : '', 
+        renderer:function(val,metaData,record,x,y,store, view){
+            metaData.tdAttr = 'qclass="x-tip" data-qtip="'
+                                + val + '"';
+            return val;
+        }
     },{
         text : '规格', 
         width : 200, 
         dataIndex : 'pr_spec', 
         xtype : '', 
+        renderer:function(val,metaData,record,x,y,store, view){
+            metaData.tdAttr = 'qclass="x-tip" data-qtip="'
+                                + val + '"';
+            return val;
+        }
     },{
         text : '包装', 
         width : 100, 
         dataIndex : 'pr_pack', 
         xtype : '', 
+        renderer:function(val,metaData,record,x,y,store, view){
+            metaData.tdAttr = 'qclass="x-tip" data-qtip="'
+                                + val + '"';
+            return val;
+        }
     },{
         text : '供应商', 
         width : 150.0, 
         dataIndex : 'pr_vendor', 
         xtype : '', 
+        renderer:function(val,metaData,record,x,y,store, view){
+            metaData.tdAttr = 'qclass="x-tip" data-qtip="'
+                                + val + '"';
+            return val;
+        }
     },{
         text : '库存', 
         width : 100,