Browse Source

修改采购模块

zhoudw 7 years ago
parent
commit
ca36e68904

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

@@ -72,11 +72,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         name : "pu_total", 
         fieldLabel : "单据金额",
         readOnly:true
-    }, {
-        xtype : "textfield", 
-        name : "PU_REMARK", 
-        fieldLabel : "备注", 
-        columnWidth : 0.25
     },{
         name : "detailGridField", 
         xtype : "detailGridField", 
@@ -276,6 +271,12 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 width : 120.0
             }
         ]
+    },
+    {
+        xtype : "textfield", 
+        name : "PU_REMARK", 
+        fieldLabel : "备注", 
+        columnWidth : 1
     }, 
     {
         xtype : "textfield", 

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

@@ -111,7 +111,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         xtype : "detailGridField",
         storeModel:'saas.model.purchase.ProdIODetail',
         // deleteDetailUrl:'http://localhost:8800/prodinout/deleteDetail/',
-        deleteDetailUrl:'api/purchase/prodinout/deleteDetail/',
+        deleteDetailUrl:'/api/purchase/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         columns : [
             {

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

@@ -103,7 +103,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         xtype : "detailGridField",
         storeModel:'saas.model.purchase.ProdIODetail',
         // deleteDetailUrl:'http://localhost:8800/prodinout/deleteDetail/',
-        deleteDetailUrl:'api/purchase/prodinout/deleteDetail/',
+        deleteDetailUrl:'/api/purchase/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         columns : [
             {

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

@@ -102,11 +102,13 @@ Ext.define('saas.view.stock.make.FormPanel', {
         xtype : "numberfield", 
         name : "ma_price", 
         fieldLabel : "单位成本",
+        decimals:8,
         columnWidth: 0.2
     },{
         xtype : "numberfield", 
         name : "ma_total", 
         fieldLabel : "总成本",
+        decimals:2,
         columnWidth: 0.2
     },
     {
@@ -177,7 +179,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
             },            
             {
                 text : "数量", 
-                dataIndex : "pd_qty", 
+                dataIndex : "mm_qty", 
                 width : 120.0,
                 editor : {
                     xtype : "numberfield",
@@ -235,6 +237,9 @@ Ext.define('saas.view.stock.make.FormPanel', {
                     decimalPrecision: 8,
                     minValue:0
                 },
+                listeners:{
+                    edit:'price_change'
+                },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length)).fill('0');

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

@@ -4,70 +4,6 @@ Ext.define('saas.view.stock.make.FormPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //主表单选放大镜模板
-            // 'dbfindtrigger[name=pu_vendcode]':{
-            //     beforerender:function(f){
-            //         Ext.apply(f,{
-            //             //数据接口
-            //             dataUrl:'/api/document/vendor/list',
-            //             addXtype: 'document-vendor-formpanel',
-            //             addTitle: '供应商资料',
-            //             //赋值 
-            //             dbfinds:[{
-            //                 from:'ve_code',to:'pu_vendcode'
-            //             },{
-            //                 from:'ve_name',to:'pu_vendname'
-            //             }],
-            //             //联想设置
-            //             dbtpls:[{
-            //                 field:'ve_code',width:100
-            //             },{
-            //                 field:'ve_name',width:100
-            //             }],
-            //             defaultCondition:"ve_statuscode='OPEN'",
-            //             //放大镜窗口字段
-            //             dbSearchFields:[{
-            //                 emptyText:'输入仓库编号或名称',
-            //                 xtype : "textfield", 
-            //                 name : "name", 
-            //                 allowBlank : true, 
-            //                 columnWidth : 0.25,
-            //                 getCondition:function(v){
-            //                     return "upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%'";
-            //                 }
-            //             }],
-            //             //放大镜窗口列表
-            //             dbColumns:[{
-            //                 "text": "供应商ID",
-            //                 "flex": 0,
-            //                 "dataIndex": "ve_id",
-            //                 "width": 0,
-            //                 "xtype": "",
-            //                 "items": null
-            //             },{
-            //                 "text": "供应商编号",
-            //                 "flex": 1,
-            //                 "dataIndex": "ve_code",
-            //                 "width": 100,
-            //                 "xtype": "",
-            //                 "items": null
-            //             }, {
-            //                 "text": "供应商名称",
-            //                 "flex": 1,
-            //                 "dataIndex": "ve_name",
-            //                 "xtype": "",
-            //                 "items": null
-            //             }, {
-            //                 "text": "供应商类型",
-            //                 "flex": 0,
-            //                 "dataIndex": "ve_type",
-            //                 "width": 200,
-            //                 "xtype": "",
-            //                 "items": null
-            //             }]
-            //         }) ;   
-            //     }
-
             //放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=ma_whname]':{
                 beforerender:function(f){
@@ -517,6 +453,15 @@ Ext.define('saas.view.stock.make.FormPanelController', {
         });
     },
 
+
+    price_change:function() {
+        var me = this,
+        viewModel = me.getViewModel(),
+        store = viewModel.get('detail0').detailStore;
+        var sum_qty = store.sum('mm_price');
+        viewModel.set('ma_price',sum_qty);
+    },
+
     turnIn: function() {
         var me = this,
         form = me.getView(),