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

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

@@ -16,14 +16,14 @@ Ext.define('saas.view.core.dbfind.types.BankInfoDbfindTrigger', {
         width: 200
     }],
     dbSearchFields: [{
-        emptyText: '查找资金账户',
+        emptyText: '输入资金账户或名称',
         xtype: "textfield",
         name: "search",
         getCondition: function (v) {
             return "(upper(bk_bankcode) like '%" + v.toUpperCase() + "%' or upper(bk_bankname) like '%" + v.toUpperCase() + "%')";
         },
         allowBlank: true,
-        columnWidth: 0.25
+        width:300       
     }],
     dbColumns: [{
         text: "账户ID",

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

@@ -25,7 +25,7 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
             return "(upper(cu_code) like '%" + v.toUpperCase() + "%' or upper(cu_name) like '%" + v.toUpperCase() + "%')";
         },
         allowBlank: true,
-        columnWidth: 0.25
+        width:300
     }],
     dbColumns: [{
         conditionCode: 'id',

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

@@ -24,7 +24,7 @@ Ext.define('saas.view.core.dbfind.types.EmployeeDbfindTrigger', {
             return "(upper(em_code) like '%"+v.toUpperCase()+"%' or upper(em_name) like '%"+v.toUpperCase()+"%')";
         },
         allowBlank : true, 
-        columnWidth : 0.25
+        width:300
     }],
     //放大镜窗口列表
     dbColumns:[{

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

@@ -12,16 +12,6 @@ Ext.define('saas.view.core.dbfind.types.OriOrderMutiDbfindTrigger', {
         field: 'sl_code',
         width: 150
     }],
-    dbSearchFields: [{
-        emptyText: '查找资金账户',
-        xtype: "textfield",
-        name: "search",
-        getCondition: function (v) {
-            return "(upper(bk_bankcode) like '%" + v.toUpperCase() + "%' or upper(bk_bankname) like '%" + v.toUpperCase() + "%')";
-        },
-        allowBlank: true,
-        columnWidth: 0.25
-    }],
     dbSearchFields:[{
         emptyText:'输入源单编号',
         xtype : "textfield",
@@ -30,7 +20,7 @@ Ext.define('saas.view.core.dbfind.types.OriOrderMutiDbfindTrigger', {
             return "(upper(sl_code) like '%"+v.toUpperCase()+"%')";
         },
         allowBlank : true,
-        columnWidth : 0.25
+        columnWidth : 300
     }],
     dbColumns:[{
         "text": "源单id",

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

@@ -23,7 +23,7 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
             return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
         },
         allowBlank : true, 
-        columnWidth : 0.25
+        columnWidth :300
     }],
     dbColumns:[{
         text: "物料ID",

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

@@ -26,7 +26,7 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
         xtype: "textfield",
         name: "search",
         allowBlank: true,
-        columnWidth: 0.25,
+        width:300,
         getCondition: function (v) {
             return "(upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%" + v.toUpperCase() + "%' or upper(pr_spec) like '%" + v.toUpperCase() + "%')";
         }

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

@@ -25,7 +25,7 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
             return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
         },
         allowBlank : true, 
-        columnWidth : 0.25
+        width:300
     }],
     //放大镜窗口列表
     dbColumns:[{

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

@@ -22,7 +22,7 @@ Ext.define('saas.view.core.dbfind.types.WarehouseDbfindTrigger', {
         xtype: "textfield",
         name: "wh_code",
         allowBlank: true,
-        columnWidth: 0.25,
+        width:300,
         getCondition: function (v) {
             return "(upper(wh_code) like '%" + v.toUpperCase() + "%' or upper(wh_description) like '%" + v.toUpperCase() + "%')";
         }

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -180,7 +180,7 @@ Ext.define('saas.view.document.kind.ChildForm', {
             },{
                 xtype:'datamulticombo',
                 dataUrl:'/api/account/role/list',
-                fieldLabel: '关联角色',
+                fieldLabel: '岗位角色',
                 name: 'roleNames',
                 allowBlank:true,
                 maxLength: 20,
@@ -321,7 +321,7 @@ Ext.define('saas.view.document.kind.ChildForm', {
             },{
                 xtype:'datamulticombo',
                 dataUrl:'/api/account/role/list',
-                fieldLabel: '关联角色',
+                fieldLabel: '岗位角色',
                 name: 'roleIds',
                 allowBlank:false,
                 maxLength: 30,
@@ -511,7 +511,7 @@ Ext.define('saas.view.document.kind.ChildForm', {
         o = o.substring(0,o.length-1);
 
         if(o==""){
-            saas.util.BaseUtil.showErrorToast('关联角色未选择，无法保存！')
+            saas.util.BaseUtil.showErrorToast('岗位角色未选择，无法保存！')
         }
 
         var _params = {

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

@@ -11,21 +11,19 @@ Ext.define('saas.view.document.product.BasePanel', {
     searchField:[{
         xtype : "textfield", 
         name : "pr_code", 
-        width:150, 
-        emptyText:'编号'
-    }, {
-        xtype : "textfield", 
-        name : "pr_detail", 
-        width:150, 
-        emptyText:'名称'
-    }, {
+        width:300, 
+        emptyText:'输入物料编号、名称、型号或规格',
+        getCondition: function (v) {
+            return "(upper(CONCAT(pr_code,'#',pr_detail,'#',pr_spec,'#',pr_orispeccode)) like '%" + v.toUpperCase() + "%')";
+        },
+    },{
         editable:true,
         hiddenBtn:true,
         xtype : "remotecombo", 
         storeUrl: '/api/document/producttype/getCombo',
         name : "pr_kind", 
         emptyText : "物料类型",
-        width:110,
+        width:120,
     }, {
         xtype : "textfield", 
         name : "pr_brand", 
@@ -81,42 +79,46 @@ Ext.define('saas.view.document.product.BasePanel', {
             text : "物料编号", 
             dataIndex : "pr_code", 
             width : 150.0
+        }, {
+            text : "类型", 
+            dataIndex : "pr_kind", 
+            width : 110.0
         }, {
             text : "物料名称", 
             dataIndex : "pr_detail", 
             width : 200.0
+        }, {
+            text : "型号", 
+            dataIndex : "pr_orispeccode", 
+            width : 150.0
         }, {
             text : "规格", 
             dataIndex : "pr_spec", 
             width : 150.0
-        }, {
-            text : "类型", 
-            dataIndex : "pr_kind", 
-            width : 110.0
-        }, {
-            text : "单位", 
-            dataIndex : "pr_unit", 
-            width : 80.0 
-        }, {
+        },{
             text : "品牌", 
             dataIndex : "pr_brand", 
             width : 110.0 
-        }, {
-            text : "总库存", 
+        },  {
+            text : "库存", 
             dataIndex : "po_onhand",
             xtype: 'numbercolumn',
-            width : 110.0,
+            width : 120.0,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }
+        },{
+            text : "单位", 
+            dataIndex : "pr_unit", 
+            width : 80.0 
         }, {
-            text : "标准单价", 
+            text : "标准定价(元)", 
             dataIndex : "pr_standardprice",
             xtype: 'numbercolumn',
-            width : 110.0,
+            width : 130.0,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
@@ -124,29 +126,27 @@ Ext.define('saas.view.document.product.BasePanel', {
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text : "最新采购单价", 
+            text : "最新采购价(元)", 
             dataIndex : "pr_purcprice",
             xtype: 'numbercolumn',
-            width : 110.0,
+            width : 140.0,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join();
                 return Ext.util.Format.number(v, format);
-            }, 
-            width : 200.0, 
+            }
         }, {
-            text : "最新出库价", 
+            text : "最新售价(元)", 
             dataIndex : "pr_saleprice",
             xtype: 'numbercolumn',
-            width : 110.0,
+            width : 120.0,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join();
                 return Ext.util.Format.number(v, format);
-            }, 
-            width : 200.0, 
+            }
         }, {
             text : "备注", 
             dataIndex : "pr_text1",

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

@@ -320,23 +320,24 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
     }, {
         xtype : "textfield", 
         name : "pu_total", 
-        fieldLabel : "单据金额",
+        fieldLabel : "采购金额",
         readOnly:true,
         columnWidth : 0.25,
     },{
-        xtype : "employeeDbfindTrigger", 
+        xtype : "hidden", 
         name : "pu_buyercode", 
-        fieldLabel : "采购员编号",
+        fieldLabel : "采购员编号"
     },{
-        xtype : "textfield", 
+        xtype : "employeeDbfindTrigger", 
         name : "pu_buyername", 
         fieldLabel : "采购员",
         columnWidth : 0.25,
-        readOnly:true
+        defaultValue:saas.util.BaseUtil.getCurrentUser().realname
     },{
         xtype : "hidden", 
         name : "pu_buyerid", 
-        fieldLabel : "采购员ID"
+        fieldLabel : "采购员ID",
+        defaultValue:saas.util.BaseUtil.getCurrentUser().id
     },
     {
         xtype : "hidden", 

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

@@ -20,7 +20,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                 }
             },
             // 主表-采购员名称
-            'dbfindtrigger[name=pu_buyercode]':{
+            'dbfindtrigger[name=pu_buyername]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         //赋值 

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

@@ -295,23 +295,23 @@ Ext.define('saas.view.sale.sale.FormPanel', {
     }, {
         xtype : "textfield", 
         name : "sa_total", 
-        fieldLabel : "单据金额",
+        fieldLabel : "销售金额",
         readOnly:true
     },{
-        xtype : "employeeDbfindTrigger", 
+        xtype : "hidden", 
         name : "sa_sellercode", 
         fieldLabel : "业务员编号",
     },{
-        xtype : "textfield", 
+        xtype : "employeeDbfindTrigger", 
         name : "sa_seller", 
         fieldLabel : "业务员",
-        readOnly:true
+        defaultValue:saas.util.BaseUtil.getCurrentUser().realname
     }, {
         xtype : 'textfield', 
         name : 'sa_sendstatus', 
         fieldLabel : '出货状态', 
         hidden : true,
-        readOnly:true
+        defaultValue:saas.util.BaseUtil.getCurrentUser().id
      },{
         xtype : "hidden", 
         name : "creatorId", 

frontend/saas-web/app/view/sys/account/DataList.js

@@ -89,13 +89,13 @@ Ext.define('saas.view.sys.account.DataList', {
         width : 180.0, 
         xtype : '', 
     },{
-        text : '关联角色id', 
+        text : '岗位角色id', 
         hidden:true,
         dataIndex : 'roleIds', 
         width : 110.0, 
         xtype : '', 
     },{
-        text : '关联角色', 
+        text : '岗位角色', 
         dataIndex : 'roleNames', 
         width : 220.0
     },{