Merge remote-tracking branch 'origin/dev' into dev

frontend/saas-web/app/view/core/base/GridPanel.js

@@ -95,7 +95,7 @@ Ext.define('saas.view.core.base.GridPanel', {
                             }
                         }
                     },{
-                        text: '关闭',
+                        text: '禁用',
                         handler: function(){
                             var form = this.ownerCt.ownerCt.ownerCt;
                             me.onVastDeal(form._batchCloseUrl,'CLOSE');

frontend/saas-web/app/view/document/customer/FormModel.js

@@ -3,7 +3,8 @@ Ext.define('saas.view.document.customer.FormModel', {
     alias: 'viewmodel.document-customer-formpanel',
 
     data: {
-        id: 0
+        id: 0,
+        cu_begindate:new Date()
     },
 
     formulas:{

frontend/saas-web/app/view/document/customer/FormPanel.js

@@ -80,6 +80,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
     },{
         xtype : "datefield", 
         name : "cu_begindate", 
+        format:'Y-m-d',
         fieldLabel : "期初日期", 
         allowBlank : true, 
         columnWidth : 0.25  

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

@@ -131,6 +131,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 dataIndex : "pd_prodcode", 
                 xtype : "", 
                 items : null,
+                allowBlank : false,
                 editor : {
                     displayField : "display", 
                     editable : true, 

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

@@ -123,6 +123,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 dataIndex : "pd_prodcode", 
                 xtype : "", 
                 items : null,
+                allowBlank : false,
                 editor : {
                     displayField : "display", 
                     editable : true, 

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

@@ -124,6 +124,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 dataIndex : "pd_prodcode", 
                 xtype : "", 
                 items : null,
+                allowBlank : false,
                 editor : {
                     displayField : "display", 
                     editable : true, 

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

@@ -120,6 +120,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 dataIndex: "pd_prodcode",
                 xtype: "",
                 items: null,
+                allowBlank : false,
                 editor: {
                     displayField: "display",
                     editable: true,