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

# Conflicts:
#	applications/document/document-server/src/main/resources/mapper/ProductMapper.xml

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -88,7 +88,8 @@ public enum BizExceptionCode implements BaseExceptionCode {
     CHECK_SETACOUNT_EXIS(74006, "不能删除单据日期小于等于结账期间<u>%s</u>的单据"),
     VERIFICATION_CHECK_BALANCE(74007,"核销金额不能大于未核销金额"),
     DELETE_NOT_EXIS(74008,"删除失败，当前单据不存在!"),
-    DOCUMENTS_AUDITED(74009,"单据已审核"),
+    DOCUMENTS_AUDITED(74009,"审核失败，存在已审核单据"),
+    DOCUMENTS_UNAUDITED(74009,"反审核失败，存在未审核单据"),
 
 
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/WarehouseMapper.java

@@ -43,4 +43,5 @@ public interface WarehouseMapper extends CommonBaseMapper<Warehouse> {
 
     int selectCountByCode(@Param("code") String code, @Param("companyId") Long companyId, @Param("id") Long id);
 
+    int deleteCheckProdIO(@Param("id") Long id, @Param("companyId") Long companyId);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/ProductServiceImpl.java

@@ -448,9 +448,10 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
     }
 
     @Override
+    @Transactional
     public boolean batchDelete(BatchDealBaseDTO baseDTOs) {
         for(DocBaseDTO docBaseDTO : baseDTOs.getBaseDTOs()){
-            getMapper().deleteByPrimaryKey(docBaseDTO.getId());
+            deleteByPrimaryKey(docBaseDTO.getId());
         }
         return true;
     }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/WarehouseServiceImpl.java

@@ -244,6 +244,11 @@ public class WarehouseServiceImpl extends CommonBaseServiceImpl<WarehouseMapper,
         if (num > 0) {
             throw new BizException(BizExceptionCode.PRODUCTWH_HAS_WAREHOUSE);
         }
+        //校验出入库单据
+        num = warehouseMapper.deleteCheckProdIO(id, companyId);
+        if (num > 0){
+            throw new BizException(BizExceptionCode.BIZ_RELDELETE);
+        }
         singleDelete(id);
     }
 

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

@@ -371,5 +371,8 @@
         select count(1) from productwh where pw_whid = #{id} and pw_onhand > 0
         and companyId = #{companyId}
     </select>
+    <select id="deleteCheckProdIO" resultType="int">
+        SELECT COUNT(*) FROM PRODIODETAIL WHERE pd_whid = #{id} and companyid = #{companyId}
+    </select>
 </mapper>
 

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

@@ -305,6 +305,10 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Fundtransfer fundtransfers = fundtransferMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
+            if (com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay().equals(fundtransfers.getFt_status())){
+                throw new BizException(500, BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage());
+            }
             this.unAudit(Math.toIntExact(docBaseDTO.getId()));
         }
     }

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

@@ -359,6 +359,10 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Othreceipts othreceipts1 = othreceiptsMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
+            if (com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay().equals(othreceipts1.getOr_status())){
+                throw new BizException(500, BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage());
+            }
             this.unAudit(Math.toIntExact(docBaseDTO.getId()));
         }
     }

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

@@ -354,6 +354,10 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Othspendings othspendings1 = othspendingsMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
+            if (com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay().equals(othspendings1.getOs_status())){
+                throw new BizException(500, BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage());
+            }
             this.unAudit(Math.toIntExact(docBaseDTO.getId()));
         }
     }

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

@@ -465,6 +465,10 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Paybalance paybalance1 = paybalanceMapper.selectByPrimaryKey(docBaseDTO.getId());
+            if (com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay().equals(paybalance1.getPb_status())){
+                throw new BizException(500, BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage());
+            }
             this.unAudit(Math.toIntExact(docBaseDTO.getId()));
         }
     }

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

