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

applications/document/document-dto/src/main/java/com.usoftchina.saas.document.dto/VendorDTO.java

@@ -1,58 +1,30 @@
 package com.usoftchina.saas.document.dto;
 
 import com.usoftchina.saas.base.dto.CommonBaseDTO;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 
-@ApiModel(value = "Vendor", description = "供应商资料")
+@Data
 public class VendorDTO extends CommonBaseDTO implements Serializable{
 
-    @ApiModelProperty(value = "供应商编号")
-    private String ve_code;
-    @ApiModelProperty(value = "供应商名称")
-    private String ve_name;
-    @ApiModelProperty(value = "供应商类型")
-    private String ve_type;
-    @ApiModelProperty(value = "状态")
-    private String ve_status;
-    @ApiModelProperty(value = "备注")
-    private String ve_remark;
 
-    public String getVe_code() {
-        return ve_code;
-    }
+    private String ve_code;
 
-    public void setVe_code(String ve_code) {
-        this.ve_code = ve_code;
-    }
+    private String ve_shortname;
 
-    public String getVe_name() {
-        return ve_name;
-    }
+    private String ve_name;
 
-    public void setVe_name(String ve_name) {
-        this.ve_name = ve_name;
-    }
+    private String ve_type;
 
-    public String getVe_type() {
-        return ve_type;
-    }
+    private String ve_status;
 
-    public void setVe_type(String ve_type) {
-        this.ve_type = ve_type;
-    }
+    private String ve_remark;
 
-    public String getVe_status() {
-        return ve_status;
-    }
+    private Long ve_buyerid;
 
-    public void setVe_status(String ve_status) {
-        this.ve_status = ve_status;
-    }
+    private String ve_buyercode;
 
-    public String getVe_remark(){return ve_remark;}
+    private String ve_buyername;
 
-    public void setVe_remark(String cu_remark) { this.ve_remark = ve_remark; }
 }

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Vendor.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.document.entities;
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -10,12 +11,19 @@ import java.util.Date;
  * @author chenwei
  * @Date 2018/10/13
  */
