Browse Source

修改采购模块

zhoudw 7 years ago
parent
commit
bb3b6f682d

+ 2 - 2
frontend/saas-web/app/model/stock/Makematerial.js

@@ -16,6 +16,6 @@ Ext.define('saas.model.stock.Makematerial', {
         { name: 'mm_qty', type: 'float' },
         { name: 'mm_qty', type: 'float' },
         { name: 'mm_amount', type: 'float' },
         { name: 'mm_amount', type: 'float' },
         { name: 'mm_repprodcode', type: 'string' },
         { name: 'mm_repprodcode', type: 'string' },
-        { name: 'mm_remark', type: 'string' }
-        ]
+        { name: 'mm_remark', type: 'string' }],
+    associations: [{ type: 'hasOne', model: 'saas.model.document.ProductDTO', associationKey: 'ProductDTO'}]        
 });
 });

+ 2 - 1
frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -148,7 +148,8 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 width : 120.0,
                 width : 120.0,
                 editor : {
                 editor : {
                     xtype : "numberfield",
                     xtype : "numberfield",
-                    decimalPrecision: 8
+                    decimalPrecision: 8,
+                    minValue:0
                 },
                 },
                 renderer : function(v) {
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var arr = (v + '.').split('.');

+ 2 - 0
frontend/saas-web/app/view/purchase/purchase/FormPanelController.js

@@ -15,6 +15,8 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         defaultCondition:"ve_statuscode='OPEN'",
                         defaultCondition:"ve_statuscode='OPEN'",
                         //赋值 
                         //赋值 
                         dbfinds:[{
                         dbfinds:[{
+                            from:'id',to:'pu_vendid'
+                        },{
                             from:'ve_code',to:'pu_vendcode'
                             from:'ve_code',to:'pu_vendcode'
                         },{
                         },{
                             from:'ve_name',to:'pu_vendname'
                             from:'ve_name',to:'pu_vendname'