Browse Source

其它出入库查询列表界面字段调整

zhuth 7 years ago
parent
commit
f28341cbfe

+ 1 - 1
frontend/saas-web/app/view/stock/otherIn/QueryPanel.js

@@ -105,7 +105,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             xtype:'datecolumn',
             width: 200
         },{
-            text: '状态',
+            text: '单据状态',
             dataIndex: 'pi_status',
             width: 120
         },{

+ 7 - 8
frontend/saas-web/app/view/stock/otherOut/QueryPanel.js

@@ -37,22 +37,21 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         hidden:true,
         columnWidth: 0.25
     }, {
-        xtype: 'textfield',
+        xtype: 'dbfindtrigger',
         name: 'pi_vendname',
         bind: '{pi_vendname}',
         fieldLabel: '供应商名称',
         allowBlank: true,
         columnWidth: 0.25
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'textfield',
         name: 'pd_prodcode',
-        bind: '{pd_prodcode}',
         fieldLabel: '物料编号',
+        hidden: true,
         showDetail: true
     }, {
-        xtype: 'textfield',
+        xtype: 'dbfindtrigger',
         name: 'pr_detail',
-        bind: '{pr_detail}',
         fieldLabel: '物料名称',
         showDetail: true
     }, {
@@ -108,7 +107,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             xtype:'datecolumn',
             width: 200
         },{
-            text: '状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         },{
@@ -138,11 +137,11 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             dataIndex: 'pd_inoutno',
             width: 200
         }, {
-            text: '单据状态',
+            text: '审核状态',
             dataIndex: 'pi_status',
             width: 120
         }, {
-            text: '单日期',
+            text: '单日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200

+ 10 - 9
frontend/saas-web/app/view/stock/otherOut/QueryPanelController.js

@@ -5,17 +5,17 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pu_vendname]':{
+            // 供应商名称
+            'dbfindtrigger[name=pi_vendname]':{
                 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_code',to:'pi_vendname'
                         },{
-                            from:'ve_name',to:'pu_vendname'
+                            from:'ve_name',to:'pi_vendname'
                         }],
                         dbtpls:[{
                             field:'ve_code',width:100
@@ -77,17 +77,18 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
 
                 }
             },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_prodcode]':{
+            // 物料名称
+            'dbfindtrigger[name=pr_detail]':{
                 beforerender:function(f){
                     Ext.apply(f,{
+                        conditionCode:'pr_code',
                         dataUrl:'/api/document/product/list',
                         addXtype: 'document-product-formpanel',
                         addTitle: '物料资料',
                         dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode'
+                            from:'pr_code',to:'pd_prodcode',
                         }, {
-                            from:'pr_unit',to:'pd_unit'
+                            from:'pr_detail',to:'pr_detail'
                         }],
                         dbtpls:[{
                             field:'pr_code',width:100
@@ -166,7 +167,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                             "text": "L/T",
                             "dataIndex": "pr_leadtime",
                             "width": 100,
-                        }]
+                        }]   
                     }) ;   
 
                 }