+@Data
 public class Vendor extends CommonBaseEntity implements Serializable{
 
     /**
      * 供应商编号
      */
     private String ve_code;
+
+    /**
+     * 供应商简称
+     */
+    private String ve_shortname;
+
     /**
      * 供应商名称
      */
@@ -99,191 +107,10 @@ public class Vendor extends CommonBaseEntity implements Serializable{
 
     private String ve_remark;
 
-    public String getVe_remark(){return ve_remark;}
-
-    public void setVe_remark(String ve_remark){this.ve_remark = ve_remark;}
-
-    public Double getVe_payamount() {
-        return ve_payamount;
-    }
-
-    public void setVe_payamount(Double ve_payamount) {
-        this.ve_payamount = ve_payamount;
-    }
-
-    public Double getVe_leftamount() {
-        return ve_leftamount;
-    }
-
-    public void setVe_leftamount(Double ve_leftamount) {
-        this.ve_leftamount = ve_leftamount;
-    }
-
-    public Integer getVe_beginym() {
-        return ve_beginym;
-    }
-
-    public void setVe_beginym(Integer ve_beginym) {
-        this.ve_beginym = ve_beginym;
-    }
-
-    public String getVe_code() {
-        return ve_code;
-    }
-
-    public void setVe_code(String ve_code) {
-        this.ve_code = ve_code;
-    }
-
-    public String getVe_name() {
-        return ve_name;
-    }
-
-    public void setVe_name(String ve_name) {
-        this.ve_name = ve_name;
-    }
-
-    public String getVe_uu() {
-        return ve_uu;
-    }
-
-    public void setVe_uu(String ve_uu) {
-        this.ve_uu = ve_uu;
-    }
-
-    public String getVe_type() {
-        return ve_type;
-    }
-
-    public void setVe_type(String ve_type) {
-        this.ve_type = ve_type;
-    }
-
-    public Date getVe_begindate() {
-        return ve_begindate;
-    }
-
-    public void setVe_begindate(Date ve_begindate) {
-        this.ve_begindate = ve_begindate;
-    }
-
-    public Double getVe_beginapamount() {
-        return ve_beginapamount;
-    }
-
-    public void setVe_beginapamount(Double ve_beginapamount) {
-        this.ve_beginapamount = ve_beginapamount;
-    }
-
-    public Double getVe_beginprepayamount() {
-        return ve_beginprepayamount;
-    }
-
-    public void setVe_beginprepayamount(Double ve_beginprepayamount) {
-        this.ve_beginprepayamount = ve_beginprepayamount;
-    }
-
-    public Long getVe_promisedays() {
-        return ve_promisedays;
-    }
-
-    public void setVe_promisedays(Long ve_promisedays) {
-        this.ve_promisedays = ve_promisedays;
-    }
-
-    public Double getVe_taxrate() {
-        return ve_taxrate;
-    }
-
-    public void setVe_taxrate(Double ve_taxrate) {
-        this.ve_taxrate = ve_taxrate;
-    }
-
-    public String getVe_nsrzh() {
-        return ve_nsrzh;
-    }
-
-    public void setVe_nsrzh(String ve_nsrzh) {
-        this.ve_nsrzh = ve_nsrzh;
-    }
-
-    public String getVe_bankaccount() {
-        return ve_bankaccount;
-    }
-
-    public void setVe_bankaccount(String ve_bankaccount) {
-        this.ve_bankaccount = ve_bankaccount;
-    }
-
-    public String getVe_bankcode() {
-        return ve_bankcode;
-    }
-
-    public void setVe_bankcode(String ve_bankcode) {
-        this.ve_bankcode = ve_bankcode;
-    }
-
-    public String getVe_status() {
-        return ve_status;
-    }
-
-    public void setVe_status(String ve_status) {
-        this.ve_status = ve_status;
-    }
-
-    public String getVe_statuscode() {
-        return ve_statuscode;
-    }
-
-    public void setVe_statuscode(String ve_statuscode) {
-        this.ve_statuscode = ve_statuscode;
-    }
-
-    public String getVe_text1() {
-        return ve_text1;
-    }
-
-    public void setVe_text1(String ve_text1) {
-        this.ve_text1 = ve_text1;
-    }
-
-    public String getVe_text2() {
-        return ve_text2;
-    }
-
-    public void setVe_text2(String ve_text2) {
-        this.ve_text2 = ve_text2;
-    }
-
-    public String getVe_text3() {
-        return ve_text3;
-    }
-
-    public void setVe_text3(String ve_text3) {
-        this.ve_text3 = ve_text3;
-    }
-
-    public String getVe_text4() {
-        return ve_text4;
-    }
-
-    public void setVe_text4(String ve_text4) {
-        this.ve_text4 = ve_text4;
-    }
-
-    public String getVe_text5() {
-        return ve_text5;
-    }
+    private Long ve_buyerid;
 
-    public void setVe_text5(String ve_text5) {
-        this.ve_text5 = ve_text5;
-    }
+    private String ve_buyercode;
 
-    public Double getVe_preamount() {
-        return ve_preamount;
-    }
+    private String ve_buyername;
 
-    public void setVe_preamount(Double ve_preamount) {
-        this.ve_preamount = ve_preamount;
-    }
 }

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/VendorList.java

@@ -14,6 +14,11 @@ public class VendorList implements Serializable {
      * 供应商编号
      */
     private String ve_code;
+
+    /**
+     * 供应商简称
+     */
+    private String ve_shortname;
     /**
      * 供应商名称
      */
@@ -93,6 +98,12 @@ public class VendorList implements Serializable {
 
     private String ve_remark;
 
+    private Long ve_buyerid;
+
+    private String ve_buyercode;
+
+    private String ve_buyername;
+
     /* 从表字段 */
 
     private Integer vc_veid;

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

@@ -4,6 +4,7 @@
     <resultMap id="VendorResultMapper" type="com.usoftchina.saas.document.entities.Vendor">
         <id column="ve_id" property="id" jdbcType="INTEGER" />
         <result column="ve_code" property="ve_code" jdbcType="VARCHAR" />
+        <result column="ve_shortname" property="ve_shortname" jdbcType="VARCHAR"/>
         <result column="ve_uu" property="ve_uu" jdbcType="VARCHAR" />
         <result column="ve_name" property="ve_name" jdbcType="VARCHAR" />
         <result column="ve_type" property="ve_type" jdbcType="VARCHAR" />
@@ -34,6 +35,7 @@
     <resultMap id="VendorDTOResultMapper" type="com.usoftchina.saas.document.dto.VendorDTO">
         <id column="ve_id" property="id" jdbcType="INTEGER" />
         <result column="ve_code" property="ve_code" jdbcType="VARCHAR" />
+        <result column="ve_shortname" property="ve_shortname" jdbcType="VARCHAR"/>
         <result column="ve_name" property="ve_name" jdbcType="VARCHAR" />
         <result column="ve_type" property="ve_type" jdbcType="VARCHAR" />
         <result column="ve_status" property="ve_status" jdbcType="VARCHAR" />
@@ -57,6 +59,7 @@
         <id column="ve_id" property="id" jdbcType="INTEGER" />
         <result column="ve_code" property="ve_code" jdbcType="VARCHAR" />
         <result column="ve_uu" property="ve_uu" jdbcType="VARCHAR" />
+        <result column="ve_shortname" property="ve_shortname" jdbcType="VARCHAR"/>
         <result column="ve_name" property="ve_name" jdbcType="VARCHAR" />
         <result column="ve_type" property="ve_type" jdbcType="VARCHAR" />
         <result column="ve_begindate" property="ve_begindate" jdbcType="TIMESTAMP" />
@@ -75,6 +78,10 @@
         <result column="ve_text3" property="ve_text3" jdbcType="VARCHAR" />
         <result column="ve_text4" property="ve_text4" jdbcType="VARCHAR" />
         <result column="ve_text5" property="ve_text5" jdbcType="VARCHAR" />
+        <result column="ve_remark" property="ve_remark" jdbcType="VARCHAR" />
+        <result column="ve_buyerid" property="ve_buyerid" jdbcType="INTEGER" />
+        <result column="ve_buyercode" property="ve_buyercode" jdbcType="VARCHAR" />
+        <result column="ve_buyername" property="ve_buyername" jdbcType="VARCHAR" />
         <result column="vc_veid" property="vc_veid" jdbcType="INTEGER" />
         <result column="vc_detno" property="vc_detno" jdbcType="INTEGER" />
         <result column="vc_name" property="vc_name" jdbcType="VARCHAR" />
@@ -87,7 +94,6 @@
         <result column="vc_text4" property="vc_text4" jdbcType="VARCHAR" />
         <result column="vc_text5" property="vc_text5" jdbcType="VARCHAR" />
         <result column="vc_default" property="vc_default" jdbcType="VARCHAR" />
-        <result column="ve_remark" property="ve_remark" jdbcType="VARCHAR" />
     </resultMap>
 
     <select id="getListDataByCondition" resultMap="VendorListResultMapper">
@@ -102,10 +108,11 @@
     </select>
 
     <sql id="Base_Column_List" >
-        ve_id, ve_code, ve_name, ve_uu, ve_type, ve_begindate, ve_beginapamount, ve_beginprepayamount,
+        ve_id, ve_code, ve_shortname,ve_name, ve_uu, ve_type, ve_begindate, ve_beginapamount, ve_beginprepayamount,
         ve_promisedays, ve_taxrate, ve_nsrzh, ve_bankaccount, ve_bankcode, ve_status, ve_statuscode,
         companyId, updaterId, updateTime, ve_text1,
-        ve_text2, ve_text3, ve_text4, ve_text5, ve_payamount, ve_leftamount, ve_beginym, ve_preamount,ve_remark
+        ve_text2, ve_text3, ve_text4, ve_text5, ve_payamount, ve_leftamount, ve_beginym, ve_preamount,ve_remark,
+        ve_buyerid,ve_buyercode,ve_buyername
     </sql>
     <select id="selectByPrimaryKey" resultMap="VendorResultMapper" parameterType="java.lang.Long" >
         select
@@ -117,31 +124,6 @@
         delete from vendor
         where ve_id = #{id}
     </delete>
-    <insert id="insert" parameterType="com.usoftchina.saas.document.entities.Vendor" >
-        insert into vendor (ve_code, ve_name,
-        ve_uu, ve_type, ve_begindate,
-        ve_beginapamount, ve_beginprepayamount,
-        ve_promisedays, ve_taxrate, ve_nsrzh,
-        ve_bankaccount, ve_bankcode, ve_status,
-        ve_statuscode, companyId, updaterId,
-        updateTime, ve_text1, ve_text2,
-        ve_text3, ve_text4, ve_text5,
-        ve_payamount, ve_leftamount, ve_beginym ,ve_preamount,
-        creatorId,createTime,creatorName,ve_remark
-        )
-        values (#{ve_code,jdbcType=VARCHAR}, #{ve_name,jdbcType=VARCHAR},
-        #{ve_uu,jdbcType=VARCHAR}, #{ve_type,jdbcType=VARCHAR}, #{ve_begindate,jdbcType=TIMESTAMP},
-        #{ve_beginapamount,jdbcType=DOUBLE}, #{ve_beginprepayamount,jdbcType=DOUBLE},
-        #{ve_promisedays,jdbcType=DECIMAL}, #{ve_taxrate,jdbcType=DOUBLE}, #{ve_nsrzh,jdbcType=VARCHAR},
-        #{ve_bankaccount,jdbcType=VARCHAR}, #{ve_bankcode,jdbcType=VARCHAR}, #{ve_status,jdbcType=VARCHAR},
-        #{ve_statuscode,jdbcType=VARCHAR}, #{companyId,jdbcType=DECIMAL}, #{updaterId,jdbcType=DECIMAL},
-        #{updateTime,jdbcType=TIMESTAMP}, #{ve_text1,jdbcType=VARCHAR}, #{ve_text2,jdbcType=VARCHAR},
-        #{ve_text3,jdbcType=VARCHAR}, #{ve_text4,jdbcType=VARCHAR}, #{ve_text5,jdbcType=VARCHAR},
-        #{ve_payamount,jdbcType=DOUBLE}, #{ve_leftamount,jdbcType=DOUBLE}, #{ve_beginym,jdbcType=INTEGER},
-        #{ve_preamount,jdbcType=DOUBLE},
-        #{creatorId,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{creatorName,jdbcType=VARCHAR},#{ve_remark,jdbcType=VARCHAR}
-        )
-    </insert>
     <insert id="insertSelective" parameterType="com.usoftchina.saas.document.entities.Vendor" >
         <selectKey resultType="java.lang.Long" keyProperty="id">
             SELECT LAST_INSERT_ID() AS ID
@@ -151,6 +133,9 @@
             <if test="ve_code != null" >
                 ve_code,
             </if>
+            <if test="ve_shortname !=null">
+                ve_shortname,
+            </if>
             <if test="ve_name != null" >
                 ve_name,
             </if>
@@ -236,13 +221,25 @@
                 creatorName,
             </if>
             <if test="ve_remark!=null">
-                ve_remark
+                ve_remark,
+            </if>
+            <if test="ve_buyerid!=null">
+                ve_buyerid,
+            </if>
+            <if test="ve_buyercode!=null">
+                ve_buyercode,
+            </if>
+            <if test="ve_buyername!=null">
+                ve_buyername
             </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides="," >
             <if test="ve_code != null" >
                 #{ve_code,jdbcType=VARCHAR},
             </if>
+            <if test="ve_shortname !=null">
+                #{ve_shortname,jdbcType=VARCHAR},
+            </if>
             <if test="ve_name != null" >
                 #{ve_name,jdbcType=VARCHAR},
             </if>
@@ -328,7 +325,16 @@
                 #{creatorName,jdbcType=VARCHAR},
             </if>
             <if test="ve_remark != null">
-                #{ve_remark,jdbcType=VARCHAR}
+                #{ve_remark,jdbcType=VARCHAR},
+            </if>
+            <if test="ve_buyerid != null">
+                #{ve_buyerid,jdbcType=INTEGER},
+            </if>
+            <if test="ve_buyercode != null">
+                #{ve_buyercode,jdbcType=VARCHAR},
+            </if>
+            <if test="ve_buyername != null">
+                #{ve_buyername,jdbcType=VARCHAR}
             </if>
         </trim>
     </insert>
@@ -338,6 +344,9 @@
             <if test="ve_code != null" >
                 ve_code = #{ve_code,jdbcType=VARCHAR},
             </if>
+            <if test="ve_shortname !=null">
+                ve_shortname = #{ve_shortname,jdbcType=VARCHAR},
+            </if>
             <if test="ve_name != null" >
                 ve_name = #{ve_name,jdbcType=VARCHAR},
             </if>
@@ -416,41 +425,18 @@
             <if test="ve_remark != null" >
                 ve_remark = #{ve_remark,jdbcType=VARCHAR},
             </if>
+            <if test="ve_buyerid != null" >
+                ve_buyerid = #{ve_buyerid,jdbcType=INTEGER},
+            </if>
+            <if test="ve_buyercode != null" >
+                ve_buyercode = #{ve_buyercode,jdbcType=VARCHAR},
+            </if>
+            <if test="ve_buyername != null" >
+                ve_buyername = #{ve_buyername,jdbcType=VARCHAR}
+            </if>
         </set>
         where ve_id = #{id}
     </update>
-    <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.document.entities.Vendor" >
-        update vendor
-        set ve_code = #{ve_code,jdbcType=VARCHAR},
-        ve_name = #{ve_name,jdbcType=VARCHAR},
-        ve_uu = #{ve_uu,jdbcType=VARCHAR},
-        ve_type = #{ve_type,jdbcType=VARCHAR},
-        ve_begindate = #{ve_begindate,jdbcType=TIMESTAMP},
-        ve_beginapamount = #{ve_beginapamount,jdbcType=DOUBLE},
-        ve_beginprepayamount = #{ve_beginprepayamount,jdbcType=DOUBLE},
-        ve_promisedays = #{ve_promisedays,jdbcType=DECIMAL},
-        ve_taxrate = #{ve_taxrate,jdbcType=DOUBLE},
-        ve_nsrzh = #{ve_nsrzh,jdbcType=VARCHAR},
-        ve_bankaccount = #{ve_bankaccount,jdbcType=VARCHAR},
-        ve_bankcode = #{ve_bankcode,jdbcType=VARCHAR},
-        ve_status = #{ve_status,jdbcType=VARCHAR},
-        ve_statuscode = #{ve_statuscode,jdbcType=VARCHAR},
-        companyId = #{companyId,jdbcType=DECIMAL},
-        updaterId = #{updaterId,jdbcType=DECIMAL},
-        updateTime = #{updateTime,jdbcType=TIMESTAMP},
-        ve_text1 = #{ve_text1,jdbcType=VARCHAR},
-        ve_text2 = #{ve_text2,jdbcType=VARCHAR},
-        ve_text3 = #{ve_text3,jdbcType=VARCHAR},
-        ve_text4 = #{ve_text4,jdbcType=VARCHAR},
-        ve_text5 = #{ve_text5,jdbcType=VARCHAR},
-        ve_payamount = #{ve_payamount,jdbcType=DOUBLE},
-        ve_leftamount = #{ve_leftamount,jdbcType=DOUBLE},
-        ve_beginym = #{ve_beginym,jdbcType=INTEGER},
-        ve_preamount =#{ve_preamount,jdbcType=DOUBLE},
-        ve_remark = #{ve_remark,jdbcType=VARCHAR}
-        where ve_id = #{id}
-    </update>
-
     <select id="validateCodeWhenInsert" resultType="int">
         select count(*) from VENDOR where VE_CODE = #{code} and companyId =#{companyId}
     </select>

frontend/saas-web/app/view/core/chart/ChartBase.scss

@@ -26,5 +26,8 @@
                 }
             }
         }
