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

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

@@ -11,27 +11,6 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
     dataUrl: '/api/document/product/list',
     addXtype: 'document-product-formpanel',
     addTitle: '物料资料',
-    //放大镜赋值设置
-    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_purcprice',
-        to: 'pd_price'
-    }, {
-        from: 'pr_zxbzs',
-        to: 'pr_zxbzs'
-    }],
     //联想设置
     dbtpls: [{
         field: 'pr_code',
@@ -75,7 +54,7 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
         width: 110
     }, {
         text: "单位",
-        dataIndex: "pr_spec",
+        dataIndex: "pr_unit",
         width: 80
     },{
         text: "品牌",