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

applications/money/money-server/src/main/resources/mapper/RecbalancedetMapper.xml

@@ -6,7 +6,7 @@
     <result column="rd_rbid" jdbcType="INTEGER" property="rd_rbid" />
     <result column="rd_detno" jdbcType="INTEGER" property="rd_detno" />
     <result column="rd_ym" jdbcType="INTEGER" property="rd_ym" />
-    <result column="pb_date" property="pb_date" jdbcType="TIMESTAMP" />
+    <result column="rb_date" property="rb_date" jdbcType="TIMESTAMP" />
     <result column="rd_bankid" jdbcType="INTEGER" property="rd_bankid" />
     <result column="rd_bankcode" jdbcType="VARCHAR" property="rd_bankcode" />
     <result column="rd_bankname" jdbcType="VARCHAR" property="rd_bankname" />
@@ -127,7 +127,7 @@
       <if test="rd_detno != null">
         rd_detno,
       </if>
-      <if test="pb_date != null">
+      <if test="rb_date != null">
         rd_ym,
       </if>
       <if test="rd_bankid != null">
@@ -183,8 +183,8 @@
       <if test="rd_detno != null">
         #{rd_detno,jdbcType=INTEGER},
       </if>
-      <if test="pb_date != null">
-        CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
+      <if test="rb_date != null">
+        CONVERT(date_format(#{rb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="rd_bankid != null">
         #{rd_bankid,jdbcType=INTEGER},
@@ -242,8 +242,8 @@
       <if test="rd_detno != null">
         rd_detno = #{rd_detno,jdbcType=INTEGER},
       </if>
-      <if test="pb_date != null">
-        rd_ym = CONVERT(date_format(#{pb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
+      <if test="rb_date != null">
+        rd_ym = CONVERT(date_format(#{rb_date,jdbcType=TIMESTAMP},'%Y%m'),SIGNED),
       </if>
       <if test="rd_bankid != null">
         rd_bankid = #{rd_bankid,jdbcType=INTEGER},

frontend/saas-web/app/view/auth/LoginController.js

@@ -10,14 +10,15 @@ Ext.define('saas.view.auth.LoginController', {
         var me = this, view = me.getView(),
             form = me.lookup('authdialog'),
             values = form.getValues();
-
+            debugger;
         view.mask('请稍等...');
 
         saas.model.Session.login(values.username, values.password)
             .then(function(session) {
                 view.isMasked() && view.unmask();
                 me.getViewModel().set('session', session);
-				var cos = session.get("account").companies;
+                var cos = session.get("account").companies;
+                debugger;
 				if (cos && cos.length) {
                     if (cos.length == 1) {
                         session.get('account').companyId = cos[0].id;

frontend/saas-web/app/view/main/Main.js

@@ -41,24 +41,28 @@ Ext.define('saas.view.main.Main', {
                     iconCls:'x-fa fa-navicon',
                     id: 'main-navigation-btn',
                     handler: 'onToggleNavigationSize'
-                },
-                {
-                    margin: '0 0 0 8',
-                    xtype: 'tbtext',
+                },{
+                    reference: 'mainprofile',
+                    arrowVisible: false,
+                    ui: 'header',
                     bind: {
-                        html: '{company.name}'
+                        tooltip: '{company.name}',
+                        text: '{company.name}'
+                    },
+                    menu: {
+                        items: [{
+                            xtype: 'menuseparator'
+                        }, {
+                            text: '退出',
+                            handler: 'onLogout'
+                        }]
                     }
                 },
                 '->',
                 {
-                    iconCls:'x-fa fa-search',
+                    iconCls:'icon-usoftchina',
                     ui: 'header',
-                    tooltip: '搜索'
-                },
-                {
-                    iconCls:'x-fa fa-bell',
-                    ui: 'header',
-                    tooltip: '消息'
+                    tooltip: '优软云'
                 },
                 {
                     iconCls:'x-fa fa-question',
@@ -66,21 +70,10 @@ Ext.define('saas.view.main.Main', {
                     tooltip: '帮助'
                 },
                 {
-                    reference: 'mainprofile',
-                    iconCls:'x-fa fa-th-large',
-                    arrowVisible: false,
                     ui: 'header',
-                    tooltip: '账户',
                     bind: {
+                        tooltip: '{account.realname}',
                         text: '{account.realname}'
-                    },
-                    menu: {
-                        items: [{
-                            xtype: 'menuseparator'
-                        }, {
-                            text: '退出',
-                            handler: 'onLogout'
-                        }]
                     }
                 },
                 {

frontend/saas-web/app/view/main/Main.scss

@@ -153,3 +153,9 @@ $treelist-nav-ui: (
     height: 21px;
     background: url(../../../../resources/images/grid/check.png) 0 0 no-repeat;
 }
+.icon-usoftchina{
+    margin-top: 0px;
+	width: 16px;
+    height: 16px;
+    background: url(../../../../resources/images/nav/usoftchina.png) 0 0 no-repeat; 
+}

frontend/saas-web/app/view/purchase/report/Purchase.js

@@ -11,7 +11,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
     listUrl: '/api/purchase/purchase/list',
     defaultCondition: null,
     reportTitle: '采购明细报表',
-    QueryWidth:0.1,
+    QueryWidth:0.2,
     //筛选：供应商、日期（必填）、业务状态			
     searchItems: [ {
         xtype: 'dbfindtrigger',
@@ -22,7 +22,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
         xtype: 'condatefield',
         name: 'pu_date',
         fieldLabel: '单据日期',
-        columnWidth: 0.5
+        columnWidth: 0.4
     }, {
         xtype: 'multicombo',
         name: 'pu_acceptstatuscode',

frontend/saas-web/app/view/sale/report/Sale.js

@@ -11,7 +11,7 @@ Ext.define('saas.view.sale.report.Sale', {
     listUrl: '/api/sale/sale/list',
     defaultCondition: null,
     reportTitle: '销售明细报表',
-    QueryWidth:0.1,
+    QueryWidth:0.2,
     searchItems: [
     {
         xtype: 'dbfindtrigger',
@@ -22,7 +22,7 @@ Ext.define('saas.view.sale.report.Sale', {
         xtype: 'condatefield',
         name: 'sa_date',
         fieldLabel: '单据日期',
-        columnWidth: 0.5
+        columnWidth: 0.4
     }, {
         xtype: 'multicombo',
         name: 'sa_sendstatuscode',

frontend/saas-web/app/view/sale/report/SaleProfit.js

@@ -12,7 +12,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
     defaultCondition: null,
     reportTitle: '销售毛利润表',
 //筛选：客户、物料、时间	
-    QueryWidth:0.1, 	
+    QueryWidth:0.2, 	
     searchItems: [{
         xtype: 'dbfindtrigger',
         name: 'sa_custname',
@@ -27,7 +27,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         xtype: 'condatefield',
         name: 'sa_date',
         fieldLabel: '时间',
-        columnWidth: 0.5
+        columnWidth: 0.4
     }],
 
     reportColumns: [

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

@@ -281,14 +281,13 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
             beforerender:function(f){
                 Ext.apply(f,{
                     dataUrl:'/api/document/warehouse/list',
-                    // dataUrl:'http://localhost:9480/warehouse/list',
                     addXtype: 'other-warehouse',
                     addTitle: '仓库资料',
                     defaultCondition:"wh_statuscode='OPEN'",
                     dbfinds:[{
-                        from:'id',to:'pd_whid'                          
+                        from:'id',to:'id',ignore:true                          
                     },{
-                        from:'wh_code',to:'pd_whcode'                          
+                        from:'wh_code',to:'wh_code'                          
                     },{
                         from:'wh_description',to:'pd_whname'
                     }],
@@ -304,9 +303,9 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         allowBlank : true, 
                         columnWidth : 0.25,
                         getCondition:function(v){
-                            return "upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%'";
+                            return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
                         }
-                    }],                    
+                    }],                        
                     dbColumns:[{
                         "text": "仓库ID",
                         "flex": 0,
@@ -327,117 +326,78 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         "dataIndex": "wh_description",
                         "xtype": "",
                         "items": null
-                    }, ]
+                    }, {
+                        "text": "仓库类型",
+                        "flex": 1,
+                        "dataIndex": "wh_type",
+                        "xtype": "",
+                        "items": null
+                    }]
                 }) ;   
 
             }
         },           
         //放大镜赋值关系 以及 tpl模板
         'dbfindtrigger[name=pd_inwhname]':{
-         beforerender:function(f){
-             Ext.apply(f,{
-                 dataUrl:'/api/document/warehouse/list',
-                //  dataUrl:'http://localhost:9480/warehouse/list',
-                 addXtype: 'other-warehouse',
-                 addTitle: '仓库资料',
-                 defaultCondition:"wh_statuscode='OPEN'",
-                 dbfinds:[{
-                     from:'id',to:'pd_inwhid'                          
-                 },{
-                     from:'wh_code',to:'pd_inwhcode'                          
-                 },{
-                     from:'wh_description',to:'pd_inwhname'
-                 }],
-                 dbtpls:[{
-                     field:'pd_inwhcode',width:100
-                 },{
-                     field:'pd_inwhname',width:100
-                 }],
-                 dbSearchFields:[{
-                    emptyText:'输入仓库编号或名称',
-                    xtype : "textfield", 
-                    name : "wh_code", 
-                    allowBlank : true, 
-                    columnWidth : 0.25,
-                    getCondition:function(v){
-                        return "upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%'";
-                    }
-                }],                 
-                 dbColumns:[{
-                     "text": "仓库ID",
-                     "flex": 0,
-                     "dataIndex": "id",
-                     "width": 0,
-                     "xtype": "",
-                     "items": null
-                 },{
-                     "text": "仓库编号",
-                     "flex": 1,
-                     "dataIndex": "wh_code",
-                     "width": 100,
-                     "xtype": "",
-                     "items": null
-                 }, {
-                     "text": "仓库名称",
-                     "flex": 1,
-                     "dataIndex": "wh_description",
-                     "xtype": "",
-                     "items": null
-                 },{
-                    "text": "仓库类型",
-                    "flex": 1,
-                    "dataIndex": "wh_type",
-                    "xtype": "",
-                    "items": null
-                }]
-             }) ;   
-
-                }
-            },
-            //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_inwhname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dataUrl:'/api/document/warehouse/list',
-                        // dataUrl:'http://localhost:9480/warehouse/list',
-                        dbfinds:[{
-                            from:'id',to:'pd_inwhid'                          
-                        },{
-                            from:'wh_code',to:'pd_inwhcode'                          
-                        },{
-                            from:'wh_description',to:'pd_inwhname'
-                        }],
-                        dbtpls:[{
-                            field:'pd_inwhcode',width:100
-                        },{
-                            field:'pd_inwhname',width:100
-                        }],
-                        dbColumns:[{
-                            "text": "仓库ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "仓库编号",
-                            "flex": 1,
-                            "dataIndex": "wh_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "仓库名称",
-                            "flex": 1,
-                            "dataIndex": "wh_description",
-                            "xtype": "",
-                            "items": null
-                        }, ]
-                    }) ;   
-
-                }
-            }            
+            beforerender:function(f){
+                Ext.apply(f,{
+                    dataUrl:'/api/document/warehouse/list',
+                    addXtype: 'other-warehouse',
+                    addTitle: '仓库资料',
+                    defaultCondition:"wh_statuscode='OPEN'",
+                    dbfinds:[{
+                        from:'id',to:'id',ignore:true                          
+                    },{
+                        from:'wh_code',to:'wh_code'                          
+                    },{
+                        from:'wh_description',to:'pd_inwhname'
+                    }],
+                    dbtpls:[{
+                        field:'pd_whcode',width:100
+                    },{
+                        field:'pd_whname',width:100
+                    }],
+                    dbSearchFields:[{
+                        emptyText:'输入仓库编号或名称',
+                        xtype : "textfield", 
+                        name : "wh_code", 
+                        allowBlank : true, 
+                        columnWidth : 0.25,
+                        getCondition:function(v){
+                            return "(upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%')";
+                        }
+                    }],                        
+                    dbColumns:[{
+                        "text": "仓库ID",
+                        "flex": 0,
+                        "dataIndex": "id",
+                        "width": 0,
+                        "xtype": "",
+                        "items": null
+                    },{
+                        "text": "仓库编号",
+                        "flex": 1,
+                        "dataIndex": "wh_code",
+                        "width": 100,
+                        "xtype": "",
+                        "items": null
+                    }, {
+                        "text": "仓库名称",
+                        "flex": 1,
+                        "dataIndex": "wh_description",
+                        "xtype": "",
+                        "items": null
+                    }, {
+                        "text": "仓库类型",
+                        "flex": 1,
+                        "dataIndex": "wh_type",
+                        "xtype": "",
+                        "items": null
+                    }]
+                }) ;   
 
+            }
+        }           
         });
 
     },

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

@@ -40,6 +40,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
         displayField: 'name',
         valueField: 'value',
         editable:false,
+        allowBlank : false,
         store: Ext.create('Ext.data.ArrayStore', {
             fields: ['name', 'value'],
             data: [
@@ -61,22 +62,26 @@ Ext.define('saas.view.stock.make.FormPanel', {
     },{
         xtype : "textfield", 
         name : "ma_proddetail", 
-        fieldLabel : "名称",
+        fieldLabel : "产品名称",
+        readOnly:true,
         columnWidth: 0.25
     },{
         xtype : "textfield", 
         name : "ma_prodspec", 
-        fieldLabel : "规格",
-        columnWidth: 0.25
+        fieldLabel : "产品规格",
+        readOnly:true,
+        columnWidth: 0.25,
     },{
         xtype : "textfield", 
         name : "ma_version", 
         fieldLabel : "版本",
+        readOnly:true,
         columnWidth: 0.25
     },{
         xtype : "textfield", 
         name : "ma_produnit", 
         fieldLabel : "单位",
+        readOnly:true,
         columnWidth: 0.25
     },
     {

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

@@ -23,35 +23,14 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
         columnWidth: 0.2
-    }, {		
-        xtype: 'remotecombo',
-        editable:false,
-        name: 'pd_prodcode',
-        fieldLabel: '物料类型',
-        columnWidth: 0.2,
-        storeUrl:'/api/document/producttype/getCombo',
-        addHandler:function(b){
-            var document = Ext.create('saas.view.document.kind.Kind',{});
-            var form = this.ownerCmp.ownerCt;
-            this.dialog = form.getController().getView().add({
-                xtype: 'document-kind-childwin',
-                bind: {
-                    title: '新增物料类型'
-                },
-                dataKind:'productkind',
-                belong:document.etc['productkind'],
-                _parent:form,
-                _combo:this.ownerCmp,
-                record:null,
-                session: true
-            });
-            this.dialog.show();
-        }
     }, {
-        xtype: 'condatefield',
-        name: 'pi_date',
+        //xtype: 'datefield',
+        xtype: 'textfield',
+        name: 'pwm_yearmonth',
         fieldLabel: '单据日期',
-        columnWidth: 0.5
+        format: 'YYYYMM',
+       // defaultValue: new Date(),
+        columnWidth: 0.4
     }],
     reportColumns: [{
         text: '物料类型',

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

@@ -11,7 +11,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     listUrl: '/api/storage/report/prodioDetail',
     defaultCondition: null,
     reportTitle: '物料出入库明细表',
-    QueryWidth:0.1,
+    QueryWidth:0.2,
     //筛选：单据类型、物料、日期
     searchItems: [{
         xtype: 'multicombo',
@@ -40,7 +40,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '单据日期',
-        columnWidth: 0.5
+        columnWidth: 0.4
     }],
   //  单号	单据类型	客户/供应商编号	客户/供应商名称	单据日期	序号	
   //物料类型	物料编号	物料名称	物料规格	单位	入库数量	出库数量	成本单价	备注