merge

frontend/saas-web/app/view/purchase/purchase/QueryPanel.js

@@ -132,7 +132,19 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             text: '总额',
             dataIndex: 'pu_total',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 120
+        },{
+            text: '制单人',
+            dataIndex: 'pu_recorder',
+            width: 120
+        },{
+            text: '审核人',
+            dataIndex: 'pu_auditman',
+            width: 120
+        },{
+            text: '关联销售单',
+            dataIndex: 'pu_salecode',
+            width: 120
         }],
         relativeColumn: [{
             text: 'id',

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

@@ -112,49 +112,47 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 100,
+            hidden:true,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
             dataIndex: 'pi_inoutno',
             width: 200
-        }, {
-            text: '单据状态',
-            dataIndex: 'pi_status',
-            width: 120
-        }, {
+        },{
             text: '单据类型',
             dataIndex: 'pi_class',
             width: 120
-        }, {
-            text: '下单日期',
+        },{
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200
         },{
-            text: '采购单号',
-            dataIndex: 'pi_pucode',
-            width: 200
+            text: '状态',
+            dataIndex: 'pi_status',
+            width: 120
         },{
             text: '供应商名称',
             dataIndex: 'pi_vendname',
             width: 120
         },{
-            text: '含税金额',
-            dataIndex: 'pi_total',
-            xtype:'numbercolumn',
+            text: '制单人',
+            dataIndex: 'pi_recordman',
             width: 120
         },{
-            text: '未税金额',
-            dataIndex: 'pi_nettotal',
-            xtype:'numbercolumn',
+            text: '审核人',
+            dataIndex: 'pi_auditman',
             width: 120
+        },{
+            text: '备注',
+            dataIndex: 'pi_remark',
+            width: 200
         }],
         relativeColumn: [{
             text: 'id',
             dataIndex: 'pu_id',
-            width: 0,
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            hidden:true
         }, {
             text: '单据编号',
             dataIndex: 'pd_inoutno',

frontend/saas-web/app/view/purchase/purchaseOut/QueryPanel.js

@@ -112,43 +112,41 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 100,
+            hidden:true,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
             dataIndex: 'pi_inoutno',
             width: 200
-        }, {
-            text: '单据状态',
-            dataIndex: 'pi_status',
-            width: 120
-        }, {
+        },{
             text: '单据类型',
             dataIndex: 'pi_class',
             width: 120
-        }, {
-            text: '下单日期',
+        },{
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200
         },{
-            text: '采购单号',
-            dataIndex: 'pi_pucode',
-            width: 200
+            text: '状态',
+            dataIndex: 'pi_status',
+            width: 120
         },{
             text: '供应商名称',
             dataIndex: 'pi_vendname',
             width: 120
         },{
-            text: '含税金额',
-            dataIndex: 'pi_total',
-            xtype:'numbercolumn',
+            text: '制单人',
+            dataIndex: 'pi_recordman',
             width: 120
         },{
-            text: '未税金额',
-            dataIndex: 'pi_nettotal',
-            xtype:'numbercolumn',
-            width: 120,
+            text: '审核人',
+            dataIndex: 'pi_auditman',
+            width: 120
+        },{
+            text: '备注',
+            dataIndex: 'pi_remark',
+            width: 200
         }],
         relativeColumn: [{
             text: 'id',

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

@@ -112,43 +112,41 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 100,
+            hidden:true,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
             dataIndex: 'pi_inoutno',
             width: 200
-        }, {
-            text: '单据状态',
-            dataIndex: 'pi_status',
-            width: 120
-        }, {
+        },{
             text: '单据类型',
             dataIndex: 'pi_class',
             width: 120
-        }, {
-            text: '下单日期',
+        },{
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200
         },{
-            text: '采购单号',
-            dataIndex: 'pi_pucode',
-            width: 200
+            text: '状态',
+            dataIndex: 'pi_status',
+            width: 120
         },{
-            text: '供应商名称',
-            dataIndex: 'pi_vendname',
+            text: '客户名称',
+            dataIndex: 'pi_custname',
             width: 120
         },{
-            text: '含税金额',
-            dataIndex: 'pi_total',
-            xtype:'numbercolumn',
+            text: '制单人',
+            dataIndex: 'pi_recordman',
             width: 120
         },{
-            text: '未税金额',
-            dataIndex: 'pi_nettotal',
-            xtype:'numbercolumn',
-            width: 120,
+            text: '审核人',
+            dataIndex: 'pi_auditman',
+            width: 120
+        },{
+            text: '备注',
+            dataIndex: 'pi_remark',
+            width: 200
         }],
         relativeColumn: [{
             text: 'id',

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

@@ -112,43 +112,41 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 100,
+            hidden:true,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
             dataIndex: 'pi_inoutno',
             width: 200
-        }, {
-            text: '单据状态',
-            dataIndex: 'pi_status',
-            width: 120
-        }, {
+        },{
             text: '单据类型',
             dataIndex: 'pi_class',
             width: 120
-        }, {
-            text: '下单日期',
+        },{
+            text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 200
         },{
-            text: '采购单号',
-            dataIndex: 'pi_pucode',
-            width: 200
+            text: '状态',
+            dataIndex: 'pi_status',
+            width: 120
         },{
-            text: '供应商名称',
-            dataIndex: 'pi_vendname',
+            text: '客户名称',
+            dataIndex: 'pi_custname',
             width: 120
         },{
-            text: '含税金额',
-            dataIndex: 'pi_total',
-            xtype:'numbercolumn',
+            text: '制单人',
+            dataIndex: 'pi_recordman',
             width: 120
         },{
-            text: '未税金额',
-            dataIndex: 'pi_nettotal',
-            xtype:'numbercolumn',
-            width: 120,
+            text: '审核人',
+            dataIndex: 'pi_auditman',
+            width: 120
+        },{
+            text: '备注',
+            dataIndex: 'pi_remark',
+            width: 200
         }],
         relativeColumn: [{
             text: 'id',