Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutListMapper.xml

@@ -203,7 +203,7 @@
 
   <sql id="Prodinout_Column_List" >
     prodinout.pi_id pi_id,prodinout.pi_inoutno pi_inoutno,prodinout.pi_class pi_class,prodinout.pi_date pi_date,prodinout.pi_vendid pi_vendid,prodinout.pi_vendcode pi_vendcode,prodinout.pi_vendname pi_vendname,prodinout.pi_custid pi_custid,prodinout.pi_custcode pi_custcode,prodinout.pi_custname pi_custname,prodinout.pi_puid pi_puid,prodinout.pi_pucode pi_pucode,prodinout.pi_said pi_said,prodinout.pi_sacode pi_sacode,prodinout.pi_total pi_total,prodinout.pi_address pi_address,prodinout.pi_ioid pi_ioid,prodinout.pi_status pi_status,prodinout.pi_statuscode pi_statuscode,prodinout.pi_printstatus pi_printstatus,prodinout.pi_printstatuscode pi_printstatuscode,prodinout.companyid companyid,prodinout.updaterId updaterId,prodinout.updatetime updatetime,prodinout.pi_text1 pi_text1,prodinout.pi_text2 pi_text2,prodinout.pi_text3 pi_text3,prodinout.pi_text4 pi_text4,prodinout.pi_text5 pi_text5,prodinout.pi_nettotal pi_nettotal,prodinout.pi_auditdate pi_auditdate,prodinout.pi_auditman pi_auditman,prodinout.pi_remark pi_remark,
-prodinout.creatorName creatorName,prodinout.creatorId creatorId,prodinout.createTime createTime,prodinout.updaterName updaterName,prodinout.pi_macode pi_macode,prodinout.pi_maid pi_maid,prodinout.pi_prstatuscode pi_prstatuscode,prodinout.pi_prstatus pi_prstatus,prodinout.pi_iocode pi_iocode,prodinout.pi_currency pi_currency
+prodinout.creatorName creatorName,prodinout.creatorId creatorId,prodinout.createTime createTime,prodinout.updaterName updaterName,prodinout.pi_macode pi_macode,prodinout.pi_maid pi_maid,prodinout.pi_prstatuscode pi_prstatuscode,prodinout.pi_prstatus pi_prstatus,prodinout.pi_iocode pi_iocode,prodinout.pi_currency pi_currency,
   </sql>
   <sql id="Prodiodetail_Column_List" >
     prodiodetail.pd_id pd_id,prodiodetail.pd_piid pd_piid,prodiodetail.pd_inoutno pd_inoutno,prodiodetail.pd_piclass pd_piclass,prodiodetail.pd_pdno pd_pdno,prodiodetail.pd_ordercode pd_ordercode,prodiodetail.pd_orderdetno pd_orderdetno,prodiodetail.pd_prodid pd_prodid,prodiodetail.pd_prodcode pd_prodcode,prodiodetail.pd_unit pd_unit,prodiodetail.pd_inqty pd_inqty,prodiodetail.pd_outqty pd_outqty,prodiodetail.pd_orderprice pd_orderprice,prodiodetail.pd_sendprice pd_sendprice,prodiodetail.pd_price pd_price,prodiodetail.pd_total pd_total,prodiodetail.pd_taxrate pd_taxrate,prodiodetail.pd_netprice pd_netprice,prodiodetail.pd_nettotal pd_nettotal,prodiodetail.pd_whid pd_whid,prodiodetail.pd_whcode pd_whcode,prodiodetail.pd_whname pd_whname,prodiodetail.pd_inwhid pd_inwhid,prodiodetail.pd_inwhcode pd_inwhcode,prodiodetail.pd_inwhname pd_inwhname,prodiodetail.pd_orderid pd_orderid,prodiodetail.pd_sdid pd_sdid,prodiodetail.pd_status pd_status,prodiodetail.pd_remark pd_remark,prodiodetail.pd_text1 pd_text1,prodiodetail.pd_text2 pd_text2,prodiodetail.pd_text3 pd_text3,

