修改其它出入库单界面

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

@@ -46,7 +46,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         readOnly:true,
         allowBlank : true, 
         columnWidth : 0.25
-    }, {
+    },{
         xtype : "hidden", 
         name : "pi_vendid", 
         fieldLabel : "供应商ID", 

frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -62,10 +62,25 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
         bind: '{pi_custcode}',
         fieldLabel: '客户编号'
     }, {
-        xtype: 'dbfindtrigger',
+        xtype: 'hidden',
         name: 'pi_custname',
         bind: '{pi_custname}',
         fieldLabel: '客户名称'
+    },{
+        xtype : "hidden", 
+        name : "pi_vendid", 
+        fieldLabel : "供应商ID", 
+        allowBlank : true, 
+        columnWidth : 0.0
+    },{
+        xtype: 'hidden',
+        name: 'pi_vendcode',
+        fieldLabel: '供应商编号'
+    }, {
+        xtype: 'dbfindtrigger',
+        name: 'pi_vendname',
+        fieldLabel: '供应商名称',
+        allowBlank : false,
     },{
         xtype : "datefield", 
         name : "pi_date", 

frontend/saas-web/app/view/stock/otherIn/FormPanelController.js

@@ -9,6 +9,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
             'dbfindtrigger[name=pi_vendname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
+
                         dataUrl:'/api/document/vendor/list',
                         // dataUrl:'http://localhost:9480/vendor/list',
                         addXtype: 'document-vendor-formpanel',
@@ -315,10 +316,10 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             to: 'pd_whname'
                         }],
                         dbtpls: [{
-                            field: 'pd_whcode',
+                            field: 'wh_code',
                             width: 100
                         }, {
-                            field: 'pd_whname',
+                            field: 'wh_description',
                             width: 100
                         }],
                         dbSearchFields:[{

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

@@ -28,7 +28,21 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         fieldLabel: '单据日期',
         allowBlank: true,
         columnWidth: 0.5
+    },{
+        xtype: 'textfield',
+        name: 'pi_vendcode',
+        fieldLabel: '供应商编号',
+        allowBlank: true,
+        hidden:true,
+        columnWidth: 0.25
     }, {
+        xtype: 'dbfindtrigger',
+        name: 'pi_vendname',
+        fieldLabel: '供应商名称',
+        emptyText:'输入供应商编号或名称',
+        allowBlank: true,
+        columnWidth: 0.25
+    },{
         xtype: 'textfield',
         name: 'pi_custcode',
         fieldLabel: '客户编号',
@@ -41,6 +55,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         fieldLabel: '客户名称',
         emptyText:'输入客户编号或名称',
         allowBlank: true,
+        hidden:true,
         columnWidth: 0.25
     }, {
         xtype: 'textfield',
@@ -113,8 +128,8 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             dataIndex: 'pi_status',
             width: 120
         },{
-            text: '客户名称',
-            dataIndex: 'pi_custname',
+            text: '供应商名称',
+            dataIndex: 'pi_vendname',
             width: 120
         },{
             text: '制单人',
@@ -142,6 +157,11 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             text: '单据类型',
             dataIndex: 'pd_piclass',
             width: 200
+        },{
+            text: '单据日期',
+            dataIndex: 'pi_date',
+            xtype:'datecolumn',
+            width: 200
         },{
             text: '审核状态',
             dataIndex: 'pi_status',
@@ -149,10 +169,11 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         },{
             text: '客户编号',
             dataIndex: 'pi_custcode',
+            hidden:true,
             width: 120
         },{
-            text: '客户名称',
-            dataIndex: 'pi_custname',
+            text: '供应商名称',
+            dataIndex: 'pi_vendname',
             width: 120
         },{
             text: '物料编号',
@@ -183,6 +204,12 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             text: '单位成本',
             dataIndex: 'pd_orderprice',
             xtype:'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },            
             width: 120
         },{
             text: '税率',
@@ -193,6 +220,12 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             text: '金额',
             dataIndex: 'pd_total',
             xtype:'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },            
             width: 120
         },{
             text: '相关单号',

frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -63,6 +63,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
         xtype: 'dbfindtrigger',
         name: 'pi_custname',
         bind: '{pi_custname}',
+        allowBlank : false,
         fieldLabel: '客户名称'
     }, {
         xtype: "datefield",

frontend/saas-web/app/view/stock/otherOut/FormPanelController.js

@@ -304,9 +304,9 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             from:'wh_description',to:'pd_whname'
                         }],
                         dbtpls:[{
-                            field:'pd_whcode',width:100
+                            field:'wh_code',width:100
                         },{
-                            field:'pd_whname',width:100
+                            field:'wh_description',width:100
                         }],
                         dbSearchFields:[{
                             emptyText:'输入仓库编号或名称',

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

@@ -139,6 +139,11 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             text: '单据类型',
             dataIndex: 'pd_piclass',
             width: 200
+        },{
+            text: '单据日期',
+            dataIndex: 'pi_date',
+            xtype:'datecolumn',
+            width: 200
         },{
             text: '审核状态',
             dataIndex: 'pi_status',
@@ -180,6 +185,12 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             text: '单位成本',
             dataIndex: 'pd_orderprice',
             xtype:'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },             
             width: 120
         },{
             text: '税率',
@@ -190,6 +201,12 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             text: '金额',
             dataIndex: 'pd_total',
             xtype:'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            },            
             width: 120
         },{
             text: '相关单号',