Merge remote-tracking branch 'origin/dev' into dev

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

@@ -47,7 +47,7 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
         width: 110
     }, {
         text: "单位",
-        dataIndex: "pr_spec",
+        dataIndex: "pr_unit",
         width: 80
     },{
         text: "品牌",
@@ -64,9 +64,32 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
             var format = '0,000.' + xr.join();
             return Ext.util.Format.number(v, format);
         }
-    },{
+    }, {
         text: "采购提前期",
         dataIndex: "pr_leadtime",
-        xtype:'hidden'
+        hidden: true
+    }, {
+        text: "仓库id",
+        dataIndex: "pr_whid",
+        hidden: true
+    }, {
+        text: "仓库编号",
+        dataIndex: "pr_whcode",
+        hidden: true
+    }, {
+        text: "仓库",
+        dataIndex: "pr_whname",
+        width: 200,
+        hidden: true
+    }, {
+        text: "最新采购单价",
+        dataIndex: "pr_purcprice",
+        xtype: 'numbercolumn',
+        hidden:true
+    }, {
+        text: "最新出货单价",
+        dataIndex: "pr_saleprice",
+        xtype: 'numbercolumn',
+        hidden:true
     }]
 });

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

@@ -74,7 +74,30 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
     }, {
         text: "采购提前期",
         dataIndex: "pr_leadtime",
-        xtype:'hidden'
+        hidden: true
+    }, {
+        text: "仓库id",
+        dataIndex: "pr_whid",
+        hidden: true
+    }, {
+        text: "仓库编号",
+        dataIndex: "pr_whcode",
+        hidden: true
+    }, {
+        text: "仓库",
+        dataIndex: "pr_whname",
+        width: 200,
+        hidden: true
+    }, {
+        text: "最新采购单价",
+        dataIndex: "pr_purcprice",
+        xtype: 'numbercolumn',
+        hidden:true
+    }, {
+        text: "最新出货单价",
+        dataIndex: "pr_saleprice",
+        xtype: 'numbercolumn',
+        hidden:true
     }]
 
 });

frontend/saas-web/app/view/sale/sale/FormPanelController.js

@@ -54,21 +54,15 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dbfinds: [{
-                            from: 'pr_code',
-                            to: 'sd_prodcode'
+                            from: 'pr_code', to: 'sd_prodcode'
                         }, {
-                            from: 'pr_saleprice',
-                            to: 'sd_price'
+                            from: 'pr_saleprice', to: 'sd_price'
                         }, {
-                            from: 'pr_detail',
-                            to: 'pr_detail'
+                            from: 'pr_detail', to: 'pr_detail'
                         }, {
-                            from: 'pr_spec',
-                            to: 'pr_spec'
+                            from: 'pr_spec', to: 'pr_spec'
                         }, {
-                            from: 'id',
-                            to: 'sd_prodid',
-                            ignore: true
+                            from: 'id', to: 'sd_prodid', ignore: true
                         }],
                     });
 

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

@@ -29,19 +29,21 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dbfinds: [{
-                                from: 'id',
-                                to: 'pd_prodid',
-                                ignore: true
-                            },
-                            {
-                                from: 'pr_code',
-                                to: 'pd_prodcode'
+                                from: 'id', to: 'pd_prodid', ignore: true 
+                            }, { 
+                                from: 'pr_code', to: 'pd_prodcode' 
                             }, {
-                                from: 'pr_detail',
-                                to: 'pr_detail'
+                                from: 'pr_detail', to: 'pr_detail'
                             }, {
-                                from: 'pr_spec',
-                                to: 'pr_spec'
+                                from: 'pr_spec', to: 'pr_spec'
+                            }, {
+                                from:'pr_whid',to:'pd_whid'
+                            }, {
+                                from:'pr_whcode',to:'pd_whcode'
+                            }, {
+                                from:'pr_whname',to:'pd_whname'
+                            }, {
+                                from:'pr_saleprice',to:'pd_sendprice'
                             }
                         ],
                     });

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

@@ -27,13 +27,20 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                     Ext.apply(f,{
                         dbfinds:[{
                             from:'id',to:'pd_prodid',ignore:true 
-                        },
-                        {
+                        }, {
                             from:'pr_code',to:'pd_prodcode'
                         }, {
                             from:'pr_detail',to:'pr_detail'
                         }, {
                             from:'pr_spec',to:'pr_spec'
+                        }, {
+                            from:'pr_whid',to:'pd_whid'
+                        }, {
+                            from:'pr_whcode',to:'pd_whcode'
+                        }, {
+                            from:'pr_whname',to:'pd_whname'
+                        }, {
+                            from:'pr_saleprice',to:'pd_sendprice'
                         }],
                     }) ;