Browse Source

移除更多查询/单据编码规则展示文本调整

zhuth 7 years ago
parent
commit
fd25ff52c5

+ 4 - 4
frontend/saas-web/app/view/core/query/QueryFormPanel.js

@@ -21,10 +21,10 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
             'border-bottom': '1px solid #35baf6 !important'
         },
         items: ['->', {
-            xtype: 'button',
-            text: '更多查询',
-            handler: 'moreQuery'
-        }, {
+        //     xtype: 'button',
+        //     text: '更多查询',
+        //     handler: 'moreQuery'
+        // }, {
             xtype: 'button',
             text: '查询',
             handler: 'onQuery'

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

@@ -15,7 +15,7 @@ Ext.define('saas.view.home.Home', {
         align: 'stretch'
     },
 
-    padding: '20',
+    bodyPadding: 5,
 
     defaults: {
         xtype: 'container'

+ 24 - 17
frontend/saas-web/app/view/sys/maxnumbers/DataList.js

@@ -74,32 +74,39 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
     }],
 
     columns : [{
-        text : "id", 
+        text : 'id', 
         width : 0, 
-        dataIndex : "id", 
-        xtype : "numbercolumn", 
+        dataIndex : 'id', 
+        xtype : 'numbercolumn', 
     },{
-        text : "单据名称", 
+        text : '单据名称', 
         width : 200.0, 
-        dataIndex : "mn_name", 
-        xtype : "", 
+        dataIndex : 'mn_name', 
+        xtype : '', 
     }, 
     {
-        text : "单据前缀", 
-        dataIndex : "mn_leadcode", 
+        text : '单据前缀', 
+        dataIndex : 'mn_leadcode', 
         width : 120.0, 
-        xtype : "", 
+        xtype : '', 
     }, 
     {
-        text : "单据规则", 
-        dataIndex : "mn_rule", 
-        width : 220.0, 
-        xtype : "", 
+        text : '单据规则', 
+        dataIndex : 'mn_rule', 
+        width : 220.0,
+        renderer: function(v) {
+            var o = {
+                yyyymmdd: '年月日',
+                yyyymm: '年月',
+                无: '无'
+            }
+            return o[v];
+        },
     },{
-        text : "流水长度", 
-        dataIndex : "mn_number", 
+        text : '流水长度', 
+        dataIndex : 'mn_number', 
         width : 120.0, 
-        xtype : "", 
+        xtype : '', 
     }],
 
     dbSearchFields: [],
@@ -132,7 +139,7 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
                     beforeload: function (store, op) {
                         var condition = me.condition;
                         if (Ext.isEmpty(condition)) {
-                            condition = "";
+                            condition = '';
                         }
                         Ext.apply(store.proxy.extraParams, {
                             number: op._page,

+ 5 - 5
frontend/saas-web/resources/json/navigation.json

@@ -260,6 +260,11 @@
     "items": [{
         "text": "系统设置",
         "items": [{
+            "id":"sys-config-formpanel",
+            "text": "系统参数",
+            "viewType": "sys-config-formpanel",
+            "leaf": true
+        }, {
             "id":"sys-messagelog-datalist",
             "text": "操作日志",
             "viewType": "sys-messagelog-datalist",
@@ -274,11 +279,6 @@
             "text": "结账/反结账",
             "viewType": "sys-finish-datalist",
             "leaf": true
-        },{
-            "id":"sys-config-formpanel",
-            "text": "参数设置",
-            "viewType": "sys-config-formpanel",
-            "leaf": true
         }]
     }]
 }]