Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/document/document-server/src/main/resources/mapper/AddressMapper.xml

@@ -11,6 +11,7 @@
     <result column="ad_text3" jdbcType="VARCHAR" property="ad_text3" />
     <result column="ad_text4" jdbcType="VARCHAR" property="ad_text4" />
     <result column="ad_text5" jdbcType="VARCHAR" property="ad_text5" />
+    <result column="ad_default" jdbcType="INTEGER" property="ad_address" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.usoftchina.saas.document.entities.Address">
     <result column="ad_address" jdbcType="LONGVARCHAR" property="ad_address" />

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/VerificationServiceImpl.java

@@ -809,7 +809,7 @@ public class VerificationServiceImpl extends CommonBaseServiceImpl<VerificationM
 
         DocBaseDTO baseDTO = new DocBaseDTO();
         baseDTO.setId(id);
-        baseDTO.setCode(code);
+        baseDTO.setCode(nowverification.getVc_code());
         baseDTO.setName("Verification");
         //日志
         messageLogService.unAudit(baseDTO);

frontend/saas-web/app/view/core/dbfind/AddMultiDbfindGridPanel.js

@@ -147,7 +147,6 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindGridPanel', {
                         text:'确定',
                         cls:'x-formpanel-btn-blue',
                         handler:function(b){
-                            debugger
                             var grid = me;//grid
                             var selectRecordArr = grid.selectRecordArr;
                             var dbfinds = grid.dbfinds;

frontend/saas-web/app/view/core/dbfind/AddMultiDbfindTrigger.js

@@ -191,7 +191,7 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindTrigger', {
         //         }
         //         dbCondition.push({
         //             type: 'condition',
-        //             value: searchField + " like '%"+me.value+"%'"
+        //             value: searchField + "='"+me.value+"'"
         //         });
         //         Ext.Ajax.request({
         //             url: me.dataUrl,

frontend/saas-web/app/view/core/dbfind/DbfindTrigger.js

@@ -209,7 +209,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
                 }
                 dbCondition.push({
                     type: 'condition',
-                    value: searchField + " like '%"+me.value+"%'"
+                    value: searchField + "='"+me.value+"'"
                 });
                 Ext.Ajax.request({
                     url: me.dataUrl,

frontend/saas-web/app/view/core/dbfind/MultiDbfindTrigger.js

@@ -192,7 +192,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindTrigger', {
                 }
                 dbCondition.push({
                     type: 'condition',
-                    value: searchField + " like '%"+me.value+"%'"
+                    value: searchField + "='"+me.value+"'"
                 });
                 Ext.Ajax.request({
                     url: me.dataUrl,

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

@@ -0,0 +1,56 @@
+/**
+ * 账户资料放大镜
+ */
+Ext.define('saas.view.core.dbfind.types.AccountDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.DbfindTrigger',
+    xtype: 'accountDbfindTrigger',
+
+    //数据接口
+    dataUrl:'/api/account/account/accountRole/list',
+    addXtype: 'sys-account-datalist',
+    addTitle: '账户资料',
+    //联想设置
+    dbtpls:[{
+        field:'realname',width:150
+    }],
+    defaultCondition: "d.status=1",
+    dbSearchFields:[{
+        emptyText:'输入账户名称或真实姓名',
+        xtype : "textfield", 
+        name : "search", 
+        getCondition: function(v) {
+            return "(upper(username) like '%"+v.toUpperCase()+"%' or upper(realname) like '%"+v.toUpperCase()+"%')";
+        },
+        allowBlank : true, 
+        width:300
+    }],
+    //放大镜窗口列表
+    dbColumns:[{
+        text: "账户ID",
+        hidden: true,
+        dataIndex: "id",
+        hidden:true,
+        xtype: "numbercolumn"
+    },{
+        text: "账号名称",
+        dataIndex: "username",
+        hidden:true
+    }, {
+        text: "姓名",
+        dataIndex: "realname",
+        width: 110
+    }, {
+        text: "联系电话",
+        dataIndex: "mobile",
+        width: 110,
+    }, {
+        text: "邮箱",
+        dataIndex: "email",
+        width: 250,
+    }, {
+        text: "岗位角色",
+        dataIndex: "roleNames",
+        width: 200
+    }]
+
+});

frontend/saas-web/app/view/document/customer/FormPanel.js

@@ -38,7 +38,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         xtype: 'textfield',
         name: 'cu_shortname',
         fieldLabel: '客户简称',
-        allowBlank: true,
+        allowBlank: false,
         columnWidth: 0.25
     },{
         xtype: 'textfield',
@@ -185,7 +185,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25
     },{
-        xtype:'textfield',
+        xtype:'hidden',
         name : "cu_uu", 
         fieldLabel : "客户UU", 
         allowBlank : true, 

frontend/saas-web/app/view/document/vendor/FormPanel.js

@@ -38,7 +38,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         xtype: 'textfield',
         name: 've_shortname',
         fieldLabel: '供应商简称',
-        allowBlank: true,
+        allowBlank: false,
         columnWidth: 0.25
     },{
         xtype: 'textfield',
@@ -165,7 +165,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25
     },{
-        xtype:'textfield',
+        xtype:'hidden',
         name : "ve_uu", 
         fieldLabel : "供应商UU", 
         allowBlank : true, 
@@ -210,6 +210,12 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         name : "ve_buyerid", 
         fieldLabel : "采购员ID",
         defaultValue:saas.util.BaseUtil.getCurrentUser().id
+    },{
+        xtype : "textfield", 
+        name : "ve_address", 
+        fieldLabel : "地址", 
+        allowBlank : true, 
+        columnWidth : 1
     },{
         fieldLabel : "备注", 
         xtype:'textfield',

frontend/saas-web/app/view/money/report/TotalPayDetail.js

@@ -36,17 +36,17 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
     reportColumns: [{
         text: '供应商编号',
         dataIndex: 'vm_vendcode',
-        width: 200
+        width: 190
     }, {
         text: '供应商名称',
         dataIndex: 'vm_vendname',
-        width: 200,
+        width: 210,
     }, {
         text: '期初预付',
         xtype: 'numbercolumn',
         exportFormat: 'Amount',
         dataIndex: 'vm_beginpreamount',
-        width: 150,
+        width: 110,
         renderer: function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');

frontend/saas-web/app/view/money/report/TotalRecDetail.js

@@ -36,17 +36,17 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
     reportColumns: [{
         text: '客户编号',
         dataIndex: 'cm_custcode',
-        width: 200
+        width: 190
     }, {
         text: '客户名称',
         dataIndex: 'cm_custname',
-        width: 200,
+        width: 210,
     }, {
         text: '期初预收',
         dataIndex: 'cm_beginpreamount',
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
-        width: 150,
+        width: 110,
         renderer: function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -58,7 +58,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         dataIndex: 'cm_beginamount',
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
-        width: 150,
+        width: 110,
         renderer: function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -70,7 +70,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         xtype: 'numbercolumn',
         exportFormat: 'Amount',
         dataIndex: 'cm_nowamount',
-        width: 150,
+        width: 110,
         renderer: function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -82,7 +82,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         xtype: 'numbercolumn',
         exportFormat: 'Amount',
         dataIndex: 'cm_nowpayamount',
-        width: 150,
+        width: 110,
         renderer: function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -94,7 +94,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         xtype: 'numbercolumn',
         exportFormat: 'Amount',
         dataIndex: 'cm_endpreamount',
-        width: 150,
+        width: 110,
         renderer: function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -106,7 +106,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         dataIndex: 'cm_endamount',
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
-        width: 150,
+        width: 110,
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');

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

@@ -25,7 +25,14 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         name: 'pr_detail',
         fieldLabel: '物料',
         emptyText:'输入物料编号或名称',
-        showDetail: true
+        showDetail: true,
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return ' pr_detail = \'' + value + '\' ';
+            }
+        }
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
@@ -66,14 +73,21 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         name: 'pd_whname',
         fieldLabel: '仓库',
         emptyText:'请输入仓库编号或名称',
-        showDetail: true
+        showDetail: true,
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'prodiodetail.pd_whname like\'%' + value + '%\'';
+            }
+        }
     }, {
         xtype: 'textfield',
         name: 'pi_iocode',
         fieldLabel: '关联验收单号',
         emptyText: '输入单号',
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
@@ -85,7 +99,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'pi_auditman',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'
@@ -177,7 +191,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             },{
                 text: '供应商名称',
                 dataIndex: 'pi_vendname',
-                width: 150
+                width: 250
             },{
                 text: '审核状态',
                 align: 'center',
@@ -186,15 +200,25 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             },{
                 text: '序号',
                 dataIndex: 'pd_pdno',
-                width: 80
+                width: 80, 
+                renderer : function(v) {
+                    return Ext.util.Format.number(v, '0');
+                }
             },{
-                text: '相关单号',
-                dataIndex: 'pd_ordercode',
+                text: '关联验收单号',
+                dataIndex: 'pi_iocode',
+                width: 150
+            },{
+                text: '关联验收序号号',
+                dataIndex: 'iodetno',
                 width: 150
             },{
                 text: '物料编号',
                 dataIndex: 'pd_prodcode',
-                width: 150
+                width: 150, 
+                renderer : function(v) {
+                    return Ext.util.Format.number(v, '0');
+                }
             },{
                 text: '物料名称',
                 dataIndex: 'pr_detail',

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

@@ -28,24 +28,19 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=pi_auditman]':{
+            },'accountDbfindTrigger[name=pi_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'pi_auditman',
+                        dbfinds:[{ from:'realname',to:'pi_auditman',
                         }],
                     }) ;   
 

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

