Browse Source

BOM资料界面调整

rainco 7 years ago
parent
commit
9938692582

+ 2 - 2
frontend/saas-web/app/view/document/bom/BasePanel.js

@@ -33,8 +33,8 @@ Ext.define('saas.view.document.bom.BasePanel', {
             xtype : "numbercolumn",   
         },{
             text : "母件编号", 
-            width : 200.0, 
-            dataIndex : "bo_mothercode", 
+            dataIndex : "bo_mothercode",
+            width : 200.0,
         }, 
         {
             text : "母件名称", 

+ 101 - 0
frontend/saas-web/app/view/document/bom/FormController.js

@@ -5,6 +5,107 @@ Ext.define('saas.view.document.bom.FormController', {
     init: function (form) {
         var me = this;
         this.control({
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=bo_mothercode]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:'/api/document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
+                        dbfinds:[
+                        {
+                            from:'pr_code',to:'bo_mothercode'
+                        }, {
+                            from:'pr_detail',to:'bo_mothername'
+                        }, {
+                            from:'pr_spec',to:'pr_spec'
+                        }, {
+                            from:'id',to:'bo_motherid',ignore:true
+                        }],
+                        dbtpls:[{
+                            field:'pr_code',width:100
+                        },{
+                            field:'pr_detail',width:100
+                        }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
+                        dbColumns:[{
+                            "text": "物料ID",
+                            "hidden": true,
+                            "dataIndex": "id",
+                        }, {
+                            "text": "物料编号",       
+                            "dataIndex": "pr_code",
+                            "width": 200,
+                        }, {
+                            "text": "物料名称",
+                            "width": 200,
+                            "dataIndex": "pr_detail",
+                        }, {
+                            "text": "规格",
+                            "dataIndex": "pr_spec",
+                            "width": 100,
+                        }, {
+                            "text": "单位",
+                            "dataIndex": "pr_unit",
+                            "width": 100,
+                        },{
+                            "text": "仓库id",
+                            "dataIndex": "pr_whid",
+                            "hidden": true,
+                        },{
+                            "text": "仓库编号",
+                            "dataIndex": "pr_whcode",
+                            "hidden": true,
+                        },{
+                            "text": "仓库",
+                            "dataIndex": "pr_whname",
+                            "width": 200,
+                        },{
+                            "text": "总库存数",
+                            "dataIndex": "po_onhand",
+                            "width": 100,
+                            align:'right'
+                        },{
+                            "text": "类型",
+                            "dataIndex": "pr_kind",
+                            "width": 100,
+                        },{
+                            "text": "型号",
+                            "dataIndex": "pr_orispeccode",
+                            "width": 100,
+                        },{
+                            "text": "品牌",
+                            "dataIndex": "pr_brand",
+                            "width": 100,
+                        },{
+                            "text": "供应商",
+                            "dataIndex": "pr_vendname",
+                            "width": 100,
+                        },{
+                            "text": "最小包装",
+                            "dataIndex": "pr_zxbzs",
+                            "width": 100,
+                            align:'right'
+                        },{
+                            "text": "L/T",
+                            "dataIndex": "pr_leadtime",
+                            "width": 100,
+                        }]
+                    }) ;   
+
+                }
+            },
             //从表多选放大镜赋值关系 以及 tpl模板
             'multidbfindtrigger[name=bd_soncode]':{
                 beforerender:function(f){

+ 13 - 7
frontend/saas-web/app/view/document/bom/FormPanel.js

@@ -10,7 +10,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
     //字段属性
     _title:'BOM资料',
     _idField: 'id',
-    _codeField: 'bo_mothercode',
+    _codeField: 'codefield',
     _statusField: 'bo_status',
     _statusCodeField: 'bo_statuscode',
     _readUrl:'/api/document/bom/read/',
@@ -53,21 +53,27 @@ Ext.define('saas.view.document.bom.FormPanel', {
     },{
         xtype: 'hidden',
         name: 'bo_motherid',
-        fieldLabel: '母件id'
+        fieldLabel: '产品id'
+    },{
+        xtype : "dbfindtrigger", 
+        name: 'bo_mothercode',
+        fieldLabel: '产品编号',
+        allowBlank: false
     },{
         xtype: 'textfield',
         name: 'bo_mothername',
-        fieldLabel: '母件名称',
+        fieldLabel: '产品名称',
         allowBlank: false
     },{
         xtype: 'textfield',
-        name: 'bo_mothercode',
-        fieldLabel: '母件编号',
-        allowBlank: false
+        name: 'pr_spec',
+        fieldLabel: '产品规格',
+        reddOnly:true,
+        ignore:true
     },{
         xtype: 'textfield',
         name: 'bo_status',
-        fieldLabel: 'BOM状态'
+        fieldLabel: '产品状态'
     },{
         xtype: 'hidden',
         name: 'bo_statuscode',

+ 9 - 1
frontend/saas-web/app/view/sale/sale/QueryPanel.js

@@ -139,7 +139,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         relativeColumn: [ {
             text: 'id',
             dataIndex: 'sa_id',
-            width: 100,
+            width: 0,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
@@ -167,6 +167,14 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             text: '物料编号',
             dataIndex: 'sd_prodcode',
             width: 120
+        }, {
+            text: '物料名称',
+            dataIndex: 'pe_detail',
+            width: 120
+        }, {
+            text: '物料规格',
+            dataIndex: 'pr_spec',
+            width: 120
         }, {
             text: '数量',
             dataIndex: 'sd_qty',