【界面标准化】【仓库统一120，调拨单名称改为物料名称】

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

@@ -105,7 +105,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
     }, {
         text: '仓库',
         dataIndex: 'pd_whname',
-        width: 150,
+        width: 120,
         hidden: true
     }, {
         text: '单价(元)',

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

@@ -106,7 +106,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
         text: '仓库',
         dataIndex: 'pd_whname',
         hidden: true,
-        width: 150
+        width: 120
     }, {
         text: '单价(元)',
         dataIndex: 'pd_orderprice',

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

@@ -208,7 +208,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         }, {
             text: '仓库',
             dataIndex: 'pd_whname',
-            width: 150
+            width: 120
         }, {
             text: '数量',
             dataIndex: 'pd_inqty',

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

@@ -213,7 +213,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         }, {
             text: '仓库',
             dataIndex: 'pd_whname',
-            width: 80
+            width: 120
         }, {
             text: '数量',
             dataIndex: 'pd_outqty',

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

@@ -209,7 +209,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         }, {
             text: '仓库',
             dataIndex: 'pd_whname',
-            width: 150
+            width: 120
         },{
             text: '数量',
             dataIndex: 'pd_inqty',

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

@@ -209,7 +209,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         },{
             text: '仓库',
             dataIndex: 'pd_whname',
-            width: 80
+            width: 120
         }, {
             text: '数量',
             dataIndex: 'pd_outqty',

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

@@ -117,7 +117,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
             },
             {
                 text : "品牌", 
-                width : 150.0, 
+                width : 100.0, 
                 dataIndex : "pr_brand",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -128,8 +128,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                 }
             },
             {
-                text : "名称", 
-                width : 200.0, 
+                text : "物料名称", 
+                width : 150.0, 
                 dataIndex : "pr_detail",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -152,7 +152,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                 }
             },{
                 text : "规格", 
-                width : 150, 
+                width : 200, 
                 dataIndex : "pr_spec",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -181,7 +181,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                 }
             },{
                 text : "单位", 
-                width : 80.0, 
+                width : 65.0, 
                 dataIndex : "pr_unit",
                 ignore:true,
                 renderer: function (v, m, r) {
@@ -204,7 +204,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
             {
                 text : "拨出仓库", 
                 dataIndex : "pd_whname", 
-                width : 150.0, 
+                width : 120.0, 
                 items : null,
                 allowBlank:false,
                 editor : {
@@ -234,7 +234,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
             {
                 text : "拨入仓库", 
                 dataIndex : "pd_inwhname", 
-                width : 150.0, 
+                width : 120.0, 
                 allowBlank:false,
                 items : null,
                 editor : {

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

@@ -196,11 +196,11 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             }, {
                 text: '拨出仓库',
                 dataIndex: 'pd_whname',
-                width: 80
+                width: 120
             },{
                 text: '拨入仓库',
                 dataIndex: 'pd_inwhname',
-                width: 80
+                width: 120
             },{
                 text: '备注',
                 dataIndex: 'pd_remark',

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

@@ -12,8 +12,8 @@ Ext.define('saas.view.stock.make.QueryPanel', {
         name: 'ma_code',
         emptyText :'请输入单号',
     }, {
-        xtype: 'productDbfindTrigger',
-        name: 'ma_prodcode',
+        xtype: 'bomDbfindTrigger',
+        name: 'ma_proddetail',
         emptyText :'请输入产品编号或名称',
         margin:'0 0 0 20',
         getCondition: function(value) {

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

@@ -6,13 +6,17 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=ma_prodcode]':{
+            'bomDbfindTrigger[name=ma_prodcode]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'pr_code',to:'ma_prodcode',
-                        },{
-                            from:'pr_detail',to:'pr_detail'
+                            from: 'bo_mothercode',
+                            to: 'bo_mothercode'
+                        }, {
+                            from: 'bo_mothername',
+                            to: 'ma_proddetail'
+                        }, {
+                            from: 'pr_orispeccode', to: 'pr_orispeccode',ignore:ture
                         }],
                     }) ;   
 

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

@@ -175,7 +175,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         }, {
             text: '仓库',
             dataIndex: 'pd_whname',
-            width: 80
+            width: 120
         }, {
             text: '数量',
             dataIndex: 'pd_inqty',

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

@@ -175,7 +175,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         }, {
             text: '仓库',
             dataIndex: 'pd_whname',
-            width: 80
+            width: 120
         }, {
             text: '数量',
             dataIndex: 'pd_outqty',

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

@@ -63,7 +63,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
     },{
         text: '仓库',
         dataIndex:'wh_description',
-        width: 80
+        width: 120
     }, {
         text: '期初',
         columns: [{

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

@@ -133,7 +133,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     },  {
         text: '仓库',
         dataIndex: 'pd_whname',
-        width: 110
+        width: 120
     }, {
         text: '往来单位',
         dataIndex: 'bizname',