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

frontend/saas-web/app/view/money/othreceipts/FormPanel.js

@@ -53,6 +53,10 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
          fieldLabel : "账户名称",
          allowBlank : false
      }, {
+        xtype:'datefield',
+        name : 'or_date',
+        fieldLabel : '单据日期'
+    },{
         name : "detailGridField", 
         xtype : "detailGridField", 
         storeModel:'saas.model.money.Othreceipts',
@@ -72,9 +76,9 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
                     xtype : "numberfield",
                     readOnly: true
                 },
-                defaultValue: Ext.Date.format(new Date(), 'Ym'),
+                // defaultValue: Ext.Date.format(new Date(), 'Ym'),
                 width : 120.0,
-                // hidden: true,
+                hidden: true,
                 items : null
             }, {
                 text : "收入类别", 

frontend/saas-web/app/view/money/othspendings/FormPanel.js

@@ -76,9 +76,9 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
                     xtype : "numberfield",
                     readOnly:true
                 },
-                defaultValue: Ext.Date.format(new Date(), 'Ym'),
+                // defaultValue: Ext.Date.format(new Date(), 'Ym'),
                 width : 120.0, 
-                // hidden: true,
+                hidden: true,
                 items : null
             }, {
                 text : "支出类别", 
@@ -139,7 +139,8 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
     },{
         xtype : 'numberfield',
         name : 'os_amount',
-        fieldLabel : '付款金额'
+        fieldLabel : '付款金额',
+        readOnly:true
     },{
         xtype : "textfield", 
         name : "os_remark", 

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

@@ -207,18 +207,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             }
         }, {
             text: "业务类型",
-            dataIndex: "pbd_slkind",
-            editor : {
-                xtype:'combo',
-                queryMode: 'local',
-                displayField: 'display',
-                valueField: 'value',
-                store:Ext.create('Ext.data.Store', {
-                    fields: ['value', 'display'],
-                    data : [{value:"应付", display:"应付"},
-                        {value:"应收", display:"应收"}]
-                })
-            }
+            dataIndex: "pbd_slkind"
         }, {
             text: "单据日期",
             dataIndex: "pbd_sldate",
@@ -290,6 +279,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                 xtype : "numberfield",
                 decimalPrecision: 2
             },
+            allowBlank : false,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length)).fill('0');

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

@@ -275,6 +275,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                 xtype : "numberfield",
                 decimalPrecision: 2
             },
+            allowBlank : false,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length)).fill('0');

frontend/saas-web/app/view/stock/make/FormPanelController.js

@@ -499,13 +499,12 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                         mm_prodidid:item.bd_sonid,
                         mm_prodcode:item.bd_soncode,
                         mm_oneuseqty:item.bd_baseqty,
-                        pr_detail:'',
-                        pr_spec:'',
-                        pr_unit:''
+                        pr_detail:item.productDTO.pr_detail,
+                        pr_spec:item.productDTO.pr_spec,
+                        pr_unit:item.productDTO.pr_unit
                     })                
                 });
-                store.loadData(loadData)
-        
+                store.loadData(loadData);
             }
         })
         .catch(function(res) {