Browse Source

单据日期字段命名调整

zhuth 7 years ago
parent
commit
213ac8f04d

+ 16 - 2
frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -199,11 +199,25 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 allowBlank:false,
                 maxLength: 20
             },{
-                xtype:'textfield',
+                xtype:'combo',
                 fieldLabel: '仓库类型',
                 name: 'wh_type',
                 allowBlank:false,
-                maxLength: 20 
+                displayField : "display", 
+                editable:true,
+                hideTrigger : false, 
+                maxLength : 100.0, 
+                minValue : null, 
+                positiveNum : false, 
+                queryMode : "local", 
+                valueField : "value", 
+                store:{
+                    fields: ['display', 'value'],
+                    data : [
+                        {"display":"良品仓", "value":'良品仓'},
+                        {"display":"不良品仓", "value":'不良品仓'}
+                    ]
+                }
             },{
                 readOnly:true,
                 xtype:'textfield',

+ 3 - 3
frontend/saas-web/app/view/money/payBalance/FormPanel.js

@@ -335,15 +335,15 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     }, {
         xtype: 'hidden',
         name: 'pb_recorder',
-        fieldLabel: '创建人'
+        fieldLabel: '录入人'
     }, {
         xtype: "hidden",
         name: "pb_recorddate",
-        fieldLabel: "创建时间"
+        fieldLabel: "录入日期"
     }, {
         xtype: "hidden",
         name: "updatedate",
-        fieldLabel: "更新时间"
+        fieldLabel: "更新日期"
     }, {
         xtype: "hidden",
         readOnly: true,

+ 2 - 2
frontend/saas-web/app/view/money/recBalance/FormPanel.js

@@ -313,12 +313,12 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
     }, {
         xtype: 'datefield',
         name: 'updatedate',
-        fieldLabel: '更新时间',
+        fieldLabel: '更新日期',
         hidden: true
     }, {
         xtype: "datefield",
         name: "rb_recorddate",
-        fieldLabel: "创建时间",
+        fieldLabel: "录入日期",
         hidden: true
     }]
 });

+ 0 - 6
frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -274,12 +274,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             }
         ]
     },
-    {
-        xtype : "textfield", 
-        name : "PU_REMARK", 
-        fieldLabel : "备注", 
-        columnWidth : 1
-    }, 
     {
         xtype : "textareafield", 
         name : "PU_REMARK", 

+ 2 - 2
frontend/saas-web/app/view/stock/appropriationInOut/FormPanel.js

@@ -276,14 +276,14 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
         xtype : "datefield", 
         name : "createTime", 
         bind : "{createTime}", 
-        fieldLabel : "创建时间", 
+        fieldLabel : "录入日期", 
         allowBlank : true, 
         columnWidth : 0.25
     }, {
         xtype : "datefield", 
         name : "updateTime", 
         bind : "{updateTime}", 
-        fieldLabel : "更新时间", 
+        fieldLabel : "更新日期", 
         allowBlank : true, 
         columnWidth : 0.25
     }, {

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

@@ -287,20 +287,19 @@ Ext.define('saas.view.stock.make.FormPanel', {
     },{
         xtype : "datefield", 
         name : "createTime", 
-        bind : "{createTime}", 
-        fieldLabel : "制单日", 
+        fieldLabel : "录入日期", 
         allowBlank : true, 
         columnWidth : 0.25
     },{
         xtype : "textfield", 
         name : "ma_recorder", 
-        fieldLabel : "制单人",
+        fieldLabel : "录入人",
         columnWidth: 0.2
     },{
         xtype : "datefield", 
         name : "updateTime", 
         bind : "{updateTime}", 
-        fieldLabel : "更新时间", 
+        fieldLabel : "更新日期", 
         allowBlank : true, 
         columnWidth : 0.25
     }, {