-    } 
+    }
+    .x-mask {
+        background-color: transparent;
+    }
 }

frontend/saas-web/app/view/core/tab/Controller.js

@@ -19,7 +19,7 @@ Ext.define('saas.view.core.tab.Controller', {
     },
 
     onTabActivate: function(component) {
-        var tabView = component.down('panel');
+        var tabView = component.down('container');
 
         if(typeof tabView.refresh == 'function') {
             tabView.refresh();
@@ -63,5 +63,12 @@ Ext.define('saas.view.core.tab.Controller', {
 
             component.resetCloseClick = true;
         }
+
+        tabView.fireEvent('onTabActivate', tabView);
+    },
+
+    onTabDeactivate: function(component) {
+        var tabView = component.down('container');
+        tabView.fireEvent('onTabDeactivate', tabView);
     }
 });

frontend/saas-web/app/view/core/tab/Panel.js

@@ -5,6 +5,7 @@ Ext.define('saas.view.core.tab.Panel', {
     layout: 'fit',
     
     listeners: {
-        activate: 'onTabActivate'
+        activate: 'onTabActivate',
+        deactivate: 'onTabDeactivate'
     }
 });

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

@@ -75,6 +75,10 @@ Ext.define('saas.view.document.vendor.BasePanel', {
             text : "供应商编号", 
             width : 150.0, 
             dataIndex : "ve_code" 
+        },{
+            text : "供应商简称", 
+            width : 150.0, 
+            dataIndex : "ve_shortname" 
         }, {
             text : "供应商名称", 
             dataIndex : "ve_name", 

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

@@ -3,7 +3,24 @@ Ext.define('saas.view.document.vendor.FormController', {
     alias: 'controller.document-vendor-formpanel',
     init: function (form) {
         var me = this;
-        this.control({});
+        this.control({
+            //主表单选放大镜模板
+            'employeeDbfindTrigger[name=ve_buyername]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'id',to:'ve_buyerid'
+                        },{
+                            from:'em_code',to:'ve_buyercode'
+                        },{
+                            from:'em_name',to:'ve_buyername'
+                        }],
+                    }) ;   
+
+                }
+            }
+        });
+
     },
 
     auditBtnClick: function() {

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

@@ -34,12 +34,18 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         fieldLabel: '供应商编号',
         allowBlank: false,
         columnWidth: 0.25
+    },{
+        xtype: 'textfield',
+        name: 've_shortname',
+        fieldLabel: '供应商简称',
+        allowBlank: true,
+        columnWidth: 0.25
     },{
         xtype: 'textfield',
         name: 've_name',
         fieldLabel: '供应商名称',
         allowBlank: false,
-        columnWidth: 0.5
+        columnWidth: 0.25
     },{
         xtype: 'hidden',
         name: 've_status',
@@ -188,6 +194,22 @@ Ext.define('saas.view.document.vendor.FormPanel', {
             var format = '0.' + xr.join();
             return Ext.util.Format.number(v, format);
         },  
+    },
+    {
+        xtype : "hidden", 
+        name : "ve_buyercode", 
+        fieldLabel : "采购员编号"
+    },{
+        xtype : "employeeDbfindTrigger", 
+        name : "ve_buyername", 
+        fieldLabel : "采购员",
+        columnWidth : 0.25,
+        defaultValue:saas.util.BaseUtil.getCurrentUser().realname
+    },{
+        xtype : "hidden", 
+        name : "ve_buyerid", 
+        fieldLabel : "采购员ID",
+        defaultValue:saas.util.BaseUtil.getCurrentUser().id
     },{
         fieldLabel : "备注", 
         xtype:'textfield',

frontend/saas-web/app/view/home/Home.js

@@ -21,6 +21,8 @@ Ext.define('saas.view.home.Home', {
 
     scrollable: true,
 
+    REFRESH_INTERVALS: 5 * 60 * 1000, // 刷新间隔
+
     defaults: {
         shadow: true,
         cls: 'x-home-box',
@@ -69,5 +71,37 @@ Ext.define('saas.view.home.Home', {
         }, {
             xtype: 'stock-amount'
         }]
-    }]
+    }],
+
+    initComponent: function() {
+        this.lastTime = Ext.Date.now();
+        this.callParent(arguments);
+    },
+
+    listeners: {
+        onTabActivate: function(p) {
+            p.refreshId = window.setInterval((p.refreshStores.bind(p)()).bind(p), p.REFRESH_INTERVALS);
+        },
+        onTabDeactivate: function(p) {
+            p.lastTime = 0;
+            window.clearInterval(p.refreshId);
+        }
+    },
+
+    refreshStores: function() {
+        var me = this,
+        lastTime = me.lastTime || 0,
+        now = Ext.Date.now(),
+        viewModel = me.getViewModel(),
+        stores = viewModel.storeInfo;
+
+        if(now - lastTime > me.REFRESH_INTERVALS) {
+            for(var key in stores) {
+                var store = stores[key];
+                store.load();
+            }
+            me.lastTime = Ext.Date.now();
+        }
+        return me.refreshStores;
+    }
 });

frontend/saas-web/app/view/home/InfoCard.js

@@ -34,8 +34,6 @@ Ext.define('saas.view.home.InfoCard', {
     initComponent: function () {
         var me = this;
 
-        var companyId = saas.util.BaseUtil.getCurrentUser().companyId;
-
         Ext.apply(me, {
             cards: {
                 unship: {
@@ -106,6 +104,7 @@ Ext.define('saas.view.home.InfoCard', {
     addCardItems: function(infoData) {
         infoData = infoData || {};
         var me = this,
+        currentIndex = me.currentIndex,
         p = me.up('home'),
         cards = me.cards,
         datas = [],
@@ -158,6 +157,11 @@ Ext.define('saas.view.home.InfoCard', {
             me.showPageTrigger();
         }
 
+        if(Ext.isNumber(currentIndex)) {
+            me.setActiveItem(me.items.items[currentIndex]);
+        }else {
+            me.currentIndex = 0;
+        }
         me.updateLayout(true);
     },
 
@@ -182,6 +186,7 @@ Ext.define('saas.view.home.InfoCard', {
         var c = me.items.items.length;
         var next = parseInt(i, 10) + incr;
         l.setActiveItem(next);
+        me.currentIndex = me.currentIndex + incr;
 
         me.down('#card-prev').setDisabled(next === 0);
         me.down('#card-next').setDisabled(next === (c-1));

frontend/saas-web/app/view/home/InfoCard.scss

@@ -52,6 +52,10 @@ $max-card-width: 235px;
     .x-toolbar-default-vertical {
         padding: 0;
     }
+
+    .x-mask {
+        background-color: transparent;
+    }
 }
 
 .x-scroller-button {

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

@@ -31,7 +31,7 @@ Ext.define('saas.view.main.Main', {
                     reference: 'mainLogo',
                     width: 180,
                     cls: 'main-logo-wrap',
-                    html: '<div class="main-logo"><img src="resources/images/default/logo-default.png"/><div class="logo-text">优企云服</div></div>',
+                    html: '<div class="main-logo"><img src="resources/images/default/logo-default.png"/><div class="logo-text">U企云服</div></div>',
                     bind: {
                         width: '{navWidth}'
                     }

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

@@ -36,14 +36,15 @@ Ext.define('saas.view.main.MainContainerWrap', {
                 closeAllTabsText: '关闭全部页',
                 closeOthersTabsText: '关闭其他页'
             })],
-            items: [
-                {
-                    iconCls: 'x-sa sa-home',
+            items: [{
+                xtype: 'core-tab-panel',
+                iconCls: 'x-sa sa-home',
+                title: '首页',
+                closable: false,
+                items: [{
                     xtype: 'home',
-                    title: '首页',
-                    closable: false
-                }
-            ]
+                }]
+            }]
         }
     ],
 });

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

@@ -26,12 +26,12 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         },
     }, {
         xtype: 'monthdatefield',
-        name: 'vm_yearmonth',
+        name: 'cm_yearmonth',
         fieldLabel: '起始期间',
         columnWidth: 0.2
     }, {
         xtype: 'monthdatefield',
-        name: 'vm_yearmonthTo',
+        name: 'cm_yearmonthTo',
         fieldLabel: '结束期间',
         columnWidth: 0.2
     }],

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

@@ -15,6 +15,12 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             from:'ve_code',to:'pu_vendcode'
                         },{
                             from:'ve_name',to:'pu_vendname'
+                        },{
+                            from:'ve_buyerid',to:'pu_buyerid'
+                        },{
+                            from:'ve_buyercode',to:'pu_buyercode'
+                        },{
+                            from:'ve_buyername',to:'pu_buyername'
                         }],
                     }) ; 
                 }

frontend/saas-web/resources/json/navigation.json

@@ -128,15 +128,15 @@
     "items": [{
         "text": "制单",
         "items": [{
-            "id": "payBalance",
-            "text": "付款单",
-            "addType": "money-paybalance-formpanel",
-            "viewType": "money-paybalance-querypanel"
-        }, {
             "id": "recBbalance",
             "text": "收款单",
             "addType": "money-recbalance-formpanel",
             "viewType": "money-recbalance-querypanel"
+        }, {
+            "id": "payBalance",
+            "text": "付款单",
+            "addType": "money-paybalance-formpanel",
+            "viewType": "money-paybalance-querypanel"
         }, {
             "id": "verification",
             "text": "核销单",
@@ -161,13 +161,13 @@
     }, {
         "text": "报表",
         "items": [{
-            "text": "应付账款明细表",
-            "id": "monry-report-paydetail",
-            "viewType":"monry-report-paydetail"
-        }, {
             "text": "应收账款明细表",
             "id": "monry-report-recdetail",
             "viewType":"monry-report-recdetail"
+        }, {
+            "text": "应付账款明细表",
+            "id": "monry-report-paydetail",
+            "viewType":"monry-report-paydetail"
         }, {
             "text": "账户收支明细表",
             "id": "monry-report-accountbalance",