Browse Source

【界面标准化】 【前端处理】

rainco 7 years ago
parent
commit
7bab1418c1

+ 8 - 8
frontend/saas-web/app/view/document/bankinformation/DataList.js

@@ -25,15 +25,15 @@ Ext.define('saas.view.document.bankinformation.DataList', {
             columns: [{
                 text: '账户编号',
                 dataIndex: 'bk_bankcode',
-                flex: 1
+                width: 150
             },{
                 text: '账户名称',
                 dataIndex: 'bk_bankname',
-                flex: 1
+                width: 200
             },{
                 text: '账户类别',
                 dataIndex: 'bk_type',
-                flex: 1,
+                width: 100
             },{
                 text: '期初金额(元)',
                 dataIndex: 'bk_beginamount',
@@ -41,25 +41,25 @@ Ext.define('saas.view.document.bankinformation.DataList', {
                 renderer : function(v) {
                     return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
-                flex: 1
+                width: 110
             },{
-                text: '当前余额',
+                text: '当前余额(元)',
                 dataIndex: 'bk_thisamount',
                 xtype: 'numbercolumn',
                 renderer : function(v) {
                     return saas.util.BaseUtil.numberFormat(v, 2, true);
                 },
-                flex: 1
+                width: 110
             },{
                 xtype:'datecolumn',
                 text: '建账日期',
                 format:'Y-m-d',
                 dataIndex: 'bk_date',
-                flex: 1
+                width: 110
             }, {
                 text: '备注',
                 dataIndex: 'bk_remark',
-                flex: 1
+                width: 250
             }],
             keyField:'id',
             reqUrl: '/api/document/bankinformation/save',

+ 2 - 2
frontend/saas-web/app/view/document/bom/BasePanel.js

@@ -19,7 +19,7 @@ Ext.define('saas.view.document.bom.BasePanel', {
     },{
         xtype : "textfield", 
         name : "bo_version", 
-        fieldLabel:'版本',
+        fieldLabel:'版本',
         emptyText: '全部',
     },{
         xtype: 'combobox',
@@ -104,7 +104,7 @@ Ext.define('saas.view.document.bom.BasePanel', {
             width : 0, 
         },
         {   
-            text : "产品版本", 
+            text : "产品版本", 
             dataIndex : "bo_version", 
             width :80.0, 
         }]

+ 1 - 1
frontend/saas-web/app/view/document/bom/FormPanel.js

@@ -84,7 +84,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
     },{
         xtype: 'textfield',
         name: 'bo_version',
-        fieldLabel: '版本',
+        fieldLabel: '版本',
         allowBlank: false
     }, {
         xtype : "detailGridField",

+ 1 - 1
frontend/saas-web/app/view/stock/make/FormPanel.js

@@ -88,7 +88,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
     },{
         xtype : "textfield", 
         name : "ma_version", 
-        fieldLabel : "版本",
+        fieldLabel : "版本",
         readOnly:true,
         columnWidth: 0.25
     },

+ 1 - 1
frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -78,7 +78,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
         defaultValue: new Date()
     },{
         xtype : "textfield", 
-        name : "pi_total", 
+        name : "pi_costtotal", 
         fieldLabel : "金额(元)", 
         allowBlank : true,
         readOnly: true,

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

@@ -109,7 +109,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         }, {
             text: '金额(元)',
             xtype: 'numbercolumn',
-            dataIndex: 'pi_nettotal',
+            dataIndex: 'pi_costtotal',
             width: 110,
             renderer : function(v) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);

+ 1 - 1
frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -63,7 +63,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
         defaultValue: new Date()
     }, {
         xtype: "textfield",
-        name: "pi_total",
+        name: "pi_costtotal",
         fieldLabel: "金额(元)",
         allowBlank: true,
         readOnly: true,

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

@@ -109,7 +109,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         }, {
             text: '金额(元)',
             xtype: 'numbercolumn',
-            dataIndex: 'pi_nettotal',
+            dataIndex: 'pi_costtotal',
             width: 110,
             renderer : function(v) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);

+ 3 - 3
frontend/saas-web/app/view/stock/report/DataList.js

@@ -19,7 +19,7 @@ Ext.define('saas.view.stock.report.DataList', {
     searchItems: [{
         name: 'pr_code',
         xtype: 'textfield',
-        emptyText: '物料编号/名称/规格',
+        emptyText: '请输入物料编号、名称或规格',
         columnWidth: 0.25,
         getCondition: function (v) {
             return "(upper(pr_spec) like '%" + v.toUpperCase() + "%' or upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%" + v.toUpperCase() + "%')";
@@ -27,7 +27,7 @@ Ext.define('saas.view.stock.report.DataList', {
     }, {
         name: 'wh_code',
         xtype: 'textfield',
-        emptyText: '仓库编号/名称',
+        emptyText: '请输入仓库编号或名称',
         columnWidth: 0.25,
         hidden: true,
         getCondition: function (v) {
@@ -69,7 +69,7 @@ Ext.define('saas.view.stock.report.DataList', {
     }, {
         text: '物料类型',
         dataIndex: 'rc_prodKind',
-        width: 200
+        width: 100
     }, {
         text: "仓库",
         dataIndex: "rc_whName",