@@ -65,6 +65,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         name: 'pd_whname',
         fieldLabel: '仓库',
         emptyText: '输入仓库编号或名称',
+        showDetail: true
     }, {
         xtype: 'textfield',
         name: 'pi_iocode',

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

@@ -64,7 +64,8 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         xtype: 'warehouseDbfindTrigger',
         name: 'pd_whname',
         emptyText:'请输入物料编号或名称',
-        fieldLabel: '仓库'
+        fieldLabel: '仓库',
+        showDetail: true
     }, {
         xtype: 'textfield',
         name: 'pi_sacode',

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

@@ -91,7 +91,6 @@ Ext.define('saas.view.stock.report.DataList', {
         text: "单价",
         xtype: 'numbercolumn',
         exportFormat: 'Price',
-        hidden: true,
         toggle: true,
         align: 'end',
         dataIndex: "rc_price",
@@ -107,6 +106,7 @@ Ext.define('saas.view.stock.report.DataList', {
         xtype: 'numbercolumn',
         dataIndex: "rc_amount",
         exportFormat: 'Amount',
+        toggle: true,
         width: 120,
         renderer: function (v) {
             var arr = (v + '.').split('.');

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

@@ -34,7 +34,7 @@ Ext.define('saas.view.stock.report.DataListController', {
         
         form.updateLayout();
         toggleColumns.map(function(c) {
-            c.setHidden(!newValue);
+            c.setHidden(c.isVisible);
         });
         store.load();
     }