frontend/saas-web/app/util/FormUtil.js

@@ -269,7 +269,7 @@ Ext.define('saas.util.FormUtil', {
                 Ext.Array.insert(items, formIndex + index, [{
                     xtype: 'container',
                     userCls: 'x-field-separator',
-                    height: 24,
+                    height: 36,
                     html: group.title,
                     columnWidth: 1,
                     ignore: true,

frontend/saas-web/app/view/core/dbfind/types/CustomerDbfindTrigger.js

@@ -49,7 +49,7 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
         dataIndex: "cu_type",
         width: 110
     }, {
-        text: "税率",
+        text: "税率(%)",
         dataIndex: "cu_taxrate",
         xtype: 'numbercolumn',
         width:80,

frontend/saas-web/app/view/core/dbfind/types/EmployeeDbfindTrigger.js

@@ -44,7 +44,7 @@ Ext.define('saas.view.core.dbfind.types.EmployeeDbfindTrigger', {
     }, {
         text: "类型",
         dataIndex: "em_class",
-        width: 110,
+        width: 100,
     }, {
         text: "手机",
         dataIndex: "em_mobile",

frontend/saas-web/app/view/core/dbfind/types/ProductAddMultiDbfindTrigger.js

@@ -11,11 +11,13 @@ Ext.define('saas.view.core.dbfind.types.ProductAddMultiDbfindTrigger', {
     addTitle: '物料资料',
     //联想设置
     dbtpls: [{
-        field: 'pr_code',
-        width: 150
+        field: 'pr_code',width: 150
     }, {
-        field: 'pr_detail',
-        width: 200
+        field: 'pr_detail',width: 150
+    },{
+        field:'pr_brand',width:100
+    },{
+        field:'pr_orispeccode',width:200
     }],
     defaultCondition: "pr_statuscode='ENABLE'",
     dbSearchFields: [{
@@ -26,7 +28,7 @@ Ext.define('saas.view.core.dbfind.types.ProductAddMultiDbfindTrigger', {
         allowBlank: true,
         width:300,
         getCondition: function (v) {
-            return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%" + v.toUpperCase() + "%' or upper(pr_brand) like '%" + v.toUpperCase() + "%')";
+            return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%" + v.toUpperCase() + "%' or upper(pr_orispeccode) like '%" + v.toUpperCase() + "%')";
         }
     }],
     //窗口列设置
@@ -41,23 +43,23 @@ Ext.define('saas.view.core.dbfind.types.ProductAddMultiDbfindTrigger', {
     },{
         text: "品牌",
         dataIndex: "pr_brand",
-        width: 110
+        width: 100
     },{
-        text: "名称",
-        width: 200,
+        text: "物料名称",
+        width: 150,
         dataIndex: "pr_detail"
     }, {
         text : "型号", 
         dataIndex : "pr_orispeccode", 
-        width : 150.0
+        width : 200.0
     }, {
         text : "规格", 
         dataIndex : "pr_spec", 
-        width : 150.0
+        width : 200.0
     },{
         text: "单位",
         dataIndex: "pr_unit",
-        width: 80
+        width: 65
     },{
         text: "类型",
         dataIndex: "pr_kind",
@@ -85,7 +87,7 @@ Ext.define('saas.view.core.dbfind.types.ProductAddMultiDbfindTrigger', {
     }, {
         text: "仓库",
         dataIndex: "pr_whname",
-        width: 200,
+        width: 110,
         hidden: true
     }, {
         text: "最新采购单价(元)",

frontend/saas-web/app/view/core/dbfind/types/ProductDbfindTrigger.js

@@ -8,10 +8,14 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
     dataUrl:'/api/document/product/list',
     addXtype: 'document-product-formpanel',
     addTitle: '物料资料',
-    dbtpls:[{
-        field:'pr_code',width:150
+    dbtpls: [{
+        field: 'pr_code',width: 150
+    }, {
+        field: 'pr_detail',width: 150
+    },{
+        field:'pr_brand',width:100
     },{
-        field:'pr_detail',width:200
+        field:'pr_orispeccode',width:200
     }],
     defaultCondition: "pr_statuscode='ENABLE'",
     dbSearchFields:[{
@@ -20,7 +24,7 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
         name : "search", 
         width: 200,
         getCondition: function(v) {
-            return "(upper(pr_brand) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+            return "(upper(pr_orispeccode) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
         },
         allowBlank : true, 
         columnWidth :300
@@ -36,23 +40,23 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
     },{
         text: "品牌",
         dataIndex: "pr_brand",
-        width: 110
+        width: 100
     },{
-        text: "名称",
-        width: 200,
+        text: "物料名称",
+        width: 150,
         dataIndex: "pr_detail"
     }, {
         text : "型号", 
         dataIndex : "pr_orispeccode", 
-        width : 150.0
+        width : 200.0
     }, {
         text : "规格", 
         dataIndex : "pr_spec", 
-        width : 150.0
+        width : 200.0
     },{
         text: "单位",
         dataIndex: "pr_unit",
-        width: 80
+        width: 65
     },{
         text: "类型",
         dataIndex: "pr_kind",
@@ -80,7 +84,7 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
     }, {
         text: "仓库",
         dataIndex: "pr_whname",
-        width: 200,
+        width: 110,
         hidden: true
     }, {
         text: "最新采购单价(元)",

frontend/saas-web/app/view/core/dbfind/types/ProductMultiDbfindTrigger.js

@@ -13,11 +13,13 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
     addTitle: '物料资料',
     //联想设置
     dbtpls: [{
-        field: 'pr_code',
-        width: 150
+        field: 'pr_code',width: 150
     }, {
-        field: 'pr_detail',
-        width: 200
+        field: 'pr_detail',width: 150
+    },{
+        field:'pr_brand',width:100
+    },{
+        field:'pr_orispeccode',width:200
     }],
     defaultCondition: "pr_statuscode='ENABLE'",
     dbSearchFields: [{
@@ -28,7 +30,7 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
         allowBlank: true,
         width:300,
         getCondition: function (v) {
-            return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%" + v.toUpperCase() + "%' or upper(pr_brand) like '%" + v.toUpperCase() + "%')";
+            return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%" + v.toUpperCase() + "%' or upper(pr_orispeccode) like '%" + v.toUpperCase() + "%')";
         }
     }],
     //窗口列设置
@@ -43,23 +45,23 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
     },{
         text: "品牌",
         dataIndex: "pr_brand",
-        width: 110
+        width: 100
     },{
         text: "物料名称",
-        width: 200,
+        width: 150,
         dataIndex: "pr_detail"
     }, {
         text : "型号", 
         dataIndex : "pr_orispeccode", 
-        width : 150.0
+        width : 200.0
     }, {
         text : "规格", 
         dataIndex : "pr_spec", 
-        width : 150.0
+        width : 200.0
     },{
         text: "单位",
         dataIndex: "pr_unit",
-        width: 80
+        width: 65
     },{
         text: "类型",
         dataIndex: "pr_kind",
@@ -87,7 +89,7 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
     }, {
         text: "仓库",
         dataIndex: "pr_whname",
-        width: 200,
+        width: 110,
         hidden: true
     }, {
         text: "最新采购单价(元)",

frontend/saas-web/app/view/core/form/FormPanel.js

@@ -20,7 +20,7 @@ Ext.define('saas.view.core.form.FormPanel', {
     bodyPadding: '8 12 8 12',
 
     fieldDefaults: {
-        margin: '0 0 10 0',
+        margin: '0 0 10 10',
         labelAlign: 'right',
         labelWidth: 90,
         columnWidth: 0.25,

frontend/saas-web/app/view/core/form/FormPanel.scss

@@ -2,7 +2,7 @@
     padding: 8px 12px 8px 12px;
 
     .x-toolbar-default-docked-top{
-        padding: 6px 0 12px 8px;
+        padding: 12px 5px 12px 8px;
     }
     .x-tb {
         color: #A2A2A2;
@@ -72,6 +72,9 @@
         &>div {
             padding-left: 20px;
             font-weight: bold;
+            height: 100%;
+            line-height: 100%;
+            vertical-align: middle;
 
             &:before {
                 content: ' ';
@@ -81,7 +84,7 @@
                 border-radius: 4px;
                 background: #33b4ee;
                 left: 4px;
-                top: 1px;
+                top: 10px;
             }
         }
     }

frontend/saas-web/app/view/document/customer/BasePanel.js

@@ -92,16 +92,16 @@ Ext.define('saas.view.document.customer.BasePanel', {
         }, {
             text : "状态", 
             dataIndex : "cu_status", 
-            width : 90.0
+            width : 80.0
         }, {
             text : "类型", 
             dataIndex : "cu_type", 
-            width : 110.0
+            width : 100.0
         }, {
-            text : "税率", 
+            text : "税率(%)", 
             dataIndex : "cu_taxrate", 
             xtype: 'numbercolumn', 
-            width : 110.0, 
+            width : 80.0, 
             renderer : function(v) {
                 return saas.util.BaseUtil.numberFormat(v, 2, false);
             }

frontend/saas-web/app/view/document/customer/FormPanel.js

@@ -137,7 +137,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
     },{
         xtype : "numberfield", 
         name : "cu_taxrate", 
-        fieldLabel : "税率", 
+        fieldLabel : "税率(%)", 
         allowBlank : false, 
         columnWidth : 0.25,
         minValue:0,

frontend/saas-web/app/view/document/vendor/BasePanel.js

@@ -85,13 +85,13 @@ Ext.define('saas.view.document.vendor.BasePanel', {
         }, {
             text : "状态", 
             dataIndex : "ve_status", 
-            width : 90.0
+            width : 80.0
         }, {
             text : "类型", 
             dataIndex : "ve_type", 
-            width : 110.0 
+            width : 100.0 
         }, {
-            text : "税率", 
+            text : "税率(%)", 
             xtype: 'numbercolumn', 
             dataIndex : "ve_taxrate", 
             width : 80.0, 

frontend/saas-web/app/view/document/vendor/FormPanel.js

@@ -145,7 +145,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         xtype : "numberfield", 
         name : "ve_taxrate", 
         hideTrigger:true,
-        fieldLabel : "税率", 
+        fieldLabel : "税率(%)", 
         allowBlank : false, 
         columnWidth : 0.25,
         minValue:0,  

frontend/saas-web/app/view/home/infoCardList/Payment.js

@@ -36,12 +36,12 @@ Ext.define('saas.view.home.infoCardList.Payment', {
     }, {
         text: '供应商名称',
         dataIndex: 'pi_vendname',
-        width: 250
+        width: 200
     }, {
         text: '审核状态',
         align: 'center',
         dataIndex: 'pi_status',
-        width: 90
+        width: 80
     },{
         text: '关联单号',
         dataIndex: 'pi_pucode',

frontend/saas-web/app/view/home/infoCardList/PurchaseIn.js

@@ -28,12 +28,12 @@ Ext.define('saas.view.home.infoCardList.PurchaseIn', {
     }, {
         text: '供应商名称',
         dataIndex: 'pu_vendname',
-        width: 150
+        width: 200
     }, {
         text: '审核状态',
         align: 'center',
         dataIndex: 'pu_status',
-        width: 90
+        width: 80
     }, {
         text: '业务状态',
         align: 'center',

frontend/saas-web/app/view/home/infoCardList/Recment.js

@@ -28,7 +28,7 @@ Ext.define('saas.view.home.infoCardList.Recment', {
     },{
         text: '客户名称',
         dataIndex: 'pi_custname',
-        width: 250
+        width: 200
     }, {
         text: '单据状态',
         align: 'center',

frontend/saas-web/app/view/home/infoCardList/SaleOut.js

@@ -38,7 +38,7 @@ Ext.define('saas.view.home.infoCardList.SaleOut', {
     }, {
         text: '客户名称',
         dataIndex: 'sa_custname',
-        width: 250
+        width: 200
     }, {
         text: '明细序号',
         dataIndex: 'sd_detno',

frontend/saas-web/app/view/home/infoCardList/UnauditCheckIn.js

@@ -36,12 +36,12 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
     }, {
         text: '供应商名称',
         dataIndex: 'pi_vendname',
-        width: 250
+        width: 200
     }, {
         text: '审核状态',
         align: 'center',
         dataIndex: 'pi_status',
-        width: 90
+        width: 80
     },{
         text: '关联单号',
         dataIndex: 'pi_pucode',

frontend/saas-web/app/view/home/infoCardList/UnauditSaleOut.js

@@ -28,7 +28,7 @@ Ext.define('saas.view.home.infoCardList.UnauditSaleOut', {
     },{
         text: '客户名称',
         dataIndex: 'pi_custname',
-        width: 250
+        width: 200
     }, {
         text: '单据状态',
         align: 'center',

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -118,7 +118,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             text: '审核状态',
             dataIndex: 'ft_status',
             align: 'center',
-            width: 90
+            width: 80
         }, {
             text: '备注',
             dataIndex: 'ftd_remark',

frontend/saas-web/app/view/money/othreceipts/FormPanelController.js

@@ -41,7 +41,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             dataIndex: "cu_sellername",
                             width:110
                         }, {
-                            text: "税率",
+                            text: "税率(%)",
                             dataIndex: "cu_taxrate",
                             xtype: 'numbercolumn',
                             width:80,

frontend/saas-web/app/view/money/othreceipts/QueryPanel.js

@@ -111,7 +111,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         }, {
             text: '客户名称',
             dataIndex: 'or_custname',
-            width: 250
+            width: 200
         },  {
             text: '结算账户',
             dataIndex: 'or_bankname',
@@ -150,7 +150,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         }, {
             text: '客户名称',
             dataIndex: 'or_custname',
-            width: 250
+            width: 200
         },  {
             text: '结算账户',
             dataIndex: 'or_bankname',

frontend/saas-web/app/view/money/othspendings/FormPanelController.js

@@ -26,7 +26,7 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             dataIndex: "ve_type",
                             width: 110,
                         }, {
-                            text: "税率",
+                            text: "税率(%)",
                             dataIndex: "ve_taxrate",
                             width: 80,
                             xtype: 'numbercolumn',

frontend/saas-web/app/view/money/othspendings/QueryPanel.js

@@ -109,7 +109,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         }, {
             text: '供应商名称',
             dataIndex: 'os_vendname',
-            width:250
+            width:200
         },{
             text: '结算账户',
             dataIndex: 'os_bankname',
@@ -149,7 +149,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         }, {
             text: '供应商名称',
             dataIndex: 'os_vendname',
-            width:250
+            width:200
         },{
             text: '结算账户',
             dataIndex: 'os_bankname',

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -27,7 +27,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             dataIndex: "ve_type",
                             width: 110,
                         }, {
-                            text: "税率",
+                            text: "税率(%)",
                             dataIndex: "ve_taxrate",
                             width: 80,
                             xtype: 'numbercolumn',

frontend/saas-web/app/view/money/payBalance/QueryPanel.js

@@ -86,7 +86,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             }, {
                 text: '供应商名称',
                 dataIndex: 'pb_vendname',
-                width: 180,
+                width: 200,
             }, {
                 text: '单据状态',
                 align: 'center',
@@ -119,7 +119,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         }, {
             text: '供应商名称',
             dataIndex: 'pb_vendname',
-            width: 180,
+            width: 200,
         }, {
             text: '单据状态',
             align: 'center',

frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -42,7 +42,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             dataIndex: "cu_sellername",
                             width:110
                         }, {
-                            text: "税率",
+                            text: "税率(%)",
                             dataIndex: "cu_taxrate",
                             xtype: 'numbercolumn',
                             width:80,

frontend/saas-web/app/view/money/recBalance/QueryPanel.js

@@ -77,7 +77,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
         }, {
             text: '客户名称',
             dataIndex: 'rb_custname',
-            width: 180,
+            width: 200,
         }, {
             text: '单据状态',
             align: 'center',
@@ -115,7 +115,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
         }, {
             text: '客户名称',
             dataIndex: 'rb_custname',
-            width: 180,
+            width: 200,
         },{
             text: '收款人',
             dataIndex: 'rb_manname',

frontend/saas-web/app/view/money/verification/FormPanelController.js

@@ -42,7 +42,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             dataIndex: "cu_sellername",
                             width:110
                         }, {
-                            text: "税率",
+                            text: "税率(%)",
                             dataIndex: "cu_taxrate",
                             xtype: 'numbercolumn',
                             width:80,
@@ -124,7 +124,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             dataIndex: "cu_sellername",
                             width:110
                         }, {
-                            text: "税率",
+                            text: "税率(%)",
                             dataIndex: "cu_taxrate",
                             xtype: 'numbercolumn',
                             width:80,
@@ -191,7 +191,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             dataIndex: "ve_type",
                             width: 110,
                         }, {
-                            text: "税率",
+                            text: "税率(%)",
                             dataIndex: "ve_taxrate",
                             width: 80,
                             xtype: 'numbercolumn',
@@ -266,7 +266,7 @@ Ext.define('saas.view.money.verification.FormPanelController', {
                             dataIndex: "ve_type",
                             width: 110,
                         }, {
-                            text: "税率",
+                            text: "税率(%)",
                             dataIndex: "ve_taxrate",
                             width: 80,
                             xtype: 'numbercolumn',

frontend/saas-web/app/view/money/verification/QueryPanel.js

@@ -97,7 +97,7 @@ Ext.define('saas.view.money.verification.QueryPanel', {
             text: '审核状态',
             align: 'center',
             dataIndex: 'vc_status',
-            width: 100
+            width: 80
         },{
             text: '业务类型',
             dataIndex: 'vc_kind',
@@ -109,7 +109,7 @@ Ext.define('saas.view.money.verification.QueryPanel', {
         }, {
             text: '客户名称',
             dataIndex: 'vc_custname',
-            width: 130
+            width: 200
         }, {
             text: '供应商编号',
             dataIndex: 'vc_vendcode',
@@ -117,7 +117,7 @@ Ext.define('saas.view.money.verification.QueryPanel', {
         }, {
             text: '供应商名称',
             dataIndex: 'vc_vendname',
-            width: 130
+            width: 200
         }, {
             text: '核销金额(元)',
             dataIndex: 'vc_amount1',

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

@@ -20,7 +20,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         showDetail: true,
-        emptyText:'输入物料编号或名称',
+        emptyText:'输入物料编号、名称或型号',
     }, {
         xtype: 'condatefield',
         name: 'pu_date',

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

@@ -13,6 +13,8 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                             from:'pr_code',to:'pd_prodcode',
                         }, {
                             from:'pr_detail',to:'pr_detail'
+                        }, {
+                            from:'pr_orispeccode',to:'pr_orispeccode'
                         }],
                     }) ;   
 

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

@@ -177,7 +177,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         }, {
             text: "仓库",
             dataIndex: "pd_whname",
-            width: 80.0,
+            width: 110.0,
             allowBlank: false,
             editor: {
                 displayField: "display",

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

@@ -18,7 +18,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         margin:'0 0 0 20',
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
-        emptyText:'输入物料编号或名称',
+        emptyText:'输入物料编号、名称或型号',
         showDetail: true
     }, {
         xtype: 'condatefield',
@@ -120,7 +120,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         },{
             text: '供应商名称',
             dataIndex: 'pi_vendname',
-            width: 150
+            width: 200
         },{
             text: '金额(元)',
             xtype: 'numbercolumn',
@@ -140,6 +140,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         },{
             text: '币别',
             dataIndex: 'pi_currency',
+            align: 'center',
             width: 65
         }, {
             text: '审核状态',

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

@@ -13,6 +13,8 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                             from:'pr_code',to:'pd_prodcode',
                         }, {
                             from:'pr_detail',to:'pr_detail'
+                        }, {
+                            from:'pr_orispeccode',to:'pr_orispeccode'
                         }],
                     }) ;   
 

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

@@ -172,7 +172,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         }, {
             text: "仓库",
             dataIndex: "pd_whname",
-            width: 80.0,
+            width: 110.0,
             allowBlank: false,
             editor: {
                 displayField: "display",

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

@@ -126,7 +126,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         }, {
             text: '供应商名称',
             dataIndex: 'pi_vendname',
-            width: 150
+            width: 200
         }, {
             text: '金额(元)',
             xtype: 'numbercolumn',
@@ -146,6 +146,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         },{
             text: '币别',
             dataIndex: 'pi_currency',
+            align: 'center',
             width: 65
         }, {
             text: '审核状态',

frontend/saas-web/app/view/sale/saleIn/FormPanel.js

@@ -192,13 +192,14 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 width : 0
             }, {
                 text : "仓库", 
+                width: 110.0,
                 dataIndex : "pd_whcode", 
                 hidden :true
             }, {
                 text : "仓库", 
                 dataIndex : "pd_whname", 
                 allowBlank:false,
-                width : 80.0, 
+                width: 110.0,
                 editor : {
                     displayField : "display", 
                     editable : true, 

frontend/saas-web/app/view/sale/saleOut/FormPanel.js

@@ -204,7 +204,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         }, {
             text: "仓库",
             dataIndex: "pd_whname",
-            width: 80.0,
+            width: 110.0,
             items: null,
             allowBlank: false,
             editor: {

frontend/saas-web/app/view/stock/inventory/EditDataList.js

@@ -118,7 +118,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
     }, {
         text : "仓库", 
         dataIndex : "st_whname", 
-        width : 80.0
+        width: 110.0
     }, {
         text : "物料类型", 
         dataIndex : "st_prodkind", 

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

@@ -265,7 +265,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
             }, {
                 text : "仓库",
                 dataIndex : "mm_whname",
-                width : 80.0,
+                width: 110.0,
                 items : null,
                 allowBlank : false,
                 editor : {

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

@@ -182,7 +182,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             }, {
                 text : "仓库", 
                 dataIndex : "pd_whname", 
-                width : 80.0, 
+                width: 110.0,
                 allowBlank : false,
                 editor : {
                     displayField : "display", 

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

@@ -165,7 +165,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             }, {
                 text: "仓库",
                 dataIndex: "pd_whname",
-                width: 80.0,
+                width: 110.0,
                 allowBlank : false,
                 editor: {
                     displayField: "display",

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

@@ -151,7 +151,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             text: '审核状态',
             align: 'center',
             dataIndex: 'pi_status',
-            width: 90
+            width: 80
         }, {
             text: '物料编号',
             dataIndex: 'pd_prodcode',

frontend/saas-web/app/view/stock/report/DataList.js

@@ -75,7 +75,7 @@ Ext.define('saas.view.stock.report.DataList', {
         dataIndex: "rc_whName",
         hidden: true,
         toggle: true,
-        width: 80,
+        width: 110.0
     }, {
         text: "数量",
         xtype: 'numbercolumn',