Browse Source

修正物料资料链接

rainco 7 years ago
parent
commit
c913f53f4b

+ 5 - 5
frontend/saas-web/app/view/document/product/FormPanel.js

@@ -13,12 +13,12 @@ Ext.define('saas.view.document.product.FormPanel', {
     _codeField: 'pr_code',
     _codeField: 'pr_code',
     _statusField: 'pr_status',
     _statusField: 'pr_status',
     _statusCodeField: 'pr_statuscode',
     _statusCodeField: 'pr_statuscode',
-    _readUrl:'http://192.168.253.31:8560/api/document/product/read/',
+    _readUrl:'/api/document/product/read/',
     //_saveUrl:'/api/document/product/save',
     //_saveUrl:'/api/document/product/save',
-    _saveUrl:'http://192.168.253.31:8560/api/document/product/save',
-    _openUrl:'http://192.168.253.31:8560/api/document/product/open',
-    _closeUrl:'http://192.168.253.31:8560/api/document/product/close',
-    _deleteUrl:'http://192.168.253.31:8560/api/document/product/delete/',
+    _saveUrl:'/api/document/product/save',
+    _openUrl:'/api/document/product/open',
+    _closeUrl:'/api/document/product/close',
+    _deleteUrl:'/api/document/product/delete/',
     _deleteMsg:'删除的物料将不能恢复,请确认是否删除?',
     _deleteMsg:'删除的物料将不能恢复,请确认是否删除?',
     initId:0,
     initId:0,
 
 

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

@@ -305,6 +305,11 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 width : 120.0
                 width : 120.0
             }
             }
         ]
         ]
+    }, {
+        xtype : "textfield", 
+        name : "pu_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 1
     }, {
     }, {
         xtype : "datefield", 
         xtype : "datefield", 
         name : "pu_date", 
         name : "pu_date", 
@@ -331,12 +336,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         name : "pu_buyerid", 
         name : "pu_buyerid", 
         fieldLabel : "采购员ID"
         fieldLabel : "采购员ID"
     },
     },
-    {
-        xtype : "textfield", 
-        name : "pu_remark", 
-        fieldLabel : "备注", 
-        columnWidth : 1
-    },
     {
     {
         xtype : "textfield", 
         xtype : "textfield", 
         name : "pu_recorder", 
         name : "pu_recorder", 

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

@@ -91,14 +91,13 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                 }
                 }
             },
             },
             // 主表-采购员名称
             // 主表-采购员名称
-            'dbfindtrigger[name=pu_buyername]':{
+            'dbfindtrigger[name=pu_buyercode]':{
                 beforerender:function(f){
                 beforerender:function(f){
                     Ext.apply(f,{
                     Ext.apply(f,{
                         //数据接口
                         //数据接口
                         dataUrl:'/api/document/employee/list',
                         dataUrl:'/api/document/employee/list',
                         addXtype: 'document-vendor-formpanel',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
                         addTitle: '供应商资料',
-                        defaultCondition:"ve_statuscode='OPEN'",
                         //赋值 
                         //赋值 
                         dbfinds:[{
                         dbfinds:[{
                             from:'id',to:'pu_buyerid',ignore:true
                             from:'id',to:'pu_buyerid',ignore:true

+ 13 - 5
frontend/saas-web/app/view/sale/sale/FormPanel.js

@@ -255,22 +255,30 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 },
                 },
             }
             }
         ]
         ]
+    }, {
+        xtype : "textfield", 
+        name : "sa_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 1
     }, {
     }, {
         xtype : "datefield", 
         xtype : "datefield", 
         name : "sa_date", 
         name : "sa_date", 
         fieldLabel : "单据日期", 
         fieldLabel : "单据日期", 
-        allowBlank : false, 
         defaultValue: new Date()
         defaultValue: new Date()
     }, {
     }, {
         xtype : "textfield", 
         xtype : "textfield", 
         name : "sa_total", 
         name : "sa_total", 
         fieldLabel : "单据金额",
         fieldLabel : "单据金额",
         readOnly:true
         readOnly:true
-    }, {
+    },{
+        xtype : "dbfindtrigger", 
+        name : "sa_sellercode", 
+        fieldLabel : "业务员编号",
+    },{
         xtype : "textfield", 
         xtype : "textfield", 
-        name : "sa_remark", 
-        fieldLabel : "备注", 
-        columnWidth : 1
+        name : "sa_seller", 
+        fieldLabel : "业务员",
+        readOnly:true
     }, {
     }, {
         xtype : 'textfield', 
         xtype : 'textfield', 
         name : 'sa_sendstatus', 
         name : 'sa_sendstatus', 

+ 66 - 0
frontend/saas-web/app/view/sale/sale/FormPanelController.js

@@ -112,6 +112,72 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                     }) ;   
                     }) ;   
 
 
                 }
                 }
+            },// 主表-采购员名称
+            'dbfindtrigger[name=sa_sellercode]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        //数据接口
+                        dataUrl:'/api/document/employee/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
+                        //赋值 
+                        dbfinds:[{
+                            from:'id',to:'id',ignore:true
+                        },{
+                            from:'em_code',to:'sa_sellercode'
+                        },{
+                            from:'em_name',to:'sa_seller'
+                        }],
+                        //联想设置
+                        dbtpls:[{
+                            field:'em_code',width:100
+                        },{
+                            field:'em_name',width:100
+                        }],
+                        defaultCondition: "em_class='正式'",
+                        dbSearchFields:[{
+                            emptyText:'输入人员编号或名称',
+                            xtype : "textfield", 
+                            name : "search", 
+                            getCondition: function(v) {
+                                return "(upper(em_code) like '%"+v.toUpperCase()+"%' or upper(em_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
+                        //放大镜窗口列表
+                        dbColumns:[{
+                            "text": "人员ID",
+                            "hidden": true,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": "numbercolumn"
+                        },{
+                            "text": "人员编号",
+                            "dataIndex": "em_code",
+                            "width": 200
+                        }, {
+                            "text": "人员名称",
+                            "dataIndex": "em_name",
+                            "width": 200
+                        }, {
+                            "text": "类型",
+                            "dataIndex": "em_class",
+                            "width": 180,
+                            "items": null
+                        }, {
+                            "text": "手机",
+                            "dataIndex": "em_mobile",
+                            "width": 180,
+                            "items": null
+                        }, {
+                            "text": "邮箱",
+                            "dataIndex": "em_email",
+                            "width": 180,
+                            "items": null
+                        }]
+                    }) ;   
+                }
             },
             },
             //放大镜赋值关系 以及 tpl模板
             //放大镜赋值关系 以及 tpl模板
             'multidbfindtrigger[name=sd_prodcode]':{
             'multidbfindtrigger[name=sd_prodcode]':{