【界面标准化】【调拨单-制造单-其它入库单】

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

@@ -21,7 +21,7 @@ Ext.define('saas.view.core.dbfind.types.BomDbfindTrigger', {
     defaultCondition: "bo_statuscode='ENABLE'",
     //窗口字段设置
     dbSearchFields: [{
-        emptyText: '请输入BOM编号或名称',
+        emptyText: '请输入产品编号或名称',
         xtype: "textfield",
         name: "search",
         width: 200,
@@ -42,18 +42,18 @@ Ext.define('saas.view.core.dbfind.types.BomDbfindTrigger', {
         width: 150,
     }, {
         text: "产品名称",
-        width: 200,
+        width: 150,
         dataIndex: "bo_mothername",
     }, {
         text: "产品型号",
-        width: 150,
+        width: 200,
         dataIndex: "pr_orispeccode",
     }, {
         text: "产品规格",
-        width: 150,
+        width: 200,
         dataIndex: "pr_spec",
     }, {
-        text: "版本",
+        text: "版本号",
         width: 80,
         dataIndex: "bo_version"
     }, {

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

@@ -21,7 +21,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
     }, {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
-        emptyText:'请输入物料编号或名称',
+        emptyText:'请输入物料编号、名称或型号',
         margin:'0 0 0 20'
     }, {
         xtype: 'condatefield',

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

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

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

@@ -111,7 +111,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
     },{
         xtype : "warehouseDbfindTrigger",
         name : "ma_whname",
-        fieldLabel : "仓库名称",
+        fieldLabel : "仓库",
         allowBlank : false,
         columnWidth: 0.25
     },{
@@ -127,8 +127,9 @@ Ext.define('saas.view.stock.make.FormPanel', {
         name : "ma_total",
         readOnly:true,
         editable:false, 
-        fieldLabel : "金额",
+        fieldLabel : "金额(元)",
         decimalPrecision:2,
+        thousandSeparator: ',',
         columnWidth: 0.25
     },
     {
@@ -265,7 +266,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
             }, {
                 text : "仓库",
                 dataIndex : "mm_whname",
-                width: 110.0,
+                width: 120.0,
                 items : null,
                 allowBlank : false,
                 editor : {

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

@@ -14,15 +14,8 @@ Ext.define('saas.view.stock.make.QueryPanel', {
     }, {
         xtype: 'bomDbfindTrigger',
         name: 'ma_proddetail',
-        emptyText :'请输入产品编号或名称',
-        margin:'0 0 0 20',
-        getCondition: function(value) {
-            if(value == 'ALL') {
-                return '1=1';
-            }else {
-                return  ' (ma_prodcode like\'%' + value + '%\' or ma_proddetail like \'%'+value+'%\') ';
-            }
-        }
+        emptyText :'请输入产品编号、名称或型号',
+        margin:'0 0 0 20'
     }, {
         xtype: 'condatefield',
         name: 'createTime',
@@ -118,15 +111,19 @@ Ext.define('saas.view.stock.make.QueryPanel', {
         }, {
             text: '类型',
             dataIndex: 'ma_type',
-            width: 110
+            width: 100
         }, {
             text: '产品编号',
             dataIndex: 'ma_prodcode',
             width: 150
+        }, {
+            text: '版本号',
+            dataIndex: 'ma_version',
+            width: 80
         }, {
             text: '产品名称',
             dataIndex: 'ma_proddetail',
-            width: 200
+            width: 150
         }, {
             text: '产品型号',
             dataIndex: 'ma_prodorispec',
@@ -135,10 +132,6 @@ Ext.define('saas.view.stock.make.QueryPanel', {
             text: '产品规格',
             dataIndex: 'ma_prodspec',
             width: 200
-        }, {
-            text: '版本号',
-            dataIndex: 'ma_version',
-            width: 80
         }, {
             text: '数量',
             dataIndex: 'ma_qty',
@@ -152,10 +145,10 @@ Ext.define('saas.view.stock.make.QueryPanel', {
             dataIndex: 'ma_produnit',
             width: 80,
         },{
-            text: '单据状态',
+            text: '审核状态',
             align: 'center',
             dataIndex: 'ma_status',
-            width: 90,
+            width: 80,
         },{
             text: '单位成本',
             dataIndex: 'ma_total',

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

@@ -16,7 +16,7 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                             from: 'bo_mothername',
                             to: 'ma_proddetail'
                         }, {
-                            from: 'pr_orispeccode', to: 'pr_orispeccode',ignore:ture
+                            from: 'pr_orispeccode', to: 'ma_prodorispec'
                         }],
                     }) ;