@@ -470,6 +470,10 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         Iterator isList = baseDTO.getBaseDTOs().iterator();
         while (isList.hasNext()){
             DocBaseDTO docBaseDTO = (DocBaseDTO) isList.next();
+            Recbalance recbalance1 = recbalanceMapper.selectByPrimaryKey(docBaseDTO.getId().intValue());
+            if (com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay().equals(recbalance1.getRb_status())){
+                throw new BizException(500, BizExceptionCode.DOCUMENTS_UNAUDITED.getMessage());
+            }
             this.unAudit(docBaseDTO.getId());
         }
     }

base-servers/account/account-dto/src/main/java/com/usoftchina/saas/account/dto/AccountAddDTO.java

@@ -0,0 +1,112 @@
+package com.usoftchina.saas.account.dto;
+
+import java.io.Serializable;
+
+/**
+ * @author chenw
+ * @date 2018/11/27
+ */
+public class AccountAddDTO implements Serializable {
+
+    private String username;
+    /**
+     * 密文密码
+     */
+    private String password;
+    private String salt;
+    private String realname;
+    private String email;
+    private String mobile;
+    /**
+     * 账号类型 0 - 管理员
+     */
+    private Integer type;
+    private Long uu;
+    private String roleIds;
+
+    public String getRoleIds() {
+        return roleIds;
+    }
+
+    public void setRoleIds(String roleIds) {
+        this.roleIds = roleIds;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getSalt() {
+        return salt;
+    }
+
+    public void setSalt(String salt) {
+        this.salt = salt;
+    }
+
+    public String getRealname() {
+        return realname;
+    }
+
+    public void setRealname(String realname) {
+        this.realname = realname;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Long getUu() {
+        return uu;
+    }
+
+    public void setUu(Long uu) {
+        this.uu = uu;
+    }
+
+    @Override
+    public String toString() {
+        return "AccountCopyDTO{" +
+                "username='" + username + '\'' +
+                ", password='" + password + '\'' +
+                ", salt='" + salt + '\'' +
+                ", realname='" + realname + '\'' +
+                ", email='" + email + '\'' +
+                ", mobile='" + mobile + '\'' +
+                ", type=" + type +
+                ", uu=" + uu +
+                '}';
+    }
+}

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/controller/AccountController.java

@@ -108,30 +108,25 @@ public class AccountController {
     /**
      * SAAS手动添加账户,并默认绑定当前公司
      *
-     * @param accountCopyDTO
+     * @param accountAddDTO
      * @return
      */
     @PostMapping("/register/add")
-    public Result AddAccount(@RequestBody AccountCopyDTO accountCopyDTO) {
-        // 判断是否已注册
-        Account account = accountService.findByUsername(accountCopyDTO.getUsername());
-        if (null != account) {
-            return Result.error(ExceptionCode.USER_NAME_EXIST);
-        }
-        account = accountService.findByMobile(accountCopyDTO.getMobile());
-        if (null != account) {
-            return Result.error(ExceptionCode.USER_MOBILE_EXIST);
-        }
-        account = accountService.findByEmail(accountCopyDTO.getEmail());
-        if (null != account) {
-            return Result.error(ExceptionCode.USER_EMAIL_EXIST);
+    public Result AddAccount(@RequestBody AccountAddDTO accountAddDTO) {
+        Account account = null;
+        // 根据手机号、邮箱、用户名片段判断是否已注册
+        boolean checked = accountService.findByUsernameOrMobileOrEmail(accountAddDTO.getUsername(), accountAddDTO.getMobile(), accountAddDTO.getEmail());
+        if (!checked) {
+            account = BeanMapper.map(accountAddDTO, Account.class);
+            account.setEnabled(true);
+            accountService.save(account);
         }
-
-        account = BeanMapper.map(accountCopyDTO, Account.class);
-        account.setEnabled(true);
-        accountService.save(account);
+        account = accountService.findByMobile(accountAddDTO.getMobile());
         //绑定企业
         accountService.bindCompany(account.getId(), BaseContextHolder.getCompanyId());
+        //绑定角色
+        accountService.bindRoles(account.getId(), accountAddDTO.getRoleIds());
+        accountService.clearCache(account.getId());
         return Result.success();
     }
 
@@ -418,6 +413,10 @@ public class AccountController {
     @PostMapping("/enable")
     public Result enableAccount(@RequestParam long accountId) {
         accountService.enable(accountId);
+        //同步到优软云
+        Long userUU = accountService.findByPrimaryKey(accountId).getUu();
+        Long companyUU = companyService.findByPrimaryKey(BaseContextHolder.getCompanyId()).getUu();
+        String result = ssoUserApi.bind("bind", "trade-app", userUU, companyUU);
         accountService.clearCache(accountId);
         return Result.success();
     }

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/mapper/AccountMapper.java

@@ -113,4 +113,13 @@ public interface AccountMapper {
      * @return
      */
     int checkEmail(@Param("email") String email, @Param("companyId") Long companyId);
+
+    /**
+     * 查询用户是否已存在
+     * @param username
+     * @param mobile
+     * @param email
+     * @return
+     */
+    int findByUsernameOrMobileOrEmail(@Param("username") String username, @Param("mobile") String mobile, @Param("email") String email);
 }

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/mapper/AccountRoleMapper.java

@@ -55,5 +55,5 @@ public interface AccountRoleMapper {
      * 解除账户绑定的所有角色
      * @param id
      */
-    void unBindRolesById(Long id);
+    void unBindRolesById(@Param("id") Long id, @Param("companyId") Long companyId);
 }

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/AccountService.java

@@ -185,4 +185,13 @@ public interface AccountService {
      * @return
      */
     boolean checkEmail(String email);
+
+    /**
+     * 通过手机号、邮箱、用户名校验是否存在此用户
+     * @param username
+     * @param mobile
+     * @param email
+     * @return
+     */
+    boolean findByUsernameOrMobileOrEmail(String username, String mobile, String email);
 }

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/impl/AccountServiceImpl.java

@@ -125,7 +125,7 @@ public class AccountServiceImpl implements AccountService {
 
     @Override
     public void bindRoles(Long accountId, String roleIds) {
-        accountRoleMapper.unBindRolesById(accountId);
+        accountRoleMapper.unBindRolesById(accountId, BaseContextHolder.getCompanyId());
         String[] array = roleIds.split(",");
         for (int i = 0; i < array.length; i++){
             bindRole(accountId, Long.parseLong(array[i]));
@@ -204,4 +204,9 @@ public class AccountServiceImpl implements AccountService {
         return accountMapper.checkEmail(email, BaseContextHolder.getCompanyId()) > 0;
     }
 
+    @Override
+    public boolean findByUsernameOrMobileOrEmail(String username, String mobile, String email) {
+        return accountMapper.findByUsernameOrMobileOrEmail(username, mobile, email) > 0;
+    }
+
 }

base-servers/account/account-server/src/main/resources/application.yml

@@ -82,7 +82,7 @@ mybatis:
 auth:
   public-key: auth/pub.key
 sso:
-  base-url: http://192.168.253.12:32323
+  base-url: https://sso.ubtob.com
 ribbon:
   ReadTimeout: 6000
   ConnectTimeout: 2000

base-servers/account/account-server/src/main/resources/mapper/AccountMapper.xml

@@ -206,4 +206,8 @@
         SELECT COUNT(*) FROM AC_ACCOUNT AA LEFT JOIN AC_ACCOUNT_COMPANY AAC ON AAC.ACCOUNT_ID = AA.ID
         WHERE AAC.COMPANY_ID = #{companyId} AND AA.EMAIL = #{email};
     </select>
+    <select id="findByUsernameOrMobileOrEmail" resultType="int">
+        SELECT COUNT(*) FROM AC_ACCOUNT
+        WHERE USERNAME = #{username} OR MOBILE = #{mobile} OR EMAIL = #{email};
+    </select>
 </mapper>

base-servers/account/account-server/src/main/resources/mapper/AccountRoleMapper.xml

@@ -32,7 +32,7 @@
         </where>
         group by a.id,a.username,a.realname,a.email,a.mobile,a.enabled
     </select>
-    <delete id="unBindRolesById" parameterType="java.lang.Long">
-        DELETE FROM AC_ACCOUNT_ROLE WHERE ACCOUNT_ID = #{id}
+    <delete id="unBindRolesById" >
+        DELETE FROM AC_ACCOUNT_ROLE WHERE ACCOUNT_ID = #{id} and company_id = #{companyId}
     </delete>
 </mapper>

base-servers/auth/sso-api/src/main/java/com/usoftchina/sso/api/SsoUserApi.java

@@ -60,6 +60,9 @@ public interface SsoUserApi {
     @PostMapping("")
     String unbind(@RequestParam("_operate") String _operate, @RequestParam("userUU") Long userUU, @RequestParam("spaceUU") Long spaceUU);
 
+    @PostMapping("")
+    String bind(@RequestParam("_operate") String _operate, @RequestParam("appId") String appId, @RequestParam("userUU") Long userUU, @RequestParam("spaceUU") Long spaceUU);
+
     @Component
     class DefaultFallback implements SsoUserApi{
         @Override
@@ -82,5 +85,10 @@ public interface SsoUserApi {
             return null;
         }
 
+        @Override
+        public String bind(String _operate, String appId, Long userUU, Long spaceUU) {
+            return null;
+        }
+
     }
 }

frontend/saas-web/app/Application.scss

@@ -389,4 +389,22 @@ div::-webkit-scrollbar-track {
 .x-monthpicker-buttons .x-btn-default-toolbar-small{
   padding: 2px 2px 2px 2px;
   min-width: 56px;
+}
+
+/** charts **/
+.x-tip-default {
+  background-color: #485465;
+  border-color: #485465;
+}
+
+/** datepicker icon **/
+.x-form-field-date .x-form-date-trigger {
+  background: #F1F9FF;
+  border-left: 1px solid #D2D6E5;
+  
+  &:before {
+    content: "\e80f";
+    font-family: font-saas;
+    color: #5AC6F8;
+  }
 }

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

@@ -9,7 +9,7 @@ Ext.define('saas.view.home.HomeModel', {
         month_out: '0', // 本月支出合计
 
         insetPadding: '12 0 0 0', // 图表insetPadding
-        maxBarWidth: 20, // 最大柱宽
+        maxBarWidth: 25, // 最大柱宽
     },
 
     stores: {

frontend/saas-web/app/view/home/charts/MonthIO.js

@@ -31,10 +31,6 @@ Ext.define('saas.view.home.charts.MonthIO', {
                     insetPadding: '{insetPadding}',
                     store: '{month_io}'
                 },
-                // legend: {
-                //     type: 'sprite',
-                //     docked: 'bottom'
-                // },
                 legend: {
                     type: 'dom',
                     docked: 'top',
@@ -50,6 +46,7 @@ Ext.define('saas.view.home.charts.MonthIO', {
                     fields: ['main'],
                     minimum: 0,
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465'
                     },
                     grid: {
@@ -69,6 +66,7 @@ Ext.define('saas.view.home.charts.MonthIO', {
                     position: 'bottom',
                     fields: ['x'],
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465'
                     },
                     style: {

frontend/saas-web/app/view/home/charts/MonthIO.scss

@@ -11,6 +11,7 @@
         .x-legend-container {
 
             .x-legend-item {
+                font-size: 12px;
                 border: none !important;
                 outline: none !important;
                 text-align: left;

frontend/saas-web/app/view/home/charts/MonthPurchase.js

@@ -26,6 +26,7 @@ Ext.define('saas.view.home.charts.MonthPurchase', {
                     fields: ['x'],
                     position: 'bottom',
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465'
                     },
                     style: {
@@ -46,6 +47,7 @@ Ext.define('saas.view.home.charts.MonthPurchase', {
                         }
                     },
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465',
                         textAlign: 'end'
                     },

frontend/saas-web/app/view/home/charts/MonthSale.scss

@@ -6,6 +6,7 @@
         .x-legend-container {
 
             .x-legend-item {
+                font-size: 12px;
                 border: none !important;
                 outline: none !important;
                 text-align: left;

frontend/saas-web/app/view/home/charts/PurchaseTrend.js

@@ -30,6 +30,7 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                     fields: ['x'],
                     position: 'bottom',
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465'
                     },
                     style: {
@@ -50,6 +51,7 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                         }
                     },
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465'
                     },
                     style: {

frontend/saas-web/app/view/home/charts/SaleTrend.js

@@ -36,6 +36,7 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                     fields: ['x'],
                     position: 'bottom',
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465',
                     },
                     style: {
@@ -56,6 +57,7 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                         }
                     },
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465',
                     },
                     style: {

frontend/saas-web/app/view/home/charts/StockAmount.js

@@ -30,6 +30,7 @@ Ext.define('saas.view.home.charts.StockAmount', {
                     fields: ['x'],
                     position: 'bottom',
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465'
                     },
                     style: {
@@ -50,6 +51,7 @@ Ext.define('saas.view.home.charts.StockAmount', {
                         }
                     },
                     label: {
+                        fontSize: '12px',
                         fillStyle: '#485465'
                     },
                     style: {

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

@@ -38,6 +38,7 @@ Ext.define('saas.view.main.MainContainerWrap', {
             })],
             items: [
                 {
+                    iconCls: 'x-sa sa-home',
                     xtype: 'home',
                     title: '首页',
                     closable: false

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

@@ -35,7 +35,7 @@ Ext.define('saas.view.main.MainController', {
         navigationList = refs.navigationTreeList,
         navCollapsed = !navigationList.navCollapsed,
         new_width = navCollapsed ? viewModel.get('smallNavWidth') : viewModel.get('navWidth'),
-        newLogoImgStyle = navCollapsed ? { width: 40, height: 40, top: 10, left: 10 } : { width: 32, height: 32, top: 16, left: 42 },
+        newLogoImgStyle = navCollapsed ? { width: 36, height: 36, top: 12, left: 12 } : { width: 32, height: 32, top: 16, left: 42 },
         newLogoTextStyle = navCollapsed ? {
             5: { opacity: 0 },
             10: { opacity: 0 },

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

@@ -81,19 +81,21 @@ Ext.define('saas.view.main.Navigation', {
                     '<div class="nav-menu-body">',
                     '<tpl for=".">',
                     '<div class="menu">',
-                    '<h3 class="menu-title">{text}</h3>',
-                    '<div class="menu-content">',
-                    '<tpl for="items">',
-                    '<div class="menuitem">',
-                    '<div class="item-text" title="{text}" data-config="{config}" data-id="{id}" data-text="{text}" data-type="query" data-viewType="{viewType}">',
-                    '{text}',
-                    '</div>',
-                    '<tpl if="{addType}">',
-                    '<div class="item-icon" data-id="{id}" data-text="{text}" data-type="form" data-viewType="{addType}">新增</div>',
-                    '</tpl>',
-                    '</div>',
-                    '</tpl>',
-                    '</div>',
+                        '<div class="menu-title">',
+                            '<span class="menu-title-text">{text}</span>',
+                        '</div>',
+                        '<div class="menu-content">',
+                            '<tpl for="items">',
+                            '<div class="menuitem">',
+                                '<div class="item-text" title="{text}" data-config="{config}" data-id="{id}" data-text="{text}" data-type="query" data-viewType="{viewType}">',
+                                    '{text}',
+                                '</div>',
+                                '<tpl if="{addType}">',
+                                '<div class="item-icon" data-id="{id}" data-text="{text}" data-type="form" data-viewType="{addType}">新增</div>',
+                                '</tpl>',
+                            '</div>',
+                            '</tpl>',
+                        '</div>',
                     '</div>',
                     '</tpl>',
                     '</div>',

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

@@ -102,61 +102,67 @@ $nav-font-color-over: #fff;
     top: 0;
     background: white;
     overflow: hidden;
-    // animation: name duration timing-function delay iteration-count direction;
 
     .nav-menu-body {
         display: flex;
-        padding: 5px;
         border-top-right-radius: 4px;
         border-bottom-right-radius: 4px;
 
         .menu {
-            
+
+            &:first-child {
+                .menu-content {
+                    border-right: 1px solid #EEF9FE;
+                }
+            }
+
             width: 200px;
-            border-right: 1px dashed #ccc;
             letter-spacing: 1px;
-            color: #444;
 
-            &:last-child {
-                border: none;
-            }
-            
             .menu-title {
-                margin: 5px;
+                padding-left: 30px;
+                background: #EEF9FE;
+
+                .menu-title-text {
+                    height: 40px;
+                    line-height: 40px;
+                    font-size: 16px;
+                    color: #4F5170;
+                    letter-spacing: 0.64px;
+                    text-align: left;
+                }
             }
 
             .menu-content {
-                list-style: none;
-                padding-left: 10px;
-                padding-right: 10px;
 
                 .menuitem {
-                    padding: 5px;
+                    padding-left: 25px;
+                    margin: 6px;
                     display: flex;
-                    border-radius: 4px;
                     align-content: space-between;
 
                     .item-text {
+                        color: #4F5170;
                         cursor: pointer;
-                        line-height: 24px;
+                        height: 34px;
+                        line-height: 34px;
                         white-space: nowrap;
-                        width: 130px;
+                        flex: 1;
                         overflow: hidden;
+                        font-size: 14px;
                         text-overflow: ellipsis;
                     }
 
                     .item-icon {
                         cursor: pointer;
-                        float: right;
-                        display: none;
                         background: #64b448;
                         color: #fff;
-                        font-size: 11px;
+                        display: none;
                         padding: 3px 6px;
                         border-radius: 3px;
                         margin-right: 5px;
-                        font-weight: 400;
-                        width: 40px;
+                        height: 24px;
+                        margin-top: 5px;
 
                         &:hover {
                             opacity: 0.7;
@@ -164,6 +170,7 @@ $nav-font-color-over: #fff;
                     }
 
                     &:hover {
+                        border-radius: 4px;
                         background-color: #E4E4E4;
 
                         .item-icon {

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -127,6 +127,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         },{
             text: '审核状态',
             dataIndex: 'ft_status',
+            align: 'center',
             width: 90
         }, {
             text: '录入人',

frontend/saas-web/app/view/money/othreceipts/QueryPanel.js

@@ -109,6 +109,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             }
         }, {
             text: '单据状态',
+            align: 'center',
             dataIndex: 'or_status',
             width: 90
         }, {
@@ -158,6 +159,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             }
         }, {
             text: '单据状态',
+            align: 'center',
             dataIndex: 'or_status',
             width: 90
         }, {

frontend/saas-web/app/view/money/othspendings/QueryPanel.js

@@ -119,6 +119,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             }
         }, {
             text: '单据状态',
+            align: 'center',
             dataIndex: 'os_status',
             width: 90
         },{
@@ -168,6 +169,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             }
         }, {
             text: '单据状态',
+            align: 'center',
             dataIndex: 'os_status',
             width: 90
         },{

frontend/saas-web/app/view/money/payBalance/QueryPanel.js

@@ -94,6 +94,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                 width: 180,
             }, {
                 text: '单据状态',
+                align: 'center',
                 dataIndex: 'pb_status',
                 width: 90
             }, {
@@ -126,6 +127,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             width: 180,
         }, {
             text: '单据状态',
+            align: 'center',
             dataIndex: 'pb_status',
             width: 90
         }, {

frontend/saas-web/app/view/money/recBalance/QueryPanel.js

@@ -85,6 +85,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             width: 180,
         }, {
             text: '单据状态',
+            align: 'center',
             dataIndex: 'rb_status',
             width: 80
         }, {
@@ -113,6 +114,7 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             width: 100
         }, {
             text: '单据状态',
+            align: 'center',
             dataIndex: 'rb_status',
             width: 80
         }, {

frontend/saas-web/app/view/money/verification/QueryPanel.js

@@ -104,6 +104,7 @@ Ext.define('saas.view.money.verification.QueryPanel', {
             width: 100
         },{
             text: '审核状态',
+            align: 'center',
             dataIndex: 'vc_status',
             width: 100
         },{

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

@@ -112,10 +112,12 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             width: 110
         }, {
             text: '审核状态',
+            align: 'center',
             dataIndex: 'pu_status',
             width: 90
         },{
             text: '业务状态',
+            align: 'center',
             dataIndex: 'pu_acceptstatus',
             width: 90
         },{
@@ -156,10 +158,12 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             width: 150
         }, {
             text: '审核状态',
+            align: 'center',
             dataIndex: 'pu_status',
             width: 90
         },{
             text: '业务状态',
+            align: 'center',
             dataIndex: 'pu_acceptstatus',
             width: 90
         }, {

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

@@ -106,10 +106,12 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             width: 110
         },{
             text: '单据状态',
+            align: 'center',
             dataIndex: 'pi_status',
             width: 90
         },{
             text: '付款状态',
+            align: 'center',
             dataIndex: 'pi_prstatus',
             width: 90
         },{
@@ -154,6 +156,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             width: 150
         },{
             text: '审核状态',
+            align: 'center',
             dataIndex: 'pi_status',
             width: 90
         },{

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

@@ -109,10 +109,12 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             width: 110
         },{
             text: '单据状态',
+            align: 'center',
             dataIndex: 'pi_status',
             width: 90
         },{
             text: '付款状态',
+            align: 'center',
             dataIndex: 'pi_prstatus',
             width: 90
         },{
@@ -157,6 +159,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                 width: 150
             },{
                 text: '审核状态',
+                align: 'center',
                 dataIndex: 'pi_status',
                 width: 90
             },{

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

@@ -57,6 +57,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
         width: 250
     }, {
         text: '业务状态',
+        align: 'center',
         dataIndex: 'pu_acceptstatus',
         width: 90
     }, {

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

@@ -56,6 +56,7 @@ Ext.define('saas.view.sale.report.Sale', {
         width: 250
     }, {
         text: '业务状态',
+        align: 'center',
         dataIndex: 'sa_sendstatus'
     }, {
         text: '业务员编号',

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

@@ -117,10 +117,12 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             }
         }, {
             text: '审核状态',
+            align: 'center',
             dataIndex: 'sa_status',
             width: 90
         }, {
             text: '业务状态',
+            align: 'center',
             dataIndex: 'sa_sendstatus',
             width: 90
         }, {
@@ -156,6 +158,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             width: 200
         }, {
             text: '单据状态',
+            align: 'center',
             dataIndex: 'sa_status',
             width: 120
         }, {

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

@@ -96,10 +96,12 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             width: 110
         }, {
             text: '单据状态',
+            align: 'center',
             dataIndex: 'pi_status',
             width: 90
         },{
             text: '收款状态',
+            align: 'center',
             dataIndex: 'pi_prstatus',
             width: 90
         },{
@@ -144,6 +146,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             width: 250
         }, {
             text: '单据状态',
+            align: 'center',
             dataIndex: 'pi_status',
             width: 90
         }, {

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

@@ -97,10 +97,12 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             width: 110
         }, {
             text: '单据状态',
+            align: 'center',
             dataIndex: 'pi_status',
             width: 90
         },{
             text: '收款状态',
+            align: 'center',
             dataIndex: 'pi_prstatus',
             width: 90
         },{
@@ -145,6 +147,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             width: 250
         }, {
             text: '单据状态',
+            align: 'center',
             dataIndex: 'pi_status',
             width: 90
         }, {

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

@@ -101,6 +101,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             width: 110
         },{
             text: '状态',
+            align: 'center',
             dataIndex: 'pi_status',
             width: 90
         },{
@@ -137,6 +138,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
                 width: 110
             },{
                 text: '状态',
+                align: 'center',
                 dataIndex: 'pi_status',
                 width: 90
             },{

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

@@ -132,6 +132,7 @@ Ext.define('saas.view.stock.make.QueryPanel', {
             width: 80,
         },{
             text: '单据状态',
+            align: 'center',
             dataIndex: 'ma_status',
             width: 90,
         },{

frontend/saas-web/app/view/stock/otherIn/QueryPanel.js

@@ -99,6 +99,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             width: 250
         },{
             text: '状态',
+            align: 'center',
             dataIndex: 'pi_status',
             width: 90
         },{
@@ -139,6 +140,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             width: 250
         },{
             text: '状态',
+            align: 'center',
             dataIndex: 'pi_status',
             width: 90
         },{

frontend/saas-web/app/view/stock/otherOut/QueryPanel.js

@@ -99,6 +99,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             width: 250
         },{
             text: '状态',
+            align: 'center',
             dataIndex: 'pi_status',
             width: 90
         },{
@@ -139,6 +140,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             width: 250
         },{
             text: '状态',
+            align: 'center',
             dataIndex: 'pi_status',
             width: 90
         },{

frontend/saas-web/packages/font-saas/sass/etc/icons.scss

@@ -1,36 +1,45 @@
+.sa-home:before { content: "\e817"; }
 
-.sa-purchase:before { content: "\e800"; }
+.sa-bar:before { content: "\e814"; }
 
 .sa-tuichu:before { content: "\e811"; }
 
 .sa-feedback:before { content: "\e810"; }
 
+.sa-money:before { content: "\e805"; }
+
+.sa-setting:before { content: "\e803"; }
+
 .sa-document:before { content: "\e804"; }
 
 .sa-switch-on:before { content: "\e807"; }
 
+.sa-tag:before { content: "\e815"; }
+
 .sa-edit:before { content: "\e806"; }
 
 .sa-help:before { content: "\e813"; }
 
 .sa-sale:before { content: "\e801"; }
 
+.sa-info:before { content: "\e816"; }
+
 .sa-userBook:before { content: "\e80b"; }
 
 .sa-arrows-left:before { content: "\e809"; }
 
+.sa-purchase:before { content: "\e800"; }
+
 .sa-serviceOnline:before { content: "\e80c"; }
 
 .sa-accountCenter:before { content: "\e812"; }
 
-.sa-warehouse:before { content: "\e802"; }
+.sa-date:before { content: "\e80f"; }
 
-.sa-setting:before { content: "\e803"; }
+.sa-warehouse:before { content: "\e802"; }
 
 .sa-saas:before { content: "\e808"; }
 
-.sa-money:before { content: "\e805"; }
-
 .sa-question:before { content: "\e80d"; }
 
 .sa-arrows-right:before { content: "\e80a"; }

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

@@ -38,7 +38,7 @@
     }]
 }, {
     "text": "销售",
-    "iconCls": "x-fa fa-shopping-cart",
+    "iconCls": "x-sa sa-tag",
     "items": [{
         "text": "制单",
         "items": [{
@@ -80,7 +80,7 @@
     }]
 }, {
     "text": "库存",
-    "iconCls": "x-fa fa-home",
+    "iconCls": "x-sa sa-bar",
     "items": [{
         "text": "制单",
         "items": [{
@@ -190,7 +190,7 @@
     }]
 }, {
     "text": "资料",
-    "iconCls": "x-fa fa-book",
+    "iconCls": "x-sa sa-info",
     "items": [{
         "text": "基础资料",
         